From c8dd8061b23bab7db4b0c384eedc9eea5b8d003e Mon Sep 17 00:00:00 2001 From: Dawn_Ocean <1785590531@qq.com> Date: Fri, 22 Mar 2024 16:20:15 +0800 Subject: [PATCH] add card note for members in mainPage --- src/pages/index/index.tsx | 3 +-- src/plain-text/MemberPage.ts | 9 +++++---- src/service/login.ts | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 361f25b..f6a7ba6 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -106,8 +106,7 @@ export default class MainPage extends Component<{}, MainPageState> { }; componentDidMount(): void { - const ptPage = wechatUser.getAccess() ? 'mainPage' : 'memberPage'; - + const ptPage = wechatUser.getAccess() ? 'memberPage' : 'mainPage'; this.setState({ dutyData: new DutyData(), inDutyCnt: 0, diff --git a/src/plain-text/MemberPage.ts b/src/plain-text/MemberPage.ts index 4ef45c3..0084314 100644 --- a/src/plain-text/MemberPage.ts +++ b/src/plain-text/MemberPage.ts @@ -106,8 +106,8 @@ export const memberPageZhCn: MemberPageText = { admin: '组长管理入口', }, cardTips: { - dutyInfo: '提示:可以先前往【维修】页面在线上预填写工单!', - stepInfo: '提示:请在 20:30 之前取走自己的物品哦!', + dutyInfo: '提示:如果有事不能值班,请及时请假!', + stepInfo: '提示:维修完成请清点机主物品!', tipsInfo: '', }, extraInfo: { @@ -183,8 +183,9 @@ export const memberPageEnUs: MemberPageText = { admin: 'Entry for admin', }, cardTips: { - dutyInfo: '提示:可以先前往【维修】页面在线上预填写工单!', - stepInfo: '提示:请在 20:30 之前取走自己的物品哦!', + dutyInfo: + "Tips: If you can't be on duty, please ask for an excused absence!", + stepInfo: "Tips: Inventory owner's belongings after maintenance!", tipsInfo: '', }, extraInfo: { diff --git a/src/service/login.ts b/src/service/login.ts index bde649a..976224e 100644 --- a/src/service/login.ts +++ b/src/service/login.ts @@ -26,7 +26,6 @@ export function loginAte() { .catch((err) => { console.log(err); }); - getLocaleData(); } else { console.log('Login Failed: ' + res.errMsg); }