~jinfei/pc-plat.git

			@@ -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 = {
			@@ -78,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)
			}
			@@ -186,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) {}
			}
			@@ -235,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)
			@@ -480,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') {
			@@ -533,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

			@@ -560,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}