liukang 2 rokov pred
rodič
commit
4384757245
79 zmenil súbory, kde vykonal 214 pridanie a 57 odobranie
  1. 3 2
      jxtxkj/pages/index/course/buy.vue
  2. 1 1
      jxtxkj/pages/index/course/detail.vue
  3. 38 2
      jxtxkj/pages/login/login.vue
  4. 24 1
      jxtxkj/pages/login/register.vue
  5. 17 1
      jxtxkj/pages/mine/collect.vue
  6. 1 1
      jxtxkj/pages/mine/mine.vue
  7. 16 13
      jxtxkj/pages/mine/order/order.vue
  8. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  9. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.js.map
  10. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-badge/u-badge.js.map
  11. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-button/u-button.js.map
  12. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
  13. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.js.map
  14. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-code/u-code.js.map
  15. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-count-down/u-count-down.js.map
  16. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-form-item/u-form-item.js.map
  17. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map
  18. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js.map
  19. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js.map
  20. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-line-progress/u-line-progress.js.map
  21. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js.map
  22. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-link/u-link.js.map
  23. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  24. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-modal/u-modal.js.map
  25. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-navbar/u-navbar.js.map
  26. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js.map
  27. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-parse/node/node.js.map
  28. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-parse/u-parse.js.map
  29. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js.map
  30. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-radio-group/u-radio-group.js.map
  31. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-radio/u-radio.js.map
  32. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
  33. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.js.map
  34. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
  35. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js.map
  36. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-tabs/u-tabs.js.map
  37. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-text/u-text.js.map
  38. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map
  39. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/course/buy.js.map
  40. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/course/detail.js.map
  41. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/declare/declare.js.map
  42. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/declare/declare_success.js.map
  43. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/exam/exam.js.map
  44. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/exam/parse.js.map
  45. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/exam/submit.js.map
  46. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  47. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/search/search.js.map
  48. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/integral/integral.js.map
  49. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/choose.js.map
  50. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/forget.js.map
  51. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  52. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/register.js.map
  53. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/allCourse.js.map
  54. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/certificate.js.map
  55. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/change.js.map
  56. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/collect.js.map
  57. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/comment.js.map
  58. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/exam/exam.js.map
  59. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/exam/wrong.js.map
  60. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
  61. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/order/apply.js.map
  62. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/order/detail.js.map
  63. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/order/order.js.map
  64. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/password/editPassword.js.map
  65. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/password/success.js.map
  66. 0 0
      jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/personal.js.map
  67. 6 6
      jxtxkj/unpackage/dist/dev/mp-weixin/common/vendor.js
  68. 2 2
      jxtxkj/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-radio-group/u-radio-group.json
  69. 2 2
      jxtxkj/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-radio/u-radio.json
  70. 3 2
      jxtxkj/unpackage/dist/dev/mp-weixin/pages/index/course/buy.js
  71. 1 1
      jxtxkj/unpackage/dist/dev/mp-weixin/pages/index/course/detail.js
  72. 37 1
      jxtxkj/unpackage/dist/dev/mp-weixin/pages/login/login.js
  73. 24 1
      jxtxkj/unpackage/dist/dev/mp-weixin/pages/login/register.js
  74. 13 7
      jxtxkj/unpackage/dist/dev/mp-weixin/pages/mine/collect.js
  75. 1 1
      jxtxkj/unpackage/dist/dev/mp-weixin/pages/mine/collect.wxml
  76. 10 0
      jxtxkj/unpackage/dist/dev/mp-weixin/pages/mine/collect.wxss
  77. 0 0
      jxtxkj/unpackage/dist/dev/mp-weixin/pages/mine/mine.wxml
  78. 15 13
      jxtxkj/unpackage/dist/dev/mp-weixin/pages/mine/order/order.js
  79. 0 0
      jxtxkj/unpackage/dist/dev/mp-weixin/pages/mine/order/order.wxml

+ 3 - 2
jxtxkj/pages/index/course/buy.vue

@@ -144,10 +144,11 @@
 						url: '/api/Index/payOrder',
 						data: {
 							order_no: that.order_no,
-							pay_type: 'wx'
+							pay_type: 'wx',
+							from: '2'
 						}
 					}, function(res) {
-						const payment = res.data
+						const payment = res.data.pay
 						wx.requestPayment({
 						  ...payment,
 						  success (res) {

+ 1 - 1
jxtxkj/pages/index/course/detail.vue

@@ -306,7 +306,7 @@
 						}
 					}, function(res) {
 						console.log(res);
-						order_no = res.order_no
+						order_no = res.data.order_no
 						$api.jump('/pages/index/course/buy?order_no=' + order_no + '&id=' + that.course.id)
 					})
 				} else {

+ 38 - 2
jxtxkj/pages/login/login.vue

@@ -108,7 +108,8 @@
 							if (res.code == 1) {
 								$api.info(res.msg)
 								uni.setStorageSync("token",res.data)
-								$api.jump("/pages/mine/mine",3)
+								that.bindId()
+								
 							} else if(res.code == 0) {
 								$api.info(res.msg)
 							}
@@ -116,7 +117,42 @@
 						
 					}
 				}
-			}
+			},
+			bindId() {
+				var that = this 
+				$api.req({
+					url: '/api/User/userinfo'
+				}, function (res) {
+					if (!res.data.openid) {
+						uni.getSetting({
+						   success(res) {
+						      if (res.authSetting['scope.userInfo']) {
+								  uni.login({
+									provider: 'weixin',
+									success: function(res2) {
+										if(res2.code) {
+											$api.req({
+												url: '/api/Login/bind_openid',
+												data: {
+													code: res2.code
+												}
+											}, function(res2) {
+												if (res2.code == 1) {
+													$api.jump("/pages/mine/mine",3)
+												}
+												
+											})
+										}
+									}
+								  })
+							  }
+						   }
+						})
+					} else {
+						$api.jump("/pages/mine/mine",3)
+					}
+				})
+			},
 		}
 	}
 </script>

+ 24 - 1
jxtxkj/pages/login/register.vue

@@ -200,7 +200,30 @@
 							if (res.code == 1) {
 								$api.info(res.msg)
 								uni.setStorageSync("token",res.data)
-								$api.jump("/pages/mine/mine",3)
+								uni.getSetting({
+								   success(res) {
+								      if (res.authSetting['scope.userInfo']) {
+										  uni.login({
+											provider: 'weixin',
+											success: function(res2) {
+												if(res2.code) {
+													$api.req({
+														url: '/api/Login/bind_openid',
+														data: {
+															code: res2.code
+														}
+													}, function(res2) {
+														if (res2.code == 1) {
+															$api.jump("/pages/mine/mine",3)
+														}
+														
+													})
+												}
+											}
+										  })
+									  }
+								   }
+								})
 							} else if(res.code == 0) {
 								$api.info(res.msg)
 							}

+ 17 - 1
jxtxkj/pages/mine/collect.vue

@@ -2,7 +2,7 @@
 	<view class="web_box">
 		<!-- <u-navbar height="44" leftIcon="arrow-left" leftIconColor="#000" leftText="我的收藏" @leftClick="leftClick" :autoBack="true" bgColor="#fff">
 		</u-navbar> -->
-		<view class="list">
+		<view class="list" v-if="collectList.length > 0">
 			<block v-for="(item,index) in collectList" :key="index">
 				<view class="list_item hflex acenter" @click="toDetail(index)">
 					<image :src="item.img" mode="widthFix" style="width: 322rpx;border-radius: 16rpx;"></image>
@@ -19,6 +19,12 @@
 				</view>
 			</block>
 		</view> 
+		<view class="list vflex acenter jcenter" v-else>
+			<image src="../../static/images/common/collect_none.png" class="img_none"></image>
+			<view class="text_none">
+				暂无收藏
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -140,5 +146,15 @@
 			font-weight: 600;
 			color: #FA6400;
 		}
+		.text_none {
+			font-size: 32rpx;
+			color: #333333;
+			margin-top: 44rpx;
+		}
+		.img_none {
+			margin-top: 300rpx;
+			width: 570rpx;
+			height: 328rpx;
+		}
 	}
 </style>

+ 1 - 1
jxtxkj/pages/mine/mine.vue

@@ -23,7 +23,7 @@
 				</view>
 			</view>
 			<view class="hflex acenter jaround" style="margin: 40rpx 0 54rpx;">
-				<view class="vflex acenter jcenter">
+				<view class="vflex acenter jcenter" @click="toDeail(3)">
 					<view class="collect_num" v-if="login">{{user.collection_count}}</view>
 					<view class="collect_num" v-else>0</view>
 					<view class="text_style1">我的收藏</view>

+ 16 - 13
jxtxkj/pages/mine/order/order.vue

@@ -7,7 +7,7 @@
 				<view class="list_item" @click="toDetail(index)">
 					<view class="hflex acenter jbetween">
 						<view class="order_id">订单编号:{{item.order_no}}</view>
-						<view class="order_state" v-if="item.statie == 0">等待买家付款</view>
+						<view class="order_state" v-if="item.status == 0">等待买家付款</view>
 					</view>
 					<view class="hflex acenter" style="padding-top: 10rpx;">
 						<image :src="item.course_info.img" mode="widthFix" style="width: 322rpx;border-radius: 16rpx;"></image>
@@ -15,7 +15,7 @@
 							<view class="title">{{item.course_info.name}}</view>
 							<view class="text_style1">总学时:{{item.period}}学时</view>
 							<view class="text_style1">讲师:{{item.course_info.lecturer}}</view>
-							<view class="hflex acenter jbetween" v-if="item.state == 0">
+							<view class="hflex acenter jbetween" v-if="item.status == 0">
 								<view class="order_price">¥{{item.course_info.price}}</view>
 								<u-button @tap="toPay(index)">继续付款</u-button>
 							</view>
@@ -28,7 +28,7 @@
 				</view>
 			</block>
 		</view>
-		<view class="list vflex acenter jcenter">
+		<view class="list vflex acenter jcenter" v-else>
 			<image src="../../../static/images/common/order_none.png" class="img_none"></image>
 			<view class="text_none">
 				暂无订单
@@ -74,9 +74,10 @@
 			},
 			// 继续付款
 			toPay(index) {
-				uni.navigateTo({
-					url: '/pages/index/course/buy?index = ' + index
-				})
+				$api.jump('/pages/index/course/buy?order_no = ' + this.orderList[index].order_no + '&id=' + this.orderList[index].course_id)
+				// uni.navigateTo({
+				// 	url: '/pages/index/course/buy?index = ' + index
+				// })
 			},
 			// 继续学习
 			toStudy(id) {
@@ -88,14 +89,16 @@
 			},
 			// 查看详情
 			toDetail(index) {
-				if(this.orderList[index].state == '未付款') {
-					uni.navigateTo({
-						url: '/pages/index/course/buy?order_no = ' + this.orderList[index].order_no
-					})
+				if(this.orderList[index].status == '未付款') {
+					$api.jump('/pages/index/course/buy?order_no = ' + this.orderList[index].order_no + '&id=' + this.orderList[index].course_id)
+					// uni.navigateTo({
+					// 	url: '/pages/index/course/buy?order_no = ' + this.orderList[index].order_no
+					// })
 				} else {
-					uni.navigateTo({
-						url: '/pages/mine/order/detail?order_no = ' + this.orderList[index].order_no
-					})
+					$api.jump('/pages/mine/order/detail?order_no = ' + this.orderList[index].order_no)
+					// uni.navigateTo({
+					// 	url: '/pages/mine/order/detail?order_no = ' + this.orderList[index].order_no
+					// })
 				}
 			},
 			// 触底事件

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-badge/u-badge.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-button/u-button.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-code/u-code.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-count-down/u-count-down.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-form-item/u-form-item.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-line-progress/u-line-progress.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-link/u-link.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-modal/u-modal.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-navbar/u-navbar.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-parse/node/node.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-parse/u-parse.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-radio-group/u-radio-group.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-radio/u-radio.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-tabs/u-tabs.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-text/u-text.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/course/buy.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/course/detail.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/declare/declare.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/declare/declare_success.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/exam/exam.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/exam/parse.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/exam/submit.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/search/search.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/integral/integral.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/choose.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/forget.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/register.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/allCourse.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/certificate.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/change.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/collect.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/comment.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/exam/exam.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/exam/wrong.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/order/apply.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/order/detail.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/order/order.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/password/editPassword.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/password/success.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/personal.js.map


+ 6 - 6
jxtxkj/unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1464,7 +1464,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_NAME":"jxtxkj","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_NAME":"jxtxkj","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败,请尽量确保 data 函数中不访问 vm 对象,否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8556,7 +8556,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_NAME":"jxtxkj","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_NAME":"jxtxkj","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8577,14 +8577,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_NAME":"jxtxkj","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_NAME":"jxtxkj","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_NAME":"jxtxkj","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_NAME":"jxtxkj","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -8670,7 +8670,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_NAME":"jxtxkj","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_NAME":"jxtxkj","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -25801,7 +25801,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 var formatRegExp = /%[sdj%]/g;
 var warning = function warning() {}; // don't print warning message when in production env or node runtime
 
-if (typeof process !== 'undefined' && Object({"VUE_APP_NAME":"jxtxkj","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !==
+if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_NAME":"jxtxkj","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !==
 'undefined' && typeof document !== 'undefined') {
   warning = function warning(type, errors) {
     if (typeof console !== 'undefined' && console.warn) {

+ 2 - 2
jxtxkj/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-radio-group/u-radio-group.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
jxtxkj/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-radio/u-radio.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon"
-  },
-  "component": true
+  }
 }

+ 3 - 2
jxtxkj/unpackage/dist/dev/mp-weixin/pages/index/course/buy.js

@@ -322,10 +322,11 @@ var _api = _interopRequireDefault(__webpack_require__(/*! @/static/js/api.js */
           url: '/api/Index/payOrder',
           data: {
             order_no: that.order_no,
-            pay_type: 'wx' } },
+            pay_type: 'wx',
+            from: '2' } },
 
         function (res) {
-          var payment = res.data;
+          var payment = res.data.pay;
           wx.requestPayment(_objectSpread(_objectSpread({},
           payment), {}, {
             success: function success(res) {

+ 1 - 1
jxtxkj/unpackage/dist/dev/mp-weixin/pages/index/course/detail.js

@@ -492,7 +492,7 @@ var _default = { data: function data() {return { show: false, course: {}, progre
     getStudy: function getStudy(id) {var that = this;_api.default.req({ url: '/api/Index/studentsDynamic', data: { page: that.page, limit: that.limit, id: id } }, function (res) {console.log(res);if (res.code == 1) {that.study = res.data.list;}});}, // 计算进度条
     totalProgress: function totalProgress() {var course = this.course;var progress = course.study_class_count / course.period * 100;this.progress = progress;console.log(this.course);}, // 切换tabs
     changeTabs: function changeTabs(e) {var that = this;that.active = e.index;}, // 购买课程
-    buyCourse: function buyCourse() {var that = this;var order_no = '';console.log(that.course.type);if (that.course.type == 1) {_api.default.req({ url: '/api/Index/createOrder', data: { id: that.course.id } }, function (res) {console.log(res);order_no = res.order_no;_api.default.jump('/pages/index/course/buy?order_no=' + order_no + '&id=' + that.course.id);});} else {_api.default.req({ url: '/api/Index/createIntergalOrder',
+    buyCourse: function buyCourse() {var that = this;var order_no = '';console.log(that.course.type);if (that.course.type == 1) {_api.default.req({ url: '/api/Index/createOrder', data: { id: that.course.id } }, function (res) {console.log(res);order_no = res.data.order_no;_api.default.jump('/pages/index/course/buy?order_no=' + order_no + '&id=' + that.course.id);});} else {_api.default.req({ url: '/api/Index/createIntergalOrder',
           data: {
             id: that.course.id } },
 

+ 37 - 1
jxtxkj/unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -288,7 +288,8 @@ var _default = { data: function data() {return { userInfo: { name: '', password:
             if (res.code == 1) {
               _api.default.info(res.msg);
               uni.setStorageSync("token", res.data);
-              _api.default.jump("/pages/mine/mine", 3);
+              that.bindId();
+
             } else if (res.code == 0) {
               _api.default.info(res.msg);
             }
@@ -296,6 +297,41 @@ var _default = { data: function data() {return { userInfo: { name: '', password:
 
         }
       }
+    },
+    bindId: function bindId() {
+      var that = this;
+      _api.default.req({
+        url: '/api/User/userinfo' },
+      function (res) {
+        if (!res.data.openid) {
+          uni.getSetting({
+            success: function success(res) {
+              if (res.authSetting['scope.userInfo']) {
+                uni.login({
+                  provider: 'weixin',
+                  success: function success(res2) {
+                    if (res2.code) {
+                      _api.default.req({
+                        url: '/api/Login/bind_openid',
+                        data: {
+                          code: res2.code } },
+
+                      function (res2) {
+                        if (res2.code == 1) {
+                          _api.default.jump("/pages/mine/mine", 3);
+                        }
+
+                      });
+                    }
+                  } });
+
+              }
+            } });
+
+        } else {
+          _api.default.jump("/pages/mine/mine", 3);
+        }
+      });
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

+ 24 - 1
jxtxkj/unpackage/dist/dev/mp-weixin/pages/login/register.js

@@ -386,7 +386,30 @@ var _default = { data: function data() {return { userInfo: { name: '', sex: '',
             if (res.code == 1) {
               _api.default.info(res.msg);
               uni.setStorageSync("token", res.data);
-              _api.default.jump("/pages/mine/mine", 3);
+              uni.getSetting({
+                success: function success(res) {
+                  if (res.authSetting['scope.userInfo']) {
+                    uni.login({
+                      provider: 'weixin',
+                      success: function success(res2) {
+                        if (res2.code) {
+                          _api.default.req({
+                            url: '/api/Login/bind_openid',
+                            data: {
+                              code: res2.code } },
+
+                          function (res2) {
+                            if (res2.code == 1) {
+                              _api.default.jump("/pages/mine/mine", 3);
+                            }
+
+                          });
+                        }
+                      } });
+
+                  }
+                } });
+
             } else if (res.code == 0) {
               _api.default.info(res.msg);
             }

+ 13 - 7
jxtxkj/unpackage/dist/dev/mp-weixin/pages/mine/collect.js

@@ -180,6 +180,12 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 
 
+
+
+
+
+
+
 var _api = _interopRequireDefault(__webpack_require__(/*! @/static/js/api.js */ 142));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} //
 //
 //
@@ -204,14 +210,14 @@ var _api = _interopRequireDefault(__webpack_require__(/*! @/static/js/api.js */
 //
 //
 //
+//
+//
+//
+//
+//
+//
 var _default = { data: function data() {return { collectList: [], page: 1, limit: 10, total: 0, show: true };}, onLoad: function onLoad() {this.getList();}, methods: { leftClick: function leftClick() {}, // 获取我的收藏
-    getList: function getList() {var that = this;_api.default.req({ url: '/api/User/myCourseList', data: { page: that.page, limit: that.limit,
-          type: 3 } },
-
-      function (res) {
-        console.log("我的课程", res);
-        if (res.code == 1) {
-          that.collectList = res.data.list;
+    getList: function getList() {var that = this;_api.default.req({ url: '/api/User/myCourseList', data: { page: that.page, limit: that.limit, type: 3 } }, function (res) {console.log("我的课程", res);if (res.code == 1) {that.collectList = res.data.list;
           that.total = res.data.count;
         }
       });

+ 1 - 1
jxtxkj/unpackage/dist/dev/mp-weixin/pages/mine/collect.wxml

@@ -1 +1 @@
-<view class="web_box data-v-0da56d67"><view class="list data-v-0da56d67"><block wx:for="{{collectList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block class="data-v-0da56d67"><view data-event-opts="{{[['tap',[['toDetail',[index]]]]]}}" class="list_item hflex acenter data-v-0da56d67" bindtap="__e"><image style="width:322rpx;border-radius:16rpx;" src="{{item.img}}" mode="widthFix" class="data-v-0da56d67"></image><view class="img_right data-v-0da56d67"><view class="title data-v-0da56d67">{{item.name}}</view><view class="text_style1 data-v-0da56d67">{{"总学时:"+item.period+"学时"}}</view><view class="text_style1 data-v-0da56d67">{{"讲师:"+item.lecturer}}</view><view class="hflex acenter jbetween data-v-0da56d67"><view class="order_price data-v-0da56d67">{{"¥"+item.price}}</view><block wx:if="{{show}}"><u-icon vue-id="{{'b1ee7f02-1-'+index}}" name="star-fill" color="#fa6400" size="22" data-event-opts="{{[['^tap',[['collect',[index]]]]]}}" catch:tap="__e" class="data-v-0da56d67" bind:__l="__l"></u-icon></block><block wx:else><u-icon vue-id="{{'b1ee7f02-2-'+index}}" name="star" color="#fa6400" size="22" class="data-v-0da56d67" bind:__l="__l"></u-icon></block></view></view></view></block></block></view></view>
+<view class="web_box data-v-0da56d67"><block wx:if="{{collectList.length>0}}"><view class="list data-v-0da56d67"><block wx:for="{{collectList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block class="data-v-0da56d67"><view data-event-opts="{{[['tap',[['toDetail',[index]]]]]}}" class="list_item hflex acenter data-v-0da56d67" bindtap="__e"><image style="width:322rpx;border-radius:16rpx;" src="{{item.img}}" mode="widthFix" class="data-v-0da56d67"></image><view class="img_right data-v-0da56d67"><view class="title data-v-0da56d67">{{item.name}}</view><view class="text_style1 data-v-0da56d67">{{"总学时:"+item.period+"学时"}}</view><view class="text_style1 data-v-0da56d67">{{"讲师:"+item.lecturer}}</view><view class="hflex acenter jbetween data-v-0da56d67"><view class="order_price data-v-0da56d67">{{"¥"+item.price}}</view><block wx:if="{{show}}"><u-icon vue-id="{{'b1ee7f02-1-'+index}}" name="star-fill" color="#fa6400" size="22" data-event-opts="{{[['^tap',[['collect',[index]]]]]}}" catch:tap="__e" class="data-v-0da56d67" bind:__l="__l"></u-icon></block><block wx:else><u-icon vue-id="{{'b1ee7f02-2-'+index}}" name="star" color="#fa6400" size="22" class="data-v-0da56d67" bind:__l="__l"></u-icon></block></view></view></view></block></block></view></block><block wx:else><view class="list vflex acenter jcenter data-v-0da56d67"><image class="img_none data-v-0da56d67" src="../../static/images/common/collect_none.png"></image><view class="text_none data-v-0da56d67">暂无收藏</view></view></block></view>

+ 10 - 0
jxtxkj/unpackage/dist/dev/mp-weixin/pages/mine/collect.wxss

@@ -65,4 +65,14 @@
   font-weight: 600;
   color: #FA6400;
 }
+.web_box.data-v-0da56d67 .text_none {
+  font-size: 32rpx;
+  color: #333333;
+  margin-top: 44rpx;
+}
+.web_box.data-v-0da56d67 .img_none {
+  margin-top: 300rpx;
+  width: 570rpx;
+  height: 328rpx;
+}
 

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/mp-weixin/pages/mine/mine.wxml


+ 15 - 13
jxtxkj/unpackage/dist/dev/mp-weixin/pages/mine/order/order.js

@@ -155,7 +155,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
 
 
 
@@ -236,23 +236,26 @@ var _api = _interopRequireDefault(__webpack_require__(/*! @/static/js/api.js */
 //
 var _default = { data: function data() {return { orderList: [], page: 1, limit: 10, total: 0 };}, onLoad: function onLoad() {this.getOrderList();}, methods: { leftClick: function leftClick() {_api.default.jump('/pages/mine/mine', 3);}, // 获取订单列表
     getOrderList: function getOrderList() {var that = this;_api.default.req({ url: '/api/User/myOrder', data: { page: that.page, limit: that.limit } }, function (res) {console.log(res);if (res.code == 1) {that.orderList = res.data.list;that.total = res.data.count;}});}, // 继续付款
-    toPay: function toPay(index) {uni.navigateTo({ url: '/pages/index/course/buy?index = ' + index });}, // 继续学习
-    toStudy: function toStudy(id) {_api.default.jump('/pages/index/course/detail?id= ' + id);
-    },
-    // 申请发票
+    toPay: function toPay(index) {_api.default.jump('/pages/index/course/buy?order_no = ' + this.orderList[index].order_no + '&id=' + this.orderList[index].course_id); // uni.navigateTo({
+      // 	url: '/pages/index/course/buy?index = ' + index
+      // })
+    }, // 继续学习
+    toStudy: function toStudy(id) {_api.default.jump('/pages/index/course/detail?id= ' + id);}, // 申请发票
     toApply: function toApply(index) {
       _api.default.jump('/pages/mine/order/apply?order_no= ' + this.orderList[index].order_no + '&course_id=' + this.orderList[index].course_id);
     },
     // 查看详情
     toDetail: function toDetail(index) {
-      if (this.orderList[index].state == '未付款') {
-        uni.navigateTo({
-          url: '/pages/index/course/buy?order_no = ' + this.orderList[index].order_no });
-
+      if (this.orderList[index].status == '未付款') {
+        _api.default.jump('/pages/index/course/buy?order_no = ' + this.orderList[index].order_no + '&id=' + this.orderList[index].course_id);
+        // uni.navigateTo({
+        // 	url: '/pages/index/course/buy?order_no = ' + this.orderList[index].order_no
+        // })
       } else {
-        uni.navigateTo({
-          url: '/pages/mine/order/detail?order_no = ' + this.orderList[index].order_no });
-
+        _api.default.jump('/pages/mine/order/detail?order_no = ' + this.orderList[index].order_no);
+        // uni.navigateTo({
+        // 	url: '/pages/mine/order/detail?order_no = ' + this.orderList[index].order_no
+        // })
       }
     },
     // 触底事件
@@ -268,7 +271,6 @@ var _default = { data: function data() {return { orderList: [], page: 1, limit:
         this.getOrderList();
       }
     } } };exports.default = _default;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
 

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
jxtxkj/unpackage/dist/dev/mp-weixin/pages/mine/order/order.wxml


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov