diff --git a/src/pages/TicketDetail/TicketDetail.tsx b/src/pages/TicketDetail/TicketDetail.tsx index 969207b..e4a6ab0 100644 --- a/src/pages/TicketDetail/TicketDetail.tsx +++ b/src/pages/TicketDetail/TicketDetail.tsx @@ -17,6 +17,7 @@ import PageFooter from '@/components/PageFooter/PageFooter'; import { submitComment } from '@/service/submitComment'; import Taro from '@tarojs/taro'; import wechatUser from '@/wechat'; +import { addToOreo } from '@/service/addToOreo'; const submitInterval = 5000; @@ -31,6 +32,10 @@ interface TicketDetailState { comment: string; isLoading: boolean; isDisable: boolean; + isOreoLoading: boolean; + isOreoDisable: boolean; + isPickLoading: boolean; + isPickDisable: boolean; } export default class TicketDetail extends Component<{}, TicketDetailState> { @@ -45,6 +50,10 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { comment: '', isLoading: false, isDisable: false, + isOreoLoading: false, + isOreoDisable: false, + isPickLoading: false, + isPickDisable: false, }; componentDidMount(): void { @@ -117,6 +126,16 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { } handleOreoConfirm(): void { + this.setState({ + isOreoDisable: true, + showOreoModal: false, + }); + addToOreo(this); + setTimeout(() => { + this.setState({ + isOreoDisable: false, + }); + }, submitInterval); return; } @@ -188,7 +207,12 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { className='at-col' style={{ marginLeft: 10, paddingRight: 5, width: '50%' }} > - + {pt.get().ticketDetail.addToOreo} @@ -251,6 +275,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> { return ( + { + console.log(res.data); + that.setState({ + isOreoLoading: false, + }); + Taro.atMessage({ + message: pt.get().button.submitText.success, + type: 'success', + }); + }) + .catch((err) => { + console.log(err); + that.setState({ + isLoading: false, + }); + Taro.atMessage({ + message: pt.get().button.submitText.error + err.toString(), + type: 'error', + }); + }); +} diff --git a/src/service/uncompletedTicket.ts b/src/service/uncompletedTicket.ts index 64f10ba..47a866b 100644 --- a/src/service/uncompletedTicket.ts +++ b/src/service/uncompletedTicket.ts @@ -6,7 +6,7 @@ import { getUrl } from '.'; export function getUncompletedTicketList(that: MemberPage) { Taro.request({ - url: getUrl('/member/tickets/uncompleted'), + url: getUrl('/tickets/uncompleted'), method: 'GET', data: { token: 'token_test', @@ -30,7 +30,6 @@ export function getUncompletedTicketList(that: MemberPage) { item.deviceModel, item.status, moment(item.createdTime), - true, ), ), });