Browse Source

用户首页优化,认证流程优化

liting2017 6 years ago
parent
commit
091cf92348

+ 3 - 3
js/component/account/index/content.less

@@ -45,9 +45,9 @@
                 }
                 .userdata-lvl {
                     span {
-                        color: #fff;
-                        background: @a-color;
-                        border-radius: 2px;
+                        // color: #fff;
+                        // background: @a-color;
+                        // border-radius: 2px;
                         padding: 0 4px;
                     }
                 }

+ 27 - 37
js/component/account/index/normal.jsx

@@ -5,11 +5,6 @@ import { Link } from 'react-router';
 import '../content.less';
 import './content.less';
 import Collection from './collection';
-
-import weixin from '../../../../image/weixin-w.png';
-import qq from '../../../../image/qq-w.png';
-import weibo from '../../../../image/weibo-w.png';
-
 import defaultAvatar from '../../../../image/avatarImg.png'
 
 const Content = React.createClass({
@@ -20,6 +15,7 @@ const Content = React.createClass({
         };
     },
     getData () {
+        if(this.state.nickname){return;}
         this.setState({
             loading: false
         });
@@ -43,12 +39,14 @@ const Content = React.createClass({
                     authentication:data.data.authentication,  //0-专家  1--顾问
                     nickname: data.data.nickname,
                     number: data.data.number,
+                    auditStatus: data.data.auditStatus,
                     patentNum: data.data.patentNum,
-                    personPortraitUrl: data.data.personPortraitUrl,
+                    personPortraitUrl: data.data.headPortraitUrl,
                     techProjectNum: data.data.techProjectNum,
                     type: data.data.type,
                     uid: data.data.uid,
-                    visible: (data.data.authentication||data.data.authentication=='0')&&data.data.type=='0'? false : true
+                    expert:data.data.expert,
+                    visible: (data.data.auditStatus!='0')? false : true
                 })
             }
         }.bind(this)).always(function () {
@@ -57,6 +55,9 @@ const Content = React.createClass({
             });
         }.bind(this));
     },
+    jump(){
+        window.location.hash='/personal';
+    },
     componentWillMount () {
         this.getData();
     },
@@ -67,21 +68,7 @@ const Content = React.createClass({
                     <div className="index-userdata clearfix">
                         <p className="acc-title">
                             欢迎,
-                            <span>{this.state.nickname || ('No.' + this.state.number)}</span>
-                            {(() => {
-                                if ( this.state.level ) {
-                                    return <img src={globalConfig.avatarUploadHost + '/rank/level_' + this.state.level + '.png'} alt="" />
-                                } else {
-                                    return ''
-                                }
-                            })()}
-                            {(() => {
-                                if (this.state.level > 1 && this.state.level < 2) {
-                                    return <span style={{ fontSize: '14px', color: '#333' }}>
-                                        <a href={globalConfig.context + '/portal/membership.html'}>升级高级会员</a> ,获取更多会员权益
-                                        </span>;
-                                }
-                            })()}
+                            <span>{this.state.nickname}</span>
                         </p>
                         <div className="userdata-img">
                             {this.state.personPortraitUrl || this.state.logoUrl ?
@@ -91,33 +78,36 @@ const Content = React.createClass({
                         <div className="userdata-content">
                             {(() => {
                                 if (this.state.type == '0') {
-                                    return <div>
-                                                {this.state.authentication=='0'?<p className="userdata-lvl">已专家认证</p>:this.state.authentication=='1'?<p className="userdata-lvl">已顾问认证</p>:<p className="userdata-lvl">已个人认证</p>}
-                                            </div>;
+                                    if(this.state.auditStatus=='2'){
+                                       
+                                        if(this.state.expert=='2'){
+                                            return <p className="userdata-lvl">个人用户(<span style={{color:'#5cb85c'}}>已认证顾问</span>)</p>
+                                        }else if(this.state.expert=='1'){
+                                            return <p className="userdata-lvl">个人用户(<span style={{color:'#5cb85c'}}>已认证专家</span>)</p>
+                                        }
+                                    }else{
+                                        if(this.state.auditStatus=='1'){
+                                            return <p className="userdata-lvl">个人用户(<span style={{color:'#5cb85c'}}>认证审核中</span>)</p>
+                                        }else if(this.state.auditStatus=='3'){
+                                            return <p className="userdata-lvl">个人用户(<span style={{color:'#f00'}}>认证失败</span>)<Button type="primary" style={{margin:10}} onClick={this.jump}>重新认证</Button></p>
+                                        }else{
+                                            return <p className="userdata-lvl">个人用户(<span style={{color:'#f00'}}>未认证</span>)<Button type="primary" style={{margin:10}} onClick={this.jump}>去认证</Button></p>
+                                        }
+                                        
+                                    }
                                 } else if(this.state.type == '1'){
-                                    return <p className="userdata-lvl"><span>已企业认证</span></p>
+                                    return <p className="userdata-lvl"><span>企业用户</span></p>
                                 }
                             })()}
                             <div>
                                 {
                                     (()=>{
-                                        if (this.state.type=='0'||this.state.type=='1') {
                                             if(this.state.type=='0'){
                                                 return <p><Link to="/personal">填写完整资料</Link>,有助于提高您的资信</p>
                                             }
                                             if(this.state.type=='1'){
                                                 return <p><Link to="/unit">填写完整资料</Link>,有助于提高您的资信</p>
                                             }
-                                            
-                                        }else {
-                                            return <div>
-                                                <p>未认证,请填写相应资料进行认证</p>
-                                                <p>
-                                                    <Link to='/personal' style={{marginRight:20}}>个人认证</Link>
-                                                    <Link to='/unit'>企业认证</Link>
-                                                </p>
-                                            </div>
-                                        }
                                     })()
                                 }
                             </div>

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

@@ -279,14 +279,7 @@ const Expert = React.createClass({
                 });
                 if (!data.error.length) {
 					//认证状态判定说明
-					if(this.state.authentication){
-						message.success((this.state.auditStatus=='0'||this.state.auditStatus=='3')&&(this.state.headPortraitUrl).length?'认证审核提交成功,请耐心等待。':'保存成功')
-					}else{
-						message.success('个人认证成功,2秒后跳转个人中心首页。')
-						setTimeout(()=>{
-							window.location.href= globalConfig.context+'/user/account/index.html'
-						},2000)   
-					}
+					message.success((this.state.auditStatus=='0'||this.state.auditStatus=='3')&&(this.state.headPortraitUrl).length?'认证审核提交成功,请耐心等待。':'保存成功')
                     this.loadInformation();
                 } else {
                     message.warning(data.error[0].message);
@@ -500,7 +493,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'&&this.state.auditStatus!='0')?
+							{(this.state.authenticationState=='0'&&(this.state.auditStatus=='0'||this.state.auditStatus=='3'))?
 							<div className="patentBody">
 								<FormItem className="half-item" {...formItemLayout} label="毕业院校">
 									{getFieldDecorator('graduateSchool', {
@@ -737,7 +730,6 @@ const Expert = React.createClass({
 				<Modal visible={this.state.visible} onOk={this.handleOk} onCancel={this.handleCancel}>
 					{this.state.authenticationState=='0'&&<p>是否申请专家认证?注意:认证成功后,您的信息将在本平台展示。</p>}
 					{this.state.authenticationState=='1'&&<p>是否申请顾问认证?注意:认证成功后,您的信息将在本平台展示。</p>}
-					{!this.state.authentication?<p>是否申请个人认证?</p>:''}
 				</Modal>
 			</div>
 		);