From ae7abb001c226803fd98baba75550d6a900750e8 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Fri, 27 Nov 2020 17:05:05 +0800
Subject: [PATCH] 对象判断空时候，要优化计算， 门店不足的bug优化

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

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 1b46abe..9b23572 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -2035,7 +2035,7 @@ Page({
         if (e.data.code == 0) {
 
           //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
-          if(dd.lat && !th.data.def_pick_store && th.data.bconfig.is_sort_storage){
+          if(dd.lat && (!th.data.def_pick_store ||  JSON.stringify(th.data.def_pick_store)=='{}') && th.data.bconfig.is_sort_storage){
             th.setData({
               def_pick_store:e.data.data.pageData[0],
               sto_sele_name: e.data.data.pageData[0].pickup_name,
@@ -2046,7 +2046,7 @@ Page({
           }
 
           //-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
-          if (th.data.def_pick_store && (g_distr_type==0 || th.data.def_pick_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type )){
+          if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'  && (g_distr_type==0 || th.data.def_pick_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type )){
             for (var k = 0; k < e.data.data.pageData.length; k++) {
               if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
                 e.data.data.pageData.splice(k, 1); //删除
--
libgit2 0.21.4