diff --git a/src/pages/repair/repair.tsx b/src/pages/repair/repair.tsx index a47b3cf..b4755ff 100644 --- a/src/pages/repair/repair.tsx +++ b/src/pages/repair/repair.tsx @@ -184,9 +184,16 @@ export default class RepairPage extends Component<{}, RepairPageState> { } render(): ReactNode { - const ticketsRenderer = - this.state.currentTicketsIdName.length !== 0 ? ( - this.state.currentTicketsIdName.map((pair, idx) => ( + const hasContinuingticket = this.state.currentTicketsIdName.length !== 0; + const ticketsRenderer = hasContinuingticket ? ( + + + {pt.get().repairPage.currentTicket.hint} + + {this.state.currentTicketsIdName.map((pair, idx) => ( { middleButton={middleButton} /> - )) - ) : ( - - ); + ))} + + ) : ( + + {pt.get().repairPage.currentTicket.nohint} + + ); return ( diff --git a/src/plain-text/RepairPage.ts b/src/plain-text/RepairPage.ts index eadc1a8..393019e 100644 --- a/src/plain-text/RepairPage.ts +++ b/src/plain-text/RepairPage.ts @@ -4,6 +4,8 @@ export interface RepairPageText { title: string; note: string; extra: string; + hint: string; + nohint: string; }; typeText: { computer: string; @@ -51,6 +53,8 @@ export const repairPageZhCn: RepairPageText = { title: '', note: '', extra: '详细信息', + hint: '我正在进行的工单', + nohint: '暂无进行中的工单', }, typeText: { computer: '电脑', @@ -98,6 +102,8 @@ export const repairPageEnUs: RepairPageText = { title: '', note: '', extra: 'Details', + hint: 'My continuing tickets', + nohint: 'No continuing tickets', }, typeText: { computer: 'Computer', diff --git a/src/service/currentTicket.ts b/src/service/currentTicket.ts index 49fb630..0d8f972 100644 --- a/src/service/currentTicket.ts +++ b/src/service/currentTicket.ts @@ -16,19 +16,21 @@ export function getCurrentTicket(that: RepairPage) { .then((res) => { const data = res.data.data; let newIdNameList: Array> = []; - data.list.map((ticket: TicketListItem) => { - if ( - ticket['status'] !== 3 && - ticket['status'] !== 5 && - ticket['status'] !== 7 - ) { - newIdNameList.push( - new Map([ - [ticket['id'], ticket['device'] + ' ' + ticket['deviceModel']], - ]), - ); - } - }); + if (data.list.length !== 0) { + data.list.map((ticket: TicketListItem) => { + if ( + ticket['status'] !== 3 && + ticket['status'] !== 5 && + ticket['status'] !== 7 + ) { + newIdNameList.push( + new Map([ + [ticket['id'], ticket['device'] + ' ' + ticket['deviceModel']], + ]), + ); + } + }); + } that.setState({ currentTicketsIdName: newIdNameList, });