From 79e4981aa6cc9354276fc54cdf6d14eb08ab7fee Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 22 六月 2023 15:59:04 +0800 Subject: [PATCH] Merge branch 'develop' of ssh://121.36.20.145:29418/~jinfei/pc-plat into develop --- src/components/header/index.jsx | 47 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 36 insertions(+), 11 deletions(-) diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx index 8c1efa8..d53c6ed 100644 --- a/src/components/header/index.jsx +++ b/src/components/header/index.jsx @@ -23,6 +23,7 @@ const { confirm } = Modal const { Search } = Input const Resetpwd = asyncComponent(() => import('@/components/resetPassword')) +const QrCode = asyncComponent(() => import('@/components/qrcode')) const LoginForm = asyncSpinComponent(() => import('./loginform')) class Header extends Component { @@ -79,8 +80,10 @@ changeMenu (value) { // 涓昏彍鍗曞垏鎹� - if (value.OpenType === 'outpage') { - window.open(value.linkUrl) + if (value.OpenType === 'newpage') { + window.open(value.src) + } else if (value.OpenType === 'newtab') { + MKEmitter.emit('modifyTabs', value) } else if (value.OpenType === 'menu') { this.props.modifyMainMenu(value) } @@ -187,8 +190,13 @@ let PageParam = JSON.parse(fst.PageParam) if (PageParam.OpenType === 'outpage' && PageParam.linkUrl) { - fstItem.OpenType = 'outpage' - fstItem.linkUrl = PageParam.linkUrl + fstItem.OpenType = 'newpage' + fstItem.src = PageParam.linkUrl + if (/#\/iframe\//.test(fstItem.src)) { + fstItem.src = fstItem.src.replace(/@userid@/ig, sessionStorage.getItem('UserID')).replace(/@loginuid@/ig, sessionStorage.getItem('LoginUID')) + fstItem.type = 'iframe' + fstItem.OpenType = 'newtab' + } } } catch (e) {} } @@ -236,16 +244,20 @@ trdItem.hidden = PageParam.hidden || 'false' if (trdItem.type === 'NewPage') { + trdItem.OpenType = 'newpage' trdItem.src = PageParam.url || '' + if (/#\/iframe\//.test(trdItem.src)) { + trdItem.src = trdItem.src.replace(/@userid@/ig, sessionStorage.getItem('UserID')).replace(/@loginuid@/ig, sessionStorage.getItem('LoginUID')) + trdItem.type = 'iframe' + trdItem.OpenType = 'newtab' + } + } else { + trdItem.src = '#/tab/' + trd.MenuID } } catch (e) {} - } - - if (trdItem.type !== 'NewPage') { + } else { trdItem.src = '#/tab/' + trd.MenuID } - - trdItem.OpenType = trdItem.OpenType.toLowerCase() // NewPage涓烘墦寮�澶栭儴椤甸潰鍦板潃 if (names.has(trdItem.menu_name)) { doublenames.set(trdItem.menu_name, true) @@ -481,8 +493,10 @@ changeVerMenu(menu, type) { if (type === 'first') { - if (menu.OpenType === 'outpage') { - window.open(menu.linkUrl) + if (menu.OpenType === 'newpage') { + window.open(menu.src) + } else if (menu.OpenType === 'newtab') { + MKEmitter.emit('modifyTabs', menu) } } else { if (menu.OpenType === 'newpage') { @@ -534,6 +548,14 @@ }) } + 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: '鍏抽棴' + }) + } + changeToHome = () => { if (!['linkage', 'menu_board'].includes(window.GLOB.navBar)) return @@ -561,6 +583,9 @@ <Menu.Item key="verup" onClick={this.verup}> 椤甸潰鏇存柊 </Menu.Item> + {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} -- Gitblit v1.8.0