Commit b3041ba2c36ee661790a802bd7cb3ab1cb95e410
1 parent
fbde7aee
点击立即狗阿米时，购物车的门店不显示的优化
Showing
2 changed files
with
12 additions
and
4 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
| @@ -4556,7 +4556,11 @@ Page({ | @@ -4556,7 +4556,11 @@ Page({ | ||
| 4556 | var th = this; | 4556 | var th = this; |
| 4557 | var ind = parseInt(e.currentTarget.dataset.ind); | 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 | //ind == 1是普通购买 | 4565 | //ind == 1是普通购买 |
| 4562 | if (ind == 1) { | 4566 | if (ind == 1) { |
pages/goods/goodsInfo/goodsInfo.js
| @@ -293,6 +293,8 @@ Page({ | @@ -293,6 +293,8 @@ Page({ | ||
| 293 | 293 | ||
| 294 | fir_set_sto:1, //最初始的一下，获取门店 | 294 | fir_set_sto:1, //最初始的一下，获取门店 |
| 295 | front_pick:null, //在详情页面上显示的门店 | 295 | front_pick:null, //在详情页面上显示的门店 |
| 296 | + | ||
| 297 | + get_sto_ing:1, //默认是不让弹出框的 | ||
| 296 | }, | 298 | }, |
| 297 | 299 | ||
| 298 | //------初始化加载---------- | 300 | //------初始化加载---------- |
| @@ -2776,7 +2778,9 @@ Page({ | @@ -2776,7 +2778,9 @@ Page({ | ||
| 2776 | return false; | 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 | this.setData({ | 2785 | this.setData({ |
| 2782 | store: 0, | 2786 | store: 0, |
| @@ -5524,7 +5528,7 @@ Page({ | @@ -5524,7 +5528,7 @@ Page({ | ||
| 5524 | //如果是拼单活动的普通购买 | 5528 | //如果是拼单活动的普通购买 |
| 5525 | if (ind == 1) { | 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 | th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)}); | 5532 | th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)}); |
| 5529 | }else if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ //要把不匹配还原 | 5533 | }else if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ //要把不匹配还原 |
| 5530 | th.data.def_pick_store.is_no_dis_nor=0; | 5534 | th.data.def_pick_store.is_no_dis_nor=0; |
| @@ -8605,7 +8609,7 @@ Page({ | @@ -8605,7 +8609,7 @@ Page({ | ||
| 8605 | this.data.g_buy_num = new Map(); | 8609 | this.data.g_buy_num = new Map(); |
| 8606 | var th = this; | 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 | th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)}); | 8613 | th.setData({def_pick_store: ut.deep_cp(th.data.front_pick)}); |
| 8610 | }else if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ //要把不匹配还原 | 8614 | }else if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ //要把不匹配还原 |
| 8611 | th.data.def_pick_store.is_no_dis_nor=0; | 8615 | th.data.def_pick_store.is_no_dis_nor=0; |