liting2017 6 years ago
parent
commit
f6ff2966b9

+ 4 - 1
js/admin/bottom.less

@@ -14,4 +14,7 @@
     }
     #LRfloater2{
         display: none!important;
-    } 
+    } 
+    .lxb-container-btn-show-bg,.lxb-container{
+        display: none!important;
+    }

+ 3 - 0
js/component/account/bottom.less

@@ -17,4 +17,7 @@
     }
     #LR-BUBBLE{
         margin-bottom: 0!important;
+    }
+    .lxb-container-btn-show-bg,.lxb-container{
+        display: none!important;
     }

+ 3 - 3
js/component/account/setAccount/expert.jsx

@@ -586,9 +586,9 @@ const Expert = React.createClass({
 									<p>建议:图片要清晰。</p>
 								</FormItem>
 							</div>:''}
-						</div>:(this.state.expertAudit=='2'||this.state.expertAudit=='1')&&this.state.expert!='0'?
+						</div>:(this.state.expertAudit=='2'||this.state.expertAudit=='1')&&this.state.expert=='1'?
 					    <div>
-							<div className="authState">{this.state.expert=='1'?'专家认证':'顾问认证'}<span>({getAuthState(this.state.expertAudit)})</span></div>
+							<div className="authState">专家认证<span>({getAuthState(this.state.expertAudit)})</span></div>
 							<FormItem className="half-item" {...formItemLayout} label="毕业院校">
 								<span>{theData.graduateSchool}</span>
 							</FormItem>
@@ -663,7 +663,7 @@ const Expert = React.createClass({
 							</FormItem>				
 						</div>:(this.state.expertAudit=='2'||this.state.expertAudit=='1')&&this.state.expert=='2'?
 						<div className="clearfix">
-							<div className="authState">{this.state.expert=='1'?'专家认证':'顾问认证'}<span>({getAuthState(this.state.expertAudit)})</span></div>
+							<div className="authState">顾问认证<span>({getAuthState(this.state.expertAudit)})</span></div>
 							<FormItem className="half-item" {...formItemLayout} label="顾问类型">
 								<span>{getAdviserType(theData.consultantType)}</span>
 							</FormItem>

+ 1 - 2
js/component/administration/authentication/authDesc.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Modal, Spin } from 'antd';
+import { Modal } from 'antd';
 import AuthDetaiel from '@/administration/authentication/authDetaiel';
 
 class DemandDesc extends React.Component {
@@ -28,7 +28,6 @@ class DemandDesc extends React.Component {
 
 	}
 	render() {
-		let data = this.props.data || {releaseStatus:0};
 		return (
 			<div className="patent-desc">
 				<Modal

+ 5 - 5
js/component/administration/authentication/authDetaiel.jsx

@@ -125,7 +125,7 @@ const AuthDetail = Form.create()(React.createClass({
     },
     componentWillMount() {
         if (this.props.data.id) {
-            this.loadData(this.props.data.id);
+            this.loadData(this.props.data.uid);
         } else {
             this.state.data = {};
         };
@@ -197,8 +197,8 @@ const AuthDetail = Form.create()(React.createClass({
                             <span>{theData.introduction}</span>
                         </FormItem>     
                     </div>
-                    <p style={{fontSize:16}}>{theData.authType=='0'?'专家认证':'顾问认证'}</p>
-                    {theData.authType=='0'?<div>
+                    <p style={{fontSize:16}}>{theData.expert=='0'?'专家认证':'顾问认证'}</p>
+                    {theData.expert=='0'?<div>
                         <FormItem className="half-item" {...formItemLayout} label="毕业院校">
                             <span>{theData.graduateSchool}</span>
                         </FormItem>
@@ -235,13 +235,13 @@ const AuthDetail = Form.create()(React.createClass({
                         </div>
                     </div>:<div>
                         <FormItem className="half-item" {...formItemLayout} label="顾问类型">
-                            <span>{getAdviserType(theData.adviserType)}</span>
+                            <span>{getAdviserType(theData.consultantType)}</span>
                         </FormItem>
                         <div className="clearfix">
                             <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 13 }} label="顾问照片">
                                     <Upload className="demandDetailShow-upload"
                                         listType="picture-card"
-                                        fileList={this.state.adviserUrl}                               
+                                        fileList={this.state.headPortraitUrl}                               
                                         onPreview={(file) => {
                                             this.setState({
                                                 previewImage: file.url || file.thumbUrl,

+ 14 - 19
js/component/administration/authentication/authExamine.jsx

@@ -11,19 +11,21 @@ const DemandList = React.createClass({
     loadData(pageNo) {
         this.state.data = [];
         this.setState({
+            selectedRowKeys:[],
             loading: true
         });
         $.ajax({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/demand/list",
+            url: globalConfig.context + "/api/user/getExpertAuditList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                identifyName: this.state.nameSearch,
+                username: this.state.nameSearch,
                 industry:this.state.demandTypeSearch,
-                authType: this.state.statusSearch
+                expert: this.state.statusSearch,
+                expertAudit:'1'
             },
             success: function (data) {
                 let theArr = [];
@@ -37,16 +39,13 @@ const DemandList = React.createClass({
                         theArr.push({
                             key: i,
                             id: thisdata.id,
+                            uid:thisdata.uid,
                             serialNumber: thisdata.serialNumber,
-                            status: thisdata.status,
-                            name: thisdata.name,
-                            demandType: thisdata.demandType,
-                            auditStatus: thisdata.auditStatus,
-                            isHot: thisdata.isHot,
-                            isUrgent: thisdata.isUrgent,
-                            employerName:thisdata.employerName,
-                            createTime:thisdata.createTime?(new Date(thisdata.createTime)).toLocaleString():'',
-                            releaseDate:thisdata.releaseDate?(new Date(thisdata.releaseDate)).toLocaleString():''
+                            identifyName: thisdata.username,
+                            mobile: thisdata.contactMobile,
+                            industry: thisdata.industry,
+                            expert:thisdata.expert,
+                           
                         });
                     };
                 }
@@ -111,12 +110,11 @@ const DemandList = React.createClass({
                     key: 'industry',
                     render: (text) => { return getIndustry(text); }
                 },
-                
                 {
                     title: '认证类型',
-                    dataIndex: 'authType',
-                    key: 'authType',
-                    render: text => { return text=='0'?'专家认证':text=='1'?'顾问认证':'未认证' }
+                    dataIndex: 'expert',
+                    key: 'expert',
+                    render: text => { return text=='1'?'专家认证':text=='2'?'顾问认证':'未认证' }
                 },
                 {
                     title: '认证审核',
@@ -166,10 +164,7 @@ const DemandList = React.createClass({
     reset() {
         this.state.nameSearch = '';
         this.state.demandTypeSearch = undefined;
-        this.state.auditStatus = undefined;
         this.state.statusSearch = undefined;
-        this.state.employerNameSearch='';
-        this.state.releaseDate = [];
         this.loadData();
     },
     searchSwitch() {

+ 19 - 11
js/component/administration/authentication/techAuth.jsx

@@ -22,11 +22,10 @@ const DemandList = React.createClass({
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                identifyName: this.state.nameSearch,
-                auditStatus:this.state.auditStatusSearch,
+                username: this.state.nameSearch,
                 industry:this.state.demandTypeSearch,
-                authType: this.state.statusSearch,
-                authState:this.state.authState
+                expert: this.state.statusSearch,
+                expertAudit:this.state.authState,
             },
             success: function (data) {
                 let theArr = [];
@@ -39,10 +38,14 @@ const DemandList = React.createClass({
                         let thisdata = data.data.list[i];
                         theArr.push({
                             key: i,
+                            uid:thisdata.uid,
                             id: thisdata.id,
                             serialNumber: thisdata.serialNumber,
-                            status: thisdata.status,
-                            name: thisdata.name,
+                            expert: thisdata.expert,
+                            identifyName: thisdata.username,
+                            mobile:thisdata.contactMobile,
+                            expertAudit:thisdata.expertAudit,
+                            releaseDate:thisdata.releaseDate?(new Date(thisdata.releaseDate)).toLocaleString():'未通过审核认证'
                         });
                     };
                 }
@@ -109,14 +112,19 @@ const DemandList = React.createClass({
                 },
                 {
                     title: '认证类型',
-                    dataIndex: 'authType',
-                    key: 'authType',
-                    render: text => { return text=='0'?'专家认证':text=='1'?'顾问认证':'未认证' }
+                    dataIndex: 'expert',
+                    key: 'expert',
+                    render: text => { return text=='1'?'专家认证':text=='2'?'顾问认证':'未认证' }
                 },
+                // {
+                //     title:'认证成功时间',
+                //     dataIndex:'releaseDate',
+                //     key:'releaseDate',
+                // },
                 {
                     title:'认证状态',
-                    dataIndex:'authState',
-                    key: 'authState',
+                    dataIndex:'expertAudit',
+                    key: 'expertAudit',
                     render:(text)=>{
                         return getAuthState(text)
                     }

+ 3 - 0
js/component/login/adminLogin.less

@@ -64,4 +64,7 @@ textarea:-ms-input-placeholder {
 }
 #LRfloater2,#LRMINIWIN,#LRdiv2{
     display: none!important;
+}
+.lxb-container-btn-show-bg,.lxb-container{
+    display: none!important;
 }

+ 1 - 1
webpack-dll.config.js

@@ -10,7 +10,7 @@ let theme = {
   '@link-color': '#58a3ff'
 };
 module.exports = (function () {
-	let staticHost = 'http://192.168.1.166:8088';    
+	let staticHost = 'http://192.168.1.124:8088';    
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';

+ 3 - 3
webpack.config.js

@@ -115,7 +115,7 @@ module.exports = (function () {
         }));
     }
 
-    let staticHost = 'http://192.168.1.166:8088';    
+    let staticHost = 'http://192.168.1.124:8088';    
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
@@ -152,9 +152,9 @@ module.exports = (function () {
         plugins: plugins,
         devServer: {
             disableHostCheck: true,
-            host: '192.168.1.166',
+            host: '192.168.1.124',
             port: 8088,
-            allowedHosts: ['127.0.0.1','192.168.1.123','192.168.1.102'],
+            allowedHosts: ['127.0.0.1','192.168.1.123','192.168.1.128'],
             headers: {
                 "Access-Control-Allow-Origin": "*"
             }

+ 6 - 6
webpack/entry.config.js

@@ -10,28 +10,28 @@ module.exports = {
     'admin/index': './js/admin/index.js',
   },
   watch: {
-    'user/index': ['webpack-dev-server/client?http://192.168.1.166:8088', // WebpackDevServer host and port
+    'user/index': ['webpack-dev-server/client?http://192.168.1.124:8088', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/index.js'
     ],
-    'user/login': ['webpack-dev-server/client?http://192.168.1.166:8088', // WebpackDevServer host and port
+    'user/login': ['webpack-dev-server/client?http://192.168.1.124:8088', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/login.js'
     ],
-    'user/signIn': ['webpack-dev-server/client?http://192.168.1.166:8088', // WebpackDevServer host and port
+    'user/signIn': ['webpack-dev-server/client?http://192.168.1.124:8088', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/signIn.js'
     ],
-    'user/account/index': ['webpack-dev-server/client?http://192.168.1.166:8088', // WebpackDevServer host and port
+    'user/account/index': ['webpack-dev-server/client?http://192.168.1.124:8088', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/account/index.js'
     ],
     //admin
-    'admin/login': ['webpack-dev-server/client?http://192.168.1.166:8088', // WebpackDevServer host and port
+    'admin/login': ['webpack-dev-server/client?http://192.168.1.124:8088', // WebpackDevServer host and port
     'webpack/hot/only-dev-server',
     './js/user/adminLogin.js'
     ],
-    'admin/index': ['webpack-dev-server/client?http://192.168.1.166:8088', // WebpackDevServer host and port
+    'admin/index': ['webpack-dev-server/client?http://192.168.1.124:8088', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/admin/index.js'
     ]