Merge branch 'feature-loginLoading-260911' into pre

src/services/modules/invoiceInformation/index.ts

@@ -22,6 +22,13 @@ export const getStatusApi = (data: PushRecordIdRequest) => {
   })
 }
 
+export const getStatusAfterLoginApi = (data: PushRecordIdRequest) => {
+  return http.get({
+    url: '/invoice-order/get-status-after-login',
+    params: data,
+  })
+}
+
 export const submitInvoiceApplyApi = (data: PushRecordIdRequest) => {
   return http.post({
     url: '/admin/invoice-order/submit-invoice-apply',

src/views/login/index.vue

@@ -73,7 +73,7 @@
 
       <div class="bold-text">未注册电子税务局</div>
       <div class="register-btn btn" @click="registerUrl">立即注册</div>
-      <div class="footer">客服电话：18813119496（微信同号）</div>
+      <div class="footer">客服电话：400-639-1811（微信同号）</div>
       <div class="footer">技术支持：要易云（北京）科技有限公司</div>
 
       <!-- 失败弹窗 -->
@@ -118,7 +118,7 @@ import {
   loginEtssmsApi,
   registerUrlApi,
 } from '@/services/modules/login'
-import { getStatusApi } from '@/services/modules/invoiceInformation'
+import { getStatusAfterLoginApi } from '@/services/modules/invoiceInformation'
 import type {
   SendTtsSmsRequest,
   LoginEtssmsRequest,
@@ -285,20 +285,31 @@ const loginBtn = useDebounceFn(async () => {
     const res: any = await loginEtssmsApi(formData)
     if (res?.access_token) {
       userStore.setAccessToken(res.access_token)
-      const statusRes = await getStatusApi({ pushRecordId: formData.pushRecordId })
       toast.close()
-      // 修改认证下的状态内容，如果已经提交，跳转到成功页
-      if (statusRes.code == 0) {
-        const { invoiceStatus, eventStatus } = statusRes.data
-        const isInvoiceSubmitted = invoiceStatus && isSubmitStatusMap.includes(invoiceStatus)
-        const isEventSubmitted = eventStatus && isSubmitEventStatusMap.includes(eventStatus)
-        if (isInvoiceSubmitted && isEventSubmitted) {
-          return router.replace({
-            path: '/login-success',
-          })
+      const statusToast = showLoadingToast({
+        message: '获取状态中…',
+        forbidClick: true,
+        duration: 0,
+      })
+      try {
+        const statusRes = await getStatusAfterLoginApi({
+          pushRecordId: formData.pushRecordId,
+        })
+        // 修改认证下的状态内容，如果已经提交，跳转到成功页
+        if (statusRes.code == 0) {
+          const { invoiceStatus, eventStatus } = statusRes.data
+          const isInvoiceSubmitted = invoiceStatus && isSubmitStatusMap.includes(invoiceStatus)
+          const isEventSubmitted = eventStatus && isSubmitEventStatusMap.includes(eventStatus)
+          if (isInvoiceSubmitted && isEventSubmitted) {
+            return router.replace({
+              path: '/login-success',
+            })
+          }
         }
+        router.replace({ path: '/invoice-information' })
+      } finally {
+        statusToast.close()
       }
-      router.replace({ path: '/invoice-information' })
     } else if (res.code == 401) {
       loginMessage.value = res.msg
       loginDialog.value = true

src/views/success/loginSuccess.vue

@@ -11,7 +11,7 @@
 
       <!-- 描述文本 -->
       <div class="desc">系统已恢复处理，正在为您继续完成开票。请保持当前登录状态。</div>
-      <div class="desc">如有疑问，可致电 18813119496 咨询。</div>
+      <div class="desc">如有疑问，可致电 400-639-1811 咨询。</div>
     </div>
   </div>
 </template>