From 0245e64a9dff794903e546c3bdf9fef7efeefdf1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:09:04 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/login/index.jsx | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index a9bf8d0..45f558f 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -311,6 +311,14 @@
// if (!res || !res.ip) return
// sessionStorage.setItem('ipAddress', res.ip)
// })
+ if (window.GLOB.filter) {
+ let view = document.getElementById('mk-login-view')
+
+ if (view) {
+ view.style.filter = 'grayscale(100%)'
+ }
+ }
+
if (sessionStorage.getItem('loginError')) {
try {
let res = JSON.parse(sessionStorage.getItem('loginError'))
@@ -510,6 +518,21 @@
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 (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 || '')
@@ -918,7 +941,7 @@
const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays, touristLogin } = this.state
return (
- <div className="login-container" style={bgImage ? {backgroundImage: 'url(' + bgImage + ')'} : {}}>
+ <div className="login-container" id="mk-login-view" style={bgImage ? {backgroundImage: 'url(' + bgImage + ')'} : {}}>
<div className="logo" style={lineColor ? {borderColor: lineColor} : {}}>
{loginlogo ? <img src={loginlogo} alt=""/> : null}
{this.state.platName ? <p className="plat-name">{this.state.platName}</p> : null}
--
Gitblit v1.8.0