yee 7 years ago
parent
commit
74b4c677e9

+ 1 - 1
js/component/account/services/achievement.jsx

@@ -86,7 +86,7 @@ const AchievementDescFrom = Form.create()(React.createClass({
         if (!this.props.visible && nextProps.visible) {
             this.props.form.resetFields();
             this.state.fileList = [];
-            this.state.enclosureUrl = null;
+            this.state.enclosureUrl = undefined;
         };
     },
     render() {

+ 1 - 1
js/component/account/services/copyright/copyright.jsx

@@ -49,7 +49,7 @@ const copyright = React.createClass({
                             contact: thisdata.contact,
                             copyrightName: thisdata.copyrightName,
                             copyrightNumber: thisdata.copyrightNumber,
-                            status: thisdata.status,
+                            status: thisdata.status == '9' ? '8' : thisdata.status,
                             comment: thisdata.comment,
                             workIssue: thisdata.workIssue,
                             outsource: thisdata.outsource,

+ 1 - 0
js/component/account/services/orgTechCenter.jsx

@@ -24,6 +24,7 @@ const CenterListDescFrom = Form.create()(React.createClass({
                     crossDomain: false,
                     url: globalConfig.context + "/api/user/cognizance/disposeCenterDetail",
                     data: {
+                        id: this.props.data.id,
                         cid: this.props.cid,
                         projectName: values.projectName,
                         projectTimeFormattedDate: values.projectTimeFormattedDate ? values.projectTimeFormattedDate.format("YYYY-MM-DD") : null,

+ 1 - 1
js/component/account/services/patent.jsx

@@ -44,7 +44,7 @@ const Patent = React.createClass({
                         patentNum: thisdata.patentNumber,
                         patentName: thisdata.patentName,
                         patentCatagory: thisdata.patentCatagory ? getPatentType(thisdata.patentCatagory) : '',
-                        patentState: getPatentState(thisdata.patentState),
+                        patentState: getPatentState(thisdata.patentState == '13' ? '12' : thisdata.patentState),
                         patentField: thisdata.patentField,
                         patentDes: thisdata.patentDes,
                         patentProryStatementUrl: thisdata.patentProryStatementUrl, //专利代理委托书

+ 9 - 7
js/component/portal/top.jsx

@@ -85,8 +85,9 @@ const LoginTop = React.createClass({
                                 </li>
                                 <li>
                                     <a href={globalConfig.context + '/portal/activity/activityIndex.html'}>活动圈</a>
-                                    <ul className="secondary_navigation_nav" style={{ 'width': (1 * 75) + 'px', left: '-' + (1 * 75 / 2 - 74.25 / 2) + 'px' }}>
-                                        <li><a href={globalConfig.context + '/portal/activity/details.html'}>活动详情</a></li>
+                                    <ul className="secondary_navigation_nav" style={{ 'width': (2 * 75) + 'px', left: '-' + (2 * 75 / 2 - 74.25 / 2) + 'px' }}>
+                                        <li><a href={globalConfig.context + '/portal/activity/activityList.html?type=0'}>在线直播</a></li>
+                                        <li><a href={globalConfig.context + '/portal/activity/activityList.html?type=1'}>线下现场</a></li>
                                     </ul>
                                 </li >
                                 <li>
@@ -108,17 +109,18 @@ const LoginTop = React.createClass({
                                 <li>
                                     <a href={globalConfig.context + '/portal/service/serviceIndex.html'}>服务汇</a>
                                     <ul className="secondary_navigation_nav" style={{ 'width': (3 * 75) + 'px', left: '-' + (3 * 75 / 2 - 74.25 / 2) + 'px' }}>
-                                        <li ><a href={globalConfig.context + '/portal/highTech/authentication.html'}>高企培育</a></li>
+                                        <li ><a href={globalConfig.context + '/portal/highTech/authentication.html'}>高企认定</a></li>
                                         <li ><a href={globalConfig.context + '/portal/ipr/service.html'}>知识产权</a></li >
                                         <li ><a href={globalConfig.context + '/portal/evaluation/index.html'}>技术评估</a></li>
                                     </ul>
                                 </li>
                                 <li>
                                     <a href={globalConfig.context + '/portal/news/newsIndex.html'}>策源地</a>
-                                    <ul className="secondary_navigation_nav" style={{ 'width': (3 * 75) + 'px', left: '-' + (3 * 75 / 2 - 74.25 / 2) + 'px' }}>
-                                        <li><a href={globalConfig.context + '/portal/news/newsIndex.html'}>新闻快讯</a></li>
-                                        <li><a href={globalConfig.context + '/portal/news/newsIndex.html'}>科技政策</a></li>
-                                        <li><a href={globalConfig.context + '/portal/news/newsIndex.html'}>政策解读</a></li>
+                                    <ul className="secondary_navigation_nav" style={{ 'width': (4 * 75) + 'px', left: '-' + (4 * 75 / 2 - 74.25 / 2) + 'px' }}>
+                                        <li><a href={globalConfig.context + '/portal/news/newsDetails.html?type=1'}>新闻快讯</a></li>
+                                        <li><a href={globalConfig.context + '/portal/news/newsDetails.html?type=3'}>技淘新闻</a></li>
+                                        <li><a href={globalConfig.context + '/portal/news/newsDetails.html?type=4'}>科技政策</a></li>
+                                        <li><a href={globalConfig.context + '/portal/news/newsDetails.html?type=2'}>政府往来</a></li>
                                     </ul>
                                 </li>
                                 <li>