Merge branch 'qa' into 'master'

Qa See merge request !805

Merge branch 'qa' into 'master'
Qa See merge request !805
后端研发-苏明海
2 parents 7e8e5adc 7059c6bf
Showing 1 changed file with 9 additions and 15 deletions
packageC/pages/presell/cart/cart2.js
@@ -473,12 +473,6 @@ Page({
                         return false;
                     }
  
-                    if(act.is_usecoupon==1){
-                        th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num;
-                        th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + "";
-                        th.data.check_quan_ware_list = t.data.data.erpwareid + "";
-                    }
-
                     //这个位置要拿活动的预售价
                     t.data.data.shop_price = prelist.presell_money;
                     th.setData({
@@ -492,6 +486,13 @@ Page({
                         act:act
                     });
  
+                    if(act.is_usecoupon==1){
+                        th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num;
+                        th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + "";
+                        th.data.check_quan_ware_list = t.data.data.erpwareid + "";
+                    }
+
+
                     //计算价格
                     th.calculatePrice2();
                     //获取优惠券,如果有券的钱，就调用
@@ -1974,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;