wxd / MShopWeApp

Commit 1caefbbea1136755b1ba03d4b258929f57ac038e

Authored by 后端研发-苏明海
2 parents 88de374e edcc5562

Merge branch 'test' into 'qa' 

Test

See merge request !376
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
pages/goods/goodsInfo/goodsInfo.js
  View file @1caefbb
... ... @@ -342,7 +342,7 @@ Page({
342 342 //获取用户的默认门店
343 343 getApp().get_user_store(function(ee) {
344 344 if(!ee) {
345   - th.data.fir_def_store={};
  345 + th.data.fir_def_store={}; //赋值空对象
346 346 return false;
347 347 }
348 348 var appd=getApp().globalData;
... ... @@ -1871,10 +1871,10 @@ Page({
1871 1871 em.data.data.total=new_list.length;
1872 1872 em.data.data.pageData=new_list;
1873 1873  
1874   - if(th.data.fir_def_store && !is_find_def_store){
  1874 + if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id){
1875 1875 th.data.fir_def_store.CanOutQty=0;
1876 1876 //--当选择的门店是客户默认的门店的时候--
1877   - if(th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id) {
  1877 + if(th.data.def_pick_store && th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id) {
1878 1878 th.setData({def_pick_store:th.data.fir_def_store});
1879 1879 em.data.data.pageData.unshift(th.data.def_pick_store);
1880 1880 }else{
... ...