【忘记密码】点击上一步无法退回到上一个页面

src/views/forgetpassword/index.vue

@@ -9,71 +9,36 @@
     <!-- Reset Password -->
 
     <div class="box-wrapper" v-if="active === 0">
-      <el-form
+      <el-form ref="resetForm" v-loading="formLoading" :model="form" label-width="130px" :rules="rules"
-        ref="resetForm"
+        class="demo-ruleForm" size="small">
-        v-loading="formLoading"
-        :model="form"
-        label-width="130px"
-        :rules="rules"
-        class="demo-ruleForm"
-        size="small"
-      >
         <!-- 邮箱 -->
-        <el-form-item
+        <el-form-item :label="$t('passwordReset:form:email')" prop="EmailOrPhone">
-          :label="$t('passwordReset:form:email')"
-          prop="EmailOrPhone"
-        >
           <el-col :span="18">
-            <el-input
+            <el-input v-model="form.EmailOrPhone" autocomplete="off" @change="handleEmailChange" />
-              v-model="form.EmailOrPhone"
-              autocomplete="off"
-              @change="handleEmailChange"
-            />
           </el-col>
         </el-form-item>
         <!-- 验证码 -->
-        <el-form-item
+        <el-form-item :label="$t('trials:researchForm:form:verifyCode')" required>
-          :label="$t('trials:researchForm:form:verifyCode')"
-          required
-        >
           <el-col :span="18">
             <el-form-item prop="VerificationCode">
               <el-input v-model="form.VerificationCode" autocomplete="off" />
             </el-form-item>
           </el-col>
           <el-col :span="6" style="text-align: right">
-            <el-button
+            <el-button size="small" type="primary" style="width: 80%" :disabled="sendDisabled"
-              size="small"
+              @click="handleSendCode">{{ sendTitle }}</el-button>
-              type="primary"
-              style="width: 80%"
-              :disabled="sendDisabled"
-              @click="handleSendCode"
-              >{{ sendTitle }}</el-button
-            >
           </el-col>
         </el-form-item>
       </el-form>
       <!-- 校验 -->
-      <el-button
+      <el-button size="small" type="primary" style="width: 50%; margin: auto; display: block"
-        size="small"
+        :disabled="form.VerificationCode === '' || form.EmailOrPhone === ''" @click="verifyCode">
-        type="primary"
-        style="width: 50%; margin: auto; display: block"
-        :disabled="form.VerificationCode === '' || form.EmailOrPhone === ''"
-        @click="verifyCode"
-      >
         {{ $t('passwordReset:button:verify') }}
       </el-button>
     </div>
     <div class="box-wrapper" v-show="active === 1">
-      <el-form
+      <el-form ref="resetForm2" v-loading="formLoading" :model="form"
-        ref="resetForm2"
+        :label-width="$i18n.locale === 'en' ? '180px' : '100px'" :rules="rules2" class="demo-ruleForm" size="small">
-        v-loading="formLoading"
-        :model="form"
-        :label-width="$i18n.locale === 'en' ? '180px' : '100px'"
-        :rules="rules2"
-        class="demo-ruleForm"
-        size="small"
-      >
         <!-- 用户名 -->
         <el-form-item :label="$t('passwordReset:form:userName')" prop="UserId">
           <el-input v-model="form.UserName" disabled />
@@ -105,27 +70,17 @@
           <el-input v-model="form.UserType" disabled />
         </el-form-item> -->
         <!-- 新密码 -->
-        <el-form-item
+        <el-form-item class="my_new_pwd" :label="$t('passwordReset:form:password')" prop="NewPwd"
-          class="my_new_pwd"
+          style="position: relative">
-          :label="$t('passwordReset:form:password')"
-          prop="NewPwd"
-          style="position: relative"
-        >
           <el-input v-model="form.NewPwd" show-password autocomplete="off" />
           <span style="position: absolute; right: -30px">
-            <el-tooltip
+            <el-tooltip :content="$t('passwordReset:form:passwordCentent')" placement="top">
-              :content="$t('passwordReset:form:passwordCentent')"
-              placement="top"
-            >
               <i class="el-icon-question" />
             </el-tooltip>
           </span>
         </el-form-item>
         <!-- 确认密码 -->
-        <el-form-item
+        <el-form-item :label="$t('passwordReset:form:confirmPassword')" prop="CheckPass">
-          :label="$t('passwordReset:form:confirmPassword')"
-          prop="CheckPass"
-        >
           <el-input v-model="form.CheckPass" show-password autocomplete="off" />
         </el-form-item>
       </el-form>
@@ -135,12 +90,7 @@
           {{ $t('passwordReset:button:cancel') }}
         </el-button>
         <!-- 提交 -->
-        <el-button
+        <el-button size="small" type="primary" @click="onSubmit" style="width: 46%">
-          size="small"
-          type="primary"
-          @click="onSubmit"
-          style="width: 46%"
-        >
           {{ $t('passwordReset:button:submit') }}
         </el-button>
       </div>
@@ -388,10 +338,14 @@ export default {
       }
     },
     onCancel() {
-      this.$refs['resetForm'].resetFields()
+      // this.$refs['resetForm'].resetFields()
       Object.keys(this.form).forEach((key) => {
         this.form[key] = ''
       })
+      this.sendDisabled = false
+      this.sendTitle = this.$t('passwordReset:button:send')
+      countdown = 60
+      clearTimeout(timer)
       this.active = 0
     },
     goBack() {
@@ -404,12 +358,14 @@ export default {
 .reset-wrapper {
   padding: 20px;
 }
+
 .reset-wrapper .el-page-header {
   line-height: 50px;
   border: 1px solid #ebeef5;
   border-radius: 4px;
   background-color: #fff;
 }
+
 .reset-wrapper .box-wrapper {
   width: 700px;
   margin: 20px auto;
@@ -425,6 +381,7 @@ export default {
 .is-error.my_new_pwd {
   margin-bottom: 45px;
 }
+
 .flexBox {
   display: flex;
   justify-content: center;