From 27821f7b598e9e87de8fb179bdcbfdc5e2cb31fa Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 九月 2019 00:17:55 +0800
Subject: [PATCH] 2019-09-25update
---
src/components/header/index.jsx | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index d4204be..993a191 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -27,7 +27,7 @@
state = {
menulist: null,
visible: false,
- dict: (!sessionStorage.getItem('lang') || sessionStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS,
+ dict: (!localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS,
confirmLoading: false
}
@@ -98,7 +98,6 @@
return Api.logoutsystem().then(res => {
if (res.status) {
sessionStorage.removeItem('UserID')
- sessionStorage.removeItem('lang')
_this.props.resetState()
_this.props.history.replace('/login')
} else {
@@ -120,15 +119,17 @@
let result = await Api.getMainMenuData()
if (result.status) {
this.setState({
- menulist: result.data.map((menu, index) => { // 澧炲姞绱㈠紩锛岀敤浜庢墦寮�鏂伴〉闈㈡椂鏌ヨ鑿滃崟
- menu.index = index
- return menu
- })
+ menulist: result.data
})
let param = sessionStorage.getItem('view_param') // 鏄惁涓烘墦寮�鏂伴〉闈�
if (param) {
- let i = parseInt(param.split('&')[0])
- this.props.modifyMainMenu(result.data[i] || result.data[0])
+ // 閫氳繃url涓璵enuid绛涢�夊嚭閫変腑鐨勪富鑿滃崟
+ let id = param.split('&')[0]
+ let _menu = result.data.filter(item => item.MenuID === id)[0]
+ if (!_menu) {
+ sessionStorage.removeItem('view_param')
+ }
+ this.props.modifyMainMenu(_menu || result.data[0])
} else {
this.props.modifyMainMenu(result.data[0])
}
--
Gitblit v1.8.0