diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml index aba0c02..5fcb35b 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml @@ -200,7 +200,7 @@ 请先选择门店 - + 库存不足 diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 55558dc..0b4e2f9 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -297,7 +297,11 @@ Page({ nav_backgroundColor: "#ffffff", nav_type: 2, //导航类型 istop: 0, //是否置顶风格为1 - searchbox_transparent: 1 + searchbox_transparent: 1, + + front_g:null, + fir_set_sto:1, //最初始的一下，获取门店 + front_pick:null, //在详情页面上显示的门店 }, @@ -1145,7 +1149,8 @@ Page({ ee.setData({ data: t.data.data, sele_g: t.data.data, - userInfo: getApp().globalData.userInfo + userInfo: getApp().globalData.userInfo, + front_g:ut.deep_cp(t.data.data) }); @@ -2332,12 +2337,11 @@ Page({ if (this.data.openSpecModal_pt && this.data.is_normal) { this.get_sto(); this.setData({ - sele_g: this.data.data, - gid: this.data.data.goods_id + sele_g: this.data.front_g, + gid: this.data.front_g.goods_id }) this.sele_spec_chech_activity(); - } this.setData({ @@ -3369,6 +3373,27 @@ Page({ } }, + + //-- 处理首页的显示门店 --- + deal_front_pk(){ + var th=this; + if(this.data.fir_set_sto==1){ + this.data.fir_set_sto=0; + var cp_data=null + if(th.data.def_pick_store && th.data.def_pick_store.pickup_id){ + cp_data=JSON.parse(JSON.stringify(th.data.def_pick_store)); + } + th.setData({ + front_pick:cp_data, + front_only_pk:th.data.only_pk, + front_def_pickpu_list:th.data.def_pickpu_list, + front_pickpu_listt:th.data.pickpu_list, + front_all_sto:th.data.all_sto, + front_is_show_sto_cat:th.data.is_show_sto_cat, + }) + } + }, + //------------处理门店--------------- deal_pickup(e) { var th = this; @@ -3502,15 +3527,21 @@ Page({ th.setData({ def_pick_store: e.data.data.pageData[0] }) } } + + //-- 设置商品详情页面的门店显示情况 --- + th.deal_front_pk(); + } else { - th.setData({ - is_show_sto_cat: -1, - only_pk: e.data.data.pageData - }); - //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ - if (!th.data.def_pick_store) { - th.setData({ def_pick_store: e.data.data.pageData[0] }) - } + th.setData({ + is_show_sto_cat: -1, + only_pk: e.data.data.pageData + }); + //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ + if (!th.data.def_pick_store) { + th.setData({ def_pick_store: e.data.data.pageData[0] }) + } + //-- 设置商品详情页面的门店显示情况 --- + th.deal_front_pk(); } } @@ -3529,6 +3560,9 @@ Page({ sto_sele_distr: e.data.data.pageData[0].distr_type }) } + + //-- 设置商品详情页面的门店显示情况 --- + th.deal_front_pk(); } }, @@ -3998,6 +4032,7 @@ Page({ } if(prom_type==9){ + ee.get_sto(); this.setData({ isshow: 1, }); } @@ -4500,6 +4535,7 @@ Page({ var th = this; var ind = parseInt(e.currentTarget.dataset.ind); + th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)}); //ind == 1是普通购买 if (ind == 1) { @@ -5940,7 +5976,10 @@ Page({ var th = this; var ind = ee.currentTarget.dataset.ind; + var isfront = ee.currentTarget.dataset.isfront; var bconfig = th.data.bconfig; + th.data.isfront=0; + if(isfront) th.data.isfront=1; //如果开启了，则不在选择门店 if(this.data.sys_switch.is_pricing_open_store && getApp().globalData.pk_store){ @@ -6187,6 +6226,10 @@ Page({ if (!th.data.sele_g) return false; //判断门店的配送方式是不是匹配 var g_distr_type = th.data.sele_g.distr_type; + if(th.data.isfront==1){ + g_distr_type = th.data.data.distr_type; + } + if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) { wx.showToast({ title: "门店配送方式不匹配", @@ -6208,6 +6251,12 @@ Page({ fir_pick_index: 0 }); + if(th.data.isfront){ + th.setData({ + front_pick: ut.deep_cp(item) + }) + } + if (openindstore == 1) { th.setData({ openSpecModal: !0, diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml index af99e3e..efa5522 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml @@ -418,8 +418,8 @@ - - + + @@ -427,30 +427,30 @@ - + - {{def_pick_store.pickup_name}} + {{front_pick.pickup_name}} - - 距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} + + 距离：{{front_pick.distance>1000?filters.toFix(front_pick.distance/1000,2)+"km":filters.toFix(front_pick.distance,0)+"m"}} - (库存不足) + (库存不足) - + (库存不足) - + (配送不匹配) - + (库存不足) - 地址:{{def_pick_store.fulladdress}} + 地址:{{front_pick.fulladdress}} diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml index a65dd47..e39d140 100644 --- a/pages/goods/goodsInfo/buy_integral.wxml +++ b/pages/goods/goodsInfo/buy_integral.wxml @@ -3,9 +3,9 @@ - + - {{data.goods_name}} + {{front_g.goods_name}} {{prom_integral}}积分 @@ -105,7 +105,7 @@ 请先选择门店 - + 库存不足 diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 65d0cd4..e4970a2 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1203,7 +1203,7 @@ Page({ data: t.data.data, sele_g: t.data.data, userInfo: getApp().globalData.userInfo, - front_g: t.data.data, + front_g: ut.deep_cp(t.data.data), }); //获取统一条形码,普通商品和优惠促销的商品 @@ -5934,7 +5934,7 @@ Page({ //----------立即购买_pt----------- buyNow_pt: function (e) { - + this.setData({ openSpecModal: 0, openSpecModal_inte: 0, @@ -8545,7 +8545,7 @@ Page({ }); //要进行还原 this.setData({ - sele_g: this.data.front_g, + sele_g: ut.deep_cp(this.data.front_g), gid: this.data.front_g.goods_id }) this.get_sto(); diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 33ef28f..3b84394 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -728,7 +728,7 @@ (该店不可售) - + (库存不足)