Commit fa1f46efbb0b330d872f1d0df40ebdf65bb8a50b

Authored by yvan.ni
2 parents 07528fc2 8c4a67dc

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

pages/goods/goodsInfo/goodsInfo.js
@@ -3385,10 +3385,10 @@ Page({ @@ -3385,10 +3385,10 @@ Page({
3385 //---把数组组装进去--- 3385 //---把数组组装进去---
3386 th.deal_pickup(em); 3386 th.deal_pickup(em);
3387 } else { 3387 } else {
3388 - th.setData({def_pick_store: null, all_sto: null, only_pk: null, def_pickpu_list: null}) 3388 + th.setData({all_sto: null, only_pk: null, def_pickpu_list: null})
3389 } 3389 }
3390 } else { 3390 } else {
3391 - th.setData({def_pick_store: null, all_sto: null, only_pk: null, def_pickpu_list: null}) 3391 + th.setData({all_sto: null, only_pk: null, def_pickpu_list: null})
3392 } 3392 }
3393 }) 3393 })
3394 }, 3394 },