Merge branch 'zuhuduan' of 192.168.60.201:root/dsk-operate-sys into zuhuduan

dsk-operate-ui/src/views/login.vue

@@ -45,7 +45,7 @@
             <img class="img" slot="prefix" src="../assets/images/validCode.png"/>
           </el-input>
           <div class="login-code">
-            <div class="hqyzm" @click="getsms" :class="{'disableds':smstitle!='获取验证码'}">{{smstitle}}</div>
+            <div class="hqyzm" @click="getsms" :class="{'disableds':smstitle!='获取验证码'&&smstitle!='重新获取'}">{{smstitle}}</div>
           </div>
         </el-form-item>
         <el-form-item style="width:100%;margin-top: 42px">
@@ -151,7 +151,7 @@
             <img class="img" slot="prefix" src="../assets/images/validCode.png"/>
           </el-input>
           <div class="login-code">
-            <div class="hqyzm" @click="getsms" :class="{'disableds':smstitle!='获取验证码'}">{{smstitle}}</div>
+            <div class="hqyzm" @click="getsms" :class="{'disableds':smstitle!='获取验证码'&&smstitle!='重新获取'}">{{smstitle}}</div>
           </div>
         </el-form-item>
         <el-form-item style="width:100%;margin-top: 42px">
@@ -247,6 +247,7 @@
       immediate: true
     },
     isDXlogin(){
+      this.smstitle = '获取验证码'
       this.resetForm('dxform')
       this.resetForm('loginForm')
       this.getCode()
@@ -271,28 +272,30 @@
       if(this.nosend == true){
         return false
       }
-      logincaptchaSms(this.dxform).then(res=>{
-        if(res.code == 200){
+      // logincaptchaSms(this.dxform).then(res=>{
+      //   if(res.code == 200){
+
           this.$message.success('已发送短信！')
           let _this = this
           _this.nosend = true
           this.timers = setInterval(()=>{
             _this.smstitle =  _this.smstime +'秒后重试'
             _this.smstime--;
-            if(_this.smstime <= 0){
-              _this.smstitle = '获取验证码'
+            if(_this.smstime < 0){
+              _this.smstitle = '重新获取'
               clearInterval(_this.timers)
               _this.nosend = false
+              _this.smstime = 60
             }
           },1000)
-        }else{
-          this.$message.error(res.msg)
-          this.getCode()
-          this.showcode = true
-        }
-      }).catch(res=>{
-        this.$message.error(res.msg)
-      })
+      //   }else{
+      //     this.$message.error(res.msg)
+      //     this.getCode()
+      //     this.showcode = true
+      //   }
+      // }).catch(res=>{
+      //   this.$message.error(res.msg)
+      // })
     },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {