恢复到上一个版本

src/view/layout/top/index.vue

@@ -5,14 +5,14 @@
       <h2>消防火调三维远程勘验平台<span>Three-dimensional remote prospecting platform of fire scene of Fire Resue</span></h2>
     </div>
     <div class="oper-btns" v-if="!isSystem && info">
-        <div class="user-menu">
-          <img :src="info.avatar ? info.avatar : defAvatar">
-          <span>{{info.department && info.department.name}}</span>
-          <el-dropdown>
-            <div style="outline: none;">
-              <span class="oper-down">{{info.nickName}}</span>
-              <i class="el-icon-arrow-down el-icon--right"></i>
-            </div>
+      <div class="user-menu">
+        <img :src="info.avatar ? info.avatar : defAvatar">
+        <span>{{info.department && info.department.name}}</span>
+        <el-dropdown>
+          <div style="outline: none;">
+            <span class="oper-down">{{info.nickName}}</span>
+            <i class="el-icon-arrow-down el-icon--right"></i>
+          </div>
           <template v-slot:dropdown>
             <el-dropdown-menu class="menu-items-user">
               <el-dropdown-item @click="data.show = true">修改密码</el-dropdown-item>
@@ -20,7 +20,7 @@
             </el-dropdown-menu>
           </template>
         </el-dropdown>
-        </div>
+      </div>
 
       <!-- <div class="info">
         <img src="@/assets/image/top_my.png">
@@ -31,32 +31,32 @@
       <span @click="logout"><img src="@/assets/image/top_exit.png"></span> -->
     </div>
   </div>
-  
+
   <com-dialog title="修改密码" v-model:show="data.show" @submit="updatePsw" enterText="确 定" width="486">
     <el-form ref="form" :model="data" label-width="90px">
-      
+
       <div class="stop-psw">
         <input type="text">
         <input type="password" name="" id="">
       </div>
-      
+
       <el-form-item label="手机号：" class="mandatory">
         <el-input v-model="data.phone" placeholder="请输入手机号码" disabled></el-input>
       </el-form-item>
-      <el-form-item label="原密码：" class="mandatory">
-        <el-input v-model="data.oldPwd" placeholder="请输入原密码">
-        <!-- <template v-slot:suffix>
-          <el-button type="primary" plain class="input-inner-btn" @click="sendCode" :disabled="msgStatus.status !== 0">
-            {{msgStatus.status === 2 ? `${msgStatus.miss}S后可重新发送` : '获取验证码' }}
-          </el-button>
-        </template> -->
-      </el-input>
+      <el-form-item label="验证码：" class="mandatory">
+        <el-input v-model="data.code" placeholder="请输入验证码">
+          <template v-slot:suffix>
+            <el-button type="primary" plain class="input-inner-btn" @click="sendCode" :disabled="msgStatus.status !== 0">
+              {{msgStatus.status === 2 ? `${msgStatus.miss}S后可重新发送` : '获取验证码' }}
+            </el-button>
+          </template>
+        </el-input>
       </el-form-item>
       <el-form-item label="新密码：" class="mandatory">
-        <el-input v-model="data.newPwd" type="password" placeholder="请输入8-16位数字、英文大小写组合"></el-input>
+        <el-input v-model="data.password" type="password" placeholder="请输入8-16位数字、英文大小写组合"></el-input>
       </el-form-item>
       <el-form-item label="密码确认：" class="mandatory">
-        <el-input v-model="data.confirmPwd" type="password" placeholder="请输入8-16位数字、英文大小写组合"></el-input>
+        <el-input v-model="data.confimPsw" type="password" placeholder="请输入8-16位数字、英文大小写组合"></el-input>
       </el-form-item>
     </el-form>
 
@@ -91,24 +91,20 @@ export default {
   },
   methods: {
     async updatePsw() {
-      
-      if (!PSW.REG.test(this.data.oldPwd)) {
-        return this.$message.error('请输入正确的原密码', '提示')
+      if (this.data.password !== this.data.confimPsw) {
+        return this.$message.error('两次密码不一致！', '提示')
       }
-      if (!PSW.REG.test(this.data.newPwd)) {
+      if (!PSW.REG.test(this.data.password)) {
         return this.$message.error(PSW.tip, '提示')
       }
-      if (this.data.newPwd !== this.data.confirmPwd) {
-        return this.$message.error('两次密码不一致！', '提示')
-      }
-      
-      let psw = encryption(this.data.newPwd)
+
+      let psw = encryption(this.data.password)
 
       await axios.post(updatePsw, {
-          userName: this.data.phone,
-          oldPwd: this.data.oldPwd,
-          newPwd: psw,
-          confirmPwd: psw
+        userName: this.data.phone,
+        code: this.data.code,
+        password: psw,
+        confirmPwd: psw
       })
 
       this.data.show = false
@@ -174,4 +170,4 @@ export default {
 .menu-items-user {
   transform: translate(-38px, -15px);
 }
-</style>
+</style>