From 007c08d62a2cb432d59bab51af25a543d55156ef Mon Sep 17 00:00:00 2001
From: antploy <antploy.ni@meidd.com>
Date: Wed, 3 Nov 2021 16:21:26 +0800
Subject: [PATCH] 结算页面报错优化

---
 pages/cart/cart2/cart2.js | 68 +++++++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 47 insertions(+), 21 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 6be2361..57a9112 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -124,6 +124,7 @@ Page({
         in_zhact_gdmap:{}, //不同门店参与同一活动的限购
         hid_inp:1,
         user_note:{},
+        zuhe_map_good:{},
     },
     onLoad: function (t) {
         wx.setNavigationBarTitle({title: "填写订单",})
@@ -453,6 +454,7 @@ Page({
                     //要把组合购的东西拿出来算一下
                     if (item1.prom_type == 7) {
                         var isok = 1;
+                        var is_flag=1;
                         //如果有组合购
                         var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item1.prom_id+'/'+getApp().globalData.userInfo.user_id;
                         await getApp().request.promiseGet(url, {}).then(res => {
@@ -464,25 +466,45 @@ Page({
                                 if (ut.gettimestamp() > res.data.data.end_time) {
                                     isok = 0;
                                 }
+                                item1.act = res.data.data;
                             } else {
                                 //未找到商品的活动
-                                isok = 0;
+                                is_flag = 0;
                             }
-                            item1.act = res.data.data;
                         })
-
                         if (!isok) {
                             getApp().my_warnning("组合购的活动已经过期", 0, th);
                             return false;
                         }
-
+                        var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                        var req_data = {
+                            page: 1,
+                            pageSize: 2000,
+                            store_id: os.stoid,
+                            zh_id: item1.prom_id,
+                        }
+                        await getApp().request.promiseGet(url1, {
+                            data: req_data
+                        }).then(res => {
+                            if (ut.ajax_ok(res)) {
+                               var gdlist = res.data.data.pageData;
+                                gdlist.forEach(i=>{
+                                    if(item1.goods_id==i.goods_id&&!is_flag){
+                                        item1.prom_type=0;
+                                        item1.prom_type1=0;
+                                        item1.prom_id=0;
+                                        item1.prom_id1=0
+                                    }
+                                })
+                                th.data.zuhe_map_good[item1.prom_id]=gdlist; 
+                            }
+                        })
                     }
                 }
 
                 //在分组的时候，就不要再调用接口，await
                 for (var i = 0; i < carr.length; i++) {
                     var item = carr[i];
-
                     //-- 如果是等级会员注册返回 --
                     if (is_card_back) {
                         th.data.card_name = th.data.userinfo.card_field;
@@ -666,22 +688,26 @@ Page({
                     //存储不同活动的商品列表
                     u_item.zh_prom_goods = {};
                     for (let var1 in obj) {
-                        var h_item = obj[var1];
-                        var gdlist = null;
-                        var url1 = "/api/weshop/prom/zhbuyGoods/page";
-                        var req_data = {
-                            page: 1,
-                            pageSize: 2000,
-                            store_id: os.stoid,
-                            zh_id: h_item.prom_id,
-                        }
-                        await getApp().request.promiseGet(url1, {
-                            data: req_data
-                        }).then(res => {
-                            if (ut.ajax_ok(res)) {
-                                gdlist = res.data.data.pageData;
-                            }
-                        })
+                        var h_item=obj[var1];
+				   	    var gdlist= th.data.zuhe_map_good[h_item.prom_id];
+						//获取活动需要的商品列表
+						// u_item.zh_prom_goods[h_item.prom_id]=gdlist;
+                        // var h_item = obj[var1];
+                        // var gdlist = null;
+                        // var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                        // var req_data = {
+                        //     page: 1,
+                        //     pageSize: 2000,
+                        //     store_id: os.stoid,
+                        //     zh_id: h_item.prom_id,
+                        // }
+                        // await getApp().request.promiseGet(url1, {
+                        //     data: req_data
+                        // }).then(res => {
+                        //     if (ut.ajax_ok(res)) {
+                        //         gdlist = res.data.data.pageData;
+                        //     }
+                        // })
                         //获取活动需要的商品列表
                         u_item.zh_prom_goods[h_item.prom_id] = {gdlist: gdlist, act: h_item.act};
                     }
--
libgit2 0.21.4