Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

src/layout/index.vue

@@ -140,13 +140,13 @@ export default {
         removeToken();
         sessionStorage.clear();
         this.$store.dispatch("app/toggleOutflag", false);
-        this.$router.push(`/login?redirect=${this.$route.fullPath}`);
+        this.$router.push(`/login`);
         location.reload();
       } else {
         sessionStorage.removeItem("userName");
         this.$store.dispatch("app/toggleOutflag", false);
         const res = await this.$store.dispatch("user/logout");
-        this.$router.push(`/login?redirect=${this.$route.fullPath}`);
+        this.$router.push(`/login`);
       }
     },
     //修改密码

src/views/accountManagement/components/accountHome.vue

@@ -154,7 +154,8 @@ export default {
       },
       ruleFormObj: {},
       roleId: '',
-      msgIndex: null
+      msgIndex: null,
+      oldPwd: ''
     }
   },
   computed: {
@@ -201,7 +202,9 @@ export default {
     // 编辑账号
     async saveEditAccount () {
       try {
-        this.ruleForm.user_pwd = MD5(this.ruleForm.user_pwd)
+        if (this.oldPwd !== this.ruleForm.user_pwd) {
+          this.ruleForm.user_pwd = MD5(this.ruleForm.user_pwd)
+        }
         const res = await GeneralDataReception({
           serviceId: SERVICE_ID.accountScId,
           dataContent: JSON.stringify(this.ruleForm)
@@ -246,6 +249,7 @@ export default {
         const { listValues } = res.returnData
         const obj = listValues[0]
         this.ruleForm = obj
+        this.oldPwd = obj.user_pwd
         this.ruleForm.event = 2
       } else {
         this.$message.error(res.message)
@@ -291,7 +295,7 @@ export default {
     // 修改状态
     async userActiveToggle (item) {
       item.event = 2
-      item.user_status = item.Flag ? 1 : 2
+      item.user_status = item.Flag ? 2 : 0
       try {
         const result = await GeneralDataReception({
           serviceId: SERVICE_ID.accountScId,
@@ -349,7 +353,7 @@ export default {
           if (newDatas && newDatas.length) {
             this.pages = result.returnData.pages
             newDatas.forEach(element => {
-              element.Flag = element.user_status == 1 ? true : false
+              element.Flag = element.user_status == 1 || element.user_status == 2 ? true : false
               this.accountArr.push(element)
             })
             this.msgIndex = this.PageIndex