From 9172a03e11a6b6b76b3ac0fbd1e5f8a09160d552 Mon Sep 17 00:00:00 2001
From: lai <10633968+laiyujun1@user.noreply.gitee.com>
Date: Thu, 20 Feb 2025 16:08:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=98=E8=AE=B0=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E6=97=B6=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order-confirm/orderConfirmModal.vue       |  14 +-
 .../_builtin/login/modules/reset-pwd.vue      |  38 +++---
 src/views/userInfo/resetpwd/index.vue         | 127 ++++++++----------
 3 files changed, 81 insertions(+), 98 deletions(-)

diff --git a/src/components/order-confirm/orderConfirmModal.vue b/src/components/order-confirm/orderConfirmModal.vue
index e7d93ee..664bef9 100644
--- a/src/components/order-confirm/orderConfirmModal.vue
+++ b/src/components/order-confirm/orderConfirmModal.vue
@@ -109,7 +109,7 @@ const handleCancel = () => {
 <style scoped>
 .order-info {
   padding: 20px;
-  background: #f8f8f8;
+  background: var(--text-color, var(--ant-text-color)); /* 使用主题变量 */
   border-radius: 8px;
   margin-bottom: 24px;
 }
@@ -127,12 +127,12 @@ const handleCancel = () => {
 
 .label {
   width: 84px;
-  color: #666;
+  color: var(--text-color, var(--ant-text-color)); /* 使用主题变量 */
 }
 
 .value {
   flex: 1;
-  color: #333;
+  color: var(--text-color, var(--ant-text-color)); /* 使用主题变量 */
 }
 
 .value.highlight {
@@ -147,7 +147,7 @@ const handleCancel = () => {
 
 .payment-methods h4 {
   margin-bottom: 16px;
-  color: #333;
+  color: var(--text-color, var(--ant-text-color)); /* 使用主题变量 */
   font-size: 14px;
   font-weight: normal;
 }
@@ -171,7 +171,7 @@ const handleCancel = () => {
 
 .method-item:hover {
   border-color: #1890ff;
-  background: #f0f5ff;
+  background: rgba(6, 42, 77, 0.192);
 }
 
 .payment-icon {
@@ -190,7 +190,7 @@ const handleCancel = () => {
 .method-item.disabled {
   opacity: 0.5;
   cursor: not-allowed;
-  background: #f5f5f5;
+  background: var(--text-color, var(--ant-text-color)); /* 使用主题变量 */
 }
 
 .balance-icon {
@@ -199,7 +199,7 @@ const handleCancel = () => {
 
 .balance-info {
   font-size: 12px;
-  color: #666;
+  color: var(--text-color, var(--ant-text-color)); /* 使用主题变量 */
   margin-top: 4px;
 }
 
diff --git a/src/views/_builtin/login/modules/reset-pwd.vue b/src/views/_builtin/login/modules/reset-pwd.vue
index 7a5539a..64ff412 100644
--- a/src/views/_builtin/login/modules/reset-pwd.vue
+++ b/src/views/_builtin/login/modules/reset-pwd.vue
@@ -79,14 +79,19 @@ async function handleSubmit() {
   try {
     await validate();
 
-    await resetPasswordByEmail({
+
+    const { error } = resetPasswordByEmail({
       email: model.email,
       code: model.code,
       password: model.password
     });
 
-    window.$message?.success(t('page.login.resetPwd.resetSuccess'));
-    toggleLoginModule('pwd-login');
+    if (!error) {
+      window.$message?.success(t('page.login.resetPwd.resetSuccess'));
+      toggleLoginModule('pwd-login');
+    }
+
+
   } catch (error) {
     console.error('Reset password failed:', error);
     window.$message?.error(t('page.login.resetPwd.resetFailed'));
@@ -97,34 +102,25 @@ async function handleSubmit() {
 <template>
   <AForm ref="formRef" :model="model" :rules="rules">
     <AFormItem name="email">
-      <AInput v-model:value="model.email" size="large" :placeholder="t('page.login.common.emailPlaceholder')" autocomplete="off"/>
+      <AInput v-model:value="model.email" size="large" :placeholder="t('page.login.common.emailPlaceholder')"
+        autocomplete="off" />
     </AFormItem>
     <AFormItem name="code">
       <div class="w-full flex-y-center gap-8px">
-        <AInput v-model:value="model.code" size="large" :placeholder="t('page.login.common.codePlaceholder')" autocomplete="off"/>
-        <AButton
-          size="small"
-          :disabled="isCounting"
-          :loading="loading"
-          @click="handleCaptcha"
-        >
+        <AInput v-model:value="model.code" size="large" :placeholder="t('page.login.common.codePlaceholder')"
+          autocomplete="off" />
+        <AButton size="small" :disabled="isCounting" :loading="loading" @click="handleCaptcha">
           {{ label }}
         </AButton>
       </div>
     </AFormItem>
     <AFormItem name="password">
-      <AInputPassword
-        v-model:value="model.password"
-        size="large"
-        :placeholder="t('page.login.common.passwordPlaceholder')"
-      />
+      <AInputPassword v-model:value="model.password" size="large"
+        :placeholder="t('page.login.common.passwordPlaceholder')" />
     </AFormItem>
     <AFormItem name="confirmPassword">
-      <AInputPassword
-        v-model:value="model.confirmPassword"
-        size="large"
-        :placeholder="t('page.login.common.confirmPasswordPlaceholder')"
-      />
+      <AInputPassword v-model:value="model.confirmPassword" size="large"
+        :placeholder="t('page.login.common.confirmPasswordPlaceholder')" />
     </AFormItem>
     <ASpace direction="vertical" size="large" class="w-full">
       <AButton type="primary" block size="large" shape="round" @click="handleSubmit">
diff --git a/src/views/userInfo/resetpwd/index.vue b/src/views/userInfo/resetpwd/index.vue
index 212097d..486f6fb 100644
--- a/src/views/userInfo/resetpwd/index.vue
+++ b/src/views/userInfo/resetpwd/index.vue
@@ -118,29 +118,40 @@ async function handleSubmit() {
   try {
     await formRef.value?.validate();
 
-    if (resetType.value === 'password') {
-      // 通过原密码重置
-      await resetPassword({
-        oldPassword: formModel.oldPassword,
-        newPassword: formModel.password
+    // if (resetType.value === 'password') {
+    //   // 通过原密码重置
+    //   await resetPassword({
+    //     oldPassword: formModel.oldPassword,
+    //     newPassword: formModel.password
+    //   });
+    // } else {
+    //   // 通过邮箱验证码重置
+    //   await resetPasswordByEmail({
+    //     email: formModel.email,
+    //     code: formModel.code,
+    //     password: formModel.password
+    //   });
+    // }
+    const { error } = await (resetType.value === 'password' ? resetPassword({
+      oldPassword: formModel.oldPassword,
+      newPassword: formModel.password
+    }) : resetPasswordByEmail({
+      email: formModel.email,
+      code: formModel.code,
+      password: formModel.password
+    }));
+
+    if (!error) {
+      message.success({
+        content: t('page.login.resetPwd.resetSuccess'),
+        duration: 2
       });
-    } else {
-      // 通过邮箱验证码重置
-      await resetPasswordByEmail({
-        email: formModel.email,
-        code: formModel.code,
-        password: formModel.password
-      });
+      // 延迟跳转
+      setTimeout(() => {
+        router.push('/userInfo/usercard');
+      }, 2000);
     }
-    message.success({
-      content: t('page.login.resetPwd.resetSuccess'),
-      duration: 2
-    });
 
-    // 延迟跳转
-    setTimeout(() => {
-      router.push('/userInfo/usercard');
-    }, 2000);
 
   } catch (error) {
     console.error('Reset password failed:', error);
@@ -169,51 +180,32 @@ const handleBack = () => {
         <a-radio value="email">{{ t('page.login.resetPwd.byEmail') }}</a-radio>
       </a-radio-group>
 
-      <a-form
-        ref="formRef"
-        :model="formModel"
-        :rules="formRules"
-        :label-col="{
-          xs: { span: 24 },
-          sm: { span: 8 },
-          md: { span: 6 }
-        }"
-        :wrapper-col="{
-          xs: { span: 24 },
-          sm: { span: 16 },
-          md: { span: 18 }
-        }"
-      >
+      <a-form ref="formRef" :model="formModel" :rules="formRules" :label-col="{
+        xs: { span: 24 },
+        sm: { span: 8 },
+        md: { span: 6 }
+      }" :wrapper-col="{
+        xs: { span: 24 },
+        sm: { span: 16 },
+        md: { span: 18 }
+      }">
         <template v-if="resetType === 'password'">
           <a-form-item name="oldPassword" :label="t('page.login.resetPwd.oldPassword')">
-            <a-input-password
-              v-model:value="formModel.oldPassword"
-              :placeholder="t('page.login.resetPwd.oldPasswordPlaceholder')"
-            />
+            <a-input-password v-model:value="formModel.oldPassword"
+              :placeholder="t('page.login.resetPwd.oldPasswordPlaceholder')" />
           </a-form-item>
         </template>
 
         <template v-else>
           <a-form-item name="email" :label="t('page.login.register.email')">
-            <a-input
-              v-model:value="formModel.email"
-              :placeholder="t('page.login.common.emailPlaceholder')"
-            />
+            <a-input v-model:value="formModel.email" :placeholder="t('page.login.common.emailPlaceholder')" />
           </a-form-item>
 
           <a-form-item name="code" :label="t('page.login.register.code')">
             <a-space>
-              <a-input
-                v-model:value="formModel.code"
-                :placeholder="t('page.login.common.codePlaceholder')"
-                style="width: 200px"
-              />
-              <a-button
-                type="primary"
-                :loading="loading"
-                :disabled="isCounting"
-                @click="handleCaptcha"
-              >
+              <a-input v-model:value="formModel.code" :placeholder="t('page.login.common.codePlaceholder')"
+                style="width: 200px" />
+              <a-button type="primary" :loading="loading" :disabled="isCounting" @click="handleCaptcha">
                 {{ label }}
               </a-button>
             </a-space>
@@ -221,26 +213,20 @@ const handleBack = () => {
         </template>
 
         <a-form-item name="password" :label="t('page.login.resetPwd.newPassword')">
-          <a-input-password
-            v-model:value="formModel.password"
-            :placeholder="t('page.login.common.passwordPlaceholder')"
-          />
+          <a-input-password v-model:value="formModel.password"
+            :placeholder="t('page.login.common.passwordPlaceholder')" />
         </a-form-item>
 
         <a-form-item name="confirmPassword" :label="t('page.login.register.confirmPassword')">
-          <a-input-password
-            v-model:value="formModel.confirmPassword"
-            :placeholder="t('page.login.common.confirmPasswordPlaceholder')"
-          />
+          <a-input-password v-model:value="formModel.confirmPassword"
+            :placeholder="t('page.login.common.confirmPasswordPlaceholder')" />
         </a-form-item>
 
-        <a-form-item
-          :wrapper-col="{
-            xs: { span: 24, offset: 0 },
-            sm: { span: 16, offset: 8 },
-            md: { span: 18, offset: 6 }
-          }"
-        >
+        <a-form-item :wrapper-col="{
+          xs: { span: 24, offset: 0 },
+          sm: { span: 16, offset: 8 },
+          md: { span: 18, offset: 6 }
+        }">
           <a-button type="primary" block @click="handleSubmit">
             {{ t('common.confirm') }}
           </a-button>
@@ -268,7 +254,8 @@ const handleBack = () => {
 }
 
 :deep(.ant-form-item-label) {
-  white-space: normal;  /* 允许标签文字换行 */
+  white-space: normal;
+  /* 允许标签文字换行 */
   height: auto;
   line-height: 1.5;
   padding-bottom: 8px;