From ac4a5c02e2dfa967905b09024cce109eb9b39482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Tue, 19 Nov 2024 09:19:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E6=97=B6?=
 =?UTF-8?q?=E5=AF=B9=E6=96=B0=E5=AF=86=E7=A0=81=E8=BF=9B=E8=A1=8C=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                           |  2 +
 .env.production                            |  7 ++-
 src/utils/myFuntion.js                     |  2 +-
 src/views/system/user/profile/resetPwd.vue | 66 +++++++++++++++-------
 4 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/.env.development b/.env.development
index c76ff68..2c74a58 100644
--- a/.env.development
+++ b/.env.development
@@ -14,5 +14,7 @@ VUE_APP_BASE_API_SB = '/outApiData'
 # VUE_APP_BASE_API_HTML = "http://192.168.0.120:19002"
 # VUE_APP_BASE_API = "http://192.168.0.120:19002"
 
+
+
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.production b/.env.production
index b6bf52a..1fb15cd 100644
--- a/.env.production
+++ b/.env.production
@@ -5,6 +5,9 @@ VUE_APP_TITLE = 人口数据管理系统
 ENV = 'production'
 
 # 人口数据管理系统/生产环境
-VUE_APP_BASE_API_HTML = "http://122.193.93.182:19002"
-VUE_APP_BASE_API = 'http://122.193.93.182:19002'
+# VUE_APP_BASE_API_HTML = "http://122.193.93.182:19002"
+# VUE_APP_BASE_API = 'http://122.193.93.182:19002'
+
+VUE_APP_BASE_API_HTML = "http://localhost:8099"
+VUE_APP_BASE_API = 'http://localhost:8099'
 
diff --git a/src/utils/myFuntion.js b/src/utils/myFuntion.js
index 3ccf17e..8e2856a 100644
--- a/src/utils/myFuntion.js
+++ b/src/utils/myFuntion.js
@@ -117,7 +117,7 @@ export async function getSb(data) {
       },
     }
   );
-  console.log(res, "社保");
+  // console.log(res, "社保");
 }
 
 export function getLeaddata() {
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index f329e6e..ce661fc 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -1,13 +1,28 @@
 <template>
   <el-form ref="form" :model="user" :rules="rules" label-width="80px">
     <el-form-item label="旧密码" prop="oldPassword">
-      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
+      <el-input
+        v-model="user.oldPassword"
+        placeholder="请输入旧密码"
+        type="password"
+        show-password
+      />
     </el-form-item>
     <el-form-item label="新密码" prop="newPassword">
-      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
+      <el-input
+        v-model="user.newPassword"
+        placeholder="请输入新密码"
+        type="password"
+        show-password
+      />
     </el-form-item>
     <el-form-item label="确认密码" prop="confirmPassword">
-      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
+      <el-input
+        v-model="user.confirmPassword"
+        placeholder="请确认新密码"
+        type="password"
+        show-password
+      />
     </el-form-item>
     <el-form-item>
       <el-button type="primary" size="mini" @click="submit">保存</el-button>
@@ -21,6 +36,21 @@ import { updateUserPwd } from "@/api/system/user";
 
 export default {
   data() {
+    const validatePassword = (rule, value, callback) => {
+      const regex =
+        /^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/;
+      if (!value) {
+        callback(new Error("密码不能为空"));
+      } else if (!regex.test(value)) {
+        callback(
+          new Error(
+            "密码必须包含至少8个字符，并且包含数字、大小写字母、特殊字符4种类型"
+          )
+        );
+      } else {
+        callback();
+      }
+    };
     const equalToPassword = (rule, value, callback) => {
       if (this.user.newPassword !== value) {
         callback(new Error("两次输入的密码不一致"));
@@ -32,38 +62,36 @@ export default {
       user: {
         oldPassword: undefined,
         newPassword: undefined,
-        confirmPassword: undefined
+        confirmPassword: undefined,
       },
       // 表单校验
       rules: {
         oldPassword: [
-          { required: true, message: "旧密码不能为空", trigger: "blur" }
-        ],
-        newPassword: [
-          { required: true, message: "新密码不能为空", trigger: "blur" },
-          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" },
-          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+          { required: true, message: "旧密码不能为空", trigger: "blur" },
         ],
+        newPassword: [{ validator: validatePassword, trigger: "blur" }],
         confirmPassword: [
           { required: true, message: "确认密码不能为空", trigger: "blur" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
-        ]
-      }
+          { required: true, validator: equalToPassword, trigger: "blur" },
+        ],
+      },
     };
   },
   methods: {
     submit() {
-      this.$refs["form"].validate(valid => {
+      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.$tab.closePage();
-    }
-  }
+    },
+  },
 };
 </script>