订单详情页面补充支付

pages/pages_zhentou/order/checkOrder.vue

@@ -90,7 +90,7 @@
 			<p class="btn" v-if="orderData.status == 2" @click="returnToAddress">修改地址</p>
 			<p class="btn" v-if="orderData.status == 0" @click="handleDelete">删除订单</p>
 			<p class="btn confirm" v-if="orderData.status == 3" @click="handleConfirm">确认收货</p>
-			<p class="btn confirm" v-if="orderData.status == 1">立即支付</p>
+			<p class="btn confirm" v-if="orderData.status == 1" @click="goPay">立即支付</p>
 			<!-- <p class="btn confirm info" v-if="orderData.status == 3" @click="handleInfo(item)">完善定制信息</p> -->
 			<p class="btn confirm info" v-if="orderData.status == 2" @click="handleInfo">完善定制信息</p>
 			<p class="btn confirm" v-if="orderData.status == 0" @click="clickCustom">再次定制</p>
@@ -124,6 +124,91 @@
 			console.log('进入模块')
 		},
 		methods: {
+			//支付成功回调
+			doPaySuccess(orderNo) {
+				uni.request({
+					url: getApp().globalData.baseUrl + '/blade-desk/order/paySuccessCallback',
+					method: 'POST',
+					data: {
+						id: orderNo
+					},
+					header: {
+						'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
+					},
+					success: (res) => {
+						if (res.data.code == 200) {
+							uni.showToast({
+								title: '订单支付成功',
+								icon: 'none'
+							})
+							this.getDetail();
+						} else if (res.data.code == 401) {
+							this.doLogin()
+						} else {
+							uni.showToast({
+								title: res.data.msg,
+								icon: 'none'
+							})
+						}
+					}
+				})
+			},
+			//支付
+			goPay() {
+				uni.showLoading({
+					title: '支付中',
+					mask: true
+				})
+				uni.request({
+					url: getApp().globalData.baseUrl + '/app/createOrder',
+					method: 'POST',
+					data: {
+						openId: getApp().globalData.openId,
+						outTradeNo: this.orderData.orderNo
+					},
+					header: {
+						'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
+					},
+					success: (res) => {
+						console.log(res)
+						if (res.data.code == 200) {
+							uni.requestPayment({
+								provider: 'wxpay',
+								orderInfo: this.orderData,
+								timeStamp: res.data.data.timeStamp,
+								nonceStr: res.data.data.nonceStr,
+								package: res.data.data.package,
+								signType: res.data.data.signType,
+								paySign: res.data.data.paySign,
+								success: (res1) => {
+									console.log(res1)
+									if (res1.errMsg == 'requestPayment:ok') {
+										this.doPaySuccess(this.orderData.id);
+									} else {
+										uni.showToast({
+											title: '支付失败',
+											icon: 'none'
+										})
+									}
+								},
+								fail: (res2) => {
+									console.log(res2)
+								}
+							})
+						} else if (res.data.code == 401) {
+							this.doLogin()
+						} else {
+							uni.showToast({
+								title: res.data.msg,
+								icon: 'none'
+							})
+						}
+					},
+					complete: () => {
+						uni.hideLoading();
+					}
+				})
+			},
 			returnToAddress() {
 				uni.navigateTo({
 					url: "/pages/pages_zhentou/myPage/address?consignee=" + this.addressInfo.consignee +

pages/pages_zhentou/order/confirmOrder.vue

@@ -227,7 +227,7 @@
 								uni.redirectTo({
 									url: '/pages/pages_zhentou/form/form?orderNo=' + orderInfo.orderNo + '&orderNum=' + this.orderInfo.goodsNum
 								})
-							}, 1000)
+							}, 500)
 						} else {
 							uni.showToast({
 								title: res.data.msg,
@@ -237,7 +237,7 @@
 								uni.redirectTo({
 									url: '/pages/pages_zhentou/order/order'
 								})
-							}, 1000)
+							}, 500)
 						}
 					}
 				})