From 8235350e07f7d292ad9849bc609ebed7bca20ff1 Mon Sep 17 00:00:00 2001
From: shil <452061493@qq.com>
Date: Fri, 16 Oct 2026 16:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=85=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/globalRouter.js |  4 ++--
 src/config/env.js          |  3 ++-
 src/http/http.js           |  6 +++++-
 src/views/Home.vue         | 13 +++++++------
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/common/globalRouter.js b/src/common/globalRouter.js
index 4db15c5..bdd85c6 100644
--- a/src/common/globalRouter.js
+++ b/src/common/globalRouter.js
@@ -7,8 +7,8 @@ import {
 let routes = [
   {
     path: "/",
-    // redirect: "/home",
-    redirect: "/enforceHome",
+    redirect: "/home",
+    // redirect: "/enforceHome",
     // redirect: "/login",
     name: "App",
   },
diff --git a/src/config/env.js b/src/config/env.js
index 4d05095..4a09c8e 100644
--- a/src/config/env.js
+++ b/src/config/env.js
@@ -2,7 +2,8 @@
 // let baseUrl="http://139.186.135.156:86";
 // let baseUrl="http://10.132.108.1:85";
 //正式环境
-let baseUrl = "http://jdm.szssfj.cn/jdmApi";
+// // 开头：跟随当前页面协议，同时支持 http / https
+let baseUrl = "//jdm.szssfj.cn/jdmApi";
 //测试环境
 // let baseUrl="http://jdm.szssfj.cn/jdmTestApi";
 // let baseUrl="http://localhost:85";
diff --git a/src/http/http.js b/src/http/http.js
index f4fc7dd..3b4c356 100644
--- a/src/http/http.js
+++ b/src/http/http.js
@@ -16,7 +16,11 @@ http.interceptors.request.use(
         if(!config.headers['Content-Type']){
             config.headers['Content-Type'] = 'application/json'
         }
-        config.headers['token'] = $globalStore.useCommon.token;
+        // 未登录时不要传空 token，否则后端 JWT 会报 “expected 3 parts, but got 1”
+        const token = $globalStore.useCommon.token;
+        if (token) {
+            config.headers['token'] = token;
+        }
         // config.headers['dataScopeId'] = $globalStore.useCommon.userId;
         
         return config
diff --git a/src/views/Home.vue b/src/views/Home.vue
index f06ba16..e53c146 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -152,7 +152,7 @@
     onMounted(() => {
         // console.log(useCommon.phonenumber)
         // useCommon.SET_USER_PHONENUMBER(success.data.phonenumber);
-        // new Vconsolefrom();
+        new Vconsolefrom();
 
         // const access_key = '6374106c5eb449a4ad6c2430f30796e6';
         // const access_secret = '434fec85aa5846e88bbeb8fac6cf6d7f';
@@ -206,11 +206,11 @@
                 console.log("鉴权", res);
 
             }).catch((err) => {
-                // 失败
-                // console.log(err)
+                // 失败：HTTPS 下深i企 SDK 鉴权失败时不要再拿空 token 去打受保护接口
                 console.log("鉴权", err);
-                // todo 临时工
-                getEnterpriseMerchant(useCommon.enterpriseNumber.toString(), useCommon.phonenumber.toString());
+                if (useCommon.token && useCommon.enterpriseNumber && useCommon.phonenumber) {
+                    getEnterpriseMerchant(useCommon.enterpriseNumber.toString(), useCommon.phonenumber.toString());
+                }
             });
 
             w6s.ready(() => {
@@ -224,7 +224,8 @@
 
                             // todo 测试时指定账号去2.0版本 start. 
                             if((success.data.area || "").includes("光明区") || (success.data.area || "").includes("宝安区") || success.data.enterpriseNumber == '91440300769156389U'){
-                                window.location.href="http://jdm.szssfj.cn/efcode20-ent-app/enterprise/enterpriseHome";
+                                // 跟随当前协议，避免 https 打开后被硬跳到 http
+                                window.location.href = window.location.protocol + "//jdm.szssfj.cn/efcode20-ent-app/enterprise/enterpriseHome";
                                 return;
                             }
                             // todo 测试时指定账号去2.0版本 end.