Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

前端开发-罗建龙
2 parents c431616f bb5d0c8b
Showing 2 changed files with 19 additions and 16 deletions
packageE/pages/cart/cart2/cart2.js
pages/cart/cart/cart.js
@@ -803,10 +803,10 @@ Page({
     //如果是购物车的时候，
     if (arr) {
-      var idx = th.data.allsto.findIndex(function (e) {
-        return e.pickup_id == arr[index].pick_id
-      })
-      pick = th.data.allsto[idx];
+      // var idx = th.data.allsto.findIndex(function (e) {
+      //   return e.pickup_id == arr[index].pick_id
+      // })
+      // pick = th.data.allsto[idx];
       var get_gd = null;
       await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + gd.goods_id, {
@@ -815,7 +815,7 @@ Page({
           get_gd = res1.data.data;
         }
       })
-      distr_t = pick.distr_type || get_gd.distr_type;
+      distr_t = gd.pickup_distr_type || get_gd.distr_type;
     } else {
       var gg = to.get_b_now();
@@ -849,7 +849,6 @@ Page({
     //   if (item0.distr_type == 0 || item0.distr_type == distr_t) {
     //     new_arr.push(item0);
     //   }
-
     // }
     if (!new_arr.length) return null;
@@ -1311,9 +1310,6 @@ Page({
                 let c_act=element.cur_act;
                 delete c_act.goods;
               }
-              if(element.ch_map){
-                delete element.ch_map;
-              }
               if(element.act_arr && element.act_arr.length>0){
                 for (var ij = 0; ij < element.act_arr.length; ij++) {
                   var act_ite = element.act_arr[ij];
@@ -2479,9 +2475,9 @@ Page({
                 newd.is_past=1;
               }
-              //ord_goods.splice(pos+1,0,newd);
+              ord_goods.splice(pos+1,0,newd);
               th.data.old_cartlist[i].goods.splice(pos2+1,0,newd);
-
+              
               var txt9 = "cartlist[" + i + "].goods["+(pos+1)+"]";
               th.setData({ [txt9]: newd })
@@ -5586,7 +5582,6 @@ Page({
       })
       // pdata.keyid = th.data.bn_goods.keyid
     }
-    // debugger
     var str = JSON.stringify(pdata);
@@ -8173,8 +8168,8 @@ Page({
     //有改，都强制把券选择清理一下
     var pickup_id = this.data.cartlist[cart_index].pickup_id;
-    var txt='using_quan['+pickup_id+']';
-    th.setData({[txt]:null});
+    var txt1='using_quan['+pickup_id+']';
+    th.setData({[txt1]:null});
     //-- 如果是选中 --
     if (e.selected) {
@@ -8687,8 +8682,15 @@ Page({
       }
     }
+    //清理下赠品
+    let n_goods=[];
+    for (let ig = 0; ig <goods.length; ig++) {
+         if(!goods[ig].is_gift){
+           n_goods.push(goods[ig]);
+         }
+    }
     //原始数据要有深拷贝不能有地址的牵连
-    th.data.cartlist_y = JSON.parse(JSON.stringify(goods))
+    th.data.cartlist_y = JSON.parse(JSON.stringify(n_goods))
     //重新调用cart_next,进行下一步计算
@@ -1192,9 +1192,10 @@ Page({
     // if (this.data.btn_click) {
     //   return false;
     // }
-
     setTimeout(() => {
       if (this.data.up_dating == 1) return false;
+      this.data.up_dating=1
+
       this.data.btn_click = 1;
       var a = t.currentTarget.dataset.item;
       var b = t.currentTarget.dataset.pitems;