1

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({

package1/group/groupBuyList.vue

@@ -64,7 +64,7 @@
 		</view>
 		<view class="shop-list">
 			<view class="shop-member" v-for="(item,index) in shopList" :key="index" @tap="goDetail('shop',item)">
-				<view @tap.stop="buyingye" v-if="item.shopTakeaway.status != 0"
+				<view @tap.stop="buyingye" v-if="item.status != 1"
 					style="width: 100%;height:100%;position: absolute;top: 0;background: rgba(0, 0, 0, 0.1);z-index: 999;border-radius: 10px;">
 				</view>
 				<view class="shop-top">

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("支付失败或取消");

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() {

package1/order/orderDetail.vue

@@ -570,7 +570,7 @@
 		
 		<!-- 增加佣金支付弹出层 -->
 		<uni-popup ref="addFeePayPopup" background-color="#fff">
-			<view class="pay-popup" style="height: 290px;background: #fff;border-radius: 40rpx 40rpx 0 0;padding-top: 40rpx;">
+			<view class="pay-popup" style="height: 290px;background: #fff;border-radius: 40rpx 40rpx 0 0;">
 				<view class="content" style="height: 100%;margin-top:0">
 					<view class="box1">
 						<view style="height: 70rpx;line-height: 70rpx;text-align: center;">
@@ -580,6 +580,9 @@
 							￥<text style="font-size: 60rpx;">{{additionalFee || '0.00'}}</text>
 						</view>
 					</view>
+					<view class="btn" style="background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));width: 90%;height: 100rpx;border-radius: 100rpx;text-align: center;font-size: 28rpx;font-weight: 700;line-height: 100rpx;margin: 40rpx auto;" @tap="addFeeWxPayment">
+						确认付款
+					</view>
 					<view class="box1" style="display: flex;padding: 40rpx;">
 						<view style="flex: 1;">
 							<view style="height: 42rpx;line-height: 42rpx;display: flex;">
@@ -594,9 +597,7 @@
 							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/02bff7edc4e04caaa1868955ff684f1f.png" alt="" style="width: 36rpx;height: 36rpx;" />
 						</view>
 					</view>
-					<view class="btn" style="background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));width: 90%;height: 100rpx;border-radius: 100rpx;text-align: center;font-size: 28rpx;font-weight: 700;line-height: 100rpx;margin: 40rpx auto;" @tap="addFeeWxPayment">
+					
-						确认付款
-					</view>
 				</view>
 			</view>
 		</uni-popup>
@@ -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.getOrderDetail(that.orderId);
-								that.$refs.addFeePayPopup.close();
+								that.$forceUpdate();
-								that.callAddFeeApi();
 							},
 							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) {

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("支付失败或取消");

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({