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/sso/index.jsx | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/views/sso/index.jsx b/src/views/sso/index.jsx
index 8847f11..05b6b59 100644
--- a/src/views/sso/index.jsx
+++ b/src/views/sso/index.jsx
@@ -1,13 +1,11 @@
import React, {Component} from 'react'
import { Spin, notification } from 'antd'
-import { connect } from 'react-redux'
import md5 from 'md5'
import moment from 'moment'
import Api from '@/api'
import Utils from '@/utils/utils.js'
import { styles } from '@/store/options.js'
-import { modifyMemberLevel } from '@/store/action'
import './index.scss'
class SSOLogin extends Component {
@@ -39,6 +37,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 || '')
this.getMessage()
@@ -139,8 +138,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
}
this.props.history.replace('/main')
} else {
@@ -165,14 +164,4 @@
}
}
-const mapStateToProps = () => {
- return {}
-}
-
-const mapDispatchToProps = (dispatch) => {
- return {
- modifyMemberLevel: (memberLevel) => dispatch(modifyMemberLevel(memberLevel))
- }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(SSOLogin)
\ No newline at end of file
+export default SSOLogin
\ No newline at end of file
--
Gitblit v1.8.0