乱七八糟

pages/checkout/cashier/index.vue

@@ -76,7 +76,7 @@
 		PayStatusEnum
 	} from '@/common/enum/order'
 	import {
-		getOrder,
+		getOrderPay,
 		setPayStatus
 	} from '@/websoft/api/order.js'
 	import {
@@ -181,7 +181,7 @@
 				} = this
 				app.isLoading = true
 				// 加载订单
-				getOrder(orderId)
+				getOrderPay(orderId)
 					.then(res => {
 						app.order = res.data
 						app.isLoading = false
@@ -271,7 +271,7 @@
 			handleSubmit() {
 				const app = this
 				const {
-					orderId
+					id
 				} = app.order
 				// 判断是否选择了支付方式
 				if (!app.curPaymentItem) {
@@ -284,10 +284,10 @@
 				// .js
 				console.log("curPaymentItem: ",app.curPaymentItem);
 				if(app.curPaymentItem.method == '余额支付'){
-					balance(orderId).then(result => app.onSubmitCallback(result)).catch(err => app.$error(err.message))
+					balance(id).then(result => app.onSubmitCallback(result)).catch(err => app.$error(err.message))
 				}
 				if(app.curPaymentItem.method == '支付宝'){
-					alipay(orderId).then(result => app.onSubmitCallback(result)).catch(err => app.$error(err.message))
+					alipay(id).then(result => app.onSubmitCallback(result)).catch(err => app.$error(err.message))
 				}
 
 
@@ -334,7 +334,7 @@
 								payQuery(app.orderId).then(result => {
 									if(result.code == 0) {
 										app.$success('支付成功')
-										app.$navTo('pages/order/index')
+										uni.navigateBack()
 									}
 								})
 								
@@ -348,7 +348,7 @@
 								// })
 							}
 							if (res.resultCode == "6001") {
-								app.$navTo('pages/order/index')
+								uni.navigateBack()
 							}
 							// my.alert({
 							//   content: JSON.stringify(res),
@@ -441,7 +441,7 @@
 					if (lastPage && inArray(lastPage.route, backRoutes)) {
 						uni.navigateBack()
 					} else {
-						this.$navTo('pages/order/index', {}, 'redirectTo')
+						uni.navigateBack()
 					}
 				}, 1200)
 			},