From d823c59ba0b5f73e06c90d8bcae4dd25f5dfab64 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 九月 2023 17:18:02 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/login/index.jsx | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 19e4aec..3135c50 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -547,20 +547,20 @@
Api.getTouristMsg().then(result => {
if (result.status) {
- if (result.website && process.env.NODE_ENV === 'production') {
- let website = result.website.replace(/http(s)?:\/\/|\/$/ig, '').toLowerCase()
- let current = window.GLOB.baseurl.replace(/http(s)?:\/\/|\/$/ig, '').toLowerCase()
+ // if (result.website && process.env.NODE_ENV === 'production') {
+ // let website = result.website.replace(/http(s)?:\/\/|\/$/ig, '').toLowerCase()
+ // let current = window.GLOB.baseurl.replace(/http(s)?:\/\/|\/$/ig, '').toLowerCase()
- if (website !== current) {
- try {
- window.history.replaceState(null, null, result.website.replace(/\/$/ig, '') + '/admin/index.html#/login')
- window.location.reload()
- } catch(e) {
- window.location.href = result.website.replace(/\/$/ig, '') + '/admin/index.html#/login'
- }
- return
- }
- }
+ // if (website !== current) {
+ // try {
+ // window.history.replaceState(null, null, result.website.replace(/\/$/ig, '') + '/admin/index.html#/login')
+ // window.location.reload()
+ // } catch(e) {
+ // window.location.href = result.website.replace(/\/$/ig, '') + '/admin/index.html#/login'
+ // }
+ // return
+ // }
+ // }
sessionStorage.setItem('visitorUserID', result.UserID || '')
sessionStorage.setItem('visitorLoginUID', result.LoginUID || '')
--
Gitblit v1.8.0