diff --git a/src/pages/index/DutyInfo.tsx b/src/pages/index/DutyInfo.tsx index 6a6db10..a564e42 100644 --- a/src/pages/index/DutyInfo.tsx +++ b/src/pages/index/DutyInfo.tsx @@ -92,13 +92,13 @@ export class DutyInfo extends Component { { title: data.currentDuty == '0' - ? pt.get().mainPage.normal.reason + ? od.reason(pt.get().common.offDutyReason) : od.reason(data.offDutyReason as string), }, { title: data.currentDuty == '0' - ? pt.get().mainPage.normal.recoverTime + ? od.recoverTime(pt.get().common.dutyRecoverTime) : od.recoverTime(data.dutyRecoverTime as string), }, ]} diff --git a/src/service/memberDutyInfo.ts b/src/service/memberDutyInfo.ts index 0223930..7e0fa87 100644 --- a/src/service/memberDutyInfo.ts +++ b/src/service/memberDutyInfo.ts @@ -20,14 +20,14 @@ export function getMemberDutyInfo(that: MainPage) { if (!data.isInDuty) { that.setState({ dutyData: { - ...that.state.dutyData, + ...data, offDutyReason: pt.get().common.offDutyReason, }, }); if (data.currentDuty === '0') { that.setState({ dutyData: { - ...that.state.dutyData, + ...data, place: pt.get().common.place, }, }); diff --git a/src/service/ticketList.ts b/src/service/ticketList.ts index 3bef77e..bb0b11f 100644 --- a/src/service/ticketList.ts +++ b/src/service/ticketList.ts @@ -14,7 +14,7 @@ export function getTicketList(that: TicketListPage) { token: wechatUser.getToken(), pageId: that.state.currentPage, count: that.state.pageSize, - querytype: 0, + queryType: 0, }, }) .then((res) => { @@ -67,7 +67,7 @@ export function searchTicketList(that: TicketListPage) { pageId: that.state.currentPage, count: that.state.pageSize, value: that.state.search, - querytype: 0, + queryType: 0, }, }) .then((res) => {