From 26bdcb6ffb3efae2aeaab86547bb11806ab5d79c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Wed, 30 Dec 2020 16:50:03 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E6=9B=B4=E6=96=B0=E4=BA=86?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E8=8F=9C=E5=8D=95=E6=A0=8F=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/request.js        |  4 ++--
 pages/config/config.js | 27 +++++++++++----------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/apis/request.js b/apis/request.js
index 07701d7..c57eff1 100644
--- a/apis/request.js
+++ b/apis/request.js
@@ -3,8 +3,8 @@ import {errInfo} from './err'
 import {updToken} from './updateToken'
 
 // 请求方式配置
-const api 	 	 = "https://new-web-test.cnskl.com/api/"
-// const api 	 = "https://mi-org.cnskl.com/api/"
+// const api 	 	 = "https://new-web-test.cnskl.com/api/"
+const api 	 = "https://mi-org.cnskl.com/api/"
 const header = {
 	"Accept"	: "application/json"
 }
diff --git a/pages/config/config.js b/pages/config/config.js
index 0768d29..988f9d8 100644
--- a/pages/config/config.js
+++ b/pages/config/config.js
@@ -14,18 +14,19 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(e) {
-        if (e.companyoid && e.companyoid == "") {
-            wx.showToast({
-                title: "参数错误，缺少companyoId"
-            })
-            return
-        }
+        // if (e.companyoid && e.companyoid == "") {
+        //     wx.showToast({
+        //         title: "参数错误，缺少companyoId"
+        //     })
+        //     return
+        // }
         wx.getStorage({
             key     : 'compayId',
             success : res=>{
                 wx.$api.publics.storeConfig({
                     company_id: res.data
                 }).then(res => {
+                    console.log(res)
                     let tabBarVal = res.concat({}),
                         newTabBar = []
 
@@ -40,18 +41,12 @@ Page({
                             case "ticket":
                                 newTabBar.push(ticket)
                                 break;
-                            default :
-                                newTabBar.push(user)
-                                break;
                         }
                     })
-
-                    if(tabBarVal.length == newTabBar.length){
-                        getApp().globalData.storeTabBarConfig = newTabBar
-                        wx.redirectTo({
-                            url: newTabBar[0].pagePath,
-                        })
-                    }
+                    getApp().globalData.storeTabBarConfig = newTabBar.concat([user])
+                    wx.redirectTo({
+                        url: newTabBar[0].pagePath,
+                    })
                 }).catch(()=>{
                     this.setData({
                         loding: false