Dawn_Ocean
/
EVA-Notify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: dutyinfo display in mainpage

mgy
Dawn1Ocean 2024-05-10 10:42:44 +08:00
parent 54d9dc45b4
commit 96dc81bd82
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/index/DutyInfo.tsx
View File

@ -92,13 +92,13 @@ export class DutyInfo extends Component {
{ {
title: title:
data.currentDuty == '0' data.currentDuty == '0'
? pt.get().mainPage.normal.reason ? od.reason(pt.get().common.offDutyReason)
: od.reason(data.offDutyReason as string), : od.reason(data.offDutyReason as string),
}, },
{ {
title: title:
data.currentDuty == '0' data.currentDuty == '0'
? pt.get().mainPage.normal.recoverTime ? od.recoverTime(pt.get().common.dutyRecoverTime)
: od.recoverTime(data.dutyRecoverTime as string), : od.recoverTime(data.dutyRecoverTime as string),
}, },
]} ]}

4
src/service/memberDutyInfo.ts
View File

@ -20,14 +20,14 @@ export function getMemberDutyInfo(that: MainPage) {
if (!data.isInDuty) { if (!data.isInDuty) {
that.setState({ that.setState({
dutyData: { dutyData: {
...that.state.dutyData, ...data,
offDutyReason: pt.get().common.offDutyReason, offDutyReason: pt.get().common.offDutyReason,
}, },
}); });
if (data.currentDuty === '0') { if (data.currentDuty === '0') {
that.setState({ that.setState({
dutyData: { dutyData: {
...that.state.dutyData, ...data,
place: pt.get().common.place, place: pt.get().common.place,
}, },
}); });

4
src/service/ticketList.ts
View File

@ -14,7 +14,7 @@ export function getTicketList(that: TicketListPage) {
token: wechatUser.getToken(), token: wechatUser.getToken(),
pageId: that.state.currentPage, pageId: that.state.currentPage,
count: that.state.pageSize, count: that.state.pageSize,
querytype: 0, queryType: 0,
}, },
}) })
.then((res) => { .then((res) => {
@ -67,7 +67,7 @@ export function searchTicketList(that: TicketListPage) {
pageId: that.state.currentPage, pageId: that.state.currentPage,
count: that.state.pageSize, count: that.state.pageSize,
value: that.state.search, value: that.state.search,
querytype: 0, queryType: 0,
}, },
}) })
.then((res) => { .then((res) => {