Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/pages/home/active.vue

 <style lang="scss" scoped>
 .page_active{
     // overflow-y: auto;
-    background: url("https://images.shengws.com/2020/4/26/admin_avatar_1587890355876.png") no-repeat;
+    background: url("https://images.shengws.com/2020/4/27/admin_avatar_1587979750798.png") no-repeat;
     background-size:100%;
     height:114rem;
     position: relative;

src/pages/home/forgetPassword/index.vue

             <el-input
               class="phoneInput"
               placeholder="请填写手机号码"
-              v-model="forgetForm.phone"
+              v-model.trim="forgetForm.phone"
               v-on:input="watchNum"
               maxlength="11"
               @input="change(forgetForm.phone)"
           <div class="code">
             <i class="iconfont icon-dunpai dunpai"></i>
             <el-input
-              v-model="forgetForm.code"
+              v-model.trim="forgetForm.code"
               placeholder="请填写验证码"
               v-on:input="watchNum"
             ></el-input>
             <i class="el-icon-lock lock"></i>
             <el-input
               class="phoneInput"
-              v-model="psd"
+              v-model.trim="psd"
               placeholder="请填写新密码"
               show-password
               v-on:input="watchNum"

src/pages/home/login.vue

             <el-input
               placeholder="请填写手机号码"
               prefix-icon="el-icon-mobile"
-              v-model="LoginForm.tel"
+              v-model.trim="LoginForm.tel"
               clearable
-              v-on:blur="watchNum"
-              v-on:input="watchNum"
               maxlength="11"
               @input="change(LoginForm.tel)"
+              v-on:blur="watchNum"
+              v-on:input="watchNum"
             ></el-input>
           </el-form-item>
           <el-form-item>
              class="noRight"
               placeholder="请填写密码"
               prefix-icon="el-icon-lock"
-              v-model="LoginForm.psd"
+              v-model.trim="LoginForm.psd"
               show-password
               clearable
               v-on:blur="watchNum"
       this.LoginForm.tel = val.replace(/[^0-9]+/g, "");
     },
     watchNum() {
-      if (
-        this.LoginForm.tel === "" ||
-        this.LoginForm.psd === "" ||
-        this.checked == false
-      ) {
-        this.loginshow = false;
-        this.loginshowtwo = true;
-      } else {
+      // if (
+      //   this.LoginForm.tel === "" ||
+      //   this.LoginForm.psd === "" ||
+      //   this.checked == false
+      // ) {
+      //   this.loginshow = false;
+      //   this.loginshowtwo = true;
+      // } else {
+      //   this.loginshow = true;
+      //   this.loginshowtwo = false;
+      // }
+      // if (this.LoginForm.psd.length < 6) {
+      //   this.loginshow = false;
+      //   this.loginshowtwo = true;
+      // }
+      // if (this.LoginForm.psd.length > 6) {
+      //   this.loginshow = true;
+      //   this.loginshowtwo = false;
+      // }
+      // if (this.LoginForm.tel.length < 11) {
+      //   this.loginshow = false;
+      //   this.loginshowtwo = true;
+      // }
+      if(this.LoginForm.psd.length >= 6 && this.LoginForm.tel.length == 11 && this.checked == true){
         this.loginshow = true;
         this.loginshowtwo = false;
-      }
-      if (this.LoginForm.psd.length < 6) {
-        this.loginshow = false;
-        this.loginshowtwo = true;
-      }
-      if (this.LoginForm.psd.length > 6) {
-        this.loginshow = true;
-        this.loginshowtwo = false;
-      }
-      if (this.LoginForm.tel.length < 11) {
-        this.loginshow = false;
+      }else{
+          this.loginshow = false;
         this.loginshowtwo = true;
       }
     },
     LoginForm:{
       handler: function(obj) {
         //do something
-        if(obj.tel != '' && obj.psd){
+        if(obj.tel.length == 11  && obj.psd.length >= 6){
           this.loginshow = true
           this.loginshowtwo = false
         }

src/pages/home/noPassword/index.vue

             <el-input
               class="phoneInput"
               placeholder="请填写手机号码"
-              v-model="NoPassForm.phone"
+              v-model.trim="NoPassForm.phone"
               v-on:input="watchNum"
               :maxlength="11"
               @input="change(NoPassForm.phone)"
             <i class="iconfont icon-dunpai dunpai"></i>
             <el-input
               class="yzm"
-              v-model="NoPassForm.code"
+              v-model.trim="NoPassForm.code"
               placeholder="请填写验证码"
               v-on:input="watchNum"
             ></el-input>

src/pages/home/register/register.vue

             <i class="el-icon-mobile mobile"></i>
             <el-input
               placeholder="请填写手机号码"
-              v-model="registerForm.phone"
+              v-model.trim="registerForm.phone"
               v-on:input="watchNum"
               maxlength="11"
               @input="change(registerForm.phone)"
           <div class="code">
             <i class="iconfont icon-dunpai dunpai"></i>
             <el-input
-              v-model="registerForm.code"
+              v-model.trim="registerForm.code"
               placeholder="请填写验证码"
               v-on:input="watchNum"
             ></el-input>
             <i class="el-icon-lock lock"></i>
             <el-input
               v-on:input="watchNum"
-              v-model="registerForm.password"
+              v-model.trim="registerForm.password"
               show-password
               clearable
               maxlength="20"

src/pages/my/modifyPassword.vue

             <el-input
               class="phoneInput"
               placeholder="请填写手机号码"
-              v-model="forgetForm.phone"
+              v-model.trim="forgetForm.phone"
               v-on:input="watchNum"
               maxlength="11"
               readonly
           <div class="code">
             <i class="iconfont icon-dunpai dunpai"></i>
             <el-input
-              v-model="forgetForm.code"
+              v-model.trim="forgetForm.code"
               placeholder="请填写验证码"
               v-on:input="watchNum"
             ></el-input>
             <i class="el-icon-lock lock"></i>
             <el-input
               class="phoneInput"
-              v-model="psd"
+              v-model.trim="psd"
               placeholder="请填写新密码"
               show-password
               v-on:input="watchNum"