diff --git a/src/pages/TicketDetail/TicketDetail.tsx b/src/pages/TicketDetail/TicketDetail.tsx index c1e482e..260712f 100644 --- a/src/pages/TicketDetail/TicketDetail.tsx +++ b/src/pages/TicketDetail/TicketDetail.tsx @@ -28,13 +28,11 @@ interface TicketDetailState { id: number; isMember: boolean; showOreoModal: boolean; - showCommentModal: boolean; + showCommentLayout: boolean; showRetrieveModal: boolean; showStatusSheet: boolean; showPickModal: boolean; comment: string; - isLoading: boolean; - isDisable: boolean; isOreoLoading: boolean; isOreoDisable: boolean; isPickLoading: boolean; @@ -43,6 +41,8 @@ interface TicketDetailState { isRetrieveDisable: boolean; isStatusLoading: boolean; isStatusDisable: boolean; + isCommentLoading: boolean; + isCommentDisable: boolean; } export default class TicketDetail extends Component<{}, TicketDetailState> { @@ -50,13 +50,11 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { id: 0, isMember: false, showOreoModal: false, - showCommentModal: false, + showCommentLayout: false, showRetrieveModal: false, showStatusSheet: false, showPickModal: false, comment: '', - isLoading: false, - isDisable: false, isOreoLoading: false, isOreoDisable: false, isPickLoading: false, @@ -65,6 +63,8 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { isRetrieveDisable: false, isStatusLoading: false, isStatusDisable: false, + isCommentLoading: false, + isCommentDisable: false, }; componentDidMount(): void { @@ -84,7 +84,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { onAddComment(): void { this.setState({ - showCommentModal: true, + showCommentLayout: true, }); } @@ -114,7 +114,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { handleCommentCancel(): void { this.setState({ - showCommentModal: false, + showCommentLayout: false, }); } @@ -201,7 +201,8 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { onCommentSubmit() { this.setState({ - isDisable: true, + isCommentDisable: true, + showCommentLayout: false, }); if (this.state.comment == '') { Taro.atMessage({ @@ -210,7 +211,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { }); setTimeout(() => { this.setState({ - isDisable: false, + isCommentDisable: false, }); }, submitInterval); return; @@ -218,7 +219,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { submitComment(this); setTimeout(() => { this.setState({ - isDisable: false, + isCommentDisable: false, }); }, submitInterval); } @@ -278,7 +279,12 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { className='at-col' style={{ marginLeft: 10, paddingRight: 5, width: '50%' }} > - + {pt.get().ticketDetail.addNote} @@ -306,7 +312,12 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { className='at-col' style={{ marginRight: 10, paddingLeft: 5, width: '50%' }} > - + {pt.get().ticketDetail.addNote} @@ -354,12 +365,11 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { content={pt.get().modal.pick.content} /> - { height={200} placeholder={pt.get().ticketDetail.comment.placeholder} /> - + {pt.get().button.buttonText.submit} diff --git a/src/service/changeStatus.ts b/src/service/changeStatus.ts index 241506d..8e7e580 100644 --- a/src/service/changeStatus.ts +++ b/src/service/changeStatus.ts @@ -3,6 +3,8 @@ import Taro from '@tarojs/taro'; import pt from '@/plain-text'; import { getUrl } from '.'; +const reLaunchInterval = 1000; + export function changeStatus(that: TicketDetail, status: number) { that.setState({ isStatusLoading: true, @@ -25,6 +27,11 @@ export function changeStatus(that: TicketDetail, status: number) { message: pt.get().button.submitText.success, type: 'success', }); + setTimeout(() => { + Taro.reLaunch({ + url: '/pages/TicketDetail/TicketDetail?id=' + that.state.id, + }); + }, reLaunchInterval); }) .catch((err) => { console.log(err); diff --git a/src/service/retrieve.ts b/src/service/retrieve.ts index dafb732..b94ab11 100644 --- a/src/service/retrieve.ts +++ b/src/service/retrieve.ts @@ -3,6 +3,8 @@ import Taro from '@tarojs/taro'; import pt from '@/plain-text'; import { getUrl } from '.'; +const reLaunchInterval = 1000; + export function retrieve(that: TicketDetail) { that.setState({ isRetrieveLoading: true, @@ -24,6 +26,11 @@ export function retrieve(that: TicketDetail) { message: pt.get().button.submitText.success, type: 'success', }); + setTimeout(() => { + Taro.reLaunch({ + url: '/pages/TicketDetail/TicketDetail?id=' + that.state.id, + }); + }, reLaunchInterval); }) .catch((err) => { console.log(err); diff --git a/src/service/submitComment.ts b/src/service/submitComment.ts index 521634a..3b407bd 100644 --- a/src/service/submitComment.ts +++ b/src/service/submitComment.ts @@ -3,9 +3,11 @@ import Taro from '@tarojs/taro'; import pt from '@/plain-text'; import { getUrl } from '.'; +const reLaunchInterval = 1000; + export function submitComment(that: TicketDetail) { that.setState({ - isLoading: true, + isCommentLoading: true, }); Taro.request({ url: getUrl('/report'), @@ -18,17 +20,22 @@ export function submitComment(that: TicketDetail) { .then((res) => { console.log(res.data); that.setState({ - isLoading: false, + isCommentLoading: false, }); Taro.atMessage({ message: pt.get().button.submitText.success, type: 'success', }); + setTimeout(() => { + Taro.reLaunch({ + url: '/pages/TicketDetail/TicketDetail?id=' + that.state.id, + }); + }, reLaunchInterval); }) .catch((err) => { console.log(err); that.setState({ - isLoading: false, + isCommentLoading: false, }); Taro.atMessage({ message: pt.get().button.submitText.error + err.toString(),