diff --git a/src/pages/index/DutyInfo.tsx b/src/pages/index/DutyInfo.tsx index 1b41a54..e80253d 100644 --- a/src/pages/index/DutyInfo.tsx +++ b/src/pages/index/DutyInfo.tsx @@ -49,7 +49,8 @@ class Card extends Component { {title} diff --git a/src/pages/index/TitleCard.tsx b/src/pages/index/TitleCard.tsx index 39fb1ac..93a5f1a 100644 --- a/src/pages/index/TitleCard.tsx +++ b/src/pages/index/TitleCard.tsx @@ -1,14 +1,25 @@ import React from 'react'; -import { View } from '@tarojs/components'; +import { View, Image } from '@tarojs/components'; import pt from '@/plain-text'; +import logo from '@/assets/images/UserPage/logo.png'; export default class TitleCard extends React.Component { render(): React.ReactNode { const mainPage = pt.get().mainPage; return ( - - {mainPage.mainTitleLine} - {mainPage.subTitleLine} + + + + + + + {mainPage.mainTitleLine} + + {mainPage.subTitleLine} + ); } diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index fd07424..4b1a78d 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -69,20 +69,20 @@ export default class MainPage extends Component<{}, MainPageState> { dutyData: new DutyData(), dutyInfoCard: { title: pt.get().mainPage.cardTitle.dutyInfo, - note: 'Tips', - extra: '额外信息', + note: pt.get().mainPage.cardTips.dutyInfo, + extra: pt.get().mainPage.extraInfo.dutyInfo, content: () => , }, stepInfoCard: { title: pt.get().mainPage.cardTitle.stepInfo, - note: 'Tips 请在20:30以前取走自己的物品哦', - extra: '额外信息', + note: pt.get().mainPage.cardTips.stepInfo, + extra: pt.get().mainPage.extraInfo.dutyInfo, content: () => , }, tipsInfoCard: { title: pt.get().mainPage.cardTitle.tipsInfo, - note: 'Tips', - extra: '额外信息', + note: pt.get().mainPage.cardTips.tipsInfo, + extra: pt.get().mainPage.extraInfo.dutyInfo, content: () => , }, // rs: new RequestState(), diff --git a/src/plain-text/MainPage.ts b/src/plain-text/MainPage.ts index ba20466..4468713 100644 --- a/src/plain-text/MainPage.ts +++ b/src/plain-text/MainPage.ts @@ -6,6 +6,16 @@ export interface MainPageText { stepInfo: string; tipsInfo: string; }; + cardTips: { + dutyInfo: string; + stepInfo: string; + tipsInfo: string; + }; + extraInfo: { + dutyInfo: string; + stepInfo: string; + tipsInfo: string; + }; expandTitle: { stepInfo: string; tipsInfo: string; @@ -31,25 +41,35 @@ export const mainPageZhCn: MainPageText = { mainTitleLine: '您好,这里是E志者协会', subTitleLine: '维修请至【东三-204】实验室', cardTitle: { - dutyInfo: '204值班情况', + dutyInfo: '204 值班情况', stepInfo: '维修步骤', tipsInfo: '注意事项', }, + cardTips: { + dutyInfo: '提示:可以先前往【维修】页面在线上预填写工单!', + stepInfo: '提示:请在 20:30 之前取走自己的物品哦!', + tipsInfo: '', + }, + extraInfo: { + dutyInfo: '', + stepInfo: '', + tipsInfo: '', + }, expandTitle: { stepInfo: '查看维修步骤', tipsInfo: '查看注意事项', }, stepList: [ { title: '线上填写工单' }, - { title: '去`东三-204`实验室维修电脑' }, + { title: '去【东三-204】实验室维修电脑' }, { title: '等待电脑维修' }, { title: '维修结束,取回电脑' }, ], tipsList: [ - { title: '戴尔、Surface、外星人、苹果电脑不能拆机哦~' }, + { title: '戴尔/外星人、Surface、苹果电脑不能拆机哦~' }, { title: '数据无价,请随时做好数据备份哦~' }, - { title: '204也是实验室,请遵守实验室纪律,请勿饮食~' }, - { title: '我们是志愿服务,不收任何礼物哦~' }, + { title: '204 也是实验室,请勿在内饮食~' }, + { title: '我们是志愿服务,不收取任何礼物哦~' }, ], dutyCard: { offDuty: { @@ -80,25 +100,35 @@ export const mainPageEnUs: MainPageText = { mainTitleLine: '您好,这里是E志者协会', subTitleLine: '维修请至【东三-204】实验室', cardTitle: { - dutyInfo: '204值班情况', + dutyInfo: '204 值班情况', stepInfo: '维修步骤', tipsInfo: '注意事项', }, + cardTips: { + dutyInfo: '提示:可以先前往【维修】页面,在线上预填写工单!', + stepInfo: '提示:请在 20:30 之前取走自己的物品哦!', + tipsInfo: '', + }, expandTitle: { stepInfo: '查看维修步骤', tipsInfo: '查看注意事项', }, + extraInfo: { + dutyInfo: '', + stepInfo: '', + tipsInfo: '', + }, stepList: [ { title: '线上填写工单' }, - { title: '去`东三-204`实验室维修电脑' }, + { title: '去【东三-204】实验室维修电脑' }, { title: '等待电脑维修' }, { title: '维修结束,取回电脑' }, ], tipsList: [ - { title: '戴尔、Surface、外星人、苹果电脑不能拆机哦~' }, + { title: '戴尔/外星人、Surface、苹果电脑不能拆机哦~' }, { title: '数据无价,请随时做好数据备份哦~' }, - { title: '204也是实验室,请遵守实验室纪律,请勿饮食~' }, - { title: '我们是志愿服务,不收任何礼物哦~' }, + { title: '204 也是实验室,请勿在内饮食~' }, + { title: '我们是志愿服务,不收取任何礼物哦~' }, ], dutyCard: { offDuty: {