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 | 544 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 322 insertions(+), 222 deletions(-)
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 8aa1af1..f7dbf17 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -1,28 +1,22 @@
import React, { Component } from 'react'
-import { message, Modal, notification } from 'antd'
+import { message, Modal } from 'antd'
import md5 from 'md5'
import moment from 'moment'
import Api from '@/api'
import Utils from '@/utils/utils.js'
-import options, { styles } from '@/store/options.js'
-import zhCN from '@/locales/zh-CN/login.js'
-import enUS from '@/locales/en-US/login.js'
+import MKEmitter from '@/utils/events.js'
+import { styles } from '@/store/options.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncLoadComponent from '@/utils/asyncLoadComponent'
import './index.scss'
const LoginForm = asyncLoadComponent(() => import('./loginform'))
-const Resetpwd = asyncLoadComponent(() => import('@/components/header/resetpwd'))
+const Resetpwd = asyncLoadComponent(() => import('@/components/resetPassword'))
const LoginCloudForm = asyncComponent(() => import('./logincloudform'))
-const iszhCN = sessionStorage.getItem('lang') !== 'en-US'
-
-const _href = window.location.href.split('#')[0]
class Login extends Component {
state = {
- selectedlang: iszhCN ? 'zh-CN' : 'en-US',
- dict: iszhCN ? zhCN : enUS,
isDisabled: false,
auth: false,
authError: '',
@@ -33,20 +27,12 @@
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,
- touristLogin: false,
syncing: false,
- visible: false,
- resetLoading: false
- }
-
- changelang (item) {
- // 鍒囨崲璇█
- this.setState({
- dict: item === 'zh-CN' ? zhCN : enUS
- })
}
handleSubmit = () => {
@@ -68,55 +54,79 @@
* @param {Object} param 鐢ㄦ埛鍚嶅瘑鐮佺瓑淇℃伅
*/
async loginsubmit (param) {
- let city = sessionStorage.getItem('city') || ''
- let ipAddress = sessionStorage.getItem('ipAddress') || ''
-
// 鐧诲綍鎻愪氦
- let res = await Api.getusermsg(param.username, param.password, false, ipAddress, city)
+ let res = await Api.getusermsg(param.username, param.password, false)
if (res.status) {
+ if (res.check_mob) {
+ let loginWays = this.state.loginWays.filter(item => item.type === 'sms_vcode')
+
+ if (loginWays.length > 0) {
+ this.setState({loginWays: null, isDisabled: false}, () => {
+ this.setState({loginWays: loginWays})
+ })
+ Modal.warning({
+ title: '涓虹‘璁ゆ槸鎮ㄦ湰浜烘搷浣滐紝璇蜂娇鐢ㄦ墜鏈虹煭淇￠獙璇佺爜杩涜韬唤璁よ瘉',
+ okText: '鐭ラ亾浜�'
+ })
+ return
+ }
+ }
+
sessionStorage.setItem('UserID', res.UserID)
sessionStorage.setItem('LoginUID', res.LoginUID)
sessionStorage.setItem('User_Name', res.UserName)
sessionStorage.setItem('Full_Name', res.FullName)
sessionStorage.setItem('avatar', res.icon || '')
sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
- sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('debug', res.debug || '')
sessionStorage.setItem('role_id', res.role_id || '')
sessionStorage.setItem('departmentcode', res.departmentcode || '')
sessionStorage.setItem('organization', res.organization || '')
sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- sessionStorage.setItem('localRole_id', res.role_id || '')
if (res.paas_externalDatabase) {
sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
window.GLOB.externalDatabase = `[${res.paas_externalDatabase}]..`
}
- localStorage.setItem(_href + 'lang', param.lang || 'zh-CN')
- sessionStorage.setItem('lang', param.lang || 'zh-CN')
-
sessionStorage.removeItem('visitorUserID')
sessionStorage.removeItem('visitorLoginUID')
- if (param.remember) { // 璁颁綇瀵嗙爜鏃惰处鍙峰瘑鐮佸瓨鍏ocalStorage
- localStorage.setItem(_href, window.btoa(window.encodeURIComponent(JSON.stringify({username: param.username, password: param.password}))))
+ let users = localStorage.getItem(window.GLOB.sysSign + 'users')
+
+ if (users) {
+ try {
+ users = JSON.parse(window.decodeURIComponent(window.atob(users)))
+ } catch (e) {
+ console.warn('Parse Failure')
+ users = []
+ }
} else {
- localStorage.removeItem(_href)
+ users = []
}
- let level = localStorage.getItem(_href + 'pwdlevel')
+ users = users.filter(item => item.username !== param.username)
- if (level) {
+ if (users.length > 4) {
+ users.length = 4
+ }
+
+ users.unshift({username: param.username, password: param.remember ? param.password : ''})
+
+ localStorage.setItem(window.GLOB.sysSign + 'users', window.btoa(window.encodeURIComponent(JSON.stringify(users))))
+
+ let level = localStorage.getItem(window.GLOB.sysSign + 'pwdlevel')
+
+ if (level && process.env.NODE_ENV === 'production') {
let visible = false
let tip = '瀵嗙爜寮哄害涓嶅锛岃淇敼瀵嗙爜锛�'
if (param.password.length < 8) {
visible = true
} else if (level === 'letter_num' && /^([^0-9]*|[^a-zA-Z]*)$/.test(param.password)) {
visible = true
- } else if ((level === 'char_num' || level === 'char_num_90') && /^([^0-9]*|[^a-zA-Z]*|[^!@#$%^&*()_]*)$/.test(param.password)) {
+ } else if ((level === 'char_num' || level === 'char_num_90' || level === 'char_num_90_sms') && /^([^0-9]*|[^a-zA-Z]*|[^!@#$%^&*()_]*)$/.test(param.password)) {
visible = true
- } else if (level === 'char_num_90' && res.modifydate) {
+ } else if ((level === 'char_num_90' || level === 'char_num_90_sms') && res.modifydate) {
let s = (new Date().getTime() - new Date(res.modifydate).getTime()) / (1000 * 24 * 60 * 60)
if (!isNaN(s) && s > 90) {
visible = true
@@ -127,22 +137,27 @@
if (visible) {
message.warning(tip)
this.setState({
- isDisabled: false,
- visible: true
+ isDisabled: false
+ })
+
+ MKEmitter.emit('resetpassword', () => {
+ const input = document.getElementById('password')
+ if (input) {
+ input.select()
+ }
})
return
}
}
- let _history = sessionStorage.getItem('history')
- if (_history) {
- sessionStorage.removeItem('history')
- // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈�
- this.props.history.replace(_history)
+ let iframe = sessionStorage.getItem('iframe')
+ if (iframe) {
+ sessionStorage.removeItem('iframe')
+ this.props.history.replace(iframe.replace(/@loginuid@/, res.LoginUID))
} else {
this.props.history.replace('/main')
}
- } else if (res.ErrCode === 'Need_Get_Appkey' && options.sysType === 'SSO') {
+ } else if (res.ErrCode === 'Need_Get_Appkey' && window.GLOB.sysType === 'SSO') {
message.warning('搴旂敤灏氭湭鍒涘缓锛岃鍚戜簯绔悓姝ュ簲鐢紒')
this.setState({
@@ -157,7 +172,8 @@
input.select()
}
} else if (res.message.indexOf('鐧诲綍鏉冮檺') > -1) {
- const input = document.getElementById('username')
+ const wrap = document.getElementById('username')
+ const input = wrap ? wrap.getElementsByTagName('input')[0] : null
if (input) {
input.select()
}
@@ -169,11 +185,8 @@
}
async phoneloginsubmit (param) {
- let city = sessionStorage.getItem('city') || ''
- let ipAddress = sessionStorage.getItem('ipAddress') || ''
-
// 鐧诲綍鎻愪氦
- let res = await Api.getphoneusermsg(param.phone, param.vercode, false, ipAddress, city)
+ let res = await Api.getphoneusermsg(param.phone, param.vercode, false)
if (res.status) {
sessionStorage.setItem('UserID', res.UserID)
sessionStorage.setItem('LoginUID', res.LoginUID)
@@ -181,34 +194,28 @@
sessionStorage.setItem('Full_Name', res.FullName)
sessionStorage.setItem('avatar', res.icon || '')
sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
- sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('debug', res.debug || '')
sessionStorage.setItem('role_id', res.role_id || '')
sessionStorage.setItem('departmentcode', res.departmentcode || '')
sessionStorage.setItem('organization', res.organization || '')
sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- sessionStorage.setItem('localRole_id', res.role_id || '')
if (res.paas_externalDatabase) {
sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
window.GLOB.externalDatabase = `[${res.paas_externalDatabase}]..`
}
- localStorage.setItem(_href + 'lang', param.lang || 'zh-CN')
- sessionStorage.setItem('lang', param.lang || 'zh-CN')
-
sessionStorage.removeItem('visitorUserID')
sessionStorage.removeItem('visitorLoginUID')
- let _history = sessionStorage.getItem('history')
- if (_history) {
- sessionStorage.removeItem('history')
- // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈�
- this.props.history.replace(_history)
+ let iframe = sessionStorage.getItem('iframe')
+ if (iframe) {
+ sessionStorage.removeItem('iframe')
+ this.props.history.replace(iframe.replace(/@loginuid@/, res.LoginUID))
} else {
this.props.history.replace('/main')
}
- } else if (res.ErrCode === 'Need_Get_Appkey' && options.sysType === 'SSO') {
+ } else if (res.ErrCode === 'Need_Get_Appkey' && window.GLOB.sysType === 'SSO') {
message.warning('搴旂敤灏氭湭鍒涘缓锛岃鍚戜簯绔悓姝ュ簲鐢紒')
this.setState({
@@ -232,13 +239,11 @@
sessionStorage.setItem('Full_Name', res.FullName)
sessionStorage.setItem('avatar', res.icon || '')
sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
- sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('debug', res.debug || '')
sessionStorage.setItem('role_id', res.role_id || '')
sessionStorage.setItem('departmentcode', res.departmentcode || '')
sessionStorage.setItem('organization', res.organization || '')
sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- sessionStorage.setItem('localRole_id', res.role_id || '')
if (res.paas_externalDatabase) {
sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
@@ -248,15 +253,14 @@
sessionStorage.removeItem('visitorUserID')
sessionStorage.removeItem('visitorLoginUID')
- let _history = sessionStorage.getItem('history')
- if (_history) {
- sessionStorage.removeItem('history')
- // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈�
- this.props.history.replace(_history)
+ let iframe = sessionStorage.getItem('iframe')
+ if (iframe) {
+ sessionStorage.removeItem('iframe')
+ this.props.history.replace(iframe.replace(/@loginuid@/, res.LoginUID))
} else {
this.props.history.replace('/main')
}
- } else if (res.ErrCode === 'Need_Get_Appkey' && options.sysType === 'SSO') {
+ } else if (res.ErrCode === 'Need_Get_Appkey' && window.GLOB.sysType === 'SSO') {
message.warning('搴旂敤灏氭湭鍒涘缓锛岃鍚戜簯绔悓姝ュ簲鐢紒')
this.setState({
@@ -288,53 +292,41 @@
document.getElementsByTagName('head')[0].removeChild(JSONP)
},500)
})
-}
+ }
componentDidMount () {
// 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")
- // 鑾峰彇ip鍙婂煄甯備俊鎭�
- // let ipurl = window.atob('aHR0cHM6Ly9lcGMubWs5a$mkC5jbi93ZWJhcGkvaXBsb2M='.replace(/\$mk/ig, ''))
- // Api.directRequest(ipurl, 'get', null, 'true').then(res => {
- // if (!res || !res.ip) return
- // sessionStorage.setItem('ipAddress', res.ip)
- // })
- if (sessionStorage.getItem('loginError')) {
- try {
- let res = JSON.parse(sessionStorage.getItem('loginError'))
- console.info(res.url)
- console.info(res.request)
- console.info(res.response)
+ sessionStorage.removeItem('langList')
- let result = JSON.parse(res.response)
+ setTimeout(() => {
+ Api.delCacheConfig()
+ }, 50)
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- } catch (e) {}
+ if (window.GLOB.filter) {
+ let view = document.getElementById('mk-login-view')
- setTimeout(() => {
- sessionStorage.removeItem('loginError')
- }, 2000)
+ if (view) {
+ view.style.filter = 'grayscale(100%)'
+ }
}
- const _addressUrl = _href + 'queryAddress'
+ const _addressUrl = window.location.href.split('#')[0] + 'queryAddress'
if (localStorage.getItem(_addressUrl) === 'true') {
this.queryAddress()
}
const timeStamp = new Date().getTime()
- const _authUrl = _href + 'AuthCode'
+ const _authUrl = window.location.href.split('#')[0] + 'AuthCode'
let authCode = localStorage.getItem(_authUrl)
let _s = md5('mksoft' + moment().format('YYYYMMDD'))
authCode = authCode ? authCode.split(',') : []
let index = authCode.findIndex(key => key === _s)
let license = false
+ let appkey = window.GLOB.localkey || window.GLOB.appkey
if (window.GLOB.licenseKey) {
if (window.GLOB.licenseKey.length !== 20) {
@@ -343,7 +335,7 @@
okText: '鐭ラ亾浜�'
})
} else {
- let key = md5(window.GLOB.appId + 'minke_software' + window.GLOB.appkey).toUpperCase().substr(-6)
+ let key = md5(window.GLOB.appId + 'minke_software' + appkey).toUpperCase().substr(-6)
let key1 = window.GLOB.licenseKey.substring(0, 6)
let key2 = window.GLOB.licenseKey.substring(6, 14)
@@ -351,7 +343,7 @@
let key4 = md5(key1 + key2).toUpperCase().substr(-6)
if (key === key1 && key3 === key4) {
- let last = window.GLOB.appkey[window.GLOB.appkey.length - 1]
+ let last = appkey[appkey.length - 1]
let offset = 0
let keys = {}
@@ -374,7 +366,7 @@
lictime = Math.floor(new Date(lictime).getTime() / 86400000)
let curtime = Math.floor(new Date().getTime() / 86400000)
let licday = lictime - curtime
- let _mindUrl = _href + 'notMind'
+ let _mindUrl = window.location.href.split('#')[0] + 'notMind'
if (licday < 0 || isNaN(licday)) {
Modal.warning({
@@ -415,22 +407,17 @@
}
if (!window.GLOB.licenseKey && (index === -1 || index > 5)) {
- let _appId = window.GLOB.appId
-
- if (options.sysType === 'cloud') { // 浜戠浣跨敤绯荤粺閰嶇疆appid
- _appId = options.caId
- }
-
- let str = md5('MK19' + _appId + timeStamp)
+ let str = md5('MK19' + window.GLOB.appId + timeStamp)
let _rduri = window.atob('aHR0cHM6Ly9lcGMubWs5aC5$mkjbi93ZWJhcGkvZG9zdGFycw=='.replace(/\$mk/ig, ''))
let _func = window.atob('c0VtcG93ZXJDbG91$mkZF9HZXRfTGlua1VybA=='.replace(/\$mk/ig, ''))
let _id = window.atob('YmgwYmFwYWJ0ZDQ1ZXBz$mkZ3JhNzlzZWdiY2g2YzFpYms='.replace(/\$mk/ig, ''))
let param = {
func: _func,
- AppID: _appId,
+ AppID: window.GLOB.appId,
TimeStamp: timeStamp,
- appkey: window.GLOB.appkey,
+ appkey: appkey,
+ SessionUid: localStorage.getItem('SessionUid') || '',
userid: _id,
LoginUID: _id,
nonc: Utils.getuuid()
@@ -453,7 +440,11 @@
param.sign = md5(values)
param.t = new Date().getTime()
- Api.directRequest(_rduri + '/' + _func, 'post', param, 'true').then(res => {
+ Api.directRequest({
+ url: _rduri + '/' + _func,
+ method: 'post',
+ data: JSON.stringify(param)
+ }).then(res => {
if (res.status) {
if (res.EPC === str) {
let box = []
@@ -463,6 +454,16 @@
}
box = box.join(',')
localStorage.setItem(_authUrl, box)
+
+ if (res.e_files === 'true') {
+ localStorage.setItem(window.GLOB.sysSign + 'files', md5(window.GLOB.sysSign + 'files'))
+ localStorage.setItem(window.GLOB.sysSign + 'filesDate', res.e_files_end_date)
+ window.GLOB.storeFiles = true
+ window.GLOB.storeDate = Math.ceil((new Date(res.e_files_end_date).getTime() - new Date().getTime()) / 86400000)
+ } else {
+ localStorage.removeItem(window.GLOB.sysSign + 'files')
+ window.GLOB.storeFiles = false
+ }
this.setState({
auth: true
@@ -476,16 +477,24 @@
}
} else {
localStorage.removeItem(_authUrl)
+ localStorage.removeItem(window.GLOB.sysSign + 'files')
+ window.GLOB.storeFiles = false
+
this.setState({
auth: false
})
}
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)
@@ -494,23 +503,69 @@
authError: res.message
})
}
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') {
+ let param = {
+ func: 's_visitor_login',
+ timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
+ SessionUid: _id,
+ TypeCharOne: 'pc',
+ appkey: '202004041613277377A6A2456D34A4948AE84'
+ }
+
+ param.LText = md5(window.btoa(_id + param.timestamp))
+ param.secretkey = md5(param.LText + 'mingke' + param.timestamp)
+
+ let params = {
+ url: _rduri.replace('dostars', 'dologon'),
+ method: 'post',
+ data: JSON.stringify(param)
+ }
+
+ Api.directRequest(params)
+
+ return
+ }
+
+ if (index === -1 || index > 10) {
+ this.setState({
+ auth: false,
+ authError: '缃戠粶閿欒瀵艰嚧绯荤粺鎺堟潈澶辫触锛岃鑱旂郴绠＄悊鍛樸��'
+ })
+ }
})
}
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 || '')
-
- if (result.UserID && result.LoginUID) {
- this.setState({touristLogin: true})
- }
// 鑾峰彇绯荤粺淇℃伅
let _param = {
func: 's_Get_style',
TypeCharOne: 'PC',
- LText: `select '${window.GLOB.appkey}'`,
+ LText: `select '${appkey}'`,
+ appkey: appkey
+ }
+
+ if (window.GLOB.style_appkey) {
+ _param.style_appkey = window.GLOB.style_appkey
}
_param.userid = result.UserID
@@ -519,15 +574,11 @@
_param.secretkey = Utils.encrypt(_param.LText, _param.timestamp)
Api.getSystemConfig(_param).then(res => {
+ if (!res) return
+
if (res.status) {
- // positecgroup
- // res.Banner = res.Banner ? res.Banner.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
- // res.doclogo = res.doclogo ? res.doclogo.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
- // res.indexlogo = res.indexlogo ? res.indexlogo.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
- // res.loginlogo = res.loginlogo ? res.loginlogo.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
-
- if (options.sysType === 'local' && window.GLOB.systemType !== 'production') {
- if (md5(('mk' + window.GLOB.appkey + res.sys_datetime + res.member_type + res.registry_date).toLowerCase()) !== res.secret_key) {
+ if (res.member_type && window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') {
+ if (md5(('mk' + appkey + res.sys_datetime + res.member_type + res.registry_date).toLowerCase()) !== res.secret_key) {
Modal.warning({
title: '瀵嗛挜閿欒锛岃鑱旂郴绠＄悊鍛橈紒',
okText: '鐭ラ亾浜�'
@@ -546,68 +597,134 @@
}
}
- let _url = _href + 'system'
+ 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 || '',
platTitle: res.titleName || '',
platName: res.SysName || '',
bgImage: res.Banner || '',
loginlogo: res.loginlogo || '',
- copyRight: res.CopyRightYear && res.CopyRightOrg ? `Copyright漏${res.CopyRightYear} 鎵�鏈夌浉鍏崇増鏉冨綊 ${res.CopyRightOrg}` : '',
+ copyRight: res.CopyRightYear && res.CopyRightOrg ? `Copyright漏${res.CopyRightYear} ${window.GLOB.dict['copyrights_by'] || '鎵�鏈夌浉鍏崇増鏉冨綊'} ${res.CopyRightOrg}` : '',
ICP: res.ICP || '',
mainlogo: res.indexlogo || '',
doclogo: res.doclogo || '',
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
+ app_version: res.app_version,
+ Member_Level: 0,
+ 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)) {
+ systemMsg.Member_Level = md5('mksoft' + appkey + res.member_level)
+ if (!window.GLOB.memberLevel) {
+ Object.defineProperty(window.GLOB, 'memberLevel', {
+ writable: false,
+ value: res.member_level
+ })
+ }
}
let level = res.pwd_level || ''
- if (level && !['letter_num', 'char_num', 'char_num_90'].includes(level)) {
+ if (level && !['letter_num', 'char_num', 'char_num_90', 'char_num_90_sms'].includes(level)) {
level = ''
}
- localStorage.setItem(_href + 'pwdlevel', level)
+ localStorage.setItem(window.GLOB.sysSign + 'pwdlevel', level)
- if (res.srcid) {
- localStorage.setItem(_href + 'srcId', res.srcid)
- } else {
- localStorage.removeItem(_href + 'srcId')
- }
+ res.index_background_color && sessionStorage.setItem('home_background', res.index_background_color)
- sessionStorage.setItem('home_background', res.index_background_color || '')
+ let seconds = 0
if (res.sys_datetime) {
- sessionStorage.setItem('sys_datetime', res.sys_datetime)
- sessionStorage.setItem('app_datetime', new Date().getTime())
+ seconds = Math.floor((new Date(res.sys_datetime).getTime() - new Date().getTime()) / 1000)
}
+ sessionStorage.setItem('sys_time_shim', isNaN(seconds) ? 0 : seconds)
// url鏍囬
document.title = systemMsg.platTitle
try {
- localStorage.setItem(_url, window.btoa(window.encodeURIComponent(JSON.stringify(systemMsg))))
+ localStorage.setItem(window.GLOB.sysSign + 'system', window.btoa(window.encodeURIComponent(JSON.stringify(systemMsg))))
} catch (e) {
- localStorage.removeItem(_url)
+ localStorage.removeItem(window.GLOB.sysSign + 'system')
}
- let _loginurl = _href + 'loginways'
+ 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
+ }
+
+ return {
+ lang: item.lang,
+ key: item.msn_code,
+ val: item.translation
+ }
+ })
+
+ localStorage.setItem(window.GLOB.sysSign + 'js_trans', JSON.stringify(js_trans))
+ }
+
+ let _loginurl = window.GLOB.sysSign + 'loginways'
let login_ways = []
- let login_types = []
if (res.login_ways && res.login_ways.length > 0) {
res.login_ways.forEach(item => {
// 鐭俊楠岃瘉鐮佺櫥褰曪紝蹇呴』璁剧疆鐭俊Id
if (item.way_no === 'sms_vcode' && !item.sms_id) return
- if (login_types.includes(item.way_no)) return
-
- login_types.push(item.way_no)
+ if (!['sms_vcode', 'uname_pwd', 'app_scan', 'weixin_scan'].includes(item.way_no)) return
login_ways.push({
type: item.way_no,
smsId: item.sms_id
- })
+ })
+
+ if (item.way_no === 'sms_vcode' && item.sms_id) {
+ sessionStorage.setItem('mk_sms_id', item.sms_id)
+ }
})
} else {
login_ways.push({
@@ -621,10 +738,29 @@
} catch (e) {
localStorage.removeItem(_loginurl)
}
+
+ if (res.lang_data && res.lang_data.length > 1 && window.GLOB.systemType !== 'production') {
+ 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')) {
+ localStorage.setItem(window.location.href.split('#')[0] + 'lang', res.lang_data[0].Lang)
+ sessionStorage.setItem('lang', res.lang_data[0].Lang)
+ 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
})
@@ -632,6 +768,7 @@
window.GLOB.style = systemMsg.style
window.GLOB.navBar = systemMsg.navBar
window.GLOB.appVersion = systemMsg.app_version
+ sessionStorage.setItem('appname', res.appname || '')
if (window.GLOB.style && styles[window.GLOB.style]) {
document.body.className = styles[window.GLOB.style] + ' ' + (res.split_line_show === 'false' ? 'hidden-split-line' : '')
@@ -643,13 +780,6 @@
link.rel = 'shortcut icon'
link.href = res.titlelogo
document.getElementsByTagName('head')[0].appendChild(link)
- }
-
- let memberLevel = res.member_level
-
- if (typeof(memberLevel) === 'number' && memberLevel > 10 && parseInt(memberLevel / 10) * 10 === memberLevel) {
- sessionStorage.setItem('Member_Level', md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + memberLevel))
- window.GLOB.memberLevel = memberLevel
}
// positecgroup
@@ -688,7 +818,7 @@
}
})
- let loginWays = localStorage.getItem(_href + 'loginways')
+ let loginWays = localStorage.getItem(window.GLOB.sysSign + 'loginways')
if (loginWays) {
try {
loginWays = JSON.parse(window.decodeURIComponent(window.atob(loginWays)))
@@ -698,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
})
}
}
@@ -733,15 +876,15 @@
func: 's_get_app_from_cloud',
UserName: '',
Password: '',
- systemType: options.sysType,
+ systemType: window.GLOB.sysType,
Type: 'X',
debug: 'Y'
}
param.appkey = window.GLOB.appkey || ''
- if (options.cloudServiceApi) {
- param.rduri = options.cloudServiceApi.replace('dostars', 'dostar')
+ if (window.GLOB.cloudServiceApi) {
+ param.rduri = window.GLOB.cloudServiceApi.replace('dostars', 'dostar')
}
this.logincloudRef.handleConfirm().then(result => {
@@ -788,48 +931,6 @@
})
}
- resetPwdSubmit = () => {
- this.formRef.handleConfirm().then(res => {
- this.setState({
- resetLoading: true
- })
-
- let _param = {
- func: 's_PwdUpt',
- LText: `select '${res.originpwd}','${res.password}'`
- }
-
- _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') // 鏃堕棿鎴�
- _param.LText = Utils.formatOptions(_param.LText) // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
- _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp) // md5瀵嗛挜
-
- Api.getSystemConfig(_param).then(result => {
- this.setState({
- visible: !result.status,
- resetLoading: false
- })
-
- if (result.status) {
- notification.success({
- top: 92,
- message: '淇敼鎴愬姛锛岃閲嶆柊鐧诲綍銆�',
- duration: 2
- })
- const input = document.getElementById('password')
- if (input) {
- input.select()
- }
- } else {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- }
- })
- }, () => {})
- }
-
/**
* @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊
*/
@@ -840,43 +941,53 @@
}
render () {
- const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays, touristLogin } = 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" 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}
</div>
<div className="login-middle" style={lineColor ? {borderColor: lineColor} : {}}>
{loginWays ? <LoginForm
- platName={this.state.platName}
- dict={this.state.dict}
auth={this.state.auth}
authError={this.state.authError}
- touristLogin={touristLogin}
loginWays={loginWays}
- lang={this.state.selectedlang}
+ prolType={prolType}
+ prolCont={prolCont}
langList={this.state.langList}
isDisabled={this.state.isDisabled}
- changelang={(value) => this.changelang(value)}
handleSubmit={() => this.handleSubmit()}
authLogin={this.authLogin}
wrappedComponentRef={(inst) => this.loginformRef = inst}
/> : 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>
- }
- {ICP ? <p dangerouslySetInnerHTML={{ __html: ICP.replace(/\s/ig, ' ') }}></p> : null}
+ <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>
{/* 缂栬緫鐘舵�佺櫥褰� */}
<Modal
- title={this.state.dict['login.sync.cloud']}
- okText={this.state.dict['login.ok']}
- cancelText={this.state.dict['login.cancel']}
+ title="鍚屾浜戠搴旂敤"
visible={this.state.syncApp}
onOk={this.syncSubmit}
maskClosable={false}
@@ -889,18 +1000,7 @@
<LoginCloudForm handleSubmit={() => this.syncSubmit()} wrappedComponentRef={(inst) => this.logincloudRef = inst}/>
</Modal>
{/* 淇敼瀵嗙爜 */}
- <Modal
- title="淇敼瀵嗙爜"
- okText={this.state.dict['login.ok']}
- cancelText={this.state.dict['login.cancel']}
- visible={this.state.visible}
- onOk={this.resetPwdSubmit}
- confirmLoading={this.state.resetLoading}
- onCancel={() => this.setState({visible: false, resetLoading: false})}
- destroyOnClose
- >
- <Resetpwd wrappedComponentRef={(inst) => this.formRef = inst} resetPwdSubmit={this.resetPwdSubmit}/>
- </Modal>
+ <Resetpwd />
</div>
)
}
--
Gitblit v1.8.0