Просмотр исходного кода

Accept Merge Request #41 v1.0.35 merge : (test -> master)

Merge Request: v1.0.35 merge
Created By: @seirios
Accepted By: @seirios
URL: https://coding.net/t/aft/p/AFT-WEB/git/merge/41
seirios лет назад: 7
Родитель
Сommit
4c839ac81b

+ 1 - 1
js/component/login/loginContent.jsx

@@ -33,7 +33,7 @@ const LoginContent = React.createClass({
     },
     render() {
         return (
-            <div className="content clearfix">
+            <div className="content clearfix" style={{ marginTop: ((window.document.body.clientHeight - 187 - 367) / 2 + 'px') }}>
                 <div className="login-left">
                     <img src="" alt="" />
                 </div>

+ 4 - 1
js/component/portal/portal.less

@@ -162,6 +162,9 @@
             float: left
         }
     }
+    .portal-body {
+        min-height: 424px;
+    }
     footer {
         background: #3c3d43;
         text-align: center;
@@ -422,7 +425,7 @@
             .org-detail {
                 float: left;
                 width: 24%;
-                height: 250px;
+                height: 300px;
                 background: #fff;
                 border: 1px solid #d9d9d9;
                 padding: 14px;

+ 4 - 4
js/component/portal/search/subscriberOrg.jsx

@@ -264,7 +264,7 @@ const SubContent = React.createClass({
                     </Row> : <div></div>}
                     <Row className="search-criteria">
                         <Col className="search-title" span={2}>
-                            <span>行家名称</span>
+                            <span>伙伴名称</span>
                         </Col>
                         <Col span={6}>
                             <div className="nav-search" style={{ float: 'none', marginBottom: '10px' }}>
@@ -280,12 +280,12 @@ const SubContent = React.createClass({
                             {this.state.dataSource.map((item, i) => {
                                 return <li key={i} className="user-detail" onClick={() => { _me.tableRowClick(item); }}>
                                     <div className="logo">
-                                        <img src={item.personPortraitUrl ?
-                                            (globalConfig.avatarHost + "/upload" + item.personPortraitUrl)
+                                        <img src={item.logoUrl ?
+                                            (globalConfig.avatarHost + "/upload" + item.logoUrl)
                                             : avatarImg} alt="头像" />
                                     </div>
                                     <div className="name">
-                                        {item.username}
+                                        {item.unitName}
                                     </div>
                                     <div className="province">
                                         <span style={{ letterSpacing: '32px' }}>地</span>

+ 13 - 10
js/component/portal/search/subscriberUser.jsx

@@ -215,7 +215,7 @@ const SubContent = React.createClass({
                     </Row> : <div></div>}
                     <Row className="search-criteria">
                         <Col className="search-title" span={2}>
-                            <span>伙伴名称</span>
+                            <span>行家名称</span>
                         </Col>
                         <Col span={6}>
                             <div className="nav-search" style={{ float: 'none', marginBottom: '10px' }}>
@@ -231,19 +231,22 @@ const SubContent = React.createClass({
                             {this.state.dataSource.map((item, i) => {
                                 return <li key={i} className="org-detail clearfix" onClick={() => { _me.tableRowClick(item); }}>
                                     <div className="logo">
-                                        <img src={(item.personPortraitUrl || item.logoUrl) ?
-                                            (globalConfig.avatarHost + "/upload" + (item.logoUrl))
+                                        <img src={item.personPortraitUrl ?
+                                            (globalConfig.avatarHost + "/upload" + (item.personPortraitUrl))
                                             : avatarImg} alt="头像" />
                                     </div>
                                     <div className="detail-right">
                                         <div className="name">
-                                            {item.unitName || 'UserName'}
-                                        </div> 
-                                        <div className="text" style={{fontSize:'14px'}}>
-                                            {(item.workUnit || '单位') + ' ' + (item.position || '职位')}
+                                            {item.username || 'UserName'}
                                         </div>
-                                        <div className="text" style={{fontSize:'12px'}}>
-                                            {getTechField(item.engagedField[0],item.engagedField[1],item.engagedField[2])}
+                                        <div className="text" style={{ fontSize: '14px' }}>
+                                            {item.workUnit || '单位'}
+                                        </div>
+                                        <div className="text" style={{ fontSize: '14px' }}>
+                                            {item.position || '职位'}
+                                        </div>
+                                        <div className="text" style={{ fontSize: '12px' }}>
+                                            {getTechField(item.engagedField[0], item.engagedField[1], item.engagedField[2])}
                                         </div>
                                         <div className="detail-text">
                                             <div className="text">
@@ -260,7 +263,7 @@ const SubContent = React.createClass({
                                             <div className="text">
                                                 <span style={{ letterSpacing: '32px' }}>粉</span>
                                                 <span>丝: </span>
-                                                <span className="text-address"> {Math.round(Math.random() * 1000)}</span>
+                                                <span className="text-Number"> {0}</span>
                                                 <span className="text-unit"> 位</span>
                                             </div>
                                         </div>

+ 1 - 2
js/component/portal/top.jsx

@@ -59,12 +59,11 @@ const LoginTop = React.createClass({
                                 <li className="home"><a href={globalConfig.context + "/portal/index.html"}>首页</a> </li>
                                 <li className="active">
                                     <a href={globalConfig.context + '/portal/search/achievement.html'}>技术交易</a>
-                                    <ul className="secondary_navigation_nav" >
+                                    <ul className="secondary_navigation_nav" style={{left:'-112.875px'}}>
                                         <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/subscriberOrg.html'}>伙伴</a></li>
                                         <li><a href={globalConfig.context + '/portal/search/subscriberUser.html'}>行家</a></li>
-                                        <li><a href={globalConfig.context + '/portal/international/internationalIndex.html'}>国际业务</a></li>
                                     </ul>
                                 </li>
                                 <li>

+ 1 - 0
js/component/subscriberDetail/detail.less

@@ -66,6 +66,7 @@
         }
     }
     .ant-spin-nested-loading {
+        margin-top: 60px;
         margin-bottom: 80px;
     }
     .detail-content {

+ 2 - 2
js/user/subscriberDetail.js

@@ -3,9 +3,9 @@ import ReactDOM from 'react-dom';
 import '../../css/base.less';
 import '../../css/login.less';
 
-import Top from '../component/subscriberDetail/top.jsx';
+import Top from '../component/portal/top.jsx';
 import Content from '../component/subscriberDetail/content.jsx';
-import Footer from '../component/subscriberDetail/footer.jsx';
+import Footer from '../component/portal/footer.jsx';
 
 ReactDOM.render(
     <div className="wrap">

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "description": "",
   "main": "index.js",
   "scripts": {