diff --git a/src/components/DetailFramework/DetailFramework.tsx b/src/components/DetailFramework/DetailFramework.tsx index dd1fb39..186bcda 100644 --- a/src/components/DetailFramework/DetailFramework.tsx +++ b/src/components/DetailFramework/DetailFramework.tsx @@ -103,56 +103,48 @@ export default class DetailFramework extends Component< ), description: this.props.isInfoShow['description'] ? ( - this.props.isInfoShow['info'] ? ( - + + + {this.state.ticketInfo.description} + + + + ) : ( + + ), + info: this.props.isInfoShow['info'] ? ( + + - - - - {this.state.ticketInfo.description} - - - - - - - {this.state.ticketInfo.info.name} - - - {this.state.ticketInfo.info.phone} - - - - - ) : ( - - + - {this.state.ticketInfo.description} + {this.state.ticketInfo.info.name} - - - ) + + {this.state.ticketInfo.info.phone} + + + + ) : ( ), @@ -189,6 +181,7 @@ export default class DetailFramework extends Component< {elements.device} {elements.createdTime} {elements.description} + {elements.info} {elements.current} {this.props.middleButton} {elements.notelist} diff --git a/src/components/NoteCard/NoteCard.tsx b/src/components/NoteCard/NoteCard.tsx index 773ccfb..9dadce0 100644 --- a/src/components/NoteCard/NoteCard.tsx +++ b/src/components/NoteCard/NoteCard.tsx @@ -36,13 +36,12 @@ export default class NoteCard extends Component { } return ( - - {note.op} + + {note.op} {note.createdTime.format(timeFormat)} - {message} - + {message} ); } diff --git a/src/components/NoteList/NoteList.tsx b/src/components/NoteList/NoteList.tsx index 488a6fe..28863ff 100644 --- a/src/components/NoteList/NoteList.tsx +++ b/src/components/NoteList/NoteList.tsx @@ -15,7 +15,7 @@ export default class NoteList extends Component { render(): ReactNode { return ( - + {this.props.noteList.map((note, idx) => ( diff --git a/src/pages/TicketDetail/TicketDetail.tsx b/src/pages/TicketDetail/TicketDetail.tsx index 260712f..0b7191f 100644 --- a/src/pages/TicketDetail/TicketDetail.tsx +++ b/src/pages/TicketDetail/TicketDetail.tsx @@ -269,10 +269,10 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { - {pt.get().ticketDetail.addNote} + {pt.get().ticketDetail.status.button} diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 4b1a78d..639f405 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -105,15 +105,17 @@ export default class MainPage extends Component<{}, MainPageState> { return ( - - {mainPageCard(this.state.dutyInfoCard)} - {mainPageCard(this.state.tipsInfoCard)} - + + + {mainPageCard(this.state.dutyInfoCard)} + {mainPageCard(this.state.tipsInfoCard)} + + + - ); } diff --git a/src/pages/repair/repair.tsx b/src/pages/repair/repair.tsx index 23b17fd..b3b4697 100644 --- a/src/pages/repair/repair.tsx +++ b/src/pages/repair/repair.tsx @@ -207,9 +207,16 @@ export default class RepairPage extends Component<{}, RepairPageState> { )); return ( - + - {ticketsRenderer} + + {ticketsRenderer} + ; descTitle: string; - infoTitle: string; + info: { + title: string; + extra: string; + }; tookAway: string; addToOreo: string; addNote: string; @@ -54,7 +57,10 @@ export const ticketDetailZhCn: TicketDetailText = { ['7', '维修翻车已取回'], ]), descTitle: '问题描述', - infoTitle: '机主信息', + info: { + title: '机主姓名', + extra: '联系方式', + }, tookAway: '我已取回', addToOreo: '加入 Oreo', addNote: '添加评论', @@ -98,7 +104,10 @@ export const ticketDetailEnUs: TicketDetailText = { ['7', 'Retrieved (Failed)'], ]), descTitle: 'Description', - infoTitle: 'Contact', + info: { + title: 'Name', + extra: 'Contact', + }, tookAway: 'Already retrieved', addToOreo: 'Add to Oreo', addNote: 'Comment',