From 6941b869c7e60c4584a49b76778e430973fc6ee4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 17 Dec 2023 18:57:08 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=EF=BC=9A=E6=8E=A5=E5=85=A5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/api/member/user.js                      |  13 +++
 sheep/api/user.js                             |  24 ----
 .../components/change-password.vue            | 105 ++++++++----------
 .../components/reset-password.vue             |   2 +-
 sheep/hooks/useModal.js                       |   9 +-
 sheep/store/modal.js                          |   3 +-
 6 files changed, 68 insertions(+), 88 deletions(-)

diff --git a/sheep/api/member/user.js b/sheep/api/member/user.js
index f0aba4c..38ed110 100644
--- a/sheep/api/member/user.js
+++ b/sheep/api/member/user.js
@@ -1,6 +1,19 @@
 import request from '@/sheep/request2';
 
 const UserApi = {
+  // 修改密码
+  updateUserPassword: (data) => {
+    return request({
+      url: '/app-api/member/user/update-password',
+      method: 'PUT',
+      data,
+      custom: {
+        loadingMsg: '验证中',
+        showSuccess: true,
+        successMsg: '修改成功'
+      },
+    });
+  },
   // 重置密码
   resetUserPassword: (data) => {
     return request({
diff --git a/sheep/api/user.js b/sheep/api/user.js
index ee153b7..6021a10 100644
--- a/sheep/api/user.js
+++ b/sheep/api/user.js
@@ -93,18 +93,6 @@ export default {
 			},
 		}),
 
-	// 修改密码
-	changePassword: (data) =>
-		request({
-			url: '/user/api/user/changePassword',
-			method: 'POST',
-			data,
-			custom: {
-				showSuccess: true,
-				loadingMsg: '验证中',
-			},
-		}),
-
 	// 绑定、更换手机号
 	changeMobile: (data) =>
 		request({
@@ -117,18 +105,6 @@ export default {
 			},
 		}),
 
-	// 修改用户名
-	changeUsername: (data) =>
-		request({
-			url: '/user/api/user/changeUsername',
-			method: 'POST',
-			data,
-			custom: {
-				showSuccess: true,
-				loadingMsg: '验证中',
-			},
-		}),
-
 	// 更新小程序信息
 	updateMpUserInfo: (data) =>
 		request({
diff --git a/sheep/components/s-auth-modal/components/change-password.vue b/sheep/components/s-auth-modal/components/change-password.vue
index 0e0af5c..b02ea02 100644
--- a/sheep/components/s-auth-modal/components/change-password.vue
+++ b/sheep/components/s-auth-modal/components/change-password.vue
@@ -1,4 +1,4 @@
-<!-- 修改密码 - changePassword  -->
+<!-- 修改密码（登录时）  -->
 <template>
   <view>
     <!-- 标题栏 -->
@@ -16,29 +16,32 @@
       labelWidth="140"
       labelAlign="center"
     >
-      <uni-forms-item name="oldPassword" label="旧密码">
+      <uni-forms-item name="code" label="验证码">
         <uni-easyinput
-          placeholder="请输入旧密码"
-          v-model="state.model.oldPassword"
-          type="text"
+          placeholder="请输入验证码"
+          v-model="state.model.code"
+          type="number"
+          maxlength="4"
           :inputBorder="false"
-        />
+        >
+          <template v-slot:right>
+            <button
+              class="ss-reset-button code-btn code-btn-start"
+              :disabled="state.isMobileEnd"
+              :class="{ 'code-btn-end': state.isMobileEnd }"
+              @tap="getSmsCode('changePassword')"
+            >
+              {{ getSmsTimer('resetPassword') }}
+            </button>
+          </template>
+        </uni-easyinput>
       </uni-forms-item>
 
-      <uni-forms-item name="newPassword" label="新密码">
+      <uni-forms-item name="reNewPassword" label="密码">
         <uni-easyinput
           type="password"
-          placeholder="请输入新密码"
-          v-model="state.model.newPassword"
-          :inputBorder="false"
-        />
-      </uni-forms-item>
-
-      <uni-forms-item name="reNewPassword" label="确认密码">
-        <uni-easyinput
-          type="password"
-          placeholder="请重新输入您的新密码"
-          v-model="state.model.reNewPassword"
+          placeholder="请输入密码"
+          v-model="state.model.password"
           :inputBorder="false"
         >
           <template v-slot:right>
@@ -50,69 +53,51 @@
       </uni-forms-item>
     </uni-forms>
 
-    <view class="editPwd-btn-box ss-m-t-80">
-      <button class="ss-reset-button forgot-btn" @tap="showAuthModal('resetPassword')">
-        忘记密码
-      </button>
-    </view>
+    <button class="ss-reset-button type-btn" @tap="closeAuthModal">
+      取消修改
+    </button>
   </view>
 </template>
 
 <script setup>
-  import { computed, watch, ref, reactive, unref } from 'vue';
-  import sheep from '@/sheep';
-  import { password } from '@/sheep/validate/form';
-  import { showAuthModal, closeAuthModal } from '@/sheep/hooks/useModal';
+  import { ref, reactive, unref } from 'vue';
+  import { code, password } from '@/sheep/validate/form';
+  import { closeAuthModal, getSmsCode, getSmsTimer } from '@/sheep/hooks/useModal';
+  import UserApi from '@/sheep/api/member/user';
 
   const changePasswordRef = ref(null);
 
   // 数据
   const state = reactive({
-    isMobileEnd: false, // 手机号输入完毕
     model: {
-      oldPassword: '', //旧密码
-      newPassword: '', //新密码
-      reNewPassword: '', //确认密码
+      mobile: '', // 手机号
+      code: '', // 验证码
+      password: '', // 密码
     },
     rules: {
-      oldPassword: password,
-      newPassword: password,
-      reNewPassword: {
-        rules: [
-          {
-            required: true,
-            errorMessage: '请确认密码',
-          },
-          {
-            validateFunction: function (rule, value, data, callback) {
-              if (value !== state.model.newPassword) {
-                callback('两次输入的密码不一致');
-              }
-              if (value === state.model.oldPassword) {
-                callback('新密码不能与旧密码相同');
-              }
-              return true;
-            },
-          },
-        ],
-      },
+      code,
+      password,
     },
   });
 
-  // 6.更改密码
+  // 更改密码
   async function changePasswordSubmit() {
+    // 参数校验
     const validate = await unref(changePasswordRef)
       .validate()
       .catch((error) => {
         console.log('error: ', error);
       });
-    if (!validate) return;
-    sheep.$api.user.changePassword(state.model).then((res) => {
-      if (res.error === 0) {
-        sheep.$store('user').getInfo();
-        closeAuthModal();
-      }
-    });
+    if (!validate) {
+      return;
+    }
+    // 发起请求
+    const { code } = await UserApi.updateUserPassword(state.model);
+    if (code !== 0) {
+      return;
+    }
+    // 成功后，只需要关闭弹窗
+    closeAuthModal();
   }
 </script>
 
diff --git a/sheep/components/s-auth-modal/components/reset-password.vue b/sheep/components/s-auth-modal/components/reset-password.vue
index 5352043..bc1be8b 100644
--- a/sheep/components/s-auth-modal/components/reset-password.vue
+++ b/sheep/components/s-auth-modal/components/reset-password.vue
@@ -1,4 +1,4 @@
-<!-- 重置密码 - resetPassword--  -->
+<!-- 重置密码（未登录时）  -->
 <template>
   <view>
     <!-- 标题栏 -->
diff --git a/sheep/hooks/useModal.js b/sheep/hooks/useModal.js
index 20a7468..377c07c 100644
--- a/sheep/hooks/useModal.js
+++ b/sheep/hooks/useModal.js
@@ -58,7 +58,7 @@ export function closeMenuTools() {
 }
 
 // 发送短信验证码  60秒
-export function getSmsCode(event, mobile = '') {
+export function getSmsCode(event, mobile) {
   const modalStore = $store('modal');
   const lastSendTimer = modalStore.lastTimer[event];
   if (typeof lastSendTimer === 'undefined') {
@@ -72,7 +72,8 @@ export function getSmsCode(event, mobile = '') {
     $helper.toast('请稍后再试');
     return;
   }
-  if (!test.mobile(mobile)) {
+  // 只有 mobile 非空时才校验。因为部分场景（修改密码），不需要输入手机
+  if (mobile && !test.mobile(mobile)) {
     $helper.toast('手机号码格式不正确');
     return;
   }
@@ -82,6 +83,10 @@ export function getSmsCode(event, mobile = '') {
   switch (event) {
     case 'resetPassword':
       scene = 4;
+      break;
+    case 'changePassword':
+      scene = 3;
+      break;
   }
   $api.AuthUtil.sendSmsCode(mobile, scene).then((res) => {
     if (res.code === 0) {
diff --git a/sheep/store/modal.js b/sheep/store/modal.js
index a665d5d..8672ca8 100644
--- a/sheep/store/modal.js
+++ b/sheep/store/modal.js
@@ -13,10 +13,11 @@ const modal = defineStore({
       smsRegister: 0,
       changeMobile: 0,
       resetPassword: 0,
+      changePassword: 0,
     }
   }),
   persist: {
-    enabled: true, 
+    enabled: true,
     strategies: [
       {
         key: 'modal-store',