From eb93ad889a68020a5317b31aa6ea0512b5f4dbd3 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 19 Mar 2025 14:56:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8C=82=E8=B4=A6?=
 =?UTF-8?q?=E6=8C=89=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E8=BF=98=E6=AC=BE?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/account/sysUser.ts                    |  57 +++++++
 .../NavBar/components/UserProfile.vue         | 140 +++++++++++++++++-
 .../components/detail/credit_repayment.vue    |   9 +-
 src/views/tool/Instead/components/order.vue   |   3 +-
 4 files changed, 203 insertions(+), 6 deletions(-)
 create mode 100644 src/api/account/sysUser.ts

diff --git a/src/api/account/sysUser.ts b/src/api/account/sysUser.ts
new file mode 100644
index 0000000..94fbb9d
--- /dev/null
+++ b/src/api/account/sysUser.ts
@@ -0,0 +1,57 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/sysUser";
+const API = {
+  getList(params: any) {
+    return request({
+      url: `${baseURL}`,
+      method: "get",
+      params
+    });
+  },
+  edit(data: any) {
+    return request({
+      url: `${baseURL}`,
+      method: "put",
+      data: data,
+    });
+  },
+  delete(data: any) {
+    return request({
+      url: `${baseURL}`,
+      method: "delete",
+      data: data,
+    });
+  },
+  add(data: any) {
+    return request({
+      url: `${baseURL}`,
+      method: "post",
+      data: data,
+    });
+  },
+  detail(params: any) {
+    return request({
+      url: `${baseURL}/detail`,
+      method: "get",
+      params
+    });
+  },
+
+  download(params: any) {
+    return request({
+      url: `${baseURL}/download`,
+      method: "get",
+      params
+    });
+  },
+  pwd(data: any) {
+    return request({
+      url: `${baseURL}/pwd`,
+      method: "put",
+      data
+    });
+  }
+
+}
+export default API;
diff --git a/src/layout/components/NavBar/components/UserProfile.vue b/src/layout/components/NavBar/components/UserProfile.vue
index 118d275..609eede 100644
--- a/src/layout/components/NavBar/components/UserProfile.vue
+++ b/src/layout/components/NavBar/components/UserProfile.vue
@@ -8,18 +8,71 @@
     <template #dropdown>
       <el-dropdown-menu>
         <el-dropdown-item @click="handleOpenUserProfile">店铺配置</el-dropdown-item>
-        <el-dropdown-item divided>修改密码</el-dropdown-item>
+        <el-dropdown-item divided @click="dialogVisible = true">修改密码</el-dropdown-item>
         <el-dropdown-item divided @click="logout">退出登录</el-dropdown-item>
       </el-dropdown-menu>
     </template>
   </el-dropdown>
+  <el-dialog
+    title="修改密码"
+    modal-append-to-body
+    append-to-body
+    v-model="dialogVisible"
+    width="400px"
+  >
+    <el-form ref="refForm" :model="form" :rules="rules">
+      <el-form-item label="旧密码" prop="oldPass">
+        <el-input :type="ip1Type" v-model="form.oldPass" placeholder="请输入旧密码">
+          <template #suffix>
+            <i
+              :class="`el-input__icon ${
+                ip1Type == 'text' ? 'el-icon-view' : 'el-icon-remove-outline'
+              }`"
+              @click.stop="changeInputType('ip1Type')"
+            ></i>
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="新密码" prop="newPass">
+        <el-input :type="ip2Type" v-model="form.newPass" placeholder="请输入新密码">
+          <template #suffix>
+            <i
+              :class="`el-input__icon ${
+                ip2Type == 'text' ? 'el-icon-view' : 'el-icon-remove-outline'
+              }`"
+              @click.stop="changeInputType('ip2Type')"
+            ></i>
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="确认新密码" prop="rnewPass">
+        <el-input :type="ip3Type" v-model="form.rnewPass" placeholder="请再次输入新密码">
+          <template #suffix>
+            <i
+              :class="`el-input__icon ${
+                ip3Type == 'text' ? 'el-icon-view' : 'el-icon-remove-outline'
+              }`"
+              @click.stop="changeInputType('ip3Type')"
+            ></i>
+          </template>
+        </el-input>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" :loading="formLoading" @click="submitHandle">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup lang="ts">
+import sysUser from "@/api/account/sysUser";
 defineOptions({
   name: "UserProfile",
 });
-
+import { ElNotification } from "element-plus";
 import { useTagsViewStore, useUserStore } from "@/store";
 
 const tagsViewStore = useTagsViewStore();
@@ -28,6 +81,89 @@ const userStore = useUserStore();
 const route = useRoute();
 const router = useRouter();
 
+const dialogVisible = ref(false);
+const formLoading = ref(false);
+
+const state = reactive({
+  ip1Type: "password",
+  ip2Type: "password",
+  ip3Type: "password",
+});
+const { ip1Type, ip2Type, ip3Type } = toRefs(state);
+const form = reactive({
+  oldPass: "",
+  newPass: "",
+  rnewPass: "",
+});
+// 修改密码框类型
+function changeInputType(key: "ip1Type" | "ip2Type" | "ip3Type") {
+  if (state[key] == "text") {
+    state[key] = "password";
+  } else {
+    state[key] = "text";
+  }
+}
+const validateNewPass = (rule: any, value: string, callback: (error?: Error) => void) => {
+  if (!form.newPass) {
+    callback(new Error(" "));
+  } else if (form.newPass === form.oldPass) {
+    callback(new Error("请输入与旧密码不同的新密码"));
+  } else {
+    callback();
+  }
+};
+const validateRnewPass = (rule: any, value: string, callback: (error?: Error) => void) => {
+  if (!form.rnewPass) {
+    callback(new Error(" "));
+  } else if (form.rnewPass !== form.newPass) {
+    callback(new Error("两次密码输入不一致"));
+  } else {
+    callback();
+  }
+};
+const rules = {
+  oldPass: [
+    {
+      required: true,
+      message: " ",
+      trigger: "blur",
+    },
+  ],
+  newPass: [
+    {
+      required: true,
+      validator: validateNewPass,
+      trigger: "blur",
+    },
+  ],
+  rnewPass: [
+    {
+      required: true,
+      validator: validateRnewPass,
+      trigger: "blur",
+    },
+  ],
+};
+const refForm = ref();
+// 提交修改密码
+function submitHandle() {
+  refForm.value.validate(async (vaild: boolean) => {
+    if (vaild) {
+      try {
+        formLoading.value = true;
+        const res = await sysUser.pwd({
+          originalPassword: form.oldPass,
+          checkPassword: form.newPass,
+          password: form.newPass,
+        });
+        ElNotification.success("修改成功，请重新登陆");
+      } catch (error) {
+        formLoading.value = false;
+        console.log(error);
+      }
+    }
+  });
+}
 /**
  * 打开个人中心页面
  */
diff --git a/src/views/data/credit/components/detail/credit_repayment.vue b/src/views/data/credit/components/detail/credit_repayment.vue
index 9a7bbf0..fd6b74a 100644
--- a/src/views/data/credit/components/detail/credit_repayment.vue
+++ b/src/views/data/credit/components/detail/credit_repayment.vue
@@ -5,6 +5,7 @@
       :show-close="false"
       v-model="dialogVisible"
       :close-on-click-modal="false"
+      @close="reset"
       width="30%"
       center
     >
@@ -122,8 +123,7 @@ export default {
               res = await creditOrderApi.pay(this.form);
             }
             ElMessage({
-              title: "成功",
-              message: res.repaymentMsg,
+              message: "还款成功",
               type: "success",
             });
             this.dialogVisible = false;
@@ -145,7 +145,8 @@ export default {
       this.form = { ...this.resetForm };
       if (row.creditBuyerId) {
         this.form.creditBuyerId = row.creditBuyerId;
-        this.form.orderId = order.id;
+        this.form.orderId = order.orderId;
+        this.form.id = order.id;
       } else {
         this.form.id = row.id;
       }
@@ -168,6 +169,8 @@ export default {
 
     reset() {
       this.query = { ...this.resetQuery };
+      this.form.id = "";
+      this.form.orderId = "";
     },
   },
 };
diff --git a/src/views/tool/Instead/components/order.vue b/src/views/tool/Instead/components/order.vue
index 38ff990..3fdb7b2 100644
--- a/src/views/tool/Instead/components/order.vue
+++ b/src/views/tool/Instead/components/order.vue
@@ -378,9 +378,10 @@ async function pointsInit() {
   if (!props.user.id || score.sel == -1) {
     return;
   }
+  const orderAmount = currentpayMoney.value - pointsDiscountAmount.value;
   const res = await PointsApi.calcOrderUsablePoints({
     shopUserId: props.user.id,
-    orderAmount: currentpayMoney.value - pointsDiscountAmount.value,
+    orderAmount: orderAmount <= 0 ? 0 : orderAmount,
   });
   pointsRes.value = res;
   usePointsNumber.value = res.usable ? res.maxUsablePoints : 0;