Browse Source

Merge branch 'master' of ssh://git.jishutao.com:55555/jishutao/jitao-client

liting2017 6 years ago
parent
commit
cfcabbf908

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

@@ -474,7 +474,7 @@ const Expert = React.createClass({
 								})(<Input type="textarea" rows={4} maxLength={512} placeholder="输入个人简介"/>)}
 							</FormItem>
 						</div>
-						{(this.state.expert=='0'||this.state.auditStatus=='3'||this.state.expert==null)&&this.state.type!=null?
+						{(this.state.expert=='0'||this.state.auditStatus=='0'||this.state.expert==null)&&this.state.type!=null?
 						<div>
 							<div className="clearfix btnGrounp">
 								<Radio.Group 
@@ -488,7 +488,7 @@ const Expert = React.createClass({
 								<Button type="dashed" style={{marginLeft:20}} onClick={(e)=>{this.setState({authenticationState:undefined})}}>暂不认证</Button>
 								<span style={{marginLeft:10,color:'#f00'}}>{this.state.auditStatus=='3'?"(认证失败:"+this.state.authMessage+')':''}</span>
 							</div>
-							{this.state.authenticationState=='0'?<div className="patentBody">
+							{(this.state.authenticationState=='0'||this.state.auditStatus!='0')?<div className="patentBody">
 								<FormItem className="half-item" {...formItemLayout} label="毕业院校">
 									{getFieldDecorator('graduateSchool', {
 										initialValue: theData.graduateSchool,

+ 3 - 2
js/component/login/loginForm.jsx

@@ -24,9 +24,9 @@ const LoginForm = Form.create()(React.createClass({
                     dataType: "json",
                     url: globalConfig.context + "/signin",
                     data: {
-                        "username": values.phone,
+                        "mobile": values.phone,
                         "password": values.password,
-                        "type": 0,
+                        "type": this.props.loginProp,
                     }
                 }).done(function (res) {
                     if (res.error && res.error.length) {
@@ -54,6 +54,7 @@ const LoginForm = Form.create()(React.createClass({
     },
     render() {
         const { getFieldDecorator } = this.props.form;
+        console.log(this.props.loginProp);
         return (
             <Form onSubmit={this.handleSubmit} className="login-form">
                 <FormItem>

+ 1 - 1
package.json

@@ -12,7 +12,7 @@
     "buildtest": "node bin/clean.js && webpack --progress --colors --env.deploy test",
     "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",
     "pro": "node bin/clean.js && webpack --progress --colors --env.deploy prod",
-    "dev": "webpack-dev-server --port 8088 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
+    "dev": "webpack-dev-server --port 80 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
   },
   "repository": {
     "type": "git",

+ 1 - 1
webpack-dll.config.js

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

+ 3 - 3
webpack.config.js

@@ -121,7 +121,7 @@ module.exports = (function () {
         }));
     }
 
-    let staticHost = 'http://192.168.0.188:8088';    
+    let staticHost = 'http://192.168.0.190';    
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
@@ -156,8 +156,8 @@ module.exports = (function () {
         plugins: plugins,
         devServer: {
             disableHostCheck: true,
-            host: '192.168.0.188',
-            port: 8088,
+            host: '192.168.0.190',
+            port: 80,
             allowedHosts: ['127.0.0.1','192.168.0.20','192.168.0.99'],
             headers: {
                 "Access-Control-Allow-Origin": "*"

+ 7 - 7
webpack/entry.config.js

@@ -11,32 +11,32 @@ module.exports = {
     'admin/index': './js/admin/index.js',
   },
   watch: {
-    'user/index': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
+    'user/index': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/index.js'
     ],
-    'user/login': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
+    'user/login': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/login.js'
     ],
-    'user/signIn': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
+    'user/signIn': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/signIn.js'
     ],
-    'user/account/index': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
+    'user/account/index': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/account/index.js'
     ],
-    'user/account/evaluateInfo': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
+    'user/account/evaluateInfo': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/account/assessment.js'
     ],
     //admin
-    'admin/login': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
+    'admin/login': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
     'webpack/hot/only-dev-server',
     './js/user/adminLogin.js'
     ],
-    'admin/index': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
+    'admin/index': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/admin/index.js'
     ]