From 84dd129f60c7ae814c5c4d1a7fad51e121e7a9d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 30 Jun 2023 11:31:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=B7=B3=E5=88=B0pc=E7=9A=84=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/public/index.html                 |  3 +++
 jero-web/src/components/tools/UserMenu.vue |  5 +----
 jero-web/src/main.js                       |  2 +-
 jero-web/src/permission.js                 | 10 ++--------
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/jero-web/public/index.html b/jero-web/public/index.html
index 58649e975..2f7255407 100644
--- a/jero-web/public/index.html
+++ b/jero-web/public/index.html
@@ -268,6 +268,9 @@
   </style>
   <!-- 全局配置 -->
   <script>
+    localStorage.removeItem('isPhone')
+    localStorage.setItem('isPhone', 'yes')
+    window.loginUrl = 'https://grp.nioint.com'
     // // 判断当前设备
     // function isMobile() {
     //   var userAgentInfo = navigator.userAgent
diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue
index 6f04241e5..d18952460 100644
--- a/jero-web/src/components/tools/UserMenu.vue
+++ b/jero-web/src/components/tools/UserMenu.vue
@@ -234,12 +234,9 @@
               // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面
               //  TODO  在部署线上时注掉以下代码
               that.$router.push({ path: '/user/login' })
-
-              // window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' +
-              // encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' //本地
               //  TODO  在部署线上时解开以下代码
               // window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' +
-              // encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上
+              // encodeURIComponent(window.loginUrl) + '&response_type=code' //线上
 
               localStorage.removeItem('language')
               // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面
diff --git a/jero-web/src/main.js b/jero-web/src/main.js
index 932c7b308..96d9467eb 100644
--- a/jero-web/src/main.js
+++ b/jero-web/src/main.js
@@ -20,7 +20,7 @@ require('@/components/onlineForm/OnlineForm.css')
 import Antd, { version } from 'ant-design-vue'
 
 console.log('ant-design-vue version:', version)
-localStorage.setItem('isPhone','yes')
+
 import Viser from 'viser-vue'
 import 'ant-design-vue/dist/antd.less' // or 'ant-design-vue/dist/antd.less'
 
diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js
index 24d9d2c40..430dbd8d2 100644
--- a/jero-web/src/permission.js
+++ b/jero-web/src/permission.js
@@ -159,13 +159,10 @@ router.beforeEach((to, from, next) => {
               } else {
                 fullPath = to.path
               }
-              // http://grp.nioint.com
-              // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
-              //   + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地
 
               //  TODO  在部署线上时解开此代码
               // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
-              //   + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上
+              //   + encodeURIComponent(window.loginUrl + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上
             })
           })
       } else {
@@ -190,12 +187,9 @@ router.beforeEach((to, from, next) => {
       } else {
         fullPath = to.path
       }
-      // http://grp.nioint.com
-      // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
-      //   + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地
       //  TODO  在部署线上时解开此代码
       // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
-      //   + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上
+      //   + encodeURIComponent(window.loginUrl + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上
 
       NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
     }