From ec382aacf16c6be58c74fc92f835c472e9fa3f86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Tue, 16 Sep 2025 14:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=20-=20=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/myOrders/index/index.vue           |  6 ++--
 packages/shop/groupPurchaseSubmit/index.vue | 37 +++++++++++++++++----
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/packages/myOrders/index/index.vue b/packages/myOrders/index/index.vue
index d2b48fb4..9a06a6ff 100644
--- a/packages/myOrders/index/index.vue
+++ b/packages/myOrders/index/index.vue
@@ -376,8 +376,8 @@ export default {
         evaluate_status: this.evaluateStatus,
         user_id: uni.getStorageSync("userId"),
       }).then((res) => {
-        res.order_list.forEach(item => {
-          item.commodity_order_item_list.forEach(good => {
+        res.order_list?.forEach(item => {
+          item.commodity_order_item_list?.forEach(good => {
             good.commodity_pic = picUrl + good.commodity_pic;
           })
         })
@@ -390,7 +390,7 @@ export default {
         user_id: uni.getStorageSync('userId'),
       }
       request(afterSaleApi.afterSalesList, "POST", params).then((res) => {
-        res.after_sales_list.forEach(item => {
+        res.after_sales_list?.forEach(item => {
           item.commodity_order_item?.forEach(good => {
             good.commodity_pic = picUrl + good.commodity_pic;
           })
diff --git a/packages/shop/groupPurchaseSubmit/index.vue b/packages/shop/groupPurchaseSubmit/index.vue
index 13bcfe8d..75e4f8b5 100644
--- a/packages/shop/groupPurchaseSubmit/index.vue
+++ b/packages/shop/groupPurchaseSubmit/index.vue
@@ -537,9 +537,34 @@ export default {
                 return;
             }
 
+            // 团购活动时间判断
+            const currentTime = new Date().getTime();
+            let isGroupBuyValid = true;
+            
+            // 检查所有商品是否在团购活动时间内
+            for (let supplierId in this.supplierGroups) {
+                const group = this.supplierGroups[supplierId];
+                for (let item of group) {
+                    const activityInfo = item.commodity_goods_info.group_buy_activity_info;
+                    // 如果没有团购活动信息，或者不在活动时间内，则isGroupBuyValid设为false
+                    if (!activityInfo) {
+                        isGroupBuyValid = false;
+                        break;
+                    }
+                    
+                    const startTime = new Date(activityInfo.start_time).getTime();
+                    const endTime = new Date(activityInfo.end_time).getTime();
+                    if (!(currentTime >= startTime && currentTime <= endTime)) {
+                        isGroupBuyValid = false;
+                        break;
+                    }
+                }
+                if (!isGroupBuyValid) break;
+            }
+
             const params = {
                 user_id: uni.getStorageSync('userId'),
-                is_group_buy: true,
+                is_group_buy: isGroupBuyValid,
                 goods_list: Object.keys(this.supplierGroups).map(supplierId => {
                     const group = this.supplierGroups[supplierId];
                     const firstItem = group[0];
@@ -550,9 +575,6 @@ export default {
                     // 根据供应商id获取自提点信息
                     const ztAddress = this.defZTAddress.find(adItem => adItem.id == supplierId) || {};
 
-                    // 团购活动时间判断
-                    const currentTime = new Date().getTime();
-
                     return {
                         supplier_id: firstItem.supplier_id,
                         supplier_name: firstItem.supplier_name || '',
@@ -562,9 +584,10 @@ export default {
                         receiving_address: ztAddress.address || '',
                         group_buy_activity_id: firstItem.commodity_goods_info.group_buy_activity_id,
                         goods_and_count: group.map(item => {
-                            const startTime = new Date(item.commodity_goods_info.group_buy_activity_info?.start_time).getTime();
-                            const endTime = new Date(item.commodity_goods_info.group_buy_activity_info?.end_time).getTime();
-                            const isGroupBuy = currentTime >= startTime && currentTime <= endTime;
+                            const activityInfo = item.commodity_goods_info.group_buy_activity_info;
+                            const isGroupBuy = activityInfo && 
+                                currentTime >= new Date(activityInfo.start_time).getTime() && 
+                                currentTime <= new Date(activityInfo.end_time).getTime();
                             return {
                                 goods_id: item.goods_id,
                                 count: item.count,