From 400fee62fb40006a9839f1c3a8244b82566b5057 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:30:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/login/index.jsx | 129 ++++++++++++++++++++++++++++++++----------
1 files changed, 97 insertions(+), 32 deletions(-)
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index b94807a..f7dbf17 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -27,6 +27,8 @@
ICP: window.GLOB.ICP || '',
lineColor: window.GLOB.lineColor || '',
webSite: window.GLOB.webSite || '',
+ prolType: window.GLOB.prolType || '',
+ prolCont: window.GLOB.prolCont || '',
langList: [],
syncApp: false,
loginWays: null,
@@ -296,7 +298,6 @@
// md5("/ws/location/v1/ip?callback=callbackFunction&key=key&output=jsonp secret key")
// md5("/ws/location/v1/ip?callback=callbackFunction&key=BA7BZ-4QB65-LFCIA-QPDA6-4G6O7-MJB4Q&output=jsonpuThL4ZM3XOj642ksEQh76tyHFjh4")
- sessionStorage.removeItem('subLangList')
sessionStorage.removeItem('langList')
setTimeout(() => {
@@ -485,10 +486,15 @@
}
if (res.query_address !== 'true') {
- localStorage.setItem(_addressUrl, 'false')
+ localStorage.removeItem(_addressUrl)
} else {
localStorage.setItem(_addressUrl, 'true')
this.queryAddress()
+ }
+ if (res.deekseek !== 'true') {
+ localStorage.removeItem(window.GLOB.sysSign + 'ds')
+ } else {
+ localStorage.setItem(window.GLOB.sysSign + 'ds', 'true')
}
} else if (res.ErrCode === 'N') {
localStorage.removeItem(_authUrl)
@@ -558,6 +564,10 @@
appkey: appkey
}
+ if (window.GLOB.style_appkey) {
+ _param.style_appkey = window.GLOB.style_appkey
+ }
+
_param.userid = result.UserID
_param.LoginUID = result.LoginUID
_param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -590,6 +600,20 @@
if (!['shutter', 'linkage_navigation', 'linkage', 'menu_board', 'menu_board_navigation'].includes(res.menu_type)) {
res.menu_type = 'shutter'
}
+
+ let loginOtop = ''
+ let loginOleft = ''
+ let windowWidth = window.innerWidth
+ let fix = null
+ res.login_screen_offset && res.login_screen_offset.forEach(item => {
+ if (!item.offset_x && !item.offset_y) return
+
+ if (fix === null || Math.abs(windowWidth - item.resolution_width) < fix) {
+ fix = Math.abs(windowWidth - item.resolution_width)
+ loginOtop = item.offset_y + item.y_unit
+ loginOleft = item.offset_x + item.x_unit
+ }
+ })
let systemMsg = {
favicon: res.titlelogo || '',
@@ -604,10 +628,27 @@
style: res.CSS || '',
showline: res.split_line_show || 'true',
webSite: res.WebSite || '',
+ prolType: '',
+ prolCont: '',
navBar: res.menu_type, // shutter 鐧惧彾绐椼�乴inkage_navigation 鑱斿姩鑿滃崟銆乴inkage 鑱斿姩鑿滃崟_鏃犲鑸爮銆乵enu_board 鑿滃崟闈㈡澘銆乵enu_board_navigation 鑿滃崟闈㈡澘_鏍囩椤�
app_version: res.app_version,
Member_Level: 0,
- appname: res.appname || ''
+ appname: res.appname || '',
+ loginOtop: loginOtop,
+ loginOleft: loginOleft
+ }
+
+ if (['every_time', 'once', 'not_required'].includes(res.require_legal_consent) && res.legal_documents) {
+ systemMsg.prolCont = res.legal_documents
+ try {
+ systemMsg.prolCont = window.decodeURIComponent(window.atob(systemMsg.prolCont))
+ if (res.require_legal_consent !== 'not_required') {
+ systemMsg.prolType = res.require_legal_consent
+ }
+ } catch(e) {
+ systemMsg.prolType = ''
+ systemMsg.prolCont = ''
+ }
}
if ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100].includes(res.member_level)) {
@@ -628,13 +669,7 @@
localStorage.setItem(window.GLOB.sysSign + 'pwdlevel', level)
- if (res.srcid) {
- localStorage.setItem(window.GLOB.sysSign + 'srcId', res.srcid)
- } else {
- localStorage.removeItem(window.GLOB.sysSign + 'srcId')
- }
-
- sessionStorage.setItem('home_background', res.index_background_color || '')
+ res.index_background_color && sessionStorage.setItem('home_background', res.index_background_color)
let seconds = 0
if (res.sys_datetime) {
@@ -654,6 +689,12 @@
if (res.lang_translation_js && res.lang_data && res.lang_data[0] && (res.lang_data.length > 1 || res.lang_data[0].Lang !== 'zh-CN')) {
let lang = sessionStorage.getItem('lang')
let js_trans = res.lang_translation_js.map(item => {
+ if (['not_empty', 'not_zero', 'max_limit', 'less_limit'].includes(item.msn_code)) {
+ item.translation = ' ' + item.translation
+ }
+ if (['input_tip', 'select_tip', 'max_limit', 'less_limit'].includes(item.msn_code)) {
+ item.translation = item.translation + ' '
+ }
if (lang === item.lang) {
window.GLOB.dict[item.msn_code] = item.translation
}
@@ -699,20 +740,8 @@
}
if (res.lang_data && res.lang_data.length > 1 && window.GLOB.systemType !== 'production') {
- let list = res.lang_data.map(item => item.Lang)
- let lang = 'zh-CN'
- if (window.GLOB.defLang && list.includes(window.GLOB.defLang)) {
- lang = window.GLOB.defLang
- }
-
- if (list.includes(lang)) {
- list = [lang, ...list.filter(item => item !== lang)]
- if (lang === sessionStorage.getItem('lang')) {
- sessionStorage.setItem('langList', JSON.stringify(list))
- } else {
- sessionStorage.setItem('subLangList', JSON.stringify(list))
- }
- }
+ let list = res.lang_data.map(item => item.Lang).filter(n => n !== 'zh-CN')
+ sessionStorage.setItem('langList', JSON.stringify(list))
}
if (res.lang_data.length === 1 && res.lang_data[0].Lang !== sessionStorage.getItem('lang')) {
@@ -721,10 +750,17 @@
window.location.reload()
return
}
+
+ let langList = res.lang_data.map(item => ({Lang: item.Lang, LangName: item.LangName}))
+
+ localStorage.setItem(window.GLOB.sysSign + 'langList', JSON.stringify(langList))
+
+ window.GLOB.loginOtop = systemMsg.loginOtop
+ window.GLOB.loginOleft = systemMsg.loginOleft
this.setState({
loginWays: login_ways,
- langList: res.lang_data || [],
+ langList: langList,
...systemMsg
})
@@ -792,6 +828,19 @@
this.setState({
loginWays: loginWays
+ })
+ }
+
+ let langs = localStorage.getItem(window.GLOB.sysSign + 'langList')
+ if (langs) {
+ try {
+ langs = JSON.parse(langs)
+ } catch (e) {
+ langs = []
+ }
+
+ this.setState({
+ langList: langs
})
}
}
@@ -892,10 +941,22 @@
}
render () {
- const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays } = this.state
+ const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays, prolType, prolCont } = this.state
+
+ let wrapStyle = {}
+
+ if (bgImage) {
+ wrapStyle.backgroundImage = `url(${bgImage})`
+ }
+ if (window.GLOB.loginOtop) {
+ wrapStyle['--mk-login-offset-top'] = window.GLOB.loginOtop
+ }
+ if (window.GLOB.loginOleft) {
+ wrapStyle['--mk-login-offset-left'] = window.GLOB.loginOleft
+ }
return (
- <div className="login-container" id="mk-login-view" style={bgImage ? {backgroundImage: 'url(' + bgImage + ')'} : {}}>
+ <div className="login-container" id="mk-login-view" style={wrapStyle}>
<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}
@@ -905,6 +966,8 @@
auth={this.state.auth}
authError={this.state.authError}
loginWays={loginWays}
+ prolType={prolType}
+ prolCont={prolCont}
langList={this.state.langList}
isDisabled={this.state.isDisabled}
handleSubmit={() => this.handleSubmit()}
@@ -913,11 +976,13 @@
/> : null}
</div>
<div className="login-bottom">
- {webSite && copyRight ?
- <a target="_blank" rel="noopener noreferrer" href={webSite} dangerouslySetInnerHTML={{ __html: copyRight.replace(/\s/ig, ' ') }}></a> :
- <p dangerouslySetInnerHTML={{ __html: copyRight ? copyRight.replace(/\s/ig, ' ') : '' }}></p>
- }
- <br/>
+ <p>
+ {webSite && copyRight ?
+ <a target="_blank" rel="noopener noreferrer" href={webSite} dangerouslySetInnerHTML={{ __html: copyRight.replace(/\s/ig, ' ') }}></a> :
+ <span dangerouslySetInnerHTML={{ __html: copyRight ? copyRight.replace(/\s/ig, ' ') : '' }}></span>
+ }
+ {prolCont && !prolType ? <span style={{marginLeft: '15px'}} dangerouslySetInnerHTML={{ __html: prolCont }}></span> : null}
+ </p>
{ICP ? <a target="_blank" rel="noopener noreferrer" href="https://beian.miit.gov.cn/#/Integrated/index" dangerouslySetInnerHTML={{ __html: ICP.replace(/\s/ig, ' ') }}></a> : null}
</div>
{/* 缂栬緫鐘舵�佺櫥褰� */}
--
Gitblit v1.8.0