From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/login/index.jsx | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 09d4090..ef494ff 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -1,6 +1,5 @@
import React, { Component } from 'react'
import { message, Modal, notification } from 'antd'
-import { connect } from 'react-redux'
import md5 from 'md5'
import moment from 'moment'
@@ -11,7 +10,6 @@
import enUS from '@/locales/en-US/login.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncLoadComponent from '@/utils/asyncLoadComponent'
-import { modifyMemberLevel } from '@/store/action'
import './index.scss'
const LoginForm = asyncLoadComponent(() => import('./loginform'))
@@ -91,6 +89,7 @@
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 || '')
localStorage.setItem(_href + 'lang', param.lang || 'zh-CN')
@@ -186,6 +185,7 @@
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 || '')
localStorage.setItem(_href + 'lang', param.lang || 'zh-CN')
@@ -231,6 +231,7 @@
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 || '')
sessionStorage.removeItem('visitorUserID')
@@ -311,10 +312,7 @@
const _addressUrl = _href + 'queryAddress'
- if (localStorage.getItem(_addressUrl) !== 'true') {
- sessionStorage.setItem('city', '')
- sessionStorage.setItem('ipAddress', '')
- } else {
+ if (localStorage.getItem(_addressUrl) === 'true') {
this.queryAddress()
}
@@ -517,6 +515,26 @@
// 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) {
+ Modal.warning({
+ title: '瀵嗛挜閿欒锛岃鑱旂郴绠＄悊鍛橈紒',
+ okText: '鐭ラ亾浜�'
+ })
+ this.setState({
+ auth: false,
+ authError: '瀵嗛挜閿欒锛岃鑱旂郴绠＄悊鍛橈紒'
+ })
+ return
+ } else if (res.member_type === 'personal' && res.registry_date) {
+ let saveDelay = 0
+ try {
+ saveDelay = parseInt((new Date().getTime() - new Date(res.registry_date).getTime()) / 4320000)
+ sessionStorage.setItem('mkDelay', saveDelay)
+ } catch(e) {}
+ }
+ }
+
let _url = _href + 'system'
let systemMsg = {
favicon: res.titlelogo || '',
@@ -619,8 +637,8 @@
let memberLevel = res.member_level
if (typeof(memberLevel) === 'number' && memberLevel > 10 && parseInt(memberLevel / 10) * 10 === memberLevel) {
- sessionStorage.setItem('Member_Level', md5('mksoft' + moment().format('YYYYMM') + memberLevel))
- this.props.modifyMemberLevel(memberLevel)
+ sessionStorage.setItem('Member_Level', md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + memberLevel))
+ window.GLOB.memberLevel = memberLevel
}
// positecgroup
@@ -676,8 +694,12 @@
queryAddress = () => {
window.callbackFunction = (res) => {
if (res.result && res.result.ad_info) {
- sessionStorage.setItem('city', res.result.ad_info.city)
- sessionStorage.setItem('ipAddress', res.result.ip)
+ sessionStorage.setItem('nation', res.result.ad_info.nation || '')
+ sessionStorage.setItem('province', res.result.ad_info.province || '')
+ sessionStorage.setItem('city', res.result.ad_info.city || '')
+ sessionStorage.setItem('district', res.result.ad_info.district || '')
+ sessionStorage.setItem('address', res.result.ad_info.address || '')
+ sessionStorage.setItem('ipAddress', res.result.ip || '')
}
}
@@ -873,14 +895,4 @@
}
}
-const mapStateToProps = () => {
- return {}
-}
-
-const mapDispatchToProps = (dispatch) => {
- return {
- modifyMemberLevel: (memberLevel) => dispatch(modifyMemberLevel(memberLevel))
- }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Login)
\ No newline at end of file
+export default Login
\ No newline at end of file
--
Gitblit v1.8.0