From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14
---
src/components/header/index.jsx | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index cfbbe05..def0339 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -11,7 +11,8 @@
modifyMainMenu,
logout
} from '@/store/action'
-import asyncComponent from '@/utils/asyncSpinComponent'
+import asyncSpinComponent from '@/utils/asyncSpinComponent'
+import asyncComponent from '@/utils/asyncComponent'
import Api from '@/api'
import MKEmitter from '@/utils/events.js'
import options from '@/store/options.js'
@@ -22,7 +23,8 @@
const { confirm } = Modal
const { Search } = Input
const Resetpwd = asyncComponent(() => import('@/components/resetPassword'))
-const LoginForm = asyncComponent(() => import('./loginform'))
+const QrCode = asyncComponent(() => import('@/components/qrcode'))
+const LoginForm = asyncSpinComponent(() => import('./loginform'))
class Header extends Component {
static propTpyes = {
@@ -33,7 +35,6 @@
userName: '',
fullName: '',
logourl: window.GLOB.mainlogo,
- appVersion: window.GLOB.appVersion,
loginVisible: false,
loginLoading: false,
avatar: Utils.getrealurl(sessionStorage.getItem('avatar')),
@@ -288,8 +289,6 @@
loginVisible: true
})
} else {
- sessionStorage.setItem('role_id', sessionStorage.getItem('cloudRole_id'))
- sessionStorage.setItem('dataM', sessionStorage.getItem('cloudDataM'))
sessionStorage.setItem('isEditState', 'true')
this.props.modifyMainMenu(null)
@@ -332,8 +331,6 @@
sessionStorage.setItem('cloudDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('cloudRole_id', res.role_id || '')
- sessionStorage.setItem('role_id', res.role_id || '')
- sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
sessionStorage.setItem('isEditState', 'true')
if (param.remember) {
@@ -444,12 +441,6 @@
setTimeout(() => {
Api.getAppVersion()
}, 1000)
- // Api.genericInterface({
- // func: 's_get_fcc_account_data',
- // fcc_date: '2022-03-01',
- // search_type: ''
- // }).then(res => {
- // })
// sessionStorage 璺ㄩ〉闈㈠叡浜�
window.addEventListener('storage', (e) => {
@@ -513,7 +504,7 @@
content: '閲嶆柊鍔犺浇搴旂敤淇℃伅',
onOk() {
return new Promise(resolve => {
- if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
+ if (!window.GLOB.IndexDB) {
notification.warning({
top: 92,
message: '鏇存柊澶辫触锛岃鍒锋柊椤甸潰閲嶈瘯锛�',
@@ -540,7 +531,15 @@
about = () => {
Modal.success({
- title: '绯荤粺鐗堟湰v' + this.state.appVersion
+ title: '绯荤粺鐗堟湰v' + window.GLOB.appVersion
+ })
+ }
+
+ wxnotice = () => {
+ Modal.success({
+ className: 'mk-wx-notice',
+ title: <QrCode card={{qrWidth: 320, color: '#000000'}} value={window.GLOB.baseurl + 'mob/wxnotice.html?userid=' + sessionStorage.getItem('UserID') + '&loginuid=' + sessionStorage.getItem('LoginUID')}/>,
+ okText: '鍏抽棴'
})
}
@@ -552,7 +551,7 @@
render () {
const { mainMenu, collapse } = this.props
- const { thdMenuList, searchkey, debug, menulist, appVersion } = this.state
+ const { thdMenuList, searchkey, debug, menulist } = this.state
const navBar = window.GLOB.navBar
const menu = (
@@ -571,7 +570,10 @@
<Menu.Item key="verup" onClick={this.verup}>
椤甸潰鏇存柊
</Menu.Item>
- {appVersion ? <Menu.Item key="version" onClick={this.about}>
+ {window.GLOB.WXNotice ? <Menu.Item key="wxnotice" onClick={this.wxnotice}>
+ 寰俊娑堟伅
+ </Menu.Item> : null}
+ {window.GLOB.appVersion ? <Menu.Item key="version" onClick={this.about}>
鍏充簬
</Menu.Item> : null}
<Menu.Item key="logout" onClick={this.logout}>閫�鍑�</Menu.Item>
--
Gitblit v1.8.0