From 71bdaaeb4c5af2b7279d45ac56850d116425bb16 Mon Sep 17 00:00:00 2001
From: Quincy_J <8194866+quincyj@user.noreply.gitee.com>
Date: Tue, 29 Jul 2025 23:11:01 +0800
Subject: [PATCH] 1

---
 src/pages.json                     |  7 +++
 src/pages/index/index.vue          |  2 +-
 src/pages/login/index.vue          | 16 ++++---
 src/pages/user/change-password.vue | 74 ++++++++++++++++++++++++++++++
 src/service/user/index.ts          |  5 ++
 src/types/uni-pages.d.ts           |  3 +-
 6 files changed, 99 insertions(+), 8 deletions(-)
 create mode 100644 src/pages/user/change-password.vue
 create mode 100644 src/service/user/index.ts

diff --git a/src/pages.json b/src/pages.json
index 7c1cdd4..b32a510 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -217,6 +217,13 @@
       "style": {
         "navigationBarTitleText": "推荐列表"
       }
+    },
+    {
+      "path": "pages/user/change-password",
+      "type": "page",
+      "style": {
+        "navigationBarTitleText": "修改密码"
+      }
     }
   ],
   "subPackages": []
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 919c5b1..3bec0ff 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -197,7 +197,7 @@ const closeUserMenu = () => {
 const handleModifyPassword = () => {
   showUserMenu.value = false
   uni.navigateTo({
-    url: '/pages/user/modify-password',
+    url: '/pages/user/change-password',
   })
 }
 
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index ed72aaa..e873b8f 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -64,12 +64,16 @@ const handleLogin = async () => {
   }
   try {
     const res = await loginAPI({ username: account.value, password: password.value })
-    uni.setStorageSync('loginData', res.data)
-    uni.setStorageSync('x-token', res.data.token)
-    useStore.setUserInfo()
-    uni.reLaunch({ url: '/pages/index/index' })
-  } catch (error) {
-    uni.showToast({ title: '登录失败', icon: 'none' })
+    if (res.code === 0) {
+      uni.setStorageSync('loginData', res.data)
+      uni.setStorageSync('x-token', res.data.token)
+      useStore.setUserInfo()
+      uni.reLaunch({ url: '/pages/index/index' })
+    } else {
+      uni.showModal({ title: '登录失败', content: res.msg || '登录失败', showCancel: false })
+    }
+  } catch (error: any) {
+    uni.showModal({ title: '登录失败', content: error?.msg || '登录失败', showCancel: false })
   }
 }
 
diff --git a/src/pages/user/change-password.vue b/src/pages/user/change-password.vue
new file mode 100644
index 0000000..03af71a
--- /dev/null
+++ b/src/pages/user/change-password.vue
@@ -0,0 +1,74 @@
+<!-- 使用 type="home" 属性设置首页，其他页面不需要设置，默认为page；推荐使用json5，更强大，且允许注释 -->
+<route lang="json5">
+{
+  style: {
+    navigationBarTitleText: '修改密码',
+  },
+}
+</route>
+<template>
+  <view class="min-h-screen flex items-center justify-center bg-gray-200 px-4">
+    <view
+      class="w-full max-w-md mx-auto bg-white rounded-2xl shadow-lg p-8 border border-gray-100 box-border mx-4"
+    >
+      <view class="mb-6 text-center">
+        <text class="text-2xl font-bold text-gray-800">修改密码</text>
+      </view>
+      <view class="mb-4">
+        <input
+          v-model="oldPassword"
+          type="password"
+          placeholder="请输入旧密码"
+          class="w-full h-12 px-4 border-2 border-gray-300 rounded-lg focus:border-pink-400 outline-none bg-gray-50 text-base transition-all duration-200 box-border"
+        />
+      </view>
+      <view class="mb-6">
+        <input
+          v-model="newPassword"
+          type="password"
+          placeholder="请输入新密码"
+          class="w-full h-12 px-4 border-2 border-gray-300 rounded-lg focus:border-pink-400 outline-none bg-gray-50 text-base transition-all duration-200 box-border"
+        />
+      </view>
+      <button
+        class="w-full h-12 bg-black text-white rounded-lg text-base font-semibold flex items-center justify-center"
+        @click="handleChangePassword"
+      >
+        <span class="w-full text-center">确定</span>
+      </button>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { changePasswordAPI } from '@/service/user'
+
+const oldPassword = ref('')
+const newPassword = ref('')
+
+const handleChangePassword = async () => {
+  if (!oldPassword.value || !newPassword.value) {
+    uni.showToast({ title: '请填写完整', icon: 'none' })
+    return
+  }
+  try {
+    const res = await changePasswordAPI({
+      oldPassword: oldPassword.value,
+      newPassword: newPassword.value,
+    })
+    console.log(111111111111111111111111)
+    console.log(res)
+    if (res.code === 0) {
+      uni.showToast({ title: '修改成功', icon: 'success' })
+      setTimeout(() => {
+        uni.navigateBack()
+      }, 1000)
+    } else {
+      uni.showModal({ title: '修改失败', content: res.msg || '修改失败', showCancel: false })
+    }
+  } catch (e: any) {
+    uni.showModal({ title: '修改失败', content: e?.msg || '修改失败', showCancel: false })
+  }
+}
+</script>
diff --git a/src/service/user/index.ts b/src/service/user/index.ts
new file mode 100644
index 0000000..001fe80
--- /dev/null
+++ b/src/service/user/index.ts
@@ -0,0 +1,5 @@
+import { request } from '@/utils/request'
+import type { BaseResponse } from '../login/type'
+
+export const changePasswordAPI = (data: { oldPassword: string; newPassword: string }) =>
+  request.post<BaseResponse<any>>('/user/updatePassword', data)
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index b4b5f09..bb95c93 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -28,7 +28,8 @@ interface NavigateToOptions {
        "/pages/my/spend" |
        "/pages/my/subordinate" |
        "/pages/my/user-info" |
-       "/pages/recommend/index";
+       "/pages/recommend/index" |
+       "/pages/user/change-password";
 }
 interface RedirectToOptions extends NavigateToOptions {}