wxd / MShopWeApp

Commit 8f5b042702e5e8e84337430ead8768e22b886925

Authored by 后端研发-苏明海
2 parents 7e8e5adc 7059c6bf

Merge branch 'qa' into 'master' 

Qa

See merge request !805
Inline Side-by-side
Showing 1 changed file with 9 additions and 15 deletions
packageC/pages/presell/cart/cart2.js
  View file @8f5b042
@@ -473,12 +473,6 @@ Page({ @@ -473,12 +473,6 @@ Page({
473 return false; 473 return false;
474 } 474 }
475 475
476 - if(act.is_usecoupon==1){  
477 - th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num;  
478 - th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + "";  
479 - th.data.check_quan_ware_list = t.data.data.erpwareid + "";  
480 - }  
481 -  
482 //这个位置要拿活动的预售价 476 //这个位置要拿活动的预售价
483 t.data.data.shop_price = prelist.presell_money; 477 t.data.data.shop_price = prelist.presell_money;
484 th.setData({ 478 th.setData({
@@ -492,6 +486,13 @@ Page({ @@ -492,6 +486,13 @@ Page({
492 act:act 486 act:act
493 }); 487 });
494 488
  489 + if(act.is_usecoupon==1){
  490 + th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num;
  491 + th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + "";
  492 + th.data.check_quan_ware_list = t.data.data.erpwareid + "";
  493 + }
  494 +
  495 +
495 //计算价格 496 //计算价格
496 th.calculatePrice2(); 497 th.calculatePrice2();
497 //获取优惠券,如果有券的钱，就调用 498 //获取优惠券,如果有券的钱，就调用
@@ -1974,20 +1975,13 @@ Page({ @@ -1974,20 +1975,13 @@ Page({
1974 var txt = ""; 1975 var txt = "";
1975 var txt1 = ""; 1976 var txt1 = "";
1976 var quan_item = null; 1977 var quan_item = null;
1977 - if (th.data.is_b_now) { 1978 +
1978 quan_item = this.data.get_by_quan_list[ind]; 1979 quan_item = this.data.get_by_quan_list[ind];
1979 txt = "get_by_quan_list[" + ind + "].show_red"; 1980 txt = "get_by_quan_list[" + ind + "].show_red";
1980 var obj = {}; 1981 var obj = {};
1981 obj[txt] = 1; 1982 obj[txt] = 1;
1982 this.setData(obj); 1983 this.setData(obj);
1983 - } else {  
1984 - txt = "by_quan_list_cart[" + ind + "].show_red";  
1985 - quan_item = th.data.by_quan_list_cart[ind];  
1986 - var obj = {};  
1987 - obj[txt] = 1;  
1988 - this.setData(obj);  
1989 - th.data.get_by_quan_list_cart[pickid] = JSON.parse(JSON.stringify(th.data.by_quan_list_cart)); //要把选中的弄回数组  
1990 - } 1984 +
1991 1985
1992 if (using_quan[th.data.selected_quan_pick]) { 1986 if (using_quan[th.data.selected_quan_pick]) {
1993 using_quan[th.data.selected_quan_pick].is_nouse_red = 0; 1987 using_quan[th.data.selected_quan_pick].is_nouse_red = 0;