diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index c6fa23a..2fc7ec3 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -74,6 +74,7 @@ Page({ show_card: null, //显示的等级卡 card_name: '', //显示的卡的名称 card_cut_price: null, //减价多少钱 + is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 }, onLoad: function (t) { @@ -240,6 +241,9 @@ Page({ // let cartList= this.data.cartlist // let cartList= arr // let length = cartList.length + if(this.data.is_pre_cut==0){ + return {} + } wx.showLoading({ title: '加载中', mask: true @@ -606,6 +610,7 @@ Page({ var is_same_city = json_d.is_same_city; th.setData({ + is_pre_cut:json_d.is_pre_cut,//预存是否可以使用0是不可以 ,1是可以 is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, rank_switch: json_d.rank_switch, diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js index 96766af..bab5dcb 100644 --- a/packageC/pages/presell/cart/cart2_pre.js +++ b/packageC/pages/presell/cart/cart2_pre.js @@ -53,7 +53,8 @@ Page({ isclose: 1, is_express: 0,//选择物流的控制器 yuer: 0, - agree_no_ref: 0 + agree_no_ref: 0, + is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 }, onLoad: function (t) { wx.setNavigationBarTitle({ @@ -277,7 +278,7 @@ Page({ th.data.ispt_goods = json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 var is_default_logistics = json_d.is_default_logistics; - th.setData({ is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics }); + th.setData({is_pre_cut:json_d.is_pre_cut, is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics }); var rank_switch = json_d.rank_switch; var max_price = -1; @@ -370,6 +371,9 @@ Page({ // let cartList= this.data.cartlist // let cartList= arr // let length = cartList.length + if(this.data.is_pre_cut==0){ + return {} + } wx.showLoading({ title: '加载中', mask: true diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index a639d58..41cabcc 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -145,6 +145,7 @@ Page({ //订单所有搭配购的 all_collocation_list: [], appoint_pick_keyid: '', + is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 }, onLoad: function (t) { wx.setNavigationBarTitle({ title: "填写订单", }) @@ -259,8 +260,9 @@ Page({ th.data.ispt_goods = json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 var is_default_logistics = json_d.is_default_logistics; var is_same_city = json_d.is_same_city; - + th.setData({ + is_pre_cut:json_d.is_pre_cut,//预存是否可以使用0是不可以 ,1是可以 is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, rank_switch: json_d.rank_switch, @@ -377,6 +379,9 @@ Page({ // let cartList= this.data.cartlist // let cartList= arr // let length = cartList.length + if(this.data.is_pre_cut==0){ + return {} + } wx.showLoading({ title: '加载中', mask: true diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js index cdf5db0..6cda3bb 100644 --- a/pages/cart/cart2_inte/cart2_inte.js +++ b/pages/cart/cart2_inte/cart2_inte.js @@ -77,6 +77,7 @@ Page({ order_prom: {}, show_submit: 0, //提交按钮变正常显示 udata: null,//用户预存值,数据 + is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 }, onLoad: function (t) { wx.setNavigationBarTitle({ title: "填写订单", }) @@ -96,7 +97,7 @@ Page({ th.data.ispt_goods = json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 var is_default_logistics = json_d.is_default_logistics; var is_same_city = json_d.is_same_city; - th.setData({ is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, + th.setData({is_pre_cut:json_d.is_pre_cut, is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics,is_same_city:is_same_city }); var rank_switch = json_d.rank_switch; @@ -241,6 +242,9 @@ Page({ // let cartList= this.data.cartlist // let cartList= arr // let length = cartList.length + if(this.data.is_pre_cut==0){ + return {} + } wx.showLoading({ title: '加载中', mask: true diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 174295e..6d49c44 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -67,8 +67,8 @@ Page({ show_btn: 0, udata: null,//用户预存值,数据 dis_config: null, - bn_use_commission: 0 //是不是使用佣金 - + bn_use_commission: 0, //是不是使用佣金 + is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 }, onLoad: function (t) { console.log("onLoad_pt_cart"); @@ -195,6 +195,9 @@ Page({ // let cartList= this.data.cartlist // let cartList= arr // let length = cartList.length + if(this.data.is_pre_cut==0){ + return {} + } wx.showLoading({ title: '加载中', mask: true @@ -539,7 +542,7 @@ Page({ var is_same_city = json_d.is_same_city; th.setData({ - is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, is_same_city: is_same_city, + is_pre_cut:json_d.is_pre_cut,is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, is_same_city: is_same_city, rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics });