diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index 4376ca3..8d7c06e 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js @@ -611,7 +611,7 @@ Page({ //-----------拼装购物车结算的数组,如果有默认物流时要用默认物流编号,计算默认的物流,不管是不是自提都算一下----------------- var m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - if (def_exp_code) { + if (def_exp_code && !th.data.is_default_logistics ) { for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { @@ -833,7 +833,7 @@ Page({ var m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - if (et == 0 && def_exp_code) { + if (et == 0 && def_exp_code && !th.data.is_default_logistics) { for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { @@ -3013,7 +3013,7 @@ Page({ } //判断有没有默认的物流地址值 - if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined) { + if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics) { var wu_arr = this.data.wu_arr; if (wu_arr != null && wu_arr != "") { for (var i = 0; i < wu_arr.length; i++) { @@ -3052,7 +3052,7 @@ Page({ } //判断有没有默认的物流地址值 - if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined) { + if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics) { var wu_arr = this.data.wu_arr; if (wu_arr != null && wu_arr != "") { for (var i = 0; i < wu_arr.length; i++) { @@ -3634,6 +3634,7 @@ Page({ //更新下默认,在onshow里面 update_code() { var th = this, m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; + if(th.data.is_default_logistics) return false; //--定时器,判断wu_arr不未空-- var uii = setInterval(function () { if (th.data.wu_arr) { 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 2fc7ec3..4a2dece 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -1695,9 +1695,12 @@ Page({ m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; + + var uii = setInterval(function () { if (th.data.wu_arr) { clearInterval(uii); + if(th.data.is_default_logistics) return false; for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { diff --git a/packageC/pages/payForAnother/payForAnother.js b/packageC/pages/payForAnother/payForAnother.js index ede814a..4706384 100644 --- a/packageC/pages/payForAnother/payForAnother.js +++ b/packageC/pages/payForAnother/payForAnother.js @@ -583,7 +583,7 @@ Page({ //-----------拼装购物车结算的数组,如果有默认物流时要用默认物流编号,计算默认的物流,不管是不是自提都算一下----------------- var m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - if (def_exp_code) { + if (def_exp_code && !th.data.is_default_logistics) { for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { @@ -764,7 +764,7 @@ Page({ var m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - if (et == 0 && def_exp_code) { + if (et == 0 && def_exp_code && !th.data.is_default_logistics) { for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { @@ -2712,7 +2712,7 @@ Page({ } //判断有没有默认的物流地址值 - if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined) { + if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics) { var wu_arr = this.data.wu_arr; if (wu_arr != null && wu_arr != "") { for (var i = 0; i < wu_arr.length; i++) { @@ -2751,7 +2751,7 @@ Page({ } //判断有没有默认的物流地址值 - if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined) { + if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics) { var wu_arr = this.data.wu_arr; if (wu_arr != null && wu_arr != "") { for (var i = 0; i < wu_arr.length; i++) { @@ -3323,10 +3323,12 @@ Page({ //更新下默认,在onshow里面 update_code(){ var th = this, m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; + //--定时器,判断wu_arr不未空-- var uii = setInterval(function () { if (th.data.wu_arr) { clearInterval(uii); + if(th.data.is_default_logistics) return false; for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 92acd2c..2847890 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -923,7 +923,7 @@ Page({ } //判断有没有默认的物流地址值 - if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined) { + if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics) { var wu_arr = this.data.wu_arr; if (wu_arr != null && wu_arr != "") { for (var i = 0; i < wu_arr.length; i++) { @@ -1429,10 +1429,12 @@ Page({ //更新下默认,在onshow里面 update_code() { var th = this, m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; + //--定时器,判断wu_arr不未空-- var uii = setInterval(function () { if (th.data.wu_arr) { clearInterval(uii); + if(th.data.is_default_logistics) return false; for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 102d2f7..bd6dec3 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -453,7 +453,7 @@ Page({ var m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - if (et == 0 && def_exp_code) { + if (et == 0 && def_exp_code && !th.data.is_default_logistics) { for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { @@ -1886,7 +1886,7 @@ Page({ } //判断有没有默认的物流地址值 - if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined) { + if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics) { var wu_arr = this.data.wu_arr; if (wu_arr != null && wu_arr != "") { for (var i = 0; i < wu_arr.length; i++) { @@ -1925,7 +1925,7 @@ Page({ } //判断有没有默认的物流地址值 - if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined) { + if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics) { var wu_arr = this.data.wu_arr; if (wu_arr != null && wu_arr != "") { for (var i = 0; i < wu_arr.length; i++) { @@ -2429,10 +2429,12 @@ Page({ //更新下默认,在onshow里面 update_code() { var th = this, m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; + //--定时器,判断wu_arr不未空-- var uii = setInterval(function () { if (th.data.wu_arr) { clearInterval(uii); + if(th.data.is_default_logistics) return false; for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js index bab5dcb..c5d2362 100644 --- a/packageC/pages/presell/cart/cart2_pre.js +++ b/packageC/pages/presell/cart/cart2_pre.js @@ -1122,6 +1122,8 @@ Page({ var uii = setInterval(function () { if (th.data.wu_arr) { clearInterval(uii); + if(th.data.is_default_logistics) return false; + for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index e789239..8d92e8d 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -980,7 +980,7 @@ Page({ //-----------拼装购物车结算的数组,如果有默认物流时要用默认物流编号,计算默认的物流,不管是不是自提都算一下----------------- var m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - if (def_exp_code) { + if (def_exp_code && !th.data.is_default_logistics) { for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { @@ -1243,7 +1243,10 @@ Page({ var m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - if (et == 0 && def_exp_code) { + + + + if (et == 0 && def_exp_code && !th.data.is_default_logistics) { for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { @@ -2346,7 +2349,7 @@ Page({ if (th.data.using_quan[pickid] && th.data.using_quan[pickid].isby == 1 && th.data.is_quan_by[pickid]) { continue; } - + if (back_data && back_data['is_by_all'] && item[j].is_post_temp && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item[j].goods_id) == -1)) { @@ -4547,7 +4550,7 @@ Page({ } //判断有没有默认的物流地址值 - if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined) { + if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics) { var wu_arr = this.data.wu_arr; if (wu_arr != null && wu_arr != "") { for (var i = 0; i < wu_arr.length; i++) { @@ -4586,7 +4589,7 @@ Page({ } //判断有没有默认的物流地址值 - if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined) { + if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics) { var wu_arr = this.data.wu_arr; if (wu_arr != null && wu_arr != "") { for (var i = 0; i < wu_arr.length; i++) { @@ -5138,10 +5141,12 @@ Page({ //更新下默认,在onshow里面 update_code() { var th = this, m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; + //--定时器,判断wu_arr不未空-- var uii = setInterval(function () { if (th.data.wu_arr) { clearInterval(uii); + if(th.data.is_default_logistics) return false; for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js index 6cda3bb..fcbb5f7 100644 --- a/pages/cart/cart2_inte/cart2_inte.js +++ b/pages/cart/cart2_inte/cart2_inte.js @@ -472,7 +472,7 @@ Page({ if (th.data.bn_goods) et = th.data.bn_exp_type var m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - if (et == 0 && def_exp_code) { + if (et == 0 && def_exp_code && !th.data.is_default_logistics) { for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { m_wind = k; } } @@ -1315,7 +1315,7 @@ Page({ } //判断有没有默认的物流地址值 - if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined) { + if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics) { var wu_arr = this.data.wu_arr; if (wu_arr != null && wu_arr != "") { for (var i = 0; i < wu_arr.length; i++) { @@ -1416,10 +1416,13 @@ Page({ //更新下默认,在onshow里面 update_code() { var th = this, m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; + + //--定时器,判断wu_arr不未空-- var uii = setInterval(function () { if (th.data.wu_arr) { clearInterval(uii); + if(th.data.is_default_logistics) return false; for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { m_wind = k; } diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 70cdd8a..95345e1 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -1465,10 +1465,10 @@ Page({ //更新下默认,在onshow里面 update_code() { var th = this, m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - var uii = setInterval(function () { if (th.data.wu_arr) { clearInterval(uii); + if(th.data.is_default_logistics) return false; for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js index 4a1b10e..1e7ab55 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/pages/cart/cart_wk/cart_wk.js @@ -109,6 +109,13 @@ Page({ }) + //--更新默认地址--,看一下是不是跳到地址页面 + if (!getApp().globalData.is_cart_old) { + this.update_code(); + } else { + getApp().globalData.is_cart_old = 0; + } + }, /** * 用户点击右上角分享 @@ -1065,6 +1072,25 @@ Page({ }); }, + //更新下默认,在onshow里面 + update_code() { + var th = this, m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; + var uii = setInterval(function () { + if (th.data.wu_arr) { + clearInterval(uii); + if(th.data.is_default_logistics) return false; + for (var k = 0; k < th.data.wu_arr.length; k++) { + var item = th.data.wu_arr[k]; + if (def_exp_code == item.code) { + m_wind = k; + } + } + //--如果是立即购买-- + th.setData({ index: m_wind, is_express: m_wind }); + } + }, 500) + }, + //// 开启物流的弹窗 show_wu_arr: function (e) {