From 7a7d1c960fc096c970ceac1c3f43c3203b0d6814 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Mon, 23 Nov 2020 11:29:15 +0800
Subject: [PATCH] 1.   购物车赠品图片显示 2.   再进入购物车的时候，要把赠品清理掉 3.   在选择的时候也要先清理赠品

---
 pages/cart/cart/cart.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 3c7aa22..7bb4191 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -153,7 +153,17 @@ Page({
         if(carr && carr.length>0) {
           for (var i = 0; i < carr.length; i++) {
             var item = carr[i];
-            var good = null;
+            var good = null;			
+			if(item.is_gift){
+				var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+				getApp().request.delete(url, {
+				  success: function (t) {
+				  }
+				});
+				//商品已经下架
+				continue;				
+			}
+			
             await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + item.goods_id, {}).then(res => {
               good = res.data.data;
             })
@@ -177,6 +187,7 @@ Page({
               //商品已经下架
               continue;
             }
+					
             //如果秒杀活动都去掉了，或者结束了，那么这个商品也没有必要留着
             if (item.prom_type == 1) {
               var prom = null;
@@ -1209,9 +1220,9 @@ Page({
                  }
            }
            if(item.is_gift==1){
-              //var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+              var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
               //getApp().request.delete(url, {});
-              //await getApp().request.promiseDelete(url, {})  // 要用同步让赠品删除
+              await getApp().request.promiseDelete(url, {})  // 要用同步让赠品删除
               list.goods.splice(i--,1);
            }
         }
@@ -1290,7 +1301,8 @@ Page({
                 prom_id:p_item[0],
                 prom_type:3,
                 selected:1,
-                gift_id:discount.gift_id
+                gift_id:discount.gift_id,
+				original_img:th.data.imgUrl+o.original_img
               };
 
               
--
libgit2 0.21.4