9.7 同步master版本，解决冲突

src/pages/MainPage/ProjectManager/Jury.js

@@ -7,11 +7,10 @@ import talkPng from '@/images/talk/talk.png';
 import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
-import { jurySaveInfo, getSessionUserData } from '@/utils/session';
+import { jurySaveInfo, getSessionUserData, getRA } from '@/utils/session';
 import NoticeDetail from '@/pages/notice/noticeList/components/NoticeDetail'
 import ExpertEnter from '@/pages/BidEvaluation/components/ExpertEnter';
 import { isInsertIdOrPhoto } from './service';
-
 @connect(({ dashboard, loading }) => ({
     ...dashboard,
     downlistLoading: loading.effects['dashboard/fetchDowntlist'],
@@ -25,6 +24,7 @@ class Jury extends PureComponent {
         noticeDetail: false, // 公告弹窗
         recordData: '', // 进入评审室弹窗数据
         enterVisible: false,  // 进入评审室弹窗
+
     }
     componentDidMount() {
         this.props.dispatch({
@@ -97,13 +97,6 @@ class Jury extends PureComponent {
             enterVisible: false
         })
     }
-    talkXy = () => {
-        if (NTKF) {
-            NTKF.im_openInPageChat('bl_1000_1492484340268');
-        } else {
-            message.warn('小优客服初始化失败，请联系系统管理员！')
-        }
-    }
     //判断是否有身份证号或照片
     isIdOrPhoto = () => {
         const { warning } = Modal;
@@ -120,14 +113,11 @@ class Jury extends PureComponent {
         })
     }
     render() {
-        const { datevalue, detailId, noticeDetail, recordData, enterVisible } = this.state;
+        const { datevalue, detailId, noticeDetail, recordData, enterVisible, } = this.state;
         const { Juryuplist, Jurydownlist, staloading, tlist } = this.props;
         return (
             <>
-                {
-                    START_ENV == 'UAT' || START_ENV == 'DEV' || START_ENV == 'sim' ? '' :
-                        <a className="talk" onClick={() => this.talkXy()}>咨询服务︵<span>8:30</span><span>|</span><span>12:30</span><span>13:00</span><span>|</span><span>17:00</span>︶<img src={talkPng} /></a>
-                }
+                {/* <a className={isFlash && !isModalVisible ? "talk text-effect":"talk"} onClick={() => this.initChatUI()}>咨询服务︵<span>8:30</span><span>|</span><span>12:30</span><span>13:00</span><span>|</span><span>17:00</span>︶<img src={talkPng} /></a> */}
                 <div className="dashboard" style={{ height: innerHeight - 70, overflow: "hidden" }}>
                     <Row className="topt">
                         <Col span={12}><Card title="我参与的项目数量统计" bordered={false} className="cardtreJury" style={{ marginRight: "10px" }} loading={staloading} extra={<div style={{ marginTop: "-14px" }}><DatePicker showNow={false} picker="month" style={{ marginRight: "10px" }} value={datevalue} onChange={this.onChange} allowClear={false} /><Button type="primary" onClick={() => { this.onSearch() }}>确定</Button></div>}>