Commit 5436cdd122b22a88253fb7c09bececf0b2ab107d

Authored by 后端研发-苏明海
2 parents b77d9480 26945329

Merge branch 'dev' into 'test'

包邮券在选中后台,在点击选中不使用,会出现bug

See merge request !806
packageC/pages/presell/cart/cart2.js
... ... @@ -7,7 +7,6 @@ var util_pay = require("../../../../utils/pay.js");
7 7  
8 8 Page({
9 9 data: {
10   - is_b_now:1, //立即购买
11 10 url: t.globalData.setting.url,
12 11 resourceUrl: t.globalData.setting.resourceUrl,
13 12 imgUrl: t.globalData.setting.imghost,
... ... @@ -42,7 +41,7 @@ Page({
42 41 is_all_zt: 1, //是否全部都是自提
43 42  
44 43 /*----------------立即购买---------------------*/
45   - is_b_now: 0, //0是购物车结算 1立即购买
  44 + is_b_now: 1, //0是购物车结算 1立即购买
46 45 bn_goods: null, //立即购买时候的调用商品
47 46 bn_use_money: 0,//是否使用余额
48 47 bn_exp_type: 1, //0是物流 1自提
... ... @@ -1975,7 +1974,7 @@ Page({
1975 1974 var txt = "";
1976 1975 var txt1 = "";
1977 1976 var quan_item = null;
1978   -
  1977 +
1979 1978 quan_item = this.data.get_by_quan_list[ind];
1980 1979 txt = "get_by_quan_list[" + ind + "].show_red";
1981 1980 var obj = {};
... ...