Commit 21c0cdc93069fc15bc0d15dee178739e1f5f3f51
Merge branch 'test' into 'qa'
Test See merge request !999
Showing
1 changed file
with
2 additions
and
2 deletions
pages/goods/goodsInfo/goodsInfo.js
| @@ -2823,8 +2823,8 @@ Page({ | @@ -2823,8 +2823,8 @@ Page({ | ||
| 2823 | } | 2823 | } |
| 2824 | clearInterval(timer_get); | 2824 | clearInterval(timer_get); |
| 2825 | 2825 | ||
| 2826 | - //如果会员是有默认的门店话 | ||
| 2827 | - if (!th.data.def_pick_store && th.data.fir_def_store) { | 2826 | + //如果会员是有默认的门店话 |
| 2827 | + if (!th.data.def_pick_store && th.data.fir_def_store && Object.keys(th.data.fir_def_store).length>0) { | ||
| 2828 | th.setData({def_pick_store: th.data.fir_def_store}); | 2828 | th.setData({def_pick_store: th.data.fir_def_store}); |
| 2829 | } | 2829 | } |
| 2830 | wx.showLoading({ | 2830 | wx.showLoading({ |