From 165792ffc131ff02d5a2a4621af46461fbd50708 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Wed, 29 Apr 2020 15:48:38 +0800
Subject: [PATCH] 默认门店修改后， 空对象要判断pickup_id是否有值。

---
 pages/goods/goodsInfo/goodsInfo.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 607f5f7..e6946f3 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -342,7 +342,7 @@ Page({
     //获取用户的默认门店
     getApp().get_user_store(function(ee) {
       if(!ee) {
-        th.data.fir_def_store={};
+        th.data.fir_def_store={}; //赋值空对象
         return false;
       }
 	  var appd=getApp().globalData;
@@ -1871,10 +1871,10 @@ Page({
 						em.data.data.total=new_list.length;
 						em.data.data.pageData=new_list;																														
 						
-						if(th.data.fir_def_store && !is_find_def_store){
+						if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id){
 							  th.data.fir_def_store.CanOutQty=0;							  
 							  //--当选择的门店是客户默认的门店的时候--
-							  if(th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id)	{
+							  if(th.data.def_pick_store && th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id)	{
 								    th.setData({def_pick_store:th.data.fir_def_store});
 									em.data.data.pageData.unshift(th.data.def_pick_store);	
 							  }else{
--
libgit2 0.21.4