Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-11-29 42295ef2ac0a5e78674cf24b62d6834138f0ffdc

 ruoyi-ui/src/views/system/user/profile/resetPwd.vue

@@ -29,7 +29,6 @@
      }
    };
    return {
      test: "1test",
      user: {
        oldPassword: undefined,
        newPassword: undefined,
@@ -55,17 +54,14 @@
    submit() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(
            response => {
              this.$modal.msgSuccess("修改成功");
            }
          );
          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
            this.$modal.msgSuccess("修改成功");
          });
        }
      });
    },
    close() {
      this.$store.dispatch("tagsView/delView", this.$route);
      this.$router.push({ path: "/index" });
      this.$tab.closePage();
    }
  }
};