yee 7 years ago
parent
commit
cf967521fc

+ 1 - 1
js/component/account/set/edu.jsx

@@ -41,7 +41,7 @@ class Avatar extends React.Component {
                 className="avatar-uploader"
                 name="avatar"
                 showUploadList={false}
-                action={globalConfig.context + "/api/user/avatar/uploadReplace"}
+                action={globalConfig.context + "/api/user/identity/upload"}
                 data={{ 'sign': this.props.name }}
                 beforeUpload={beforeUpload}
                 onChange={this.handleChange.bind(this)}

+ 4 - 4
js/component/groupCertify/personal.jsx

@@ -97,7 +97,7 @@ const Content = Form.create()(React.createClass({
         return {
             loading: false,
             field: [],
-            fileList:[],
+            fileList: [],
             vsCodeSrc: globalConfig.context + '/open/getVCode'
         };
     },
@@ -118,15 +118,15 @@ const Content = Form.create()(React.createClass({
                 return;
             };
             if (!err) {
-                this.setState({
-                    loading: true
-                });
                 if (values.listed == 1) {
                     if (!values.listedDate || !values.listedType || !values.stockCode) {
                         message.warning("请输入上市资料!");
                         return;
                     };
                 };
+                this.setState({
+                    loading: true
+                });
                 $.ajax({
                     method: "POST",
                     dataType: "json",

+ 4 - 3
js/component/manageCenter/servicesManage/highTech/highTechApply.jsx

@@ -116,7 +116,7 @@ const CognizanceDescFrom = Form.create()(React.createClass({
             });
         }.bind(this));
     },
-    getBusinessCount(uid) {
+    getBusinessCount(uid, year) {
         this.setState({
             loading: true
         });
@@ -126,7 +126,8 @@ const CognizanceDescFrom = Form.create()(React.createClass({
             crossDomain: false,
             url: globalConfig.context + "/api/admin/getBusinessCount",
             data: {
-                uid: uid || this.props.data.uid
+                uid: uid || this.props.data.uid,
+                year: year || this.props.data.year
             },
             success: function (data) {
                 if (!data.data) {
@@ -310,7 +311,7 @@ const CognizanceDescFrom = Form.create()(React.createClass({
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible) {
             this.getStateData(nextProps.data.cid);
-            this.getBusinessCount(nextProps.data.uid);
+            this.getBusinessCount(nextProps.data.uid, nextProps.data.year);
             this.loadData(nextProps.data.uid, nextProps.data.cid, nextProps.data.year);
             this.getContactsList(nextProps.data.uid);
             this.props.form.resetFields();

+ 5 - 1
js/component/portal/footer.jsx

@@ -5,7 +5,11 @@ const Footer = React.createClass({
     render() {
         return (
             <div className="footer">
-                <p>阿凡提2017  技术支持@湖南智明</p>
+                <div className="container">
+                    <a href="#">联系我们</a>
+                    <a href="#">Copyright © 2016-2017 阿凡提 版权所有</a>
+                    <a href="#">技术支持:湖南智明科技有限公司</a>
+                </div>
             </div>
         )
     }

+ 144 - 13
js/component/portal/portal.less

@@ -1,17 +1,18 @@
+@headerNavDetaulHeight : 70px;
 .wrap {
     width: 100%;
     margin: 0 auto;
     background: #ffffff;
     .portal-header {
-        background: #f8f8f8;
-        width: 100%;
-        border-bottom: 1px solid #ececec;
         .portal-top {
-            width: 1280px;
-            line-height: 30px;
+            line-height: 35px;
             font-size: 12px;
-            margin: 0 auto;
             color: #999;
+            background: #F3F3F3;
+            >div {
+                width: 1000px;
+                margin: 0 auto;
+            }
             .top-welcomeText {
                 float: left;
             }
@@ -32,6 +33,136 @@
                 padding-left: 20px;
             }
         }
+        .header_nav_detail {
+            height: @headerNavDetaulHeight;
+            line-height: 68px;
+            position: relative;
+            border-bottom: 1px solid #4466bf;
+            .container {
+                width: 1000px;
+                margin: 0 auto;
+                padding-right: 0;
+                padding-left: 0;
+                .nav_content {
+                    position: relative;
+                    >li {
+                        float: left;
+                        width: 10%;
+                        font-size: 13px;
+                        height: @headerNavDetaulHeight;
+                        padding: 0;
+                        text-align: center;
+                        font-weight: bold;
+                        position: relative;
+                        &.active,
+                        &:hover {
+                            >a {
+                                color: #58a3ff;
+                                font-weight: bolder;
+                                font-size: 14px;
+                            }
+                            .secondary_navigation_nav {
+                                display: block;
+                            }
+                            &.hideSub .secondary_navigation_nav {
+                                display: none;
+                            }
+                        }
+                        >a {
+                            color: #333333;
+                            display: block;
+                            width: 100%;
+                            padding: 3px 1px; //border-right: 1px solid #ececec;
+                            line-height: 22px;
+                            margin-top: 25px;
+                            margin-bottom: 16px
+                        }
+                        .showSub .secondary_navigation_nav {
+                            display: block;
+                        }
+                    }
+                }
+                .secondary_navigation_nav {
+                    position: absolute;
+                    left: auto;
+                    top: @headerNavDetaulHeight;
+                    width: 450px;
+                    z-index: 100;
+                    display: none;
+                    li {
+                        float: left;
+                        width: 75px;
+                        line-height: 45px;
+                        text-align: center;
+                        a {
+                            margin: 15px 0;
+                            line-height: 1.25;
+                            border-right: 1px solid #ececec;
+                            color: #fff;
+                            font-size: 12px;
+                            font-weight: normal;
+                            width: 100%;
+                            display: block;
+                        }
+                        &.active,
+                        &:hover {
+                            background: rgba(0, 0, 0, 0.1);
+                            a {
+                                font-size: 13px;
+                                font-weight: bolder;
+                                border: none;
+                            }
+                        }
+                        &:last-child a {
+                            border: none;
+                        }
+                    }
+                    &.show {
+                        display: block;
+                    }
+                }
+            }
+            .secondary_navigation {
+                position: absolute;
+                height: 45px;
+                line-height: 45px;
+                width: 100%;
+                background: #58a3ff;
+                opacity: 0.2;
+                z-index: 99;
+                display: block;
+            }
+            .logo {
+                height: @headerNavDetaulHeight;
+                line-height: 68px;
+                img {
+                    vertical-align: middle;
+                }
+            }
+            .search {
+                line-height: 68px
+            }
+        }
+        .glyphicon {
+            font-size: 12px;
+            font-weight: inherit;
+        }
+        .col-md-3 {
+            width: 25%;
+            float: left
+        }
+        .col-md-6 {
+            width: 50%;
+            float: left
+        }
+        .col-md-8 {
+            width: 66.66666667%;
+            float: left
+        }
+        .col-md-9 {
+            width: 75%;
+            float: left
+        }
     }
     .footer {
         width: 100%;
@@ -97,11 +228,17 @@
                 }
             }
         }
+    }
+    .portal-content {
+        width: 1280px;
+        margin: 0 auto; //background: #e0e0e0;
+        padding-top: 56px;
+        margin-bottom: 120px;
         .nav-search {
             float: right;
             height: 28px;
             width: 250px;
-            margin-top: 20px;
+            margin-right: 50px;
             position: relative;
             >input {
                 position: absolute;
@@ -131,12 +268,6 @@
                 }
             }
         }
-    }
-    .portal-content {
-        width: 1280px;
-        margin: 0 auto; //background: #e0e0e0;
-        padding-top: 20px;
-        margin-bottom: 120px;
         .search-criteria {
             margin-bottom: 10px;
             border-bottom: 1px dotted #ccc;

+ 11 - 18
js/component/portal/search/achievement.jsx

@@ -22,6 +22,7 @@ import { getAchievementCategory, getTransferMode, getMaturity } from '../../tool
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 
+
 const Content = React.createClass({
     loadData(pageNo) {
         this.setState({
@@ -182,7 +183,7 @@ const Content = React.createClass({
 
         if (window.location.search) {
             let theUrl = window.location.search
-            this.state.keyword =theUrl.substring(1, theUrl.length);
+            this.state.keyword = theUrl.substring(1, theUrl.length);
         };
 
         this.loadData();
@@ -223,22 +224,6 @@ const Content = React.createClass({
         const _me = this;
         return (
             <div className="portal-body">
-                <div className="portal-nav clearfix">
-                    <div className="nav-logoBox">
-                        <img onClick={() => { window.open(globalConfig.context + '/portal/index.html') }} src={logoImg} alt="" />
-                    </div>
-                    <ul className="nav-list clearfix">
-                        <li className={this.props.searchType == 'achievement' ? 'active' : ''}><a href={"/portal/search/achievement.html"}>科技成果</a></li>
-                        <li className={this.props.searchType == 'demand' ? 'active' : ''}><a href={"/portal/search/demand.html"}>科技需求</a></li>
-                        <li className={this.props.searchType == 'subscriber' ? 'active' : ''}><a href={"/portal/search/subscriber.html"}>伙伴/行家</a></li>
-                    </ul>
-                    <div className="nav-search">
-                        <Input onChange={(e) => { this.state.keyword = e.target.value; }} />
-                        <Button onClick={() => { this.loadData() }}>
-                            <img src={searchImg} alt="" />
-                        </Button>
-                    </div>
-                </div>
                 <div className="portal-content">
                     <Row className="search-criteria">
                         <Col className="search-title" span={2}>
@@ -331,7 +316,7 @@ const Content = React.createClass({
                         <Col className="search-title" span={2}>
                             <span>成熟度</span>
                         </Col>
-                        <Col className="search-select" span={22}>
+                        <Col className="search-select" span={12}>
                             <Radio.Group defaultValue={999} onChange={(e) => {
                                 this.setState({
                                     maturity: e.target.value
@@ -342,6 +327,14 @@ const Content = React.createClass({
                                 {this.state.maturityRadio}
                             </Radio.Group>
                         </Col>
+                        <Col span={10}>
+                            <div className="nav-search">
+                                <Input onChange={(e) => { this.state.keyword = e.target.value; }} />
+                                <Button onClick={() => { this.loadData() }}>
+                                    <img src={searchImg} alt="" />
+                                </Button>
+                            </div>
+                        </Col>
                     </Row>
                     <Spin spinning={this.state.loading} style={{ marginBottom: '40px' }}>
                         <ul className='detail_interest_sub clearfix' style={{ padding: 0 }}>

+ 102 - 11
js/component/portal/top.jsx

@@ -2,6 +2,8 @@ import React from 'react';
 import './portal.less';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
+import logoImg from '../../../image/logo-2.png';
+
 
 const LoginTop = React.createClass({
     logOut() {
@@ -16,18 +18,107 @@ const LoginTop = React.createClass({
     render() {
         return (
             <div className="portal-header">
-                <div className="portal-top clearfix">
-                    <div className="top-welcomeText">欢迎您来到科技认知计算交易平台!</div>
-                    <div className="top-alink">
-                        <a href={globalConfig.context + "/portal/index.html"}>返回首页</a>
-                        {window.userData.number ?
-                            <span>
-                                <a href={globalConfig.context + "/user/account/index"}>尊敬的{userData.nickname || userData.number}</a>
-                                <a onClick={this.logOut}>退出</a>
-                            </span>
-                            : <a href={globalConfig.context + "/user/login/index"}>请登录</a>}
-                        <a href="./index.html">帮助中心</a>
+                <div className="portal-top">
+                    <div className="clearfix">
+                        <div className="top-welcomeText">欢迎您来到科技认知计算交易平台-公测版</div>
+                        <div className="top-alink">
+                            <a href={globalConfig.context + "/portal/index.html"}>返回首页</a>
+                            {window.userData.number ?
+                                <span>
+                                    <a href={globalConfig.context + "/user/account/index"}>尊敬的{userData.nickname || userData.number}</a>
+                                    <a onClick={this.logOut}>退出</a>
+                                </span>
+                                : <span>
+                                    <a href={globalConfig.context + "/user/login/index"}>登录</a>
+                                    <a href={globalConfig.context + "/user/login/index"}>注册</a>
+                                </span>}
+                            <a href="./index.html">帮助中心</a>
+                        </div>
+                    </div>
+                </div>
+                <div className="header_nav_detail">
+                    <div className="container clearfix">
+                        <div className="col-md-3 logo">
+                            <a href={globalConfig.context + '/portal/index.html'}>
+                                <img src={logoImg} alt="" />
+                            </a>
+                        </div>
+                        <div className="col-md-9">
+                            <ul className="nav_content">
+                                <li className="home"><a href={globalConfig.context + "/portal/index.html"}>首页</a> </li>
+                                <li >
+                                    <a href={globalConfig.context + '/portal/search/achievement.html'}>技术交易</a>
+                                    <ul className="secondary_navigation_nav" >
+                                        <li><a href={globalConfig.context + '/portal/search/demand.html'}>需求谷</a></li>
+                                        <li><a href={globalConfig.context + '/portal/search/achievement.html'}>技术海</a></li>
+                                        <li><a href={globalConfig.context + '/portal/search/subscriber.html'}>伙伴</a></li>
+                                        <li><a href={globalConfig.context + '/portal/search/subscriber.html'}>行家</a></li>
+                                        <li><a href={globalConfig.context + '/portal/international/internationalIndex.html'}>国际业务</a></li>
+                                    </ul>
+                                </li>
+                                <li>
+                                    <a href={globalConfig.context + '/portal/scienceTechnology/bigShot.html'}>大咖说</a>
+                                    <ul className="secondary_navigation_nav">
+                                        <li><a href={globalConfig.context + '/portal/scienceTechnology/star.html'}>科技明星</a></li>
+                                        <li><a href={globalConfig.context + '/portal/scienceTechnology/lecture.html'}>科技讲堂</a></li>
+                                    </ul>
+                                </li>
+                                <li>
+                                    <a href={globalConfig.context + '/portal/activity/activityIndex.html'}>活动圈</a>
+                                    <ul className="secondary_navigation_nav">
+                                        <li><a href={globalConfig.context + '/portal/activity/details.html'}>活动详情</a></li>
+                                    </ul>
+                                </li >
+                                <li>
+                                    <a href={globalConfig.context + '/portal/websiteBuild/websiteBuildIndex.html'}>建设兵团</a>
+                                    <ul className="secondary_navigation_nav">
+                                        <li><a href={globalConfig.context + '/portal/websiteBuild/websiteBuildIndex.html#customized'}>平台定制</a></li>
+                                        <li><a href={globalConfig.context + '/portal/websiteBuild/websiteBuildIndex.html#operates'}>平台运营</a></li>
+                                        <li><a href={globalConfig.context + '/portal/websiteBuild/websiteBuildIndex.html#event_planning'}>活动筹划</a></li>
+                                    </ul>
+                                </li>
+                                <li>
+                                    <a href={globalConfig.context + '/portal/international/internationalIndex.html'}>国际业务</a>
+                                    <ul className="secondary_navigation_nav" >
+                                        <li><a href={globalConfig.context + '/portal/international/internationalIndex.html#internationalTechnology'}>国际技术</a></li>
+                                        <li><a href={globalConfig.context + '/portal/international/internationalIndex.html#internationalPartner'}>国际伙伴</a></li>
+                                        <li><a href={globalConfig.context + '/portal/international/internationalIndex.html#internationalExpert'}>国际专家</a></li>
+                                    </ul>
+                                </li>
+                                <li>
+                                    <a href={globalConfig.context + '/portal/service/serviceIndex.html'}>服务汇</a>
+                                    <ul className="secondary_navigation_nav">
+                                        <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">
+                                        <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>
+                                </li>
+                                <li>
+                                    <a href={globalConfig.context + '/portal/entrepreneurship/entrepreneurshipIndex.html'}>创意圈</a>
+                                    <ul className="secondary_navigation_nav">
+                                        <li><a href={globalConfig.context + '/portal/entrepreneurship/entrepreneurshipIndex.html'}>项目圈</a></li>
+                                        <li><a href={globalConfig.context + '/portal/entrepreneurship/entrepreneurshipIndex.html#chuangke'}>创客圈</a></li>
+                                        <li><a href={globalConfig.context + '/portal/entrepreneurship/entrepreneurshipIndex.html#jieyi'}>结义园</a></li>
+                                    </ul>
+                                </li>
+                                <li>
+                                    <a href={globalConfig.context + '/portal/financial/financialIndex.html'}>金融圈</a>
+                                    <ul className="secondary_navigation_nav">
+                                        <li ><a href={globalConfig.context + '/portal/financial/financialIndex.html'}>金融街</a></li>
+                                    </ul>
+                                </li>
+                            </ul>
+                        </div>
                     </div>
+                    <div className="secondary_navigation"></div>
                 </div>
             </div>
         )