Merge branch 'dev' into 'test'

全额预售不可以使用包邮券 See merge request !803

Merge branch 'dev' into 'test'
全额预售不可以使用包邮券 See merge request !803
后端研发-苏明海
2 parents fdfab9a2 483fafa9
Showing 1 changed file with 3 additions and 10 deletions
packageC/pages/presell/cart/cart2.js
@@ -472,7 +472,7 @@ Page({
                         wx.showToast({title: "未找到商品", icon: 'none', duration: 3000});
                         return false;
                     }
-                    
+
                     //这个位置要拿活动的预售价
                     t.data.data.shop_price = prelist.presell_money;
                     th.setData({
@@ -1975,20 +1975,13 @@ Page({
         var txt = "";
         var txt1 = "";
         var quan_item = null;
-        if (th.data.is_b_now) {
+       
             quan_item = this.data.get_by_quan_list[ind];
             txt = "get_by_quan_list[" + ind + "].show_red";
             var obj = {};
             obj[txt] = 1;
             this.setData(obj);
-        } else {
-            txt = "by_quan_list_cart[" + ind + "].show_red";
-            quan_item = th.data.by_quan_list_cart[ind];
-            var obj = {};
-            obj[txt] = 1;
-            this.setData(obj);
-            th.data.get_by_quan_list_cart[pickid] = JSON.parse(JSON.stringify(th.data.by_quan_list_cart));  //要把选中的弄回数组
-        }
+
         if (using_quan[th.data.selected_quan_pick]) {
             using_quan[th.data.selected_quan_pick].is_nouse_red = 0;