diff --git a/package1/buyFood/buyFood.vue b/package1/buyFood/buyFood.vue index 624c38c..96d6423 100644 --- a/package1/buyFood/buyFood.vue +++ b/package1/buyFood/buyFood.vue @@ -774,7 +774,7 @@ signType: res.signType, paySign: res.paySign, success: function(res2) { - uni.showToast({ title: '支付成功', icon: 'success' }); + /* uni.showToast({ title: '支付成功', icon: 'success' }); that.tui.request("/api/wechat/pay/paySuccess", "POST", { outTradeNo: that.currentOrderId }, false, false).then((res3) => { @@ -783,8 +783,8 @@ }else{ that.tui.toast("订单创建失败,请联系客服处理"); } - }) - + }) */ + that.handlePaymentSuccess(); }, fail: function(err) { uni.redirectTo({ diff --git a/package1/group/groupBuyList.vue b/package1/group/groupBuyList.vue index 09f40f2..a4fb38b 100644 --- a/package1/group/groupBuyList.vue +++ b/package1/group/groupBuyList.vue @@ -64,7 +64,7 @@ - diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue index 7858ee8..9dff538 100644 --- a/package1/group/groupBuySingle.vue +++ b/package1/group/groupBuySingle.vue @@ -1453,7 +1453,7 @@ signType: res.signType, paySign: res.paySign, success: function(res2) { - uni.showToast({ title: '支付成功', icon: 'success' }); + /* uni.showToast({ title: '支付成功', icon: 'success' }); that.tui.request("/api/wechat/pay/paySuccess", "POST", { outTradeNo: that.currentOrderId }, false, false).then((res3) => { @@ -1464,8 +1464,10 @@ }else{ that.tui.toast("订单创建失败,请联系客服处理"); } - }) - + }) */ + uni.redirectTo({ + url: '/package1/order/orderConfirm?id=' + that.currentOrderId + '&groupId=' + that.groupId + '&amount=' + that.backendTotalAmount + }); }, fail: function(err) { that.tui.toast("支付失败或取消"); diff --git a/package1/order/orderConfirm.vue b/package1/order/orderConfirm.vue index a4a552f..263c8d5 100644 --- a/package1/order/orderConfirm.vue +++ b/package1/order/orderConfirm.vue @@ -51,7 +51,7 @@ methods: { getorder(){ uni.redirectTo({ - url: '/package1/order/orderDetail?id=' + that.id + '&groupId=' + that.groupId + url: '/package1/order/orderDetail?id=' + this.id + '&groupId=' + this.groupId }); }, back() { diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue index f0ab4bd..a448d23 100644 --- a/package1/order/orderDetail.vue +++ b/package1/order/orderDetail.vue @@ -570,7 +570,7 @@ - + @@ -580,6 +580,9 @@ ¥{{additionalFee || '0.00'}} + + 确认付款 + @@ -594,9 +597,7 @@ - - 确认付款 - + @@ -1051,7 +1052,7 @@ this.$refs.addFeePopup.close(); const now = Date.now(); // 获取当前时间戳 (13位) const randomPart = Math.floor(Math.random() * 1000000); // 6位随机数 - this.addFeeTradeNo = `${now}${randomPart.toString().padStart(6, '0')}`; + //this.addFeeTradeNo = `${now}${randomPart.toString().padStart(6, '0')}`; setTimeout(() => { this.$refs.addFeePayPopup.open('bottom'); }, 300); @@ -1066,7 +1067,7 @@ openid: uni.getStorageSync('miniProgramOpenid') || 'test-openid', amount: amountInCents, description: '增加配送佣金', - outTradeNo: this.addFeeTradeNo + outTradeNo: that.orderDetail.deliveryInfo.id }, false, false).then((res) => { if (res.code == 200) { uni.requestPayment({ @@ -1077,9 +1078,8 @@ signType: res.signType, paySign: res.paySign, success: function(res2) { - uni.showToast({ title: '支付成功', icon: 'success' }); - that.$refs.addFeePayPopup.close(); - that.callAddFeeApi(); + that.getOrderDetail(that.orderId); + that.$forceUpdate(); }, fail: function(err) { that.tui.toast('支付失败或取消'); @@ -1109,7 +1109,7 @@ that.tui.request("/mall/delivery/addFee", "POST", { deliveryId: deliveryId, additionalFee: fee, - orderId:that.orderDetail.deliveryFee.id, + orderId:that.orderDetail.id, olditionalFee:that.orderDetail.deliveryFee ? that.orderDetail.deliveryFee : 0 }, false, true).then((res) => { if (res.code == 200) { diff --git a/package1/order/orderList.vue b/package1/order/orderList.vue index 7995df4..1577ad4 100644 --- a/package1/order/orderList.vue +++ b/package1/order/orderList.vue @@ -431,7 +431,7 @@ signType: res.signType, paySign: res.paySign, success: function(res2) { - uni.showToast({ title: '支付成功', icon: 'success' }); + /* uni.showToast({ title: '支付成功', icon: 'success' }); that.tui.request("/api/wechat/pay/paySuccess", "POST", { outTradeNo: that.payData.id }, false, false).then((res3) => { @@ -442,8 +442,10 @@ }else{ that.tui.toast("订单创建失败,请联系客服处理"); } - }) - + }) */ + uni.redirectTo({ + url: '/package1/order/orderDetail?id=' + that.payData.id + }); }, fail: function(err) { that.tui.toast("支付失败或取消"); diff --git a/package1/runErrand/runErrand.vue b/package1/runErrand/runErrand.vue index f2db0a9..308365c 100644 --- a/package1/runErrand/runErrand.vue +++ b/package1/runErrand/runErrand.vue @@ -870,7 +870,7 @@ signType: res.signType, paySign: res.paySign, success: function(res2) { - uni.showToast({ title: '支付成功', icon: 'success' }); + /* uni.showToast({ title: '支付成功', icon: 'success' }); that.tui.request("/api/wechat/pay/paySuccess", "POST", { outTradeNo: that.currentOrderId }, false, false).then((res3) => { @@ -879,7 +879,8 @@ } else { that.tui.toast("系统繁忙,请联系客服处理"); } - }) + }) */ + that.handlePaymentSuccess(); }, fail: function(err) { uni.redirectTo({