From 3f4130615498b2aa863f75577597b9a6500a192b Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Fri, 6 Sep 2024 20:02:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=90=8E=E4=B8=8D=E5=BC=B9=E5=87=BA=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=8F=90=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/setting/components/VerifyModel.vue | 43 +++++++++++++++-----
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/views/setting/components/VerifyModel.vue b/src/views/setting/components/VerifyModel.vue
index fc08f4b..04d97da 100644
--- a/src/views/setting/components/VerifyModel.vue
+++ b/src/views/setting/components/VerifyModel.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible" :title="title" :mask-closable="false" :esc-to-close="false"
-    :width="width >= 500 ? 500 : '100%'" draggable @before-ok="save" @close="reset">
+    :width="width >= 500 ? 500 : '100%'" draggable @before-ok="save" @ok="saveAfter" @close="reset">
     <GiForm ref="formRef" v-model="form" :options="options" :columns="columns">
       <template #captcha>
         <a-input v-model="form.captcha" placeholder="请输入验证码" :max-length="6" allow-clear style="flex: 1 1" />
@@ -18,13 +18,15 @@
 <script setup lang="ts">
 import { useWindowSize } from '@vueuse/core'
 import { Message } from '@arco-design/web-vue'
-import { getEmailCaptcha, updateUserEmail, updateUserPassword } from '@/apis'
-
+import NProgress from 'nprogress'
+import { getEmailCaptcha, updateUserEmail, updateUserPassword, updateUserPhone } from '@/apis'
 import { encryptByRsa } from '@/utils/encrypt'
 import { useUserStore } from '@/stores'
 import { type Columns, GiForm, type Options } from '@/components/GiForm'
 import { useForm } from '@/hooks'
 import * as Regexp from '@/utils/regexp'
+import modalErrorWrapper from '@/utils/modal-error-wrapper'
+import router from '@/router'
 
 const { width } = useWindowSize()
 const userStore = useUserStore()
@@ -210,17 +212,19 @@ const save = async () => {
   if (isInvalid) return false
   try {
     if (verifyType.value === 'phone') {
-      // await updateUserPhone({
-      //   phone: form.phone,
-      //   captcha: form.captcha,
-      //   oldPassword: encryptByRsa(form.oldPassword) as string
-      // })
+      await updateUserPhone({
+        phone: form.phone,
+        captcha: form.captcha,
+        oldPassword: encryptByRsa(form.oldPassword) as string
+      })
+      Message.success('修改成功')
     } else if (verifyType.value === 'email') {
       await updateUserEmail({
         email: form.email,
         captcha: form.captcha,
         oldPassword: encryptByRsa(form.oldPassword) as string
       })
+      Message.success('修改成功')
     } else if (verifyType.value === 'password') {
       if (form.newPassword !== form.rePassword) {
         Message.error('两次新密码不一致')
@@ -235,14 +239,31 @@ const save = async () => {
         newPassword: encryptByRsa(form.newPassword) || ''
       })
     }
-    Message.success('修改成功')
-    // 修改成功后，重新获取用户信息
-    await userStore.getInfo()
     return true
   } catch (error) {
     return false
   }
 }
+const saveAfter = async () => {
+  if (verifyType.value === 'password') {
+    modalErrorWrapper({
+      title: '提示',
+      content: '密码修改成功! 请保存好新密码，并使用新密码重新登录',
+      maskClosable: false,
+      escToClose: false,
+      okText: '重新登录',
+      async onOk() {
+        NProgress.done()
+        const userStore = useUserStore()
+        await userStore.logoutCallBack()
+        await router.replace('/login')
+      }
+    })
+  } else {
+    // 修改成功后，重新获取用户信息
+    await userStore.getInfo()
+  }
+}
 
 const visible = ref(false)
 // 打开弹框