From 8b2ed251098abb290bfd3b1993788a0732a885d3 Mon Sep 17 00:00:00 2001
From: Dawn1Ocean <1785590531@qq.com>
Date: Mon, 22 Apr 2024 21:05:27 +0800
Subject: [PATCH] fix: request before getting token

---
 src/app.config.ts                   |  1 +
 src/pages/Loading/Loading.config.ts |  3 +++
 src/pages/Loading/Loading.scss      |  0
 src/pages/Loading/Loading.tsx       | 24 ++++++++++++++++++++++++
 src/plain-text/NavBarTitle.ts       |  3 +++
 src/service/login.ts                |  3 +++
 src/service/pingAte.ts              | 17 +++++++++--------
 7 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 src/pages/Loading/Loading.config.ts
 create mode 100644 src/pages/Loading/Loading.scss
 create mode 100644 src/pages/Loading/Loading.tsx

diff --git a/src/app.config.ts b/src/app.config.ts
index 8dac34c..0a77a33 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -1,5 +1,6 @@
 export default defineAppConfig({
   pages: [
+    'pages/Loading/Loading',
     'pages/index/index',
     'pages/repair/repair',
     'pages/user/user',
diff --git a/src/pages/Loading/Loading.config.ts b/src/pages/Loading/Loading.config.ts
new file mode 100644
index 0000000..a9ca517
--- /dev/null
+++ b/src/pages/Loading/Loading.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+  usingComponents: {},
+});
diff --git a/src/pages/Loading/Loading.scss b/src/pages/Loading/Loading.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/Loading/Loading.tsx b/src/pages/Loading/Loading.tsx
new file mode 100644
index 0000000..2fd46bc
--- /dev/null
+++ b/src/pages/Loading/Loading.tsx
@@ -0,0 +1,24 @@
+import { AtActivityIndicator } from 'taro-ui';
+import { Component, ReactNode } from 'react';
+import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
+import { View } from '@tarojs/components';
+import './Loading.scss';
+
+export default class LoadingPage extends Component {
+  componentDidMount(): void {
+    Taro.setNavigationBarTitle({
+      title: pt.get().navBar.loading,
+    });
+  }
+  render(): ReactNode {
+    return (
+      <View>
+        <AtActivityIndicator
+          mode='center'
+          content={pt.get().actIndicator.loading}
+        ></AtActivityIndicator>
+      </View>
+    );
+  }
+}
diff --git a/src/plain-text/NavBarTitle.ts b/src/plain-text/NavBarTitle.ts
index 044b905..3cf6e84 100644
--- a/src/plain-text/NavBarTitle.ts
+++ b/src/plain-text/NavBarTitle.ts
@@ -1,5 +1,6 @@
 export interface NavBarTitle {
   notFound: string;
+  loading: string;
   ticketDetail: string;
   ticketList: string;
   askLeave: string;
@@ -16,6 +17,7 @@ export interface NavBarTitle {
 
 export const navBarTitleZhCn: NavBarTitle = {
   notFound: '连接失败',
+  loading: '加载中',
   ticketDetail: '工单详情',
   ticketList: '所有工单',
   askLeave: '请假单填写',
@@ -32,6 +34,7 @@ export const navBarTitleZhCn: NavBarTitle = {
 
 export const navBarTitleEnUs: NavBarTitle = {
   notFound: 'Failed',
+  loading: 'Loading',
   ticketDetail: 'Ticket Detail',
   ticketList: 'All Tickets',
   askLeave: 'Ask for leave',
diff --git a/src/service/login.ts b/src/service/login.ts
index c6d30fe..6c9831c 100644
--- a/src/service/login.ts
+++ b/src/service/login.ts
@@ -21,6 +21,9 @@ export function loginAte() {
               data: data.token,
             });
             wechatUser.setToken(data.token);
+            Taro.reLaunch({
+              url: '/pages/index/index',
+            });
             getLocaleData();
           })
           .catch((err) => {
diff --git a/src/service/pingAte.ts b/src/service/pingAte.ts
index 83346b3..bf9ac19 100644
--- a/src/service/pingAte.ts
+++ b/src/service/pingAte.ts
@@ -13,14 +13,15 @@ export function pingAte() {
   })
     .then((res) => {
       console.log(res.data);
-      checkLogin((success) => {
-        if (success) {
-          wechatUser.setToken(checkToken());
-          getInfo();
-        } else {
-          loginAte();
-        }
-      });
+      // checkLogin((success) => {
+      //   if (success) {
+      //     wechatUser.setToken(checkToken());
+      //     getInfo();
+      //   } else {
+      //     loginAte();
+      //   }
+      // });
+      loginAte();
     })
     .catch((err) => {
       console.log(err.errMsg);