完善功能

pages/order_now/order_now.vue

@@ -252,18 +252,7 @@ export default {
 		this.pay.alipay = 1
 		//#endif
 
-		this.initDelivery()
-	},
-
-	onUnload() {
-		// 取消全局监听
-		uni.$off(['selectaddress', 'store'])
-	},
-
-	methods: {
-		// 初始化配送方式
-		initDelivery(){
-			getDelivery()
+		getDelivery()
 			.then(({ code, data, msg }) => {
 				// 请求结果判断
 				if (code != 1) throw new Error(msg)
@@ -298,14 +287,15 @@ export default {
 				uni.$on('payment', (params) => {
 					setTimeout(() => {
 						uni.$off('payment')
+                        console.log("payment>>>", 'payment');
 
 						if (params.result) {
 							uni.redirectTo({
 								url: `/pages/pay_result/pay_result?id=${params.order_id}`
 							})
 						} else {
-							uni.redirectTo({
-								url: '/pages/user_order/user_order'
+							uni.reLaunch({
+								url: '/pages/order/order'
 							})
 						}
 					}, 500)
@@ -318,13 +308,14 @@ export default {
 			.catch((err) => {
 				console.log(err)
 			})
-		},
+	},
 
-		// 初始化支付方式
-		initPay() {
-
-		},
+	onUnload() {
+		// 取消全局监听
+		uni.$off(['selectaddress', 'store'])
+	},
 
+	methods: {
 		appointmentTime() {
 			this.timePopup = true
 		},
@@ -334,17 +325,17 @@ export default {
 			getOrderCoupon({
 				goods: this.goods
 			})
-				.then(({ code, data, msg }) => {
-					if (code != 1) throw new Error(msg)
-					return data
-				})
-				.then((data) => {
-					this.usableCoupon = data.usable
-					this.unusableCoupon = data.unusable
-				})
-				.catch((err) => {
-					console.log(err)
-				})
+			.then(({ code, data, msg }) => {
+				if (code != 1) throw new Error(msg)
+				return data
+			})
+			.then((data) => {
+				this.usableCoupon = data.usable
+				this.unusableCoupon = data.unusable
+			})
+			.catch((err) => {
+				console.log(err)
+			})
 		},
 
 		// 选择优惠券
@@ -456,54 +447,6 @@ export default {
                 this.showLoading = false
             }
         },
-
-		// 订单处理
-		// handleOrderMethods(action) {
-		// 	// 订单提交数据
-		// 	const orderFrom = {
-		// 		action,
-		// 		goods: this.goods,
-		// 		delivery_type: this.delivery,
-		// 		use_integral: this.useIntegral,
-		// 		address_id: this.addressId,
-		// 		coupon_id: this.couponId,
-		// 		bargain_launch_id: this.bargainLaunchId == -1 ? '' : this.bargainLaunchId
-		// 	}
-
-		// 	switch (action) {
-		// 		case 'info':
-		// 			this.initPageData(orderFrom)
-		// 			break
-		// 		case 'submit':
-		// 			this.handleOrderSubmit(orderFrom)
-		// 			break
-		// 	}
-		// },
-
-		// // 订单提交
-		// async handleOrderSubmit(from) {
-		// 	this.showLoading = true
-
-		// 	from.remark = this.userRemark
-		// 	from.type = this.type
-
-		// 	try {
-		// 		const { code, data, msg } = this.teamId ? await teamBuy(from) : await orderBuy(from)
-
-		// 		if (code == 1) {
-		// 			uni.redirectTo({
-		// 				url: `/pages/payment/payment?from=${data.type}&order_id=${data.order_id}`
-		// 			})
-		// 		} else {
-		// 			throw new Error(msg)
-		// 		}
-		// 	} catch (err) {
-		// 		console.log(err)
-		// 		// this.$toast({ title: '下单异常，请重新操作' })
-		// 	} finally {
-		// 		this.showLoading = false
-		// 	}
-		// },
 	},
 	computed: {
 		delivery() {