add ping service

mock/api.ts

@@ -5,6 +5,12 @@ import ticketsList from './ticketsList.json';
 import ticketsSearch from './ticketSearch.json';
 
 export default {
+  'GET /ping': {
+    success: true,
+    data: {
+      msg: 'pong',
+    },
+  },
   'GET /duty/info': {
     success: true,
     data: {

src/app.ts

@@ -6,22 +6,21 @@ import { checkLogin, checkToken } from './service/checkLogin';
 import wechatUser from './wechat';
 import { loginAte } from './service/login';
 import { getInfo } from './service/getInfo';
+import { pingAte } from './service/pingAte';
 
 function App({ children }: PropsWithChildren<any>) {
   useLaunch(() => {
     console.log('App launched.');
-    // if (checkLogin()) {
-    //   wechatUser.setToken(checkToken());
-    //   if(getMemberInfo());
-    // } else {
-    //   loginAte();
-    // }
-    checkLogin((success) => {
-      if (success) {
-        wechatUser.setToken(checkToken());
-        getInfo();
-      } else {
-        loginAte();
+    pingAte((res) => {
+      if (res) {
+        checkLogin((success) => {
+          if (success) {
+            wechatUser.setToken(checkToken());
+            getInfo();
+          } else {
+            loginAte();
+          }
+        });
       }
     });
   });

src/pages/user/about/about.tsx

@@ -2,6 +2,7 @@ import { Component, ReactNode } from 'react';
 import { Image, View } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 import pt from '@/plain-text';
+import PageFooter from '@/components/PageFooter/PageFooter';
 import './about.scss';
 
 export default class AboutPage extends Component {
@@ -14,7 +15,10 @@ export default class AboutPage extends Component {
     return (
       <View>
         <View
-          style={{ marginTop: '60rpx', marginBottom: '60rpx' }}
+          style={{
+            marginTop: '200rpx',
+            marginBottom: '60rpx',
+          }}
           className='at-row at-row__align--start'
         >
           <View className='at-col at-col-1 at-col--auto'>
@@ -40,13 +44,13 @@ export default class AboutPage extends Component {
           </View>
         </View>
         <View
-          style={{ marginTop: '60rpx', marginBottom: '60rpx' }}
+          style={{ marginTop: '100rpx', marginBottom: '60rpx' }}
           className='at-row at-row__align--start'
         >
           <View className='at-col at-col-1 at-col--auto'>
             <Image
               style='width: 240rpx; height: 240rpx; margin-left: 60rpx; margin-right: 30rpx; margin-top: 30rpx; border-radius: 120rpx'
-              src='https://wiki.zjueva.net/images/1/10/%E5%A4%B4%E5%83%8F.jpg?20240319171222'
+              src='https://static.fracher21.top/head.jpg'
               mode='aspectFit'
             />
           </View>
@@ -65,6 +69,8 @@ export default class AboutPage extends Component {
             </View>
           </View>
         </View>
+        <View style={{ height: '200rpx' }}></View>
+        <PageFooter />
       </View>
     );
   }

src/plain-text/AboutPage.ts

@@ -23,8 +23,8 @@ export const aboutPageZhCn: AboutPageText = {
   fracher: {
     nickname: '宇航员',
     username: '@ FrozenArcher',
-    status: 'Ate 总设计, Eta 合作贡献者',
-    note: '6~',
+    status: 'Ate 总设计, 项目合作贡献者',
+    note: 'React 真是太有意思了',
   },
 };
 
@@ -38,7 +38,7 @@ export const aboutPageEnUs: AboutPageText = {
   fracher: {
     nickname: 'Fracher',
     username: '@ FrozenArcher',
-    status: "Ate's General Designer, Eta's Contributor",
-    note: '6~',
+    status: "Ate's General Designer, Project's Contributor",
+    note: 'React is so fun',
   },
 };

src/service/addToOreo.ts

@@ -32,7 +32,7 @@ export function addToOreo(that: TicketDetail) {
         isOreoLoading: false,
       });
       Taro.atMessage({
-        message: pt.get().button.submitText.error + err.errMsg.toString(),
+        message: pt.get().button.submitText.error + err.errMsg,
         type: 'error',
       });
     });

src/service/changeDutyCount.ts

@@ -39,7 +39,7 @@ export function changeDutyCnt(that: MainPage) {
         isLoading: false,
       });
       Taro.atMessage({
-        message: pt.get().button.submitText.error + err.errMsg.toString(),
+        message: pt.get().button.submitText.error + err.errMsg,
         type: 'error',
       });
     });

src/service/changeStatus.ts

@@ -40,7 +40,7 @@ export function changeStatus(that: TicketDetail, status: number) {
         isStatusLoading: false,
       });
       Taro.atMessage({
-        message: pt.get().button.submitText.error + err.errMsg.toString(),
+        message: pt.get().button.submitText.error + err.errMsg,
         type: 'error',
       });
     });

src/service/currentTicket.ts

@@ -36,7 +36,7 @@ export function getCurrentTicket(that: RepairPage) {
     .catch((err) => {
       console.log(err);
       Taro.atMessage({
-        message: pt.get().button.submitText.error + err.errMsg.toString(),
+        message: pt.get().button.submitText.error + err.errMsg,
         type: 'error',
       });
     });

src/service/memberLogin.ts

@@ -47,7 +47,7 @@ export function memberLogin(that: UserMemberPage) {
             isLoading: false,
           });
           Taro.atMessage({
-            message: pt.get().button.loginText.error + err.errMsg.toString(),
+            message: pt.get().button.loginText.error + err.errMsg,
             type: 'error',
           });
         });
@@ -57,7 +57,7 @@ export function memberLogin(that: UserMemberPage) {
         isLoading: false,
       });
       Taro.atMessage({
-        message: pt.get().button.loginText.error + err.errMsg.toString(),
+        message: pt.get().button.loginText.error + err.errMsg,
         type: 'error',
       });
     },
@@ -95,7 +95,7 @@ export function memberLogout(that: UserMemberPage) {
         isLoading: false,
       });
       Taro.atMessage({
-        message: pt.get().button.logoutText.error + err.errMsg.toString(),
+        message: pt.get().button.logoutText.error + err.errMsg,
         type: 'error',
       });
     });

src/service/pickTicket.ts

@@ -39,7 +39,7 @@ export function pickTicket(that: TicketDetail) {
         isPickLoading: false,
       });
       Taro.atMessage({
-        message: pt.get().button.submitText.error + err.errMsg.toString(),
+        message: pt.get().button.submitText.error + err.errMsg,
         type: 'error',
       });
     });

src/service/pingAte.ts

@@ -0,0 +1,18 @@
+import Taro from '@tarojs/taro';
+import { getUrl } from '.';
+
+export function pingAte(callback: (success: boolean) => void) {
+  Taro.request({
+    url: getUrl('/ping'),
+    method: 'GET',
+    data: {},
+  })
+    .then((res) => {
+      console.log(res.data);
+      callback(true);
+    })
+    .catch((err) => {
+      console.log(err.errMsg);
+      callback(false);
+    });
+}

src/service/report.ts

@@ -32,7 +32,7 @@ export function reportMessage(that: ReportPage) {
         isLoading: false,
       });
       Taro.atMessage({
-        message: pt.get().button.submitText.error + err.errMsg.toString(),
+        message: pt.get().button.submitText.error + err.errMsg,
         type: 'error',
       });
     });

src/service/retrieve.ts

@@ -39,7 +39,7 @@ export function retrieve(that: TicketDetail) {
         isRetrieveLoading: false,
       });
       Taro.atMessage({
-        message: pt.get().button.submitText.error + err.errMsg.toString(),
+        message: pt.get().button.submitText.error + err.errMsg,
         type: 'error',
       });
     });

src/service/submitComment.ts

@@ -39,7 +39,7 @@ export function submitComment(that: TicketDetail) {
         isCommentLoading: false,
       });
       Taro.atMessage({
-        message: pt.get().button.submitText.error + err.errMsg.toString(),
+        message: pt.get().button.submitText.error + err.errMsg,
         type: 'error',
       });
     });

src/service/submitTicket.ts

@@ -87,7 +87,7 @@ export function submitTicket(that: RepairPage) {
         isLoading: false,
       });
       Taro.atMessage({
-        message: pt.get().button.submitText.error + err.errMsg.toString(),
+        message: pt.get().button.submitText.error + err.errMsg,
         type: 'error',
       });
     });

src/service/userData.ts

@@ -33,7 +33,7 @@ export function updateUserInfo(that: InformPage) {
         isLoading: false,
       });
       Taro.atMessage({
-        message: pt.get().button.submitText.error + err.errMsg.toString(),
+        message: pt.get().button.submitText.error + err.errMsg,
         type: 'error',
       });
     });