Forráskód Böngészése

完成回退bug修改

yuanmingze 1 hónapja
szülő
commit
a182bec7aa

+ 1 - 1
src/stores/modules/user.ts

@@ -35,7 +35,7 @@ export const useUserStore = defineStore('user', {
 
   persist: {
     key: 'user-store',
-    storage: localStorage,
+    storage: sessionStorage,
     pick: ['access_token', 'needFaceId', 'tenant_id', 'pushRecordId'],
   },
 })

+ 14 - 3
src/views/invoice-information/index.vue

@@ -137,7 +137,6 @@
 
 <script setup lang="ts">
 import { ref, reactive, onMounted } from 'vue'
-
 import { showToast, showSuccessToast } from 'vant'
 import { useRouter } from 'vue-router'
 import { useDebounceFn } from '@/utils/util'
@@ -207,23 +206,35 @@ const rejectAndReturnDialog = ref(false)
 // 拒绝并退回
 const rejectAndReturn = () => {
   rejectAndReturnDialog.value = true
+  showSuccessToast('提交成功')
 }
 
 const rejectAndReturnDialogConfirm = async () => {
+  rejectAndReturnDialog.value = false
+
   const res = await invoiceRecordInvalidateApi(params)
+
   if (res.code === 0 && res.data) {
-    showSuccessToast('提交成功')
+    await showSuccessToast({
+      message: '提交成功',
+      duration: 800,
+      forbidClick: true,
+    })
+
     setTimeout(() => {
       router.replace({
         path: '/login',
         query: {
+          from: 'reject',
           pushRecordId: userStore.pushRecordId,
         },
       })
+
       userStore.LogOut()
-    }, 1500)
+    }, 1000)
   }
 }
+
 /** 防抖包装 */
 const handleNextDebounced = useDebounceFn(handleNext, 1000)
 

+ 34 - 1
src/views/login/index.vue

@@ -89,7 +89,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onBeforeMount } from 'vue'
+import { ref, reactive, onBeforeMount, onActivated } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import { showFailToast, showSuccessToast, showToast, showLoadingToast } from 'vant'
 import {
@@ -326,10 +326,43 @@ const toAgreement = (type: string) => {
   })
 }
 
+const resetLoginState = () => {
+  formData.mobile = ''
+  formData.code = ''
+  agree.value = false
+
+  isCounting.value = false
+  countDown.value = 60
+  sending.value = false
+
+  showDialog.value = false
+  loginDialog.value = false
+  changePasswordDialog.value = false
+
+  if (timer) {
+    clearInterval(timer)
+    timer = undefined
+  }
+}
+
+onActivated(() => {
+  if (route.query.from === 'reject') {
+    resetLoginState()
+    router.replace({
+      path: route.path,
+      query: {
+        pushRecordId: route.query.pushRecordId,
+      },
+    })
+  }
+})
+
 onBeforeMount(() => {
   userStore.LogOut()
   registerUrlParams.value.returnUrl = `${location.origin}/h5${route.fullPath}`
   const pushRecordId = route?.query.pushRecordId || ''
+  console.log('pushRecordId', pushRecordId)
+
   if (pushRecordId) {
     sendEtsSms.pushRecordId = pushRecordId as string
     userStore.setPushRecordId(pushRecordId as string)