From f9782f733e333052a5ff6b0b9e9d341dbebe532d Mon Sep 17 00:00:00 2001
From: antploy <antploy.ni@meidd.com>
Date: Tue, 2 Nov 2021 18:55:16 +0800
Subject: [PATCH] 购物车商品清空优化

---
 pages/cart/cart/cart.js | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 19006ac..5d65ea5 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -221,6 +221,7 @@ Page({
                 state:0
             },
             success:async function(su) {
+                console.log(su,10000);
                 //按门店分类的数组
                 var arr = new Array(),
                     carr = su.data.data.pageData;
@@ -387,9 +388,11 @@ Page({
                             if(!th.data.zuhe_map[item.prom_id]){
                                 //如果有组合购
                                 var isok = 1;
+                                var is_flag=1;
                                 var act=null;
                                 var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+item.prom_id+"/"+getApp().globalData.userInfo.user_id;
                                 await getApp().request.promiseGet(url, {}).then(res => {
+                                    console.log(res,1000);
                                      if(res.data.code==0 && res.data.data){
                                           if(res.data.data.is_show!=1){
                                               isok=0;
@@ -407,12 +410,11 @@ Page({
                                               isok=0;
                                           }
                                           act=res.data.data;
-
-                                      }
-                                    //   else{
-                                    //     //未找到商品的活动
-                                    //     isok = 0;
-                                    // }
+                                          
+                                      }else{
+                                         //未找到商品的活动
+                                         is_flag = 0;
+                                     }
                                 })
                                 if (!isok){
                                     var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
@@ -421,7 +423,6 @@ Page({
                                     continue;
                                 }
                                 th.data.zuhe_map[item.prom_id]=act;
-
                                 var url1 = "/api/weshop/prom/zhbuyGoods/page";
                                 var req_data = {
                                     page: 1,
@@ -432,8 +433,17 @@ Page({
                                 await getApp().request.promiseGet(url1, {
                                     data: req_data
                                 }).then(res => {
+                                    console.log(res,2000);
                                     if (ut.ajax_ok(res)) {
                                         var gdlist = res.data.data.pageData;
+                                        gdlist.forEach(i=>{
+                                            if(item.goods_id==i.goods_id&&!is_flag){
+                                                item.prom_type=0;
+                                                item.prom_type1=0;
+                                                item.prom_id=0;
+                                                item.prom_id1=0
+                                            }
+                                        })
                                         th.data.zuhe_map_good[item.prom_id]=gdlist;
                                     }
                                 })
--
libgit2 0.21.4