From a99caad99c3c19e85edd03f2fe425a0630033ac5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 20 十一月 2024 16:09:11 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/components/header/index.jsx | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 4dd6942..ac0967d 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -11,6 +11,7 @@
import Utils from '@/utils/utils.js'
import avatar from '@/assets/img/avatar.jpg'
import wxicon from '@/assets/img/wx-icon.png'
+import mkpublic from '@/assets/img/mkpublic.jpg'
import './index.scss'
const { confirm } = Modal
@@ -27,6 +28,7 @@
fullName: '',
logourl: window.GLOB.mainlogo,
wxVisible: false,
+ wxStep: 1,
loginVisible: false,
loginLoading: false,
avatar: Utils.getrealurl(sessionStorage.getItem('avatar')),
@@ -638,7 +640,7 @@
<Menu.Item key="verup" onClick={this.verup}>
{dict['page_upd'] || '椤甸潰鏇存柊'}
</Menu.Item>
- {window.GLOB.WXNotice ? <Menu.Item key="wxnotice" onClick={() => this.setState({wxVisible: true})}>
+ {window.GLOB.WXNotice ? <Menu.Item key="wxnotice" onClick={() => this.setState({wxVisible: true, wxStep: 1})}>
寰俊娑堟伅
</Menu.Item> : null}
{window.GLOB.appVersion ? <Menu.Item key="version" onClick={this.about}>
@@ -823,14 +825,22 @@
footer={null}
destroyOnClose
>
- <div className="wx-sms-wrap">
+ {this.state.wxStep !== 2 ? <div className="wx-sms-wrap">
+ <img className="mk-img" src={mkpublic} alt=""/>
+ <div className="mk-tip">
+ <span>寰俊鎵爜</span>
+ <span>鍏虫敞鍏紬鍙�</span>
+ <span>鍏虫敞鍏紬鍙蜂笖鎺堟潈鍚庢柟鍙帴鏀舵秷鎭��</span>
+ <span onClick={() => this.setState({wxStep: 2})}>涓嬩竴姝�</span>
+ </div>
+ </div> : <div className="wx-sms-wrap">
<QrCode card={{qrWidth: 200, color: '#000000'}} value={window.GLOB.baseurl + 'mob/wxnotice.html?userid=' + sessionStorage.getItem('UserID') + '&loginuid=' + sessionStorage.getItem('LoginUID')}/>
<div className="tip">
<img src={wxicon} alt=""/>
<span>寰俊鎵爜</span>
- <span>鍏虫敞鍏紬鍙�</span>
+ <span>鑾峰彇鐢ㄦ埛鎺堟潈</span>
</div>
- </div>
+ </div>}
</Modal>
</header>
)
--
Gitblit v1.8.0