Merge branch 'ChronicMag_zxc' into test

src/components/common/Banner.vue

@@ -9,7 +9,7 @@
             <div class="consult fr">
                 <span>咨询热线：{{phone}} &nbsp;</span> |
                 <span>服务时间：{{workTime}}</span>
-                <span class="toLogin" v-show="route=='/register'">已有账号？<b @click="toLogin">立即登录</b></span>
+                <!-- <span class="toLogin" v-show="route=='/register'">已有账号？<b @click="toLogin">立即登录</b></span> -->
             </div>
         </div>
     </div>
@@ -63,6 +63,7 @@
         height: 60px;
         background: #fff;
         line-height: 60px;
+        position: relative;
     }
 
     .banner img {
@@ -77,6 +78,7 @@
         font-size: 14px;
         color: #2871FA;
         letter-spacing: 0;
+        font-weight: bold;
     }
 
     .img-title {
@@ -92,6 +94,8 @@
 
     .logo {
         display: inline-block;
+        position: relative;
+        left: 13.5%;
     }
 
     .consult {

src/components/forgetPassword/FindPassword.vue

@@ -21,25 +21,36 @@
                     </div> -->
                     <form>
                         <div class="first" v-if="flag==1">
-                            <input type="tel" name="" v-model="phone" maxlength="11" @input="handleTelInput"
-                                   placeholder="手机号" @blur="checkPhone">
+                            <div class="phoneBox">
+                                <input type="tel" :class="{error: phoneErrText}" name="" v-model="phone" maxlength="11" @input="handleTelInput"
+                                    placeholder="手机号" @blur="checkPhone">
+                                <span class="tips" v-show="phoneErrText" >{{phoneErrText}}</span>
+                            </div>
+                            
                             <div class="yanzm" maxlength="11">
-                                <input type="text" name="" v-model="picCode" @blur="checkImgCode" maxlength="4"
+                                <input type="text" :class="{error: imgErrText}" name="" v-model="picCode" @blur="checkImgCode" maxlength="4"
                                        placeholder="图形验证码">
-
                                 <img :src='"data:image/png;base64,"+imgCode' @click="refreshCode">
+                                <span class="tips" >{{imgErrText}}</span>
                             </div>
                             <div class="yanzm">
                                 <input type="text" name="" v-model="msgCode" maxlength="6" placeholder="短信验证码" @blur="checkMsgCode">
                                 <div v-if="timerFlag" type="primary" class="getMsg disabled">{{'再次发送(' + time + ')'}}</div>
                                 <div v-else class="getMsg" @click="getMsgCode">获取验证码</div>
+                                 <span class="tips" v-show="SMSErrText">{{SMSErrText}}</span>
                             </div>
-                            <span class="tips" v-show="imgCodeErr">{{codeErrText}}</span>
+                           
                         </div>
                         <div class="second" v-if="flag == 2">
-                            <input type="password" name="" placeholder="新密码（6-16位字母、数字组合）" v-model="newPsw"
+                          <div class="phoneBox">
+                              <input type="password" :class="{error: newPswErrText}" name="" placeholder="新密码（6-16位字母、数字组合）" v-model="newPsw"
                                    @blur="checkPsw" maxlength="16">
+                              <span class="tips" v-show="newPswErrText">{{newPswErrText}}</span>
+                          </div>
+                          <div class="phoneBox">
                             <input type="password" name="" placeholder="确认新密码（6-16位字母、数字组合）" v-model="newPswAgain"  maxlength="16">
+
+                          </div>
                         </div>
                         <div class="third" v-if="flag == 3">
                             <img class="modifyImg" src="../../images/success.png" alt="">
@@ -79,7 +90,7 @@
         nextText: '下一步',
         changCor: true,
         imgCodeErr: false,
-        time: 60,
+        time: 180,
         timer: null,
         timerFlag: false,//倒计时标识
         newPawComplete: false,//进度条1
@@ -92,6 +103,10 @@
         msgCodeTime:180,
         codeErrText:'',
         modifiPsw:'',//修改密码
+        phoneErrText: '', //用户名错误信息
+        imgErrText: '', //图片验证码错误信息
+        SMSErrText: '',  //短信验证码错误信息
+        newPswErrText: '' //新密码错误信息
 
       }
     },
@@ -173,11 +188,12 @@
           api.vertifyImgCode(params).then((res) => {
             if (+res.data.code != 0) {//验证失败
               this.imgCodeErr = true
-              this.codeErrText = "图形验证码错误";
+              this.imgErrText = "图形验证码错误";
             } else {
               this.imgCodeErr = false
               /*window.clearInterval(this.picTimer);
               this.picTime = 600*/
+              this.imgErrText = "";
             }
           }).catch((err) => {
             console.log(err);
@@ -195,14 +211,15 @@
               type: 'warning'
             });*/
             this.imgCodeErr = true;
-            this.codeErrText = "手机格式不正确";
+            this.phoneErrText = "手机格式有误";
             this.phone = "";
           }else{//验证手机号是否注册
             this.imgCodeErr = false;
             api.checkForgetTel(this.phone).then((res)=>{
               if(+res.data.code == 0){
-                
+                 this.phoneErrText = ''
               }else{
+                this.phoneErrText = ''
                 this.$message({
                   message: res.data.msg,
                   type: 'warning'
@@ -220,10 +237,10 @@
             type: 'warning'
           });*/
           this.imgCodeErr = true;
-          this.codeErrText = "手机号不能为空";
+          this.phoneErrText = "手机号不能为空";
         }else if(!this.picCode){
           this.imgCodeErr = true
-          this.codeErrText = "图形验证码不能为空";
+          this.imgErrText = "图形验证码不能为空";
         }else{
           //调请求接口
           if(!this.imgCodeErr){
@@ -282,18 +299,20 @@
       checkPsw() {//校验密码
         // const pswlReg = /^(?![0-9]+$)(?![a-zA-Z]+$)/;
         const pswlReg = utils.pswReg;
-        const psw = this.psw;
+        const psw = this.newPsw;
+        console.log('assssssss', psw)
         if (psw) {
           if (psw.trim().length < 6 || psw.trim().length > 16) {
             this.imgCodeErr = true;
-            this.codeErrText = "密码长度为6-16位";
+            this.newPswErrText = "密码长度为6-16位";
             this.psw = "";
           }
           else if (!pswlReg.test(psw)) {
             this.imgCodeErr = true;
-            this.codeErrText = "密码过于简单";
+            this.newPswErrText = "密码过于简单";
             this.psw = "";
           }else{
+            this.newPswErrText = ''
             this.imgCodeErr = false;
           }
         }
@@ -315,7 +334,7 @@
             } else {
               // this.$message.error('短信验证码错误');
               this.imgCodeErr = true;
-              this.codeErrText = "短信验证码错误";
+              this.SMSErrText = "短信验证码错误";
               this.msgCode = "";
             }
           }).catch((err) => {
@@ -340,7 +359,7 @@
             } else {
               // this.$message.error('短信验证码错误');
               this.imgCodeErr = true;
-              this.codeErrText = "短信验证码错误";
+              this.SMSErrText = "短信验证码错误";
               this.msgCode = "";
             }
           }).catch((err) => {

src/components/forgetPassword/findPassword.less

@@ -121,12 +121,15 @@
         input:-ms-input-placeholder { /* Internet Explorer 10-11 */
           color: #c9c9c9;
         }
+        .phoneBox {
+          position: relative;
+        }
         .tips{
           display: inline-block;
           font-size: 12px;
           color: #dd0f0f;
           position: absolute;
-          top: 278px;
+          top: 42px;
         }
         .yanzm {
           position: relative;
@@ -157,7 +160,7 @@
             display: inline-block;
             vertical-align: middle;
             top: 0;
-            right: -1px;
+            right: -2px;
             cursor: pointer;
           }
           .disabled {
@@ -210,10 +213,18 @@
           color: #000000;
           letter-spacing: 0;
         }
+
+        input:focus {
+          border: 1px solid #0952DA;
+        }
+        .error {
+          border: 1px solid #FA2828;
+        }
       }
     }
   }
   .box2 {
     height: 340px;
   }
+  
 }

src/components/icss/IndeptLabel.vue

@@ -9,7 +9,7 @@
                 </el-form-item>
                 <el-form-item label="标签归属：">
                     <el-select size="mini" v-model="filter.tagAdscription" @change="getValue"  placeholder="标签归属" clearable>
-                        <el-option v-if="item.val!=6&&item.val!=7&&item.val!=8&&item.val!=9" v-for="item in Adscriptions" :label="item.name" :value="item.val" :key="item.id" ></el-option>
+                        <el-option v-if="item.val!=6&&item.val!=7&&item.val!=8&&item.val!=9&&item.val!=10&&item.val!=21&&item.val!=22" v-for="item in Adscriptions" :label="item.name" :value="item.val" :key="item.id" ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="标签系统名称：">

src/components/login/Login.vue

@@ -27,7 +27,7 @@
                             <span class="pwd" @click="toForgetPsw">忘记密码?</span>
                         </el-form-item>
                         <el-form-item>
-                            <el-button plain v-if="otherCor" @click="submitForm('ruleForm2')">登录</el-button>
+                            <el-button plain v-if="otherCor" >登录</el-button>
                             <el-button ref="btn" v-else class="otherCor" plain @click="submitForm('ruleForm2')">登录
                             </el-button>
                         </el-form-item>
@@ -67,7 +67,7 @@
         // 手机号
         if (isNaN(value) == false) {
           if (value.length !== 11 || !myreg.test(value)) {
-            callback(new Error('请输入正确的手机号码'));
+            callback(new Error('手机号格式有误'));
           } else {
             callback();
           }

src/components/login/login.less

@@ -10,15 +10,15 @@
   .login-box {
     width: 406px;
     position: absolute;
-    left: calc(50% + 203px);
+    left: 60%;
     top: 50%;
-    transform: translate(-50%, -50%);
+    transform: translate(0%, -50%);
   }
   .login-img {
-    left: 10%;
+    left: 17.5%;
     top: 0;
     position: absolute;
-    width: 40%;
+    width: 43%;
     height: 100%;
   }
   .login-img img {
@@ -148,4 +148,16 @@
   .el-message {
     top: 50px;
   }
+  .ri-tel, .ri-pwd {
+    input:focus {
+      border: 1px solid #0952DA!important;
+    }
+  }
+  .is-error {
+    .ri-tel, .ri-pwd {
+      input {
+        border: 1px solid #FA2828!important;
+      }
+    }
+  }
 }

src/components/register/Register.vue

@@ -16,41 +16,59 @@
                 <div v-if="flag" class="title-box clearfix"> <h3 class="login-title fl">注册</h3> <h4 class="num fr" @click="toLogin">登录</h4></div>
                 <div v-else class="title-box clearfix"> <h3 class="login-title fl">其他信息</h3> <h4 class="num fr num2">2/2</h4></div>
                 <form>
-                    <div class="main" v-if="flag">
+                    <div class="main" v-show="flag">
                         <!-- <p>手机号</p> -->
-                        <input type="tel" name="" v-model="phone" maxlength="11" @input="handleTelInput"
+						<div class="phoneBox">
+							<input type="tel" :class="[{ 'error': phoneErrText}]" name="" v-model="phone" maxlength="11" @input="handleTelInput"
                                @blur="checkPhone" placeholder="请输入用户名或手机号">
+							<span class="tips" v-show="phoneErrText">{{phoneErrText}}</span>
+						</div>
+                        <div class="phoneBox">
+                        	<input type="password" :class="[{ 'error': pswErrText}]" name="" v-model="psw" minlength="6" maxlength="16" @blur="checkPsw" placeholder="请输入密码">
+							<span class="tips" v-show="pswErrText">{{pswErrText}}</span>
+						</div>
+                        
                         <!-- <p>密码</p> -->
-                        <input type="password" name="" v-model="psw" minlength="6" maxlength="16" @blur="checkPsw" placeholder="请输入密码">
                         
                         <div class="yanzm">
                             <!-- <p>图形验证码</p> -->
-                            <input type="text" name="" v-model="picCode" @blur="checkImgCode" maxlength="4">
+                            <input type="text" :class="[{ 'error': imgErrText}]" name="" v-model="picCode" @blur="checkImgCode" maxlength="4">
                             <img :src='"data:image/png;base64,"+imgCode' @click="refreshCode">
+							<span class="tips" v-show="imgErrText">{{imgErrText}}</span>
                         </div>
                         <div class="yanzm">
                             <!-- <p>短信验证码</p> -->
                             <!-- <input type="text" name="" v-model="msgCode" maxlength="6" @input="handleMsg"> -->
-                            <input type="text" name="" v-model="msgCode" maxlength="6" @blur="cheeckMsgCode">
+                            <input type="text" :class="[{ 'error': SMSErrText}]" name="" v-model="msgCode" maxlength="6" @blur="cheeckMsgCode">
                             <div v-if="timerFlag" type="primary" class="getMsg disabled">{{ '再次发送('+ time+')'}}</div>
                             <div v-else class="getMsg" @click="getMsgCode">获取验证码</div>
+							<span class="tips" v-show="SMSErrText">{{SMSErrText}}</span>
 
                         </div>
                         <!-- <span class="tips" v-show="imgCodeErr">图形验证码错误</span> -->
-                        <span class="tips" v-show="imgCodeErr">{{codeErrText}}</span>
+                        <!-- <span class="tips" v-show="imgCodeErr">{{codeErrText}}</span> -->
 
                         <div class="next" v-if="changCor">下一步</div>
                         <div class="next nextCor" @click="toNext" v-else>下一步</div>
                     </div>
 
-                    <div class="main" v-else>
+                    <div class="main"  v-show="!flag">
                         <!-- <p>联系邮箱</p> -->
-                        <input type="email" name="" v-model="email" @blur="checkEmail"  placeholder="请输入联系邮箱">
+						<div class="phoneBox">
+                        	<input type="email" :class="[{ 'error': emailErrText}]" name="" v-model="email" @blur="checkEmail"  placeholder="请输入联系邮箱" autocomplete="off">
+							<span class="tips" v-show="emailErrText">{{emailErrText}}</span>
+						</div>
                         <!-- <p>机构名称</p> -->
-                        <input type="text" name="" v-model="agencyName" maxlength="20" placeholder="请输入机构名称">
+						<div class="phoneBox">
+                        	<input type="text" :class="[{ 'error': agencyErrText}]" name="" v-model="agencyName" maxlength="20" placeholder="请输入机构名称" autocomplete="off">
+							<span class="tips" v-show="agencyErrText">{{agencyErrText}}</span>
+						</div>
+						<div class="phoneBox">
+                        	<input type="text" :class="[{ 'error': contactErrText}]" name="" v-model="contact" maxlength="10" @blur="handleContInput" placeholder="请输入联系人" autocomplete="off">
+							<span class="tips" v-show="contactErrText">{{contactErrText}}</span>
+						</div>
                         <!-- <p>联系人</p> -->
                         <!-- <input type="text" name="" v-model="contact" @input="handleContInput"> -->
-                        <input type="text" name="" v-model="contact" maxlength="10" @blur="handleContInput" placeholder="请输入联系人">
                         <div class="next" v-if="submitCor">立即注册</div>
                         <div class="next nextCor" @click="submit" v-else>立即注册</div>
                     </div>
@@ -85,7 +103,7 @@
         changCor: true,
         submitCor: true,
         imgCodeErr: false,
-        time: 60,
+        time: 180,
         timer: null,//按钮倒计时
         timerFlag: false,//倒计时标识
         complete: false, //注册进度条
@@ -94,7 +112,14 @@
         msgCodeTimer:null,//短信验证码
         msgCodeTime:180,
         codeErrText:'',
-        phoneRg:null
+		phoneRg:null, 
+		phoneErrText: '', // 手机号错误提示
+		pswErrText: '', //密码错误提示
+		imgErrText: '', //图像码错误信息
+		SMSErrText: '', //短信验证码错误信息
+		emailErrText:'', //邮箱错误信息提示
+		agencyErrText: '', //机构错误信息提示
+		contactErrText: '' //联系人错误信息提示
       }
     },
     created() {
@@ -133,9 +158,10 @@
             type: 'warning'
           });*/
           this.imgCodeErr = true;
-          this.codeErrText = "联系人只能输入中文";
+          this.contactErrText = "联系人只能输入中文";
           this.contact = '';
         }else{
+		this.contactErrText = "";
           this.imgCodeErr = false;
         }
       },
@@ -184,8 +210,9 @@
           api.vertifyImgCode(params).then((res) => {
             if (+res.data.code != 0) {//验证失败
               this.imgCodeErr = true
-              this.codeErrText = "图形验证码错误";
+              this.imgErrText = "图形验证码错误";
             } else {
+			  this.imgErrText = "";
               this.imgCodeErr = false
             }
           }).catch((err) => {
@@ -199,12 +226,12 @@
         const reg = utils.phoneReg;
         if(this.phone.trim()){
           if (!reg.test(this.phone)) {
-            this.$message({
-              message: '手机格式不正确',
-              type: 'warning'
-            });
-           /* this.imgCodeErr = true;
-            this.codeErrText = "手机格式不正确";*/
+            // this.$message({
+            //   message: '手机格式不正确',
+            //   type: 'warning'
+			// });
+			this.phoneErrText = '手机格式有误'
+          
             this.phone = "";
             this.phoneRg = 1;
           }else{
@@ -212,7 +239,7 @@
             // this.imgCodeErr = false;
             api.checkTel(this.phone).then((res)=>{
               if(+res.data.code == 0){
-                
+                this.phoneErrText = ''
               }else{
                 this.$message({
                   message: res.data.msg,
@@ -231,20 +258,19 @@
       },
       getMsgCode() {//获取短信验证码
         //手机号、密码、联系人、图形验证码不为空且符合规则且图形验证码正确--shenq10.26
-        console.log('sadad')
         if(!this.phone.trim() && !this.phoneRg){
           this.imgCodeErr = true;
-          this.codeErrText = "手机号不能为空";
+          this.phoneErrText = "手机号不能为空";
           /*this.$message({
             message: '手机号不能为空',
             type: 'warning'
           });*/
         }else if(!this.psw.trim()){
           this.imgCodeErr = true;
-          this.codeErrText = "密码不能为空";
+          this.pswErrText = "密码不能为空";
         }else if(!this.picCode.trim()){
           this.imgCodeErr = true;
-          this.codeErrText = "图形验证码不能为空";
+          this.imgErrText = "图形验证码不能为空";
         }else{//调请求接口
           this.imgCodeErr = false;
           const params = {
@@ -308,15 +334,17 @@
         if (psw) {
           if (psw.trim().length < 6 || psw.trim().length > 16) {
             this.imgCodeErr = true;
-            this.codeErrText = "密码长度为6-16位";
+            this.pswErrText = "密码长度为6-16位";
             this.psw = "";
           }
           else if (!pswlReg.test(psw)) {
             this.imgCodeErr = true;
-            this.codeErrText = "密码过于简单";
+            this.pswErrText = "密码过于简单";
             this.psw = "";
           }else{
-            this.imgCodeErr = false;
+			this.pswErrText = "";
+			this.imgCodeErr = false;
+			console.log()
           }
         }
 
@@ -336,7 +364,7 @@
           } else {
             // this.$message.error('短信验证码错误');
             this.imgCodeErr = true;
-            this.codeErrText = "短信验证码错误";
+            this.SMSErrText = "短信验证码错误";
             this.msgCode = "";
           }
         }).catch((err) => {
@@ -351,14 +379,16 @@
         const email = this.email;
         if (email.trim()) {
           if (!emailReg.test(email)) {
-            /*this.$message({
-              message: '邮箱格式不正确',
-              type: 'warning'
-            });*/
+          //   this.$message({
+          //     message: '邮箱格式不正确',
+          //     type: 'warning'
+          //   });
+
             this.imgCodeErr = true;
-            this.codeErrText = "邮箱格式不正确";
+            this.emailErrText = "邮箱格式不正确";
             this.email = "";
           }else{
+			this.emailErrText = "";
             this.imgCodeErr = false;
           }
         }

src/components/register/register.less

@@ -7,10 +7,10 @@
   font-weight: bold;
 }
 .login-img {
-  left: 10%;
+  left: 17.5%;
   top: 0;
   position: absolute;
-  width: 40%;
+  width: 43%;
   height: 100%;
 }
 .login-img img {
@@ -26,7 +26,7 @@
   // margin-top: 10%;
   height: 460px;//适配笔记本360
   position: absolute;
-  left: 50%;
+  left: 60%;
   top: 50%;
   transform: translate(0%, -50%);
   font-size: 12px; //默认字体
@@ -70,6 +70,7 @@
     border-bottom: 1px dashed #9c9c9c;
     font-size: 12px;
     margin-bottom: 10px;
+    
     .plan {
       display: inline-block;
       width: 149px;
@@ -96,6 +97,9 @@
   form {
     width: 286px;
     margin: auto;
+    .phoneBox {
+      position: relative;
+    }
     input {
       outline: none;
       width: 256px;
@@ -142,7 +146,7 @@
         display: inline-block;
         vertical-align: middle;
         top: 0;
-        right: -1px;
+        right: -2px;
         cursor: pointer;
       }
       .disabled {
@@ -181,7 +185,14 @@
       color: #dd0f0f;
       // margin-top: 4px;
       position: absolute;
-      bottom: 108px;
+      top: 44px;
     }
   }
-}
+
+  input:focus {
+    border: 1px solid #0952DA;
+  }
+  .error {
+    border: 1px solid #FA2828;
+  }
+}