From 4366981fbe7d406e90487fd94450fab6eb31120d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 八月 2023 17:19:35 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/design/header/index.jsx | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/views/design/header/index.jsx b/src/views/design/header/index.jsx
index 3fe5ad4..2e9c419 100644
--- a/src/views/design/header/index.jsx
+++ b/src/views/design/header/index.jsx
@@ -23,7 +23,6 @@
menulist: null, // 涓�绾ц彍鍗�
userName: sessionStorage.getItem('CloudUserName'),
avatar: Utils.getrealurl(sessionStorage.getItem('CloudAvatar')),
- memberLevel: Utils.getMemberLevel(),
visible: false,
loading: false
}
@@ -154,7 +153,7 @@
trdItem.PageParam = {OpenType: 'newtab'}
}
- if (trdItem.type === 'CustomPage' && this.state.memberLevel < 20) { // 浼氬憳绛夌骇澶т簬绛変簬20鏃讹紝鏈夌紪杈戞潈闄�
+ if (trdItem.type === 'CustomPage' && window.GLOB.memberLevel < 20) { // 浼氬憳绛夌骇澶т簬绛変簬20鏃讹紝鏈夌紪杈戞潈闄�
trdItem.forbidden = true
}
@@ -408,7 +407,7 @@
render () {
const { mainMenu, editLevel } = this.props
- const { menulist, memberLevel, visible, loading } = this.state
+ const { menulist, visible, loading } = this.state
return (
<header className={'sys-header-container ant-menu-dark ' + (['level2', 'level3'].includes(editLevel) ? 'mask' : '')} id="main-header-container">
@@ -450,7 +449,7 @@
<div className="icon"><HomeOutlined /></div>
<div className="title">棣栭〉</div>
<div className="detail">鍩轰簬鑷畾涔夐〉闈㈢殑棣栭〉璁捐锛屽彲瀹炵幇鐏垫椿鐨勫厓绱犻厤缃強鏍峰紡璋冩暣锛屽睍鐜板綋鍓嶇郴缁熺殑椋庢牸銆�</div>
- <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/menudesign/JTdCJTIyTWVudVR5cGUlMjIlM0ElMjJob21lJTIyJTJDJTIyTWVudUlkJTIyJTNBJTIyaG9tZV9wYWdlX2lkJTIyJTJDJTIyTWVudU5hbWUlMjIlM0ElMjIlRTklQTYlOTYlRTklQTElQjUlMjIlN0Q=')}}>
+ <Button type="primary" disabled={window.GLOB.memberLevel < 20} title={window.GLOB.memberLevel < 20 ? '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��' : ''} onClick={() => {window.open('#/menudesign/JTdCJTIyTWVudVR5cGUlMjIlM0ElMjJob21lJTIyJTJDJTIyTWVudUlkJTIyJTNBJTIyaG9tZV9wYWdlX2lkJTIyJTJDJTIyTWVudU5hbWUlMjIlM0ElMjIlRTklQTYlOTYlRTklQTElQjUlMjIlN0Q=')}}>
缂栬緫
</Button>
</div> : null
@@ -459,7 +458,7 @@
<div className="icon"><ApiOutlined /></div>
<div className="title">鎺ュ彛璋冭瘯</div>
<div className="detail">鍙嚜鍔ㄥ鐞嗙櫥褰曟帴鍙ｇ殑鍙傛暟鍔犲瘑锛屼互鍙婁笟鍔℃帴鍙ｇ殑绛惧悕璁＄畻锛屾柟渚垮紑鍙戜汉鍛樼殑鎺ュ彛娴嬭瘯宸ヤ綔銆�</div>
- <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/interface')}}>
+ <Button type="primary" disabled={window.GLOB.memberLevel < 20} title={window.GLOB.memberLevel < 20 ? '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��' : ''} onClick={() => {window.open('#/interface')}}>
缂栬緫
</Button>
</div>
@@ -468,10 +467,10 @@
<div className="title">搴旂敤绠＄悊</div>
<div className="detail">鍙垱寤哄強绠＄悊PC銆乸ad鍙婄Щ鍔ㄧ绛変笉鍚岃澶囩殑搴旂敤锛屽疄鐜版槑绉戜簯APP銆佸井淇″叕浼楀彿銆佸皬绋嬪簭绛夊骞冲彴鐨勫簲鐢ㄥ叡浜��</div>
{window.GLOB.systemType !== 'production' ?
- <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/appmanage')}}>
+ <Button type="primary" disabled={window.GLOB.memberLevel < 20} title={window.GLOB.memberLevel < 20 ? '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��' : ''} onClick={() => {window.open('#/appmanage')}}>
缂栬緫
</Button> :
- <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/appcheck')}}>
+ <Button type="primary" disabled={window.GLOB.memberLevel < 20} title={window.GLOB.memberLevel < 20 ? '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��' : ''} onClick={() => {window.open('#/appcheck')}}>
鏌ョ湅
</Button>
}
--
Gitblit v1.8.0