找回密码合并

src/views/home/login.vue

@@ -102,19 +102,19 @@
         </div>
       </div>
     </div>
-    <!-- 手机找回密码 -->
+    <!-- 手机or邮箱找回密码 -->
     <div class="login-block" v-if="loginTab===2">
       <div class="contain">
-        <h2>找回密码</h2>
-        <h4>Retrieve password</h4>
-        <!-- <div class="tab-box">
+        <!-- <h2>找回密码</h2>
+        <h4>Retrieve password</h4> -->
+        <div class="tab-box">
           <span :class='{active:operateType=="mobile"}' @click="operateType='mobile'">手机找回</span>
           <span :class='{active:operateType=="email"}' @click="operateType='email'">邮箱找回</span>
-        </div> -->
-        <!-- <div class="login-line" v-if="operateType=='email'">
+        </div>
+        <div class="login-line" v-if="operateType=='email'">
           <span><i class="iconfont icon-tubiao01"></i></span>
           <input class="input" v-model="setParam.username" type="text" placeholder="请输入您的邮箱">
-        </div> -->
+        </div>
         <div v-if="operateType=='mobile'">
           <div class="login-line">
             <span v-if="operateType=='email'"><i class="iconfont icon-tubiao01"></i></span>
@@ -155,10 +155,11 @@
           <p class="warning" v-show="messageCodeisError">*短信验证码错误</p>
         </div>
         <div class="submit-line">
-          <!-- <el-button class="loginBtn cursor" @click="" v-if="operateType=='email'" :loading="codeLoad">
+          <el-button class="loginBtn cursor" @click="" v-if="operateType=='email'" :loading="codeLoad">
             <span v-if="codestate===0" @click="pwdSend()">发送邮件</span>
             <span v-if="codestate===1">已发送{{secondNum}}</span>
-          </el-button> -->
+            <button v-if="codestate===2" @click="pwdSend()">重新发送</button>
+          </el-button>
           <el-button class="loginBtn cursor" @click="reSetPwd" v-if="operateType=='mobile'" :loading="setLoad">修改密码</el-button>
         </div>
       </div>
@@ -333,7 +334,7 @@ export default{
         this.loginTab = 2;
         this.operateType='mobile'
       }else if(this.operateType=='email'){
-        this.loginTab = 4;
+        this.loginTab = 2;
         this.operateType='email'
       }