Merge branch 'dev' into 'test'

Dev See merge request !563

Merge branch 'dev' into 'test'
Dev See merge request !563
后端研发-苏明海
2 parents 445c789f e53e0bba
Showing 1 changed file with 20 additions and 5 deletions
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;
@@ -367,7 +378,10 @@ Page({
     a = this.data.requestData[b].goods[a];
     this.data.btn_click=1;
-    if (a.goods_num - 1 < 0) return false;
+    if (a.goods_num - 1 < 0){		
+		this.data.up_dating = 0;  
+		return false;
+	} 
     if (1 != a.goods_num) {
       var e = {
@@ -1209,9 +1223,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 +1304,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
               };