Merge remote-tracking branch 'origin/master'

public/css/common.scss

@@ -14,7 +14,8 @@ html, body, div, ul, li, h1, h2, h3, h4, h5, h6, p, dl, dt, dd, ol, form, input,
 
 html, body, #app {
   background-color:#ECECF2;
-  //height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 body {
@@ -361,6 +362,10 @@ input.el-input__inner {
   height: 40px !important;
 }
 
+.buttonWidth180px{
+  width: 180px;
+}
+
 /****密码****/
 .passwordItem {
   border: 1px solid #C8CBE0;
@@ -631,7 +636,7 @@ i {
   border-color: #5D78FF !important;
 }
 
-//动画
+//动画淡入淡出
 @-webkit-keyframes fadeInOut {
   0% {
     opacity: 0
@@ -692,33 +697,86 @@ i {
   }
 }
 
+//动画错误提示
+@-webkit-keyframes mymove{
+  from {top:100px;}
+  to {top:106px;}
+}
+
+@-moz-keyframes mymove{
+  from {top:100px;}
+  to {top:106px;}
+}
+
+@-ms-keyframes mymove{
+  from {top:100px;}
+  to {top:106px;}
+}
+
+@-o-keyframes mymove{
+  from {top:100px;}
+  to {top:106px;}
+}
+
+@keyframes mymove{
+  from {top:100px;}
+  to {top:106px;}
+}
+
 //tag
+.el-tag,.el-tag--plain{
+  height: 40px !important;
+  line-height: 40px !important;
+  font-weight: 400;
+  border-radius: 3px;
+}
 .el-tag--plain.el-tag--success {
-  width: 320px;
+  background-color: #E6F8F3 !important;
+  color: #0ABB87 !important;
+  border-color: #0ABB87 !important;
+  & .tag-btn{
+    color: #0ABB87 !important;
+    text-decoration: underline;
+    cursor: pointer;
+  }
+}
+.el-tag--plain.el-tag--warning {
   background-color: #FFF8EF !important;
   color: #FF9E29 !important;
   border-color: #FF9E29 !important;
-  height: 40px;
-  line-height: 40px;
-  -webkit-animation: fadeInOut 3s;
-  -moz-animation: fadeInOut 3s;
-  -ms-animation: fadeInOut 3s;
-  -o-animation: fadeInOut 3s;
+  & .tag-btn{
+    color: #FF9E29 !important;
+    text-decoration: underline;
+    cursor: pointer;
+  }
 }
 
 .el-tag--plain.el-tag--danger {
-  width: 320px;
   background-color: #FFEFEF !important;
   color: #FF5D5D !important;
   border-color: #FF5D5D !important;
   height: 40px;
   line-height: 40px;
+  & .tag-btn{
+    color: #FF5D5D !important;
+    text-decoration: underline;
+    cursor: pointer;
+  }
+}
+.tagWidth320px.el-tag--plain{
+  width: 320px;
+  -webkit-animation: fadeInOut 3s;
+  -moz-animation: fadeInOut 3s;
+  -ms-animation: fadeInOut 3s;
+  -o-animation: fadeInOut 3s;
+}
+.tagWidth270px.el-tag--plain{
+  width: 264px;
   -webkit-animation: fadeInOut 3s;
   -moz-animation: fadeInOut 3s;
   -ms-animation: fadeInOut 3s;
   -o-animation: fadeInOut 3s;
 }
-
 //抽屉
 .el-drawer.userInfo-drawer {
   width: 20% !important;
@@ -903,12 +961,19 @@ i {
 
 //tab导航
 .wrapperContent {
+  padding: 0 30px;
+  min-height:100%;
   .el-tabs__nav-wrap::after {
     background: transparent !important;
     height: 1px !important;
   }
+  .el-form-item__label{
+    color:#565B79;
+    font-weight: 500;
+  }
   .el-tabs__header {
     padding-left: 30px;
+    margin: 0;
     border-bottom: 1px solid #E7E9F5;
   }
   //.el-tabs__nav{
@@ -928,14 +993,20 @@ i {
     background: #5D78FF;
   }
   .el-tabs__content {
-    padding-left: 8%;
+    padding-top:30px;
+    padding-bottom: 30px;
+    color: #565B79;
+    font-weight: 400;
   }
 }
 
 //登录之后的右侧公共样式
 .loginedWrapper {
-  padding: 10px 30px;
+  padding: 0 30px;
+  margin:10px 0;
   background: #ECECF2;
+  height: calc(100vh - 110px);
+  overflow-y: auto;
   .breadcrumb {
     padding: 7px 0;
     color: #565B79;
@@ -986,3 +1057,30 @@ i {
 .demo-ruleForm .el-form-item:nth-last-of-type(2) .el-form-item__content{
   width: 372px !important;
 }
+.detail-ruleForm {
+  .el-form-item{
+    margin-bottom:18px;
+  }
+  .el-form-item__label{
+    line-height: 20px;
+  }
+  .el-form-item__content{
+    line-height: 20px;
+  }
+}
+
+//错误提示
+.errorText{
+  color: #ff4949;
+  font-size: 12px;
+  line-height: 1;
+  padding-top: 4px;
+  position: absolute;
+  top: 106px;
+  left: 0;
+  animation:mymove 0.3s linear;
+  animation-iteration-count:1;
+  /* Safari and Chrome */
+  -webkit-animation:mymove 0.3s linear;
+  -webkit-animation-iteration-count:1;
+}
\ No newline at end of file

src/common/lang/en.js

@@ -190,21 +190,33 @@ module.exports = {
         modifyPwd:"修改密码en",
         notAuthTitle:"您的账号还未进行个人认证，提交认证成功后即可解锁完整功能en",
         name:"姓名en",
-        placeholderName:"请输入你的真实姓名en",
-        phone:"手机号en",
+        placeholderName:"请输入您的真实姓名en",
+        phone:"帐号en",
         company:"公司全称en",
-        placeholderCompany:"请输入公司全称en",
-        companyEmail:"公司邮箱en",
-        placeholderEmail:"请填写公司邮箱地址en",
+        placeholderCompany:"请输入工商注册时的企业名称v",
+        companyEmail:"企业邮箱en",
+        placeholderEmail:"请输入您的企业邮箱地址en",
         code:"验证码en",
-        placeholderCode:"请输入邮箱验证码v",
+        placeholderCode:"请输入邮箱验证码en",
         notsendCode:"收不到验证码？en",
-        department:"所在部门en",
-        placeholderDepartment:"请输入所在公司部门en",
+        department:"所属部门en",
+        placeholderDepartment:"请输入您所在的公司部门en",
         position:"职位en",
-        placeholderPosition:"请输入职位名称en",
+        placeholderPosition:"请输入您所任的职位en",
         businessCard:"上传名片en",
         businessCardTitle:"请确保图片清晰、完整，仅支持PNG，JPG，最大不超过2Men",
-        submitAuth:"提交认证en"
+        submitAuth:"提交认证en",
+        errorName:"请输入您的真实姓名en",
+        errorCompany: "请输入正确的工商注册时的企业名称v",
+        errorEmail:"请输入正确的企业邮箱地址en",
+        errorCode:"请输入正确的邮箱验证码en",
+        errorDepartment:"请输入正确的部门名称en",
+        errorPosition:"请输入正确的职位名称en",
+        emptyCard:"请上传名片en",
+        errorformatCard:"上传格式错误，仅支持PNG/JPG图片格式en",
+        errorSizeCard:"上传名片大小超出限制，最大可支持2Men",
+        card:"名片en",
+        editButton:"修改en"
+
     }
 }

src/common/lang/zh.js

@@ -190,21 +190,33 @@ module.exports = {
         modifyPwd:"修改密码",
         notAuthTitle:"您的账号还未进行个人认证，提交认证成功后即可解锁完整功能",
         name:"姓名",
-        placeholderName:"请输入你的真实姓名",
-        phone:"手机号",
+        placeholderName:"请输入您的真实姓名",
+        phone:"帐号",
         company:"公司全称",
-        placeholderCompany:"请输入公司全称",
-        companyEmail:"公司邮箱",
-        placeholderEmail:"请填写公司邮箱地址",
+        placeholderCompany:"请输入工商注册时的企业名称",
+        companyEmail:"企业邮箱",
+        placeholderEmail:"请输入您的企业邮箱地址",
         code:"验证码",
         placeholderCode:"请输入邮箱验证码",
         notsendCode:"收不到验证码？",
-        department:"所在部门",
-        placeholderDepartment:"请输入所在公司部门",
+        department:"所属部门",
+        placeholderDepartment:"请输入您所在的公司部门",
         position:"职位",
-        placeholderPosition:"请输入职位名称",
+        placeholderPosition:"请输入您所任的职位",
         businessCard:"上传名片",
         businessCardTitle:"请确保图片清晰、完整，仅支持PNG，JPG，最大不超过2M",
-        submitAuth:"提交认证"
-    }
+        submitAuth:"提交认证",
+        errorName:"请输入您的真实姓名",
+        errorCompany: "请输入正确的工商注册时的企业名称",
+        errorEmail:"请输入正确的企业邮箱地址",
+        errorCode:"请输入正确的邮箱验证码",
+        errorDepartment:"请输入正确的部门名称",
+        errorPosition:"请输入正确的职位名称",
+        emptyCard:"请上传名片",
+        errorformatCard:"上传格式错误，仅支持PNG/JPG图片格式",
+        errorSizeCard:"上传名片大小超出限制，最大可支持2M",
+        card:"名片",
+        editButton:"修改"
+
+    },
 }

src/common/validate.js

@@ -105,4 +105,75 @@ export default {
             callback();
         }
     },
+
+    //验证姓名
+    checkName(rule,value,callback){
+        var reg = /^[a-zA-Z\u4e00-\u9fa5]{2,36}$/;
+        if(value ===''){
+            callback(new Error(i18n.t("personalAuth.placeholderName")));
+        }else if(!reg.test(value)){
+            callback(new Error(i18n.t("personalAuth.placeholderName")));
+        }else{
+            callback();
+        }
+    },
+
+    //验证公司
+    checkCompany(rule,value,callback){
+        var reg = /^[a-zA-Z\u4e00-\u9fa5]{2,36}$/;
+        if(value ===''){
+            callback(new Error(i18n.t("personalAuth.placeholderCompany")));
+        }else if(!reg.test(value)){
+            callback(new Error(i18n.t("personalAuth.errorCompany")));
+        }else{
+            callback();
+        }
+    },
+
+    //验证所在部门
+    checkDepartment(rule,value,callback){
+        var reg = /^[a-zA-Z\u4e00-\u9fa5]{2,36}$/;
+        if(value ===''){
+            callback(new Error(i18n.t("personalAuth.placeholderDepartment")));
+        }else if(!reg.test(value)){
+            callback(new Error(i18n.t("personalAuth.errorDepartment")));
+        }else{
+            callback();
+        }
+    },
+
+    //验证职位
+    checkPosition(rule,value,callback){
+        var reg = /^[a-zA-Z\u4e00-\u9fa5]{2,36}$/;
+        if(value ===''){
+            callback(new Error(i18n.t("personalAuth.placeholderPosition")));
+        }else if(!reg.test(value)){
+            callback(new Error(i18n.t("personalAuth.errorPosition")));
+        }else{
+            callback();
+        }
+    },
+
+    //验证企业邮箱
+    checkCompanyEmail(rule,value,callback){
+        // var reg = /^\w+((.\w+)|(-\w+))@[A-Za-z0-9]+((.|-)[A-Za-z0-9]+).[A-Za-z0-9]+$/;
+        var reg = /^[A-Za-z\d]+([-_.][A-Za-z\d]+)*@([A-Za-z\d]+[-.])+[A-Za-z]{2,5}$/;
+        if(value===''){
+            callback(new Error(i18n.t("personalAuth.placeholderEmail")));
+        }else if(!reg.test(value)){
+            callback(new Error(i18n.t("personalAuth.errorEmail")));
+        }else{
+            callback();
+        }
+    },
+
+    //验证名片
+    checkBusinessCard(rule,value,callback){
+        if(value ===''){
+            callback(new Error(i18n.t("personalAuth.emptyCard")));
+        }else{
+            callback();
+        }
+    },
+
 }
\ No newline at end of file

src/components/authentication/modifyPassword.vue

+<template>
+    <div class="modifyPwdWrapper">
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="95px" class="demo-ruleForm">
+
+            <el-form-item :label="$t('personalAuth.name')+'：'" prop="name">
+                <el-input v-model.trim="ruleForm.name" :placeholder="$t('personalAuth.placeholderName')" maxlength="36"></el-input>
+            </el-form-item>
+
+            <el-form-item :label="$t('personalAuth.phone')+'：'" required>
+                <el-input v-model.trim="ruleForm.phone" disabled autocomplete
+                          maxlength="11"></el-input>
+            </el-form-item>
+
+            <el-form-item :label="$t('personalAuth.company')+'：'" prop="company">
+                <el-input v-model.trim="ruleForm.company" :placeholder="$t('personalAuth.placeholderCompany')" maxlength="36"></el-input>
+            </el-form-item>
+
+            <el-form-item :label="$t('personalAuth.companyEmail')+'：'" prop="email">
+                <el-input v-model.trim="ruleForm.email" :placeholder="$t('personalAuth.placeholderEmail')" autocomplete maxlength="36"></el-input>
+            </el-form-item>
+
+            <el-form-item :label="$t('personalAuth.code')+'：'" prop="code" class="authyzcodeItem" style="margin-bottom: 30px !important;">
+                <el-input type="text" v-model.trim="ruleForm.code" :placeholder="$t('personalAuth.placeholderCode')" style="float: left;" maxlength="6"
+                          autocomplete></el-input>
+                <span class="getyzcodeBtn" @click="handleGetCode" v-if="showCount">{{$t("commonTips."+codehtml)}}</span>
+                <span class="getdyzcodeBtn"  v-if="!showCount">{{count}}{{$t("commonTips.resendCode")}}</span>
+            </el-form-item>
+            <el-form-item v-if="isShowSlider">
+                <sliderCmpt @sendVerification="getVerification"></sliderCmpt>
+            </el-form-item>
+            <el-form-item v-if="!showMessageInfo" class="message-item">
+                <el-tag
+                        class="tagWidth270px"
+                        :type="messageObj.type"
+                        effect="plain">
+                    {{ messageObj.message }}
+                </el-tag>
+            </el-form-item>
+
+            <el-form-item :label="$t('personalAuth.department')+'：'" prop="department">
+                <el-input v-model.trim="ruleForm.department" :placeholder="$t('personalAuth.placeholderDepartment')" maxlength="36"></el-input>
+            </el-form-item>
+            <el-form-item :label="$t('personalAuth.position')+'：'" prop="position">
+                <el-input v-model.trim="ruleForm.position" :placeholder="$t('personalAuth.placeholderPosition')" maxlength="36"></el-input>
+            </el-form-item>
+
+            <el-form-item :label="$t('personalAuth.businessCard')+'：'" prop="businessCard" required>
+                <p class="imgTitle">{{$t("personalAuth.businessCardTitle")}}</p>
+                <div class="uploadImg">
+                    <el-upload
+                            name="fileUpload"
+                            list-type="picture-card"
+                            class="uploadImgCircle"
+                            :action=uploadHostHeader
+                            :multiple="false"
+                            :file-list="fileList"
+                            :on-preview="handlePictureCardPreview"
+                            :on-success="uploadComplete"
+                            :before-upload="handleBeforeFile"
+                            :on-remove="handleRemove"
+                    >
+                        <i class="iconfont icon-jiahao"></i>
+                        <p class="uploadImgTitle">{{$t("personalAuth.businessCard")}}</p>
+                    </el-upload>
+                    <el-dialog :visible.sync="dialogVisible">
+                        <img width="100%" :src="dialogImageUrl" alt="">
+                    </el-dialog>
+                </div>
+                <span class="errorText" v-if="isShowErrorText1">{{$t("personalAuth.emptyCard")}}</span>
+                <span class="errorText" v-if="isShowErrorText2">{{$t("personalAuth.errorformatCard")}}</span>
+                <span class="errorText" v-if="isShowErrorText3">{{$t("personalAuth.errorSizeCard")}}</span>
+            </el-form-item>
+
+            <el-form-item :label="$t('personalAuth.businessCard')+'：'" prop="businessCard" required>
+                <p class="imgTitle">{{$t("personalAuth.businessCardTitle")}}</p>
+                <div class="uploadImg">
+                    <el-upload
+                            name="fileUpload"
+                            list-type="picture-card"
+                            class="uploadImgCircle"
+                            :action=uploadHostHeader
+                            :multiple="false"
+                            :file-list="fileList"
+                            :on-preview="handlePictureCardPreview"
+                            :on-success="uploadComplete"
+                            :before-upload="handleBeforeFile"
+                            :on-remove="handleRemove"
+                    >
+                        <i class="iconfont icon-jiahao"></i>
+                        <p class="uploadImgTitle">{{$t("personalAuth.businessCard")}}</p>
+                    </el-upload>
+                    <el-dialog :visible.sync="dialogVisible">
+                        <img width="100%" :src="dialogImageUrl" alt="">
+                    </el-dialog>
+                </div>
+                <span class="errorText" v-if="isShowErrorText1">{{$t("personalAuth.emptyCard")}}</span>
+                <span class="errorText" v-if="isShowErrorText2">{{$t("personalAuth.errorformatCard")}}</span>
+                <span class="errorText" v-if="isShowErrorText3">{{$t("personalAuth.errorSizeCard")}}</span>
+            </el-form-item>
+
+
+            <el-form-item :label="$t('personalAuth.businessCard')+'：'" prop="businessCard" required>
+                <p class="imgTitle">{{$t("personalAuth.businessCardTitle")}}</p>
+                <div class="uploadImg">
+                    <el-upload
+                            name="fileUpload"
+                            list-type="picture-card"
+                            class="uploadImgCircle"
+                            :action=uploadHostHeader
+                            :multiple="false"
+                            :file-list="fileList"
+                            :on-preview="handlePictureCardPreview"
+                            :on-success="uploadComplete"
+                            :before-upload="handleBeforeFile"
+                            :on-remove="handleRemove"
+                    >
+                        <i class="iconfont icon-jiahao"></i>
+                        <p class="uploadImgTitle">{{$t("personalAuth.businessCard")}}</p>
+                    </el-upload>
+                    <el-dialog :visible.sync="dialogVisible">
+                        <img width="100%" :src="dialogImageUrl" alt="">
+                    </el-dialog>
+                </div>
+                <span class="errorText" v-if="isShowErrorText1">{{$t("personalAuth.emptyCard")}}</span>
+                <span class="errorText" v-if="isShowErrorText2">{{$t("personalAuth.errorformatCard")}}</span>
+                <span class="errorText" v-if="isShowErrorText3">{{$t("personalAuth.errorSizeCard")}}</span>
+            </el-form-item>
+
+
+            <el-form-item style="text-align: left;">
+                <el-button type="primary" class="buttonWidth180px" @click="submitForm('ruleForm')">{{$t("personalAuth.submitAuth")}}</el-button>
+            </el-form-item>
+
+        </el-form>
+
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "modifyPassword",
+        data(){
+            return{
+                ruleForm: {
+                    name: '',
+                    phone:'',
+                    company:'',
+                    email:'',
+                    code:'',
+                    department:'',
+                    position:'',
+                    file:''
+                },
+                rules: {
+                    name: [
+                        {required: true, validator:validate.checkName, trigger: 'blur'},
+                    ],
+                    company: [
+                        {required: true, validator:validate.checkCompany, trigger: 'blur'},
+                    ],
+                    email: [
+                        {required: true, validator:validate.checkCompanyEmail, trigger: 'blur'}
+                    ],
+                    code: [{required: true, validator:validate.checkEmailCode, trigger: 'blur'}],
+                    department: [{required: true, validator:validate.checkDepartment, trigger: 'blur'}],
+                    position: [{required: true, validator:validate.checkDepartment, trigger: 'blur'}],
+                    businessCard: [{required: true, message:"请上传名片", trigger: 'blur'}]
+
+                },
+            }
+        },
+        methods:{
+
+        },
+        mounted(){
+
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+.modifyPwdWrapper{
+    padding-left: 7%;
+}
+</style>
\ No newline at end of file

src/components/authentication/personalAuthDetail.vue

+<template>
+    <div class="personalForm">
+
+        <el-form :model="ruleForm" label-width="95px" class="demo-ruleForm detail-ruleForm">
+
+            <el-form-item :label="$t('personalAuth.name')+'：'">
+                <span>张燕妮</span>
+            </el-form-item>
+
+            <el-form-item :label="$t('personalAuth.phone')+'：'">
+                <span>15210174265</span>
+            </el-form-item>
+
+            <el-form-item :label="$t('personalAuth.company')+'：'">
+                <span>太库发展有限公司</span>
+            </el-form-item>
+
+            <el-form-item :label="$t('personalAuth.companyEmail')+'：'">
+                <span>yanni.zhang@techcode.com</span>
+            </el-form-item>
+
+            <el-form-item :label="$t('personalAuth.department')+'：'">
+                <span>线上业务中心</span>
+            </el-form-item>
+            <el-form-item :label="$t('personalAuth.position')+'：'">
+                <span>web前端开发工程师</span>
+            </el-form-item>
+
+            <el-form-item :label="$t('personalAuth.card')+'：'">
+                <div class="uploadImg">
+                    <img width="100%" :src="dialogImageUrl" alt="">
+                    <el-dialog :visible.sync="dialogVisible">
+                        <img width="100%" :src="dialogImageUrl" alt="">
+                    </el-dialog>
+                </div>
+            </el-form-item>
+
+            <el-form-item style="text-align: left;">
+                <el-button type="primary" class="buttonWidth180px" @click="submitForm('ruleForm')">
+                    {{$t("personalAuth.editButton")}}
+                </el-button>
+            </el-form-item>
+
+        </el-form>
+    </div>
+</template>
+
+<script>
+    import api from '../../views/accountmanage/api/api'
+
+    export default {
+        name: "personalAuthDetail",
+        data() {
+            return {
+                ruleForm: {
+                    name: '',
+                    phone: '',
+                    company: '',
+                    email: '',
+                    code: '',
+                    department: '',
+                    position: '',
+                    file: ''
+                },
+                dialogImageUrl: "",
+                dialogVisible: false,
+            }
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+    .personalForm {
+        margin-top: 30px;
+        padding-left: 8%;
+    }
+
+    .demo-ruleForm {
+        text-align: left;
+    }
+</style>
\ No newline at end of file

src/components/index/PageLeft.vue

 <template>
-    <div class="boxWrapper">
+    <div class="leftboxWrapper">
 
         <div class="nav-dashboard">
             <p class="left-nav-list link-nav">
@@ -151,12 +151,13 @@
 </script>
 
 <style scoped lang="scss">
-    .boxWrapper {
+    .leftboxWrapper {
         background: #1E1E2D;
         width: 15%;
-        height: calc(100% - 60px);
+        min-height: calc(100% - 60px);
+        height: auto;
         color: #A2A3B7;
-        position: absolute;
+        position: fixed;
         left: 0;
         top: 60px;
         z-index: 1;

src/components/index/PageTop.vue

@@ -283,7 +283,7 @@
     }
 
     .loginedTopWrapper{
-        position: absolute;
+        position: fixed;
         background-color: #fff;
         .header-left > span{
             color: #A8A8A8;

src/components/login/emailLoginCmpt.vue

@@ -44,6 +44,7 @@
                     </el-form-item>
                     <el-form-item v-if="showMessageInfo" class="message-item">
                         <el-tag
+                                class="tagWidth320px"
                                 :type="messageObj.type"
                                 effect="plain">
                             {{ messageObj.message }}
@@ -106,7 +107,7 @@
                 count:'',
                 flag:0,
                 messageObj:{
-                    type:"success",
+                    type:"warning",
                     message:null
                 }
             }
@@ -250,7 +251,7 @@
                 api.getYZEmailCodeAxios(params).then((res)=>{
                     that.showMessageInfo =true;
                     if(res.code==0){
-                        that.messageObj.type = "success";
+                        that.messageObj.type = "warning";
                         that.messageObj.message = that.$t("commonTips.successEmailCodeMessage");
                         that.timeoutFunc();
                     }else{

src/components/login/mobileLoginCmpt.vue

@@ -45,6 +45,7 @@
                     </el-form-item>
                     <el-form-item v-if="showMessageInfo" class="message-item">
                         <el-tag
+                                class="tagWidth320px"
                                 :type="messageObj.type"
                                 effect="plain">
                             {{ messageObj.message }}

src/views/accountmanage/pages/edit.vue

@@ -10,7 +10,12 @@
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane :label="$t('personalAuth.personalAuth')" name="first">
           <div class="authFormWrapper">
-            <personalAuthCmpt></personalAuthCmpt>
+            <el-tag type="success" effect="plain">您的认证已通过审核！您可以提前<span class="tag-btn">发项目</span></el-tag>
+            <el-tag type="danger" effect="plain">您的认证未通过审核，驳回原因：xxxxxxxxxxxxxxxxxxxxxxxxxx。您仍可以提前<span class="tag-btn">发项目</span></el-tag>
+            <el-tag type="warning" effect="plain">您的认证正在审核中，请您耐心等待！您可以提前<span class="tag-btn">发项目</span></el-tag>
+
+            <!--<personalAuthCmpt></personalAuthCmpt>-->
+            <personalAuthDetailCmpt></personalAuthDetailCmpt>
           </div>
         </el-tab-pane>
         <el-tab-pane :label="$t('personalAuth.modifyPwd')" name="second">
@@ -23,11 +28,13 @@
 
 <script>
   import personalAuthCmpt from '../../../components/authentication/personalAuth';
+  import personalAuthDetailCmpt from '../../../components/authentication/personalAuthDetail';
 
   export default {
     name: "edit",
     components: {
-      personalAuthCmpt
+      personalAuthCmpt,
+      personalAuthDetailCmpt
     },
     data() {
       return {
@@ -43,6 +50,9 @@
 </script>
 
 <style scoped lang="scss">
-  .loginedWrapper {
+  .authFormWrapper {
+    .el-tag--plain{
+      width: 100% !important;
+    }
   }
 </style>

src/views/loginregister/pages/emailRegisterCmpt.vue

@@ -22,6 +22,7 @@
 
                     <el-form-item v-if="showMessageInfo" class="message-item">
                         <el-tag
+                                class="tagWidth320px"
                                 :type="messageObj.type"
                                 effect="plain">
                             {{ messageObj.message }}
@@ -107,7 +108,7 @@
                 protocolContent:"TechBook服务协议TechBook服务协议TechBook服务协议TechBook服务协议TechBook服务协议TechBook服务协议",
                 className:"height600px",
                 messageObj:{
-                    type:"success",
+                    type:"warning",
                     message:null
                 },
                 showMessageInfo:false,

src/views/loginregister/pages/login.vue

@@ -123,7 +123,7 @@
             padding-top: 50px;
             padding-left: 40px;
             background: url("../../../assets/img/login/login-bg@2x.jpg") no-repeat;
-            background-size: 100% auto;
+            background-size: cover;
             text-align: left;
             .logoInfo {
                 & > img {

src/views/loginregister/pages/mobileRegisterCmpt.vue

@@ -22,7 +22,7 @@
                     </el-form-item>
 
                     <el-form-item v-if="showMessageInfo" class="message-item">
-                        <el-tag
+                        <el-tag class="tagWidth320px"
                                 :type="messageObj.type"
                                 effect="plain">
                             {{ messageObj.message }}
@@ -108,7 +108,7 @@
                 protocolContent:"TechBook服务协议TechBook服务协议TechBook服务协议TechBook服务协议TechBook服务协议TechBook服务协议",
                 className:"height600px",
                 messageObj:{
-                    type:"success",
+                    type:"warning",
                     message:null
                 },
                 showMessageInfo:false,
@@ -234,7 +234,7 @@
                 api.getYZPhoneCodeAxios(params).then((res)=>{
                     that.showMessageInfo =true;
                     if(res.code==0){
-                        that.messageObj.type = "success";
+                        that.messageObj.type = "warning";
                         that.messageObj.message = that.$t("commonTips.successPhoneCodeMessage");
                         that.timeoutFunc();
                     }else{

src/views/ltrIndex.vue

@@ -4,6 +4,7 @@
         <page-left v-if="!isShow"></page-left>
         <div class="page-content popper-boundaries">
             <router-view/>
+            <p class="copyRight">@2019 All Copyright Reserved By TechBook.com　京ICP备15012625号-1</p>
         </div>
     </div>
 </template>
@@ -43,13 +44,21 @@
 </script>
 <style scoped lang="scss">
     .page-wrapper {
+        overflow: hidden;
         .page-content {
             width: 85%;
             margin-left: 15%;
             margin-top: 60px;
             position: relative;
             overflow: hidden;
-            background: #f5f5f5;
+        }
+        .copyRight{
+            font-weight: 400;
+            color: #B8BBCD;
+            font-size: 12px;
+            background: #ECECF2;
+            height: 30px;
+            line-height: 30px;
         }
     }
 </style>