Merge remote-tracking branch 'origin/master'

zhaowei

7 天以前 008245cbe95c63a80f9a255378a5ffbe25d15085

 src/views/system/modules/PasswordModal.vue

@@ -41,15 +41,15 @@
        confirmLoading: false,
        confirmDirty: false,
        validatorRules:{
          password:{
            rules: [{
              required: true,
              pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
              message: '密码由8位数字、大小写字母和特殊符号组成!'
            }, {
              validator: this.validateToNextPassword,
            }],
          },
          // password:{
          //   rules: [{
          //     required: true,
          //     pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
          //     message: '密码由8位数字、大小写字母和特殊符号组成!'
          //   }, {
          //     validator: this.validateToNextPassword,
          //   }],
          // },
          confirmpassword:{
            rules: [{
              required: true, message: '请重新输入登录密码!',
@@ -105,11 +105,17 @@
            this.confirmLoading = true;
            let formData = Object.assign(this.model, values);
            changePassword(formData).then((res)=>{
              if(res.success){
                this.$message.success(res.message);
              if(res.success){;
                this.$notification.success({
                  message:'消息',
                  description:res.message
                });
                this.$emit('ok');
              }else{
                this.$message.warning(res.message);
                this.$notification.warning({
                  message:'消息',
                  description:res.message
                });
              }
            }).finally(() => {
              this.confirmLoading = false;