Merge remote-tracking branch 'origin/master'

pages/daiJiaoGeRenChaXunJieGuo/daiJiaoGeRenChaXunJieGuo.vue

@@ -105,10 +105,14 @@
 				  signType: params.signType,
 				  paySign: params.paySign,
 				  success (res) {
-						console.log('支付成功', res)
+						msgSuccess('支付成功')
+						uni.navigateBack()
 					},
 				  fail (res) {
-						console.log('支付失败', res)
+						const errMsg = res.errMsg
+						if (errMsg.indexOf('fail cancel')) {
+							msgError('已取消支付')
+						}
 					}
 				})
 			}

pages/order/order.vue

@@ -36,7 +36,7 @@
 		>
 		</u-empty>
 		<view class="list-box">
-			<view class="list-item-box" v-for="item in list" :key="item.id">
+			<view class="list-item-box" v-for="item in list" :key="item.id" @click="onItem(item)">
 				<view class="title-box">
 					{{item.title}}
 				</view>
@@ -67,7 +67,7 @@
 							待支付
 						</view>
 						<view class="button" v-if="item.status === '2'">
-							订单取消/关闭
+							订单关闭
 						</view>
 					</view>
 				</view>
@@ -128,6 +128,15 @@
 			status: 1
 		},
 	])
+	function onItem(order) {
+		console.log('点击订单', order)
+		if (order.type === '8') {
+			// 研究报告
+		}
+		if (order.type === '9') {
+			// 培训课程
+		}
+	}
 	
 	function onSearchConfirm() {
 		searchForm.value.pageNumber = 1