fix relaunch logic in app.ts

src/app.ts

@@ -2,7 +2,6 @@ import { PropsWithChildren } from 'react';
 import { useLaunch } from '@tarojs/taro';
 import 'taro-ui/dist/style/index.scss';
 import './app.scss';
-import { getLocaleData } from './service/localeData';
 import { checkLogin, checkToken } from './service/checkLogin';
 import wechatUser from './wechat';
 import { loginAte } from './service/login';
@@ -25,7 +24,6 @@ function App({ children }: PropsWithChildren<any>) {
         loginAte();
       }
     });
-    getLocaleData();
   });
 
   // children 是将要会渲染的页面

src/pages/repair/repair.tsx

@@ -18,6 +18,7 @@ import repairLogo from '@/assets/icons/RepairPage/repair.svg';
 import DetailFramework from '@/components/DetailFramework/DetailFramework';
 import { getCurrentTicket } from '@/service/currentTicket';
 import { randomInt } from '@/utils/random';
+import wechatUser from '@/wechat';
 import './repair.scss';
 
 interface RepairPageState {
@@ -51,8 +52,8 @@ export default class RepairPage extends Component<{}, RepairPageState> {
     type: 1 as 0 | 1,
     device: '',
     deviceModel: '',
-    owner: '',
+    owner: wechatUser.getInfo().name,
-    phone: '',
+    phone: wechatUser.getInfo().phone,
     description: '',
     isLoading: false,
     isDisable: true,

src/service/getInfo.ts

@@ -2,6 +2,7 @@ import Taro from '@tarojs/taro';
 import wechatUser, { UserInfo } from '@/wechat';
 import { defaultAvatar } from '@/common';
 import { getUrl } from '.';
+import { getLocaleData } from './localeData';
 
 export function getInfo() {
   Taro.request({
@@ -16,9 +17,6 @@ export function getInfo() {
       if (res.data.success) {
         wechatUser.setInfo(data as UserInfo);
         wechatUser.setAccess(true);
-        Taro.reLaunch({
-          url: '/pages/member/member',
-        });
       } else {
         Taro.request({
           url: getUrl('/user/info'),
@@ -34,12 +32,14 @@ export function getInfo() {
               phone: info.phone,
               avatar: defaultAvatar,
             };
+            console.log(userInfo);
             wechatUser.setInfo(userInfo);
           })
           .catch((err) => {
             console.log(err);
           });
       }
+      getLocaleData();
     })
     .catch((err) => {
       console.log(err);

src/service/localeData.ts

@@ -1,5 +1,6 @@
 import Taro from '@tarojs/taro';
 import pt, { Lang } from '@/plain-text';
+import wechatUser from '@/wechat';
 import { getUrl } from '.';
 
 export function setLocaleData(lang: Lang) {
@@ -26,7 +27,9 @@ export function getLocaleData() {
     console.log(res.data);
     pt.setLang(res.data.data.lang);
     Taro.reLaunch({
-      url: '/pages/index/index',
+      url: wechatUser.getAccess()
+        ? '/pages/member/member'
+        : '/pages/index/index',
     });
   });
 }

src/service/login.ts

@@ -1,6 +1,7 @@
 import Taro from '@tarojs/taro';
 import wechatUser from '@/wechat';
 import { getUrl } from '.';
+import { getLocaleData } from './localeData';
 
 export function loginAte() {
   Taro.login({
@@ -20,6 +21,7 @@ export function loginAte() {
               data: data.token,
             });
             wechatUser.setToken(data.token);
+            getLocaleData();
           })
           .catch((err) => {
             console.log(err);