From ba0a3d82883440063b01b672c6ca0ab55668f1c4 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Wed, 30 Oct 2019 09:44:34 +0800
Subject: [PATCH] 1.后台不启用 默认登记门店的bug优化， 2.同时 在程序重新进入的时候，默认门店不显示的bug

---
 app.js | 67 +++++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/app.js b/app.js
index 459ae59..e612c7c 100644
--- a/app.js
+++ b/app.js
@@ -298,34 +298,45 @@ App({
     //获取会员门店
     get_user_store:function (func)
     {
-         var th=this;
-         //---空会员的情况---
-         if(!th.globalData.userInfo){
-              return func(null);
-         }
-         if(!this.globalData.pk_store){
-            var pick_id=0;
-            //先找一个会员是否有设置默认的地址
-           if(th.globalData.userInfo.def_pickup_id){
-               pick_id= th.globalData.userInfo.def_pickup_id
-           }
-           //查找会员的注册的地址
-           else if(th.globalData.userInfo.pickup_id){
-               pick_id= th.globalData.userInfo.pickup_id
-           }
-           //---如果会员没有设置默认门店，同时也没有再注册的时候选择门店--
-           if(pick_id==0)  return func(null);
-           //获取用户注册时候的门店
-           th.request.get("/api/weshop/pickup/get/"+os.stoid+"/"+this.globalData.userInfo.pickup_id,{
-                 data:{},
-                 success:function (res) {
-                     th.globalData.pk_store=res.data.data;
-                     func(th.globalData.pk_store);
-                 }
-           })
-         }else{
-             func(this.globalData.pk_store);
-         }
+        var th=this;
+        this.getConfig2(function (conf) {
+            //---空会员的情况---
+            if(!th.globalData.userInfo){
+                return func(null);
+            }
+            if(!th.globalData.pk_store){
+                var pick_id=0;
+                //先找一个会员是否有设置默认的地址
+                if(th.globalData.userInfo.def_pickup_id){
+                    pick_id= th.globalData.userInfo.def_pickup_id
+                }
+                //查找会员的注册的地址
+                else if(th.globalData.userInfo.pickup_id){
+                    //--购买门店是否默认登记门店--
+                    if(conf.switch_list){
+                        var t_swi=JSON.parse(conf.switch_list);
+                        if(t_swi.is_regstores){
+                            pick_id= th.globalData.userInfo.pickup_id
+                        }
+                    }
+
+                }
+                //---如果会员没有设置默认门店，同时也没有再注册的时候选择门店--
+                if(pick_id==0)  return func(null);
+                //获取用户注册时候的门店
+                th.request.get("/api/weshop/pickup/get/"+os.stoid+"/"+pick_id,{
+                    data:{},
+                    success:function (res) {
+                        th.globalData.pk_store=res.data.data;
+                        func(th.globalData.pk_store);
+                    }
+                })
+            }else{
+                func(th.globalData.pk_store);
+            }
+        })
+
+
     },
 
     //-------获取购物车数量----------
--
libgit2 0.21.4