From 613ece979aec91fadb219704e59b1742ad2771b5 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Wed, 22 Apr 2026 17:03:49 +0800
Subject: [PATCH] 11

---
 package2/shop/merchantCenter.vue |  2 +-
 package2/shop/shopOrderList.vue  | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/package2/shop/merchantCenter.vue b/package2/shop/merchantCenter.vue
index 23eb119..965f4f8 100644
--- a/package2/shop/merchantCenter.vue
+++ b/package2/shop/merchantCenter.vue
@@ -281,7 +281,7 @@
 					case 'pj':
 						let item = {
 							shopScore:uni.getStorageSync('shopScore'),
-							id:uni.getStorageSync('id')
+							id:uni.getStorageSync('shopId')
 						}
 						url = '/package1/group/shopEvaluate?item=' + JSON.stringify(item)
 						break;
diff --git a/package2/shop/shopOrderList.vue b/package2/shop/shopOrderList.vue
index d3159e3..df211a9 100644
--- a/package2/shop/shopOrderList.vue
+++ b/package2/shop/shopOrderList.vue
@@ -53,7 +53,7 @@
 				</view>
 			</view>
 			<view style="height: 80rpx;border-top: 1px solid #eee;display: flex;">
-				<view v-if="item.orderType != 1" style="margin: 20rpx 0;background: linear-gradient(90deg, #FF4500, #FFA07A);width: 40rpx;height: 40rpx;line-height: 40rpx;text-align: center;border-radius: 10rpx;color: #fff;">拼</view>
+				<view v-if="item.orderType != 1" @tap.stop="getGroupOrders(item.id)" style="margin: 20rpx 0;background: linear-gradient(90deg, #FF4500, #FFA07A);width: 40rpx;height: 40rpx;line-height: 40rpx;text-align: center;border-radius: 10rpx;color: #fff;">拼</view>
 				<view style="flex: 1;"></view>
 				<view @tap.stop="mealServing(item)" v-if="currentIndex == 13" class="btn" style="margin: 10rpx 0 0 20rpx;">
 					已出餐
@@ -77,6 +77,7 @@
 					regionId: JSON.parse(uni.getStorageSync('area')).id
 				},
 				totalPages: 1,
+				tuanzhangOrder:[],
 				orderList: [],
 				currentIndex: 10,
 				menuButtonInfo: {},
@@ -197,6 +198,17 @@
 					uni.hideLoading();
 				}).catch((res) => {});
 			},
+			getGroupOrders(id){
+				this.tui.request("/mall/order/selectAllOrderByOrderId/"+id, "GET", {}, false, true).then((res) => {
+					if (res.code == 200) {
+						this.tuanzhangOrder = res.result;
+					} else {
+						that.tui.toast(res.message)
+						return
+					}
+					uni.hideLoading()
+				}).catch((res) => {})
+			},
 			openPopup(){
 				this.$refs.groupPopup.open()
 			},