wxd / MShopWeApp

Commit b3041ba2c36ee661790a802bd7cb3ab1cb95e410

Authored by yvan.ni
1 parent fbde7aee

点击立即狗阿米时，购物车的门店不显示的优化

Inline Side-by-side
Showing 2 changed files with 12 additions and 4 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @b3041ba
... ... @@ -4556,7 +4556,11 @@ Page({
4556 4556 var th = this;
4557 4557 var ind = parseInt(e.currentTarget.dataset.ind);
4558 4558  
4559   - th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)});
  4559 + if(th.data.front_pick && th.data.front_pick.pickup_id){
  4560 + th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)});
  4561 + }
  4562 +
  4563 +
4560 4564  
4561 4565 //ind == 1是普通购买
4562 4566 if (ind == 1) {
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @b3041ba
... ... @@ -293,6 +293,8 @@ Page({
293 293  
294 294 fir_set_sto:1, //最初始的一下，获取门店
295 295 front_pick:null, //在详情页面上显示的门店
  296 +
  297 + get_sto_ing:1, //默认是不让弹出框的
296 298 },
297 299  
298 300 //------初始化加载----------
... ... @@ -2776,7 +2778,9 @@ Page({
2776 2778 return false;
2777 2779 }
2778 2780  
2779   - th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)});
  2781 + if(th.data.front_pick && th.data.front_pick.pickup_id>0 ){
  2782 + th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)});
  2783 + }
2780 2784  
2781 2785 this.setData({
2782 2786 store: 0,
... ... @@ -5524,7 +5528,7 @@ Page({
5524 5528 //如果是拼单活动的普通购买
5525 5529 if (ind == 1) {
5526 5530  
5527   - if(th.data.front_pick){
  5531 + if(th.data.front_pick && th.data.front_pick.pickup_id){
5528 5532 th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)});
5529 5533 }else if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ //要把不匹配还原
5530 5534 th.data.def_pick_store.is_no_dis_nor=0;
... ... @@ -8605,7 +8609,7 @@ Page({
8605 8609 this.data.g_buy_num = new Map();
8606 8610 var th = this;
8607 8611  
8608   - if(th.data.front_pick){
  8612 + if(th.data.front_pick && th.data.front_pick.pickup_id){
8609 8613 th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)});
8610 8614 }else if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ //要把不匹配还原
8611 8615 th.data.def_pick_store.is_no_dis_nor=0;
... ...