yee 7 years ago
parent
commit
70d7d21161

+ 2 - 2
js/component/account/services/annualReport.jsx

@@ -333,8 +333,8 @@ const AnnualReportDescFrom = Form.create()(React.createClass({
                             </p>
                         </div>
                         <div className="four-item" style={{ marginRight: '25%' }}>
-                            <p className="item-title">在中国境内研发费用: </p>
-                            <p>{theData.territory}</p>
+                            <p className="item-title">其中:在中国境内研发费用: </p>
+                            <p>{theData.researchCost}</p>
                         </div>
                         <div className="four-item">
                             <p className="item-title">纳税总额: </p>

+ 2 - 2
js/component/manageCenter/servicesManage/highTech/fosterDesc/annualReport.jsx

@@ -251,8 +251,8 @@ const AnnualReportDescFrom = Form.create()(React.createClass({
                             </p>
                         </div>
                         <div className="four-item" style={{ marginRight: '25%' }}>
-                            <p className="item-title">在中国境内研发费用: </p>
-                            <p>{theData.territory}</p>
+                            <p className="item-title">其中:在中国境内研发费用: </p>
+                            <p>{theData.researchCost}</p>
                         </div>
                         <div className="four-item">
                             <p className="item-title">纳税总额: </p>

+ 5 - 3
js/component/manageCenter/topTab.jsx

@@ -423,7 +423,9 @@ const TopTab = React.createClass({
         });
     },
     componentWillMount() {
-        this.loadData();
+        if (this.props.active) {
+            this.loadData();
+        };
     },
     loadData() {
         this.setState({
@@ -474,14 +476,14 @@ const TopTab = React.createClass({
                         this.setState({ userModalShow: true });
                     }}> {adminData.name || adminData.mobile} </a> : <a onClick={this.logOut}>{this.state.username}</a>} <a onClick={this.logOut}>[ 退出 ]</a></span>
                     <span className="acc-top-user-toindex"><a href={globalConfig.context + "/portal/index.html"}>返回首页</a></span>
-                    <a onClick={() => { this.setState({ messageModalShow: true }); }} className="user-badge">
+                    {this.props.active ? <a onClick={() => { this.setState({ messageModalShow: true }); }} className="user-badge">
                         <Icon type="mail" />
                         {(() => {
                             if (!window.showSystem && this.state.badge) {
                                 return <Badge status="processing" />
                             }
                         })()}
-                    </a>
+                    </a> : <div></div>}
                 </div>
                 <div className="acc-index">
                     <div className="acc-index-imgbox">