Compare commits
No commits in common. "dev" and "main" have entirely different histories.
21
doc/api.md
21
doc/api.md
|
|
@ -44,12 +44,9 @@ data:
|
|||
{
|
||||
"isInDuty": true,
|
||||
"inDutyCnt": 3,
|
||||
"currentDuty": "1",
|
||||
"place": "", // 只有当 currentDuty 为 others 时，place 和 值班时间 才不为空
|
||||
"otherDutyStart": "",
|
||||
"otherDutyEnd": "",
|
||||
"offDutyReason": "",
|
||||
"dutyRecoverTime": ""
|
||||
"currentDuty": "2",
|
||||
"place": "东三-204",
|
||||
"otherDutyTime": ""
|
||||
}
|
||||
```
|
||||
|
||||
|
|
@ -62,11 +59,8 @@ data:
|
|||
"isInDuty": true,
|
||||
"inDutyCnt": 3,
|
||||
"currentDuty": "others",
|
||||
"place": "蓝田", // 只有当 currentDuty 为 others 时，place 才不为空
|
||||
"otherDutyStart": "2024-03-07T11:52:48.523303", // Timestamp
|
||||
"otherDutyEnd": "2024-03-07T13:52:48.523303",
|
||||
"offDutyReason": "",
|
||||
"dutyRecoverTime": ""
|
||||
"place": "蓝田",
|
||||
"otherDutyTime": "9:30-11:30"
|
||||
}
|
||||
```
|
||||
|
||||
|
|
@ -77,11 +71,6 @@ data:
|
|||
```json
|
||||
{
|
||||
"isInDuty": false,
|
||||
"inDutyCnt": 0,
|
||||
"currentDuty": "0", // '0' 代表正常值班时间下班，'others' 代表其他值班时间下班
|
||||
"place": "",
|
||||
"otherDutyStart": "",
|
||||
"otherDutyEnd": "",
|
||||
"offDutyReason": "学园维修",
|
||||
"dutyRecoverTime": "下周一"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,19 +14,18 @@ export default {
|
|||
'GET /duty/info': {
|
||||
success: true,
|
||||
data: {
|
||||
token: 'token_test',
|
||||
isInDuty: true,
|
||||
inDutyCnt: 3,
|
||||
currentDuty: 'others',
|
||||
otherDutyStart: '2024-03-07T09:30:48.523303',
|
||||
otherDutyEnd: '2024-03-07T13:30:48.523303',
|
||||
otherDutyTime: '9:30-11:30',
|
||||
place: '蓝田',
|
||||
offDutyReason: '',
|
||||
dutyRecoverTime: '',
|
||||
},
|
||||
},
|
||||
'GET /user/info': {
|
||||
success: true,
|
||||
data: {
|
||||
token: 'token_test',
|
||||
name: '马保国',
|
||||
phone: 13333333333,
|
||||
},
|
||||
|
|
@ -117,6 +116,7 @@ export default {
|
|||
'GET /member/duty/info': {
|
||||
success: true,
|
||||
data: {
|
||||
token: 'token_test',
|
||||
isInDuty: true,
|
||||
inDutyCnt: 6,
|
||||
currentDuty: '3',
|
||||
|
|
|
|||
|
|
@ -3,24 +3,13 @@
|
|||
{
|
||||
"id": 6830,
|
||||
"type": 1,
|
||||
"status": 3,
|
||||
"status": 2,
|
||||
"device": "主机",
|
||||
"deviceModel": "技嘉",
|
||||
"owner": "武技栏",
|
||||
"phone": "18888888888",
|
||||
"createdTime": "2024-03-06T19:49:27.043865",
|
||||
"isConfirmed": false
|
||||
},
|
||||
{
|
||||
"id": 6831,
|
||||
"type": 1,
|
||||
"status": 2,
|
||||
"device": "ROG",
|
||||
"deviceModel": "幻 14",
|
||||
"owner": "晓洋",
|
||||
"phone": "18888888887",
|
||||
"createdTime": "2024-03-06T19:49:27.043865",
|
||||
"isConfirmed": false
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
"description": "清灰",
|
||||
"workers": ["宇航员"],
|
||||
"createdTime": "2024-03-07T19:52:48.523303",
|
||||
"status": 4,
|
||||
"status": 5,
|
||||
"isConfirmed": false,
|
||||
"notes": [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ export default class DetailFramework extends Component<
|
|||
marginLeft: '3%',
|
||||
}}
|
||||
>
|
||||
<AtCard isFull title={pt.get().ticketDetail.desc.title}>
|
||||
<AtCard isFull title={pt.get().ticketDetail.descTitle}>
|
||||
<View className='at-article__h3'>
|
||||
{this.state.ticketInfo.description}
|
||||
</View>
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@ export default class NoteCard extends Component<NoteCardProps, {}> {
|
|||
var message = '';
|
||||
const note = this.props.note;
|
||||
const td = pt.get().ticketDetail;
|
||||
const createMessage = td.comment.createTicketMessage;
|
||||
const createMessage = td.createTicketMessage;
|
||||
const modifyMessage = td.statusModifyMessage;
|
||||
const prefix = td.comment.statusModifyPrefix;
|
||||
const prefix = td.statusModifyPrefix;
|
||||
|
||||
switch (note.type) {
|
||||
case 0:
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@ export default class NotFoundPage extends Component {
|
|||
style={{ marginTop: '150rpx', marginBottom: '240rpx' }}
|
||||
>
|
||||
<View className='at-article__h1' style={{ fontWeight: 'bold' }}>
|
||||
{pt.get().notFound.title.ZhCn}
|
||||
{pt.get().notFound.titleZhCn}
|
||||
</View>
|
||||
<View className='at-article__h2'>{pt.get().notFound.desc.ZhCn}</View>
|
||||
<View className='at-article__h2'>{pt.get().notFound.descZhCn}</View>
|
||||
<View style={{ height: '150rpx' }}></View>
|
||||
<View className='at-article__h1' style={{ fontWeight: 'bold' }}>
|
||||
{pt.get().notFound.title.EnUs}
|
||||
{pt.get().notFound.titleEnUs}
|
||||
</View>
|
||||
<View className='at-article__h2'>{pt.get().notFound.desc.EnUs}</View>
|
||||
<View className='at-article__h2'>{pt.get().notFound.descEnUs}</View>
|
||||
</View>
|
||||
<PageFooter />
|
||||
</View>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import {
|
|||
AtActionSheet,
|
||||
AtActionSheetItem,
|
||||
AtButton,
|
||||
AtCheckbox,
|
||||
AtFloatLayout,
|
||||
AtForm,
|
||||
AtMessage,
|
||||
|
|
@ -23,98 +22,58 @@ import { pickTicket } from '@/service/pickTicket';
|
|||
import { retrieve } from '@/service/retrieve';
|
||||
import { changeStatus } from '@/service/changeStatus';
|
||||
import { getDisable } from '@/service/getDisable';
|
||||
import { StatusStr } from './TicketNote';
|
||||
|
||||
const submitInterval = 5000;
|
||||
|
||||
interface TicketDetailState {
|
||||
id: number;
|
||||
isMember: boolean;
|
||||
show: {
|
||||
modal: {
|
||||
oreo: boolean;
|
||||
retrieve: boolean;
|
||||
pick: boolean;
|
||||
};
|
||||
layout: {
|
||||
comment: boolean;
|
||||
reminder: boolean;
|
||||
};
|
||||
actionSheet: {
|
||||
status: boolean;
|
||||
};
|
||||
};
|
||||
showOreoModal: boolean;
|
||||
showCommentLayout: boolean;
|
||||
showRetrieveModal: boolean;
|
||||
showStatusSheet: boolean;
|
||||
showPickModal: boolean;
|
||||
comment: string;
|
||||
isLoading: {
|
||||
oreo: boolean;
|
||||
pick: boolean;
|
||||
retrieve: boolean;
|
||||
comment: boolean;
|
||||
status: boolean;
|
||||
reminder: boolean;
|
||||
};
|
||||
isDisable: {
|
||||
oreo: boolean;
|
||||
pick: boolean;
|
||||
retrieve: boolean;
|
||||
comment: boolean;
|
||||
status: boolean;
|
||||
reminder: boolean;
|
||||
};
|
||||
isDisable_main: {
|
||||
oreo: boolean;
|
||||
pick: boolean;
|
||||
retrieve: boolean;
|
||||
comment: boolean;
|
||||
};
|
||||
reminderList: Array<number>;
|
||||
statusToBe: number;
|
||||
isOreoLoading: boolean;
|
||||
isOreoDisable: boolean;
|
||||
isOreoDisable_main: boolean;
|
||||
isPickLoading: boolean;
|
||||
isPickDisable: boolean;
|
||||
isPickDisable_main: boolean;
|
||||
isRetrieveLoading: boolean;
|
||||
isRetrieveDisable: boolean;
|
||||
isRetrieveDisable_main: boolean;
|
||||
isStatusLoading: boolean;
|
||||
isStatusDisable: boolean;
|
||||
isCommentLoading: boolean;
|
||||
isCommentDisable: boolean;
|
||||
isCommentDisable_main: boolean;
|
||||
}
|
||||
|
||||
export default class TicketDetail extends Component<{}, TicketDetailState> {
|
||||
state: Readonly<TicketDetailState> = {
|
||||
id: 0,
|
||||
isMember: false,
|
||||
show: {
|
||||
modal: {
|
||||
oreo: false,
|
||||
retrieve: false,
|
||||
pick: false,
|
||||
},
|
||||
layout: {
|
||||
comment: false,
|
||||
reminder: false,
|
||||
},
|
||||
actionSheet: {
|
||||
status: false,
|
||||
},
|
||||
},
|
||||
showOreoModal: false,
|
||||
showCommentLayout: false,
|
||||
showRetrieveModal: false,
|
||||
showStatusSheet: false,
|
||||
showPickModal: false,
|
||||
comment: '',
|
||||
isLoading: {
|
||||
oreo: false,
|
||||
pick: false,
|
||||
retrieve: false,
|
||||
comment: false,
|
||||
status: false,
|
||||
reminder: false,
|
||||
},
|
||||
isDisable: {
|
||||
oreo: false,
|
||||
pick: false,
|
||||
retrieve: false,
|
||||
comment: false,
|
||||
status: false,
|
||||
reminder: false,
|
||||
},
|
||||
isDisable_main: {
|
||||
oreo: false,
|
||||
pick: false,
|
||||
retrieve: false,
|
||||
comment: false,
|
||||
},
|
||||
reminderList: [],
|
||||
// eslint-disable-next-line react/no-unused-state
|
||||
statusToBe: 0,
|
||||
isOreoLoading: false,
|
||||
isOreoDisable: false,
|
||||
isOreoDisable_main: false,
|
||||
isPickLoading: false,
|
||||
isPickDisable: false,
|
||||
isPickDisable_main: false,
|
||||
isRetrieveLoading: false,
|
||||
isRetrieveDisable: false,
|
||||
isRetrieveDisable_main: false,
|
||||
isStatusLoading: false,
|
||||
isStatusDisable: false,
|
||||
isCommentLoading: false,
|
||||
isCommentDisable: false,
|
||||
isCommentDisable_main: false,
|
||||
};
|
||||
|
||||
componentDidMount(): void {
|
||||
|
|
@ -129,157 +88,73 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
|
||||
onAddToOreo(): void {
|
||||
this.setState({
|
||||
show: {
|
||||
...this.state.show,
|
||||
modal: {
|
||||
...this.state.show.modal,
|
||||
oreo: true,
|
||||
},
|
||||
},
|
||||
showOreoModal: true,
|
||||
});
|
||||
}
|
||||
|
||||
onAddComment(): void {
|
||||
this.setState({
|
||||
show: {
|
||||
...this.state.show,
|
||||
layout: {
|
||||
...this.state.show.layout,
|
||||
comment: true,
|
||||
},
|
||||
},
|
||||
showCommentLayout: true,
|
||||
});
|
||||
}
|
||||
|
||||
onRetrieved(): void {
|
||||
this.setState({
|
||||
show: {
|
||||
...this.state.show,
|
||||
modal: {
|
||||
...this.state.show.modal,
|
||||
retrieve: true,
|
||||
},
|
||||
},
|
||||
showRetrieveModal: true,
|
||||
});
|
||||
}
|
||||
|
||||
onPick(): void {
|
||||
this.setState({
|
||||
show: {
|
||||
...this.state.show,
|
||||
modal: {
|
||||
...this.state.show.modal,
|
||||
pick: true,
|
||||
},
|
||||
},
|
||||
showPickModal: true,
|
||||
});
|
||||
}
|
||||
|
||||
onChangeStatus(): void {
|
||||
this.setState({
|
||||
show: {
|
||||
...this.state.show,
|
||||
actionSheet: {
|
||||
...this.state.show.actionSheet,
|
||||
status: true,
|
||||
},
|
||||
},
|
||||
showStatusSheet: true,
|
||||
});
|
||||
}
|
||||
|
||||
handleOreoCancel(): void {
|
||||
this.setState({
|
||||
show: {
|
||||
...this.state.show,
|
||||
modal: {
|
||||
...this.state.show.modal,
|
||||
oreo: false,
|
||||
},
|
||||
},
|
||||
showOreoModal: false,
|
||||
});
|
||||
}
|
||||
|
||||
handleCommentCancel(): void {
|
||||
this.setState({
|
||||
show: {
|
||||
...this.state.show,
|
||||
layout: {
|
||||
...this.state.show.layout,
|
||||
comment: false,
|
||||
},
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
handleReminderCancel(): void {
|
||||
this.setState({
|
||||
show: {
|
||||
...this.state.show,
|
||||
layout: {
|
||||
...this.state.show.layout,
|
||||
reminder: false,
|
||||
},
|
||||
},
|
||||
showCommentLayout: false,
|
||||
});
|
||||
}
|
||||
|
||||
handleRetrieveCancel(): void {
|
||||
this.setState({
|
||||
show: {
|
||||
...this.state.show,
|
||||
modal: {
|
||||
...this.state.show.modal,
|
||||
retrieve: false,
|
||||
},
|
||||
},
|
||||
showRetrieveModal: false,
|
||||
});
|
||||
}
|
||||
|
||||
handleStatusCancel(): void {
|
||||
this.setState({
|
||||
show: {
|
||||
...this.state.show,
|
||||
actionSheet: {
|
||||
...this.state.show.actionSheet,
|
||||
status: false,
|
||||
},
|
||||
},
|
||||
showStatusSheet: false,
|
||||
});
|
||||
}
|
||||
|
||||
handlePickCancel(): void {
|
||||
this.setState({
|
||||
show: {
|
||||
...this.state.show,
|
||||
modal: {
|
||||
...this.state.show.modal,
|
||||
pick: false,
|
||||
},
|
||||
},
|
||||
showPickModal: false,
|
||||
});
|
||||
}
|
||||
|
||||
handleOreoConfirm(): void {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
oreo: true,
|
||||
},
|
||||
show: {
|
||||
...this.state.show,
|
||||
modal: {
|
||||
...this.state.show.modal,
|
||||
oreo: false,
|
||||
},
|
||||
},
|
||||
isOreoDisable: true,
|
||||
showOreoModal: false,
|
||||
});
|
||||
addToOreo(this);
|
||||
setTimeout(() => {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
oreo: false,
|
||||
},
|
||||
isOreoDisable: false,
|
||||
});
|
||||
}, submitInterval);
|
||||
return;
|
||||
|
|
@ -287,25 +162,13 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
|
||||
handleRetrieveConfirm(): void {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
retrieve: true,
|
||||
},
|
||||
show: {
|
||||
...this.state.show,
|
||||
modal: {
|
||||
...this.state.show.modal,
|
||||
retrieve: false,
|
||||
},
|
||||
},
|
||||
isRetrieveDisable: true,
|
||||
showRetrieveModal: false,
|
||||
});
|
||||
retrieve(this);
|
||||
setTimeout(() => {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
retrieve: false,
|
||||
},
|
||||
isRetrieveDisable: false,
|
||||
});
|
||||
}, submitInterval);
|
||||
return;
|
||||
|
|
@ -313,73 +176,27 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
|
||||
handlePickConfirm(): void {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
pick: true,
|
||||
},
|
||||
show: {
|
||||
...this.state.show,
|
||||
modal: {
|
||||
...this.state.show.modal,
|
||||
pick: false,
|
||||
},
|
||||
},
|
||||
isPickDisable: true,
|
||||
showPickModal: false,
|
||||
});
|
||||
pickTicket(this);
|
||||
setTimeout(() => {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
pick: false,
|
||||
},
|
||||
isPickDisable: false,
|
||||
});
|
||||
}, submitInterval);
|
||||
return;
|
||||
}
|
||||
|
||||
handleStatusChange(status: number): void {
|
||||
if (status == 3 || status == 5 || status == 7) {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
status: true,
|
||||
},
|
||||
show: {
|
||||
...this.state.show,
|
||||
actionSheet: {
|
||||
...this.state.show.actionSheet,
|
||||
status: false,
|
||||
},
|
||||
layout: {
|
||||
...this.state.show.layout,
|
||||
reminder: true,
|
||||
},
|
||||
},
|
||||
// eslint-disable-next-line react/no-unused-state
|
||||
statusToBe: status,
|
||||
showStatusSheet: false,
|
||||
isStatusDisable: true,
|
||||
});
|
||||
} else {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
status: true,
|
||||
},
|
||||
show: {
|
||||
...this.state.show,
|
||||
actionSheet: {
|
||||
...this.state.show.actionSheet,
|
||||
status: false,
|
||||
},
|
||||
},
|
||||
});
|
||||
changeStatus(this);
|
||||
}
|
||||
changeStatus(this, status);
|
||||
setTimeout(() => {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
status: false,
|
||||
},
|
||||
isStatusDisable: false,
|
||||
});
|
||||
}, submitInterval);
|
||||
return;
|
||||
|
|
@ -394,17 +211,8 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
|
||||
onCommentSubmit() {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
comment: true,
|
||||
},
|
||||
show: {
|
||||
...this.state.show,
|
||||
layout: {
|
||||
...this.state.show.layout,
|
||||
comment: false,
|
||||
},
|
||||
},
|
||||
isCommentDisable: true,
|
||||
showCommentLayout: false,
|
||||
});
|
||||
if (this.state.comment == '') {
|
||||
Taro.atMessage({
|
||||
|
|
@ -413,10 +221,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
});
|
||||
setTimeout(() => {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
comment: false,
|
||||
},
|
||||
isCommentDisable: false,
|
||||
});
|
||||
}, submitInterval);
|
||||
return;
|
||||
|
|
@ -424,81 +229,11 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
submitComment(this);
|
||||
setTimeout(() => {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
comment: false,
|
||||
},
|
||||
isCommentDisable: false,
|
||||
});
|
||||
}, submitInterval);
|
||||
}
|
||||
|
||||
handleReminderChange(reminderList: Array<number>) {
|
||||
this.setState({
|
||||
reminderList: reminderList,
|
||||
});
|
||||
return reminderList;
|
||||
}
|
||||
|
||||
onReminderSubmit() {
|
||||
if (
|
||||
this.state.reminderList.includes(1) &&
|
||||
this.state.reminderList.includes(3)
|
||||
) {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
reminder: true,
|
||||
},
|
||||
show: {
|
||||
...this.state.show,
|
||||
layout: {
|
||||
...this.state.show.layout,
|
||||
reminder: false,
|
||||
},
|
||||
},
|
||||
});
|
||||
changeStatus(this);
|
||||
} else {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
reminder: true,
|
||||
},
|
||||
});
|
||||
Taro.atMessage({
|
||||
message: pt.get().ticketDetail.reminder.error,
|
||||
type: 'error',
|
||||
});
|
||||
}
|
||||
setTimeout(() => {
|
||||
this.setState({
|
||||
isDisable: {
|
||||
...this.state.isDisable,
|
||||
reminder: false,
|
||||
},
|
||||
});
|
||||
}, submitInterval);
|
||||
}
|
||||
|
||||
reminderOption = [
|
||||
{
|
||||
value: 0,
|
||||
label: pt.get().ticketDetail.reminder.r0,
|
||||
},
|
||||
{
|
||||
value: 1,
|
||||
label: pt.get().ticketDetail.reminder.r1,
|
||||
},
|
||||
{
|
||||
value: 2,
|
||||
label: pt.get().ticketDetail.reminder.r2,
|
||||
},
|
||||
{
|
||||
value: 3,
|
||||
label: pt.get().ticketDetail.reminder.r3,
|
||||
},
|
||||
];
|
||||
|
||||
render(): ReactNode {
|
||||
const middleButton = this.state.isMember ? (
|
||||
<View>
|
||||
|
|
@ -511,14 +246,14 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
style={{ marginLeft: '20rpx', paddingRight: '10rpx', width: '50%' }}
|
||||
>
|
||||
<AtButton
|
||||
loading={this.state.isLoading.pick}
|
||||
loading={this.state.isPickLoading}
|
||||
disabled={
|
||||
this.state.isDisable.pick || this.state.isDisable_main.pick
|
||||
this.state.isPickDisable || this.state.isPickDisable_main
|
||||
}
|
||||
type='secondary'
|
||||
onClick={this.onPick.bind(this)}
|
||||
>
|
||||
{pt.get().ticketDetail.button.pick}
|
||||
{pt.get().ticketDetail.pick}
|
||||
</AtButton>
|
||||
</View>
|
||||
<View
|
||||
|
|
@ -526,14 +261,14 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
style={{ marginLeft: '20rpx', paddingRight: '10rpx', width: '50%' }}
|
||||
>
|
||||
<AtButton
|
||||
loading={this.state.isLoading.oreo}
|
||||
loading={this.state.isOreoLoading}
|
||||
disabled={
|
||||
this.state.isDisable.oreo || this.state.isDisable_main.oreo
|
||||
this.state.isOreoDisable || this.state.isOreoDisable_main
|
||||
}
|
||||
type='primary'
|
||||
onClick={this.onAddToOreo.bind(this)}
|
||||
>
|
||||
{pt.get().ticketDetail.button.addToOreo}
|
||||
{pt.get().ticketDetail.addToOreo}
|
||||
</AtButton>
|
||||
</View>
|
||||
</View>
|
||||
|
|
@ -546,12 +281,12 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
style={{ marginLeft: '20rpx', paddingRight: '10rpx', width: '50%' }}
|
||||
>
|
||||
<AtButton
|
||||
loading={this.state.isLoading.status}
|
||||
disabled={this.state.isDisable.status}
|
||||
loading={this.state.isStatusLoading}
|
||||
disabled={this.state.isStatusDisable}
|
||||
type='primary'
|
||||
onClick={this.onChangeStatus.bind(this)}
|
||||
>
|
||||
{pt.get().ticketDetail.button.status}
|
||||
{pt.get().ticketDetail.status.button}
|
||||
</AtButton>
|
||||
</View>
|
||||
<View
|
||||
|
|
@ -560,14 +295,13 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
>
|
||||
<AtButton
|
||||
disabled={
|
||||
this.state.isDisable.comment ||
|
||||
this.state.isDisable_main.comment
|
||||
this.state.isCommentDisable || this.state.isCommentDisable_main
|
||||
}
|
||||
loading={this.state.isLoading.comment}
|
||||
loading={this.state.isCommentLoading}
|
||||
type='secondary'
|
||||
onClick={this.onAddComment.bind(this)}
|
||||
>
|
||||
{pt.get().ticketDetail.button.addNote}
|
||||
{pt.get().ticketDetail.addNote}
|
||||
</AtButton>
|
||||
</View>
|
||||
</View>
|
||||
|
|
@ -582,15 +316,14 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
style={{ marginLeft: '20rpx', paddingRight: '10rpx', width: '50%' }}
|
||||
>
|
||||
<AtButton
|
||||
loading={this.state.isLoading.retrieve}
|
||||
loading={this.state.isRetrieveLoading}
|
||||
disabled={
|
||||
this.state.isDisable.retrieve ||
|
||||
this.state.isDisable_main.retrieve
|
||||
this.state.isRetrieveDisable || this.state.isRetrieveDisable_main
|
||||
}
|
||||
type='primary'
|
||||
onClick={this.onRetrieved.bind(this)}
|
||||
>
|
||||
{pt.get().ticketDetail.button.tookAway}
|
||||
{pt.get().ticketDetail.tookAway}
|
||||
</AtButton>
|
||||
</View>
|
||||
<View
|
||||
|
|
@ -599,38 +332,18 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
>
|
||||
<AtButton
|
||||
disabled={
|
||||
this.state.isDisable.comment || this.state.isDisable_main.comment
|
||||
this.state.isCommentDisable || this.state.isCommentDisable_main
|
||||
}
|
||||
loading={this.state.isLoading.comment}
|
||||
loading={this.state.isCommentLoading}
|
||||
type='secondary'
|
||||
onClick={this.onAddComment.bind(this)}
|
||||
>
|
||||
{pt.get().ticketDetail.button.addNote}
|
||||
{pt.get().ticketDetail.addNote}
|
||||
</AtButton>
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
|
||||
const actionSheetItemList: Array<StatusStr> = [
|
||||
'0',
|
||||
'1',
|
||||
'2',
|
||||
'3',
|
||||
'4',
|
||||
'5',
|
||||
'6',
|
||||
'7',
|
||||
];
|
||||
|
||||
const sheetItemsRenderer = actionSheetItemList.map((item, idx) => (
|
||||
<AtActionSheetItem
|
||||
key={idx}
|
||||
onClick={this.handleStatusChange.bind(this, idx)}
|
||||
>
|
||||
{pt.get().ticketDetail.statusModifyMessage.get(item)}
|
||||
</AtActionSheetItem>
|
||||
));
|
||||
|
||||
const isInfoShow = {
|
||||
device: true,
|
||||
createdTime: true,
|
||||
|
|
@ -645,7 +358,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
<View>
|
||||
<AtMessage />
|
||||
<AtModal
|
||||
isOpened={this.state.show.modal.oreo}
|
||||
isOpened={this.state.showOreoModal}
|
||||
title={pt.get().modal.addToOreo.title}
|
||||
cancelText={pt.get().modal.cancel}
|
||||
confirmText={pt.get().modal.confirm}
|
||||
|
|
@ -654,7 +367,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
content={pt.get().modal.addToOreo.content}
|
||||
/>
|
||||
<AtModal
|
||||
isOpened={this.state.show.modal.retrieve}
|
||||
isOpened={this.state.showRetrieveModal}
|
||||
title={pt.get().modal.retrieve.title}
|
||||
cancelText={pt.get().modal.cancel}
|
||||
confirmText={pt.get().modal.confirm}
|
||||
|
|
@ -663,7 +376,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
content={pt.get().modal.retrieve.content}
|
||||
/>
|
||||
<AtModal
|
||||
isOpened={this.state.show.modal.pick}
|
||||
isOpened={this.state.showPickModal}
|
||||
title={pt.get().modal.pick.title}
|
||||
cancelText={pt.get().modal.cancel}
|
||||
confirmText={pt.get().modal.confirm}
|
||||
|
|
@ -672,7 +385,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
content={pt.get().modal.pick.content}
|
||||
/>
|
||||
<AtFloatLayout
|
||||
isOpened={this.state.show.layout.comment}
|
||||
isOpened={this.state.showCommentLayout}
|
||||
title={pt.get().ticketDetail.comment.title}
|
||||
onClose={this.handleCommentCancel.bind(this)}
|
||||
>
|
||||
|
|
@ -689,35 +402,37 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
|||
</AtButton>
|
||||
</AtForm>
|
||||
</AtFloatLayout>
|
||||
<AtFloatLayout
|
||||
isOpened={this.state.show.layout.reminder}
|
||||
title={pt.get().ticketDetail.reminder.title}
|
||||
onClose={this.handleReminderCancel.bind(this)}
|
||||
>
|
||||
<AtForm onSubmit={this.onReminderSubmit.bind(this)}>
|
||||
<AtCheckbox
|
||||
options={this.reminderOption}
|
||||
selectedList={this.state.reminderList}
|
||||
onChange={this.handleReminderChange.bind(this)}
|
||||
/>
|
||||
<AtButton
|
||||
loading={this.state.isLoading.reminder}
|
||||
formType='submit'
|
||||
type='primary'
|
||||
disabled={this.state.isDisable.reminder}
|
||||
>
|
||||
{pt.get().button.buttonText.submit}
|
||||
</AtButton>
|
||||
</AtForm>
|
||||
</AtFloatLayout>
|
||||
<AtActionSheet
|
||||
isOpened={this.state.show.actionSheet.status}
|
||||
isOpened={this.state.showStatusSheet}
|
||||
cancelText={pt.get().ticketDetail.status.cancel}
|
||||
title={pt.get().ticketDetail.status.title}
|
||||
onCancel={this.handleStatusCancel.bind(this)}
|
||||
onClose={this.handleStatusCancel.bind(this)}
|
||||
>
|
||||
{sheetItemsRenderer}
|
||||
<AtActionSheetItem onClick={this.handleStatusChange.bind(this, 0)}>
|
||||
{pt.get().ticketDetail.status.status0}
|
||||
</AtActionSheetItem>
|
||||
<AtActionSheetItem onClick={this.handleStatusChange.bind(this, 1)}>
|
||||
{pt.get().ticketDetail.status.status1}
|
||||
</AtActionSheetItem>
|
||||
<AtActionSheetItem onClick={this.handleStatusChange.bind(this, 2)}>
|
||||
{pt.get().ticketDetail.status.status2}
|
||||
</AtActionSheetItem>
|
||||
<AtActionSheetItem onClick={this.handleStatusChange.bind(this, 3)}>
|
||||
{pt.get().ticketDetail.status.status3}
|
||||
</AtActionSheetItem>
|
||||
<AtActionSheetItem onClick={this.handleStatusChange.bind(this, 4)}>
|
||||
{pt.get().ticketDetail.status.status4}
|
||||
</AtActionSheetItem>
|
||||
<AtActionSheetItem onClick={this.handleStatusChange.bind(this, 5)}>
|
||||
{pt.get().ticketDetail.status.status5}
|
||||
</AtActionSheetItem>
|
||||
<AtActionSheetItem onClick={this.handleStatusChange.bind(this, 6)}>
|
||||
{pt.get().ticketDetail.status.status6}
|
||||
</AtActionSheetItem>
|
||||
<AtActionSheetItem onClick={this.handleStatusChange.bind(this, 7)}>
|
||||
{pt.get().ticketDetail.status.status7}
|
||||
</AtActionSheetItem>
|
||||
</AtActionSheet>
|
||||
<DetailFramework
|
||||
middleButton={middleButton}
|
||||
|
|
|
|||
|
|
@ -30,4 +30,4 @@ export class ShowElements {
|
|||
notelist: JSX.Element;
|
||||
}
|
||||
|
||||
export type StatusStr = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7';
|
||||
export type StatusStr = '1' | '2' | '3' | '4' | '5';
|
||||
|
|
|
|||
|
|
@ -95,7 +95,6 @@ export default class TicketListPage extends Component<{}, TicketListState> {
|
|||
<AtList>{fixListRenderer}</AtList>
|
||||
<View style={{ marginTop: '40rpx' }}>
|
||||
<AtPagination
|
||||
icon
|
||||
total={this.state.totalPage}
|
||||
pageSize={this.state.pageSize}
|
||||
current={this.state.currentPage}
|
||||
|
|
|
|||
|
|
@ -6,24 +6,22 @@ import tick from '@/assets/icons/MainPage/tick.svg';
|
|||
import cross from '@/assets/icons/MainPage/cross.svg';
|
||||
import clock from '@/assets/icons/MainPage/offduty.svg';
|
||||
import wechatUser from '@/wechat';
|
||||
import moment from 'moment';
|
||||
|
||||
export class DutyData {
|
||||
constructor() {
|
||||
this.isInDuty = false;
|
||||
this.inDutyCnt = 3;
|
||||
this.currentDuty = '1';
|
||||
this.otherDutyStart = '2024-03-07T13:30:48.523303';
|
||||
this.otherDutyEnd = '2024-03-07T16:00:48.523303';
|
||||
this.dutyRecoverTime = '明天 13：30';
|
||||
this.currentDuty = '2';
|
||||
this.otherDutyTime = '9:30-11:30';
|
||||
this.offDutyReason = '学园维修';
|
||||
this.dutyRecoverTime = '下周一';
|
||||
this.place = '东三-204';
|
||||
}
|
||||
|
||||
isInDuty: boolean;
|
||||
inDutyCnt?: number;
|
||||
currentDuty?: '0' | '1' | '2' | '3' | 'others';
|
||||
otherDutyStart?: string;
|
||||
otherDutyEnd?: string;
|
||||
currentDuty?: 'off' | '1' | '2' | '3' | 'others';
|
||||
otherDutyTime?: string;
|
||||
offDutyReason?: string;
|
||||
dutyRecoverTime?: string;
|
||||
place: string;
|
||||
|
|
@ -89,18 +87,8 @@ export class DutyInfo extends Component {
|
|||
<Card isInDuty={data.isInDuty} place={data.place} />
|
||||
<AtTimeline
|
||||
items={[
|
||||
{
|
||||
title:
|
||||
data.currentDuty == '0'
|
||||
? pt.get().mainPage.normal.reason
|
||||
: od.reason(data.offDutyReason as string),
|
||||
},
|
||||
{
|
||||
title:
|
||||
data.currentDuty == '0'
|
||||
? pt.get().mainPage.normal.recoverTime
|
||||
: od.recoverTime(data.dutyRecoverTime as string),
|
||||
},
|
||||
{ title: od.reason(data.offDutyReason as string) },
|
||||
{ title: od.recoverTime(data.dutyRecoverTime as string) },
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
|
|
@ -118,11 +106,8 @@ export class DutyInfo extends Component {
|
|||
{
|
||||
title:
|
||||
data.currentDuty == 'others'
|
||||
? id.currentDutyText('others') +
|
||||
moment(data.otherDutyStart).format('H:mm') +
|
||||
' - ' +
|
||||
moment(data.otherDutyEnd).format('H:mm')
|
||||
: id.currentDutyText(data.currentDuty || '0'),
|
||||
? id.currentDutyText('others') + data.otherDutyTime
|
||||
: id.currentDutyText(data.currentDuty || 'off'),
|
||||
},
|
||||
{ title: id.inDutyCnt(data.inDutyCnt as number) },
|
||||
]}
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@ export default class TitleCard extends React.Component {
|
|||
<View className='page-title'>
|
||||
<View className='at-article__h1' style={{ fontWeight: 'bold' }}>
|
||||
{wechatUser.getAccess()
|
||||
? memberPage.titleLine.main.index + wechatUser.getInfo().name
|
||||
: mainPage.titleLine.main}
|
||||
? memberPage.mainTitleLine + wechatUser.getInfo().name
|
||||
: mainPage.mainTitleLine}
|
||||
</View>
|
||||
<View className='at-article__h2'>
|
||||
{wechatUser.getAccess()
|
||||
? memberPage.titleLine.sub.index
|
||||
: mainPage.titleLine.sub}
|
||||
? memberPage.subTitleLine
|
||||
: mainPage.subTitleLine}
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
|
|
|
|||
|
|
@ -265,18 +265,12 @@ export default class MainPage extends Component<{}, MainPageState> {
|
|||
/>
|
||||
</View>
|
||||
{wechatUser.getAccess() ? (
|
||||
<View style={{ marginTop: '40rpx' }}>
|
||||
<View
|
||||
className='at-article__h3'
|
||||
style={{ marginBottom: '20rpx', fontWeight: 'bold' }}
|
||||
>
|
||||
{memberPage.ticketList.hint}
|
||||
</View>
|
||||
<View>
|
||||
<AtList>{fixListRenderer}</AtList>
|
||||
<AtList>
|
||||
<AtListItem
|
||||
title={pt.get().memberPage.ticketList.title}
|
||||
note={pt.get().memberPage.ticketList.note}
|
||||
title={pt.get().mainPage.ticketList.title}
|
||||
note={pt.get().mainPage.ticketList.note}
|
||||
arrow='right'
|
||||
thumb={clockIcon}
|
||||
onClick={this.ticketListPage}
|
||||
|
|
|
|||
|
|
@ -184,16 +184,9 @@ export default class RepairPage extends Component<{}, RepairPageState> {
|
|||
}
|
||||
|
||||
render(): ReactNode {
|
||||
const hasContinuingticket = this.state.currentTicketsIdName.length !== 0;
|
||||
const ticketsRenderer = hasContinuingticket ? (
|
||||
<View>
|
||||
<View
|
||||
className='at-article__h3'
|
||||
style={{ marginBottom: '20rpx', fontWeight: 'bold' }}
|
||||
>
|
||||
{pt.get().repairPage.currentTicket.hint}
|
||||
</View>
|
||||
{this.state.currentTicketsIdName.map((pair, idx) => (
|
||||
const ticketsRenderer =
|
||||
this.state.currentTicketsIdName.length !== 0 ? (
|
||||
this.state.currentTicketsIdName.map((pair, idx) => (
|
||||
<AtCard
|
||||
key={idx}
|
||||
title={pair.values().next().value} //pair.keys().next().value == ticket['device'] + ' ' + ticket['deviceModel']
|
||||
|
|
@ -217,15 +210,9 @@ export default class RepairPage extends Component<{}, RepairPageState> {
|
|||
middleButton={middleButton}
|
||||
/>
|
||||
</AtCard>
|
||||
))}
|
||||
</View>
|
||||
))
|
||||
) : (
|
||||
<View
|
||||
className='at-article__h3'
|
||||
style={{ marginBottom: '20rpx', fontWeight: 'bold' }}
|
||||
>
|
||||
{pt.get().repairPage.currentTicket.nohint}
|
||||
</View>
|
||||
<View></View>
|
||||
);
|
||||
return (
|
||||
<View style={{ width: '94%', marginLeft: '3%' }}>
|
||||
|
|
|
|||
|
|
@ -50,10 +50,10 @@ export default class UserMemberPage extends Component {
|
|||
<AtMessage />
|
||||
<View className='page-title' style={{ marginBottom: '40rpx' }}>
|
||||
<View className='at-article__h1' style={{ fontWeight: 'bold' }}>
|
||||
{pt.get().memberPage.titleLine.main.login}
|
||||
{pt.get().memberPage.loginMainTitleLine}
|
||||
</View>
|
||||
<View className='at-article__h2'>
|
||||
{pt.get().memberPage.titleLine.sub.login}
|
||||
{pt.get().memberPage.loginSubTitleLine}
|
||||
</View>
|
||||
</View>
|
||||
<AtButton
|
||||
|
|
@ -70,10 +70,10 @@ export default class UserMemberPage extends Component {
|
|||
<AtMessage />
|
||||
<View className='page-title' style={{ marginBottom: '40rpx' }}>
|
||||
<View className='at-article__h1' style={{ fontWeight: 'bold' }}>
|
||||
{pt.get().memberPage.titleLine.main.logout}
|
||||
{pt.get().memberPage.logoutMainTitleLine}
|
||||
</View>
|
||||
<View className='at-article__h2'>
|
||||
{pt.get().memberPage.titleLine.sub.logout}
|
||||
{pt.get().memberPage.logoutSubTitleLine}
|
||||
</View>
|
||||
</View>
|
||||
<AtButton type='primary' onClick={this.onLogout.bind(this)}>
|
||||
|
|
|
|||
|
|
@ -43,9 +43,9 @@ export default class UserPage extends Component {
|
|||
if (this.state.clicks < 3) {
|
||||
this.setState({
|
||||
toastText:
|
||||
pt.get().userPage.memberEntry.prefix +
|
||||
pt.get().userPage.memberEntry.front +
|
||||
(this.state.clicks + 1).toString() + // React State's feature
|
||||
pt.get().userPage.memberEntry.affix,
|
||||
pt.get().userPage.memberEntry.behind,
|
||||
isToastOpen: true,
|
||||
});
|
||||
if (this.state.clicks == 0) {
|
||||
|
|
@ -123,7 +123,7 @@ export default class UserPage extends Component {
|
|||
className='at-row at-row__justify--center at-row__align--center'
|
||||
style='height:120rpx;color:#696969;'
|
||||
>
|
||||
<Text style={{ fontSize: '32rpx' }}> EVA Eta v1.0.2</Text>
|
||||
<Text style={{ fontSize: '32rpx' }}> EVA Eta v1.0.0</Text>
|
||||
</View>
|
||||
<AtList>
|
||||
<AtListItem
|
||||
|
|
|
|||
|
|
@ -1,21 +1,14 @@
|
|||
export interface NotFoundText {
|
||||
title: {
|
||||
ZhCn: string;
|
||||
EnUs: string;
|
||||
};
|
||||
desc: {
|
||||
ZhCn: string;
|
||||
EnUs: string;
|
||||
};
|
||||
titleZhCn: string;
|
||||
titleEnUs: string;
|
||||
descZhCn: string;
|
||||
descEnUs: string;
|
||||
}
|
||||
|
||||
export const notFound: NotFoundText = {
|
||||
title: {
|
||||
ZhCn: '啊哦...请求出错了...',
|
||||
EnUs: 'Oops...Network Error...',
|
||||
},
|
||||
desc: {
|
||||
ZhCn: '请确保处于校网环境后，点击右上角 "...-重新进入小程序"！',
|
||||
EnUs: 'Please make sure you\'re in ZJU\'s school network environment and then click on the top right corner "... - re-enter the applet"!',
|
||||
},
|
||||
titleZhCn: '啊哦...请求出错了...',
|
||||
descZhCn: '请确保处于校网环境后，点击右上角 "...-重新进入小程序"！',
|
||||
titleEnUs: 'Oops...Network Error...',
|
||||
descEnUs:
|
||||
'Please make sure you\'re in ZJU\'s school network environment and then click on the top right corner "... - re-enter the applet"!',
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,12 +1,6 @@
|
|||
export interface MainPageText {
|
||||
normal: {
|
||||
recoverTime: string;
|
||||
reason: string;
|
||||
};
|
||||
titleLine: {
|
||||
main: string;
|
||||
sub: string;
|
||||
};
|
||||
mainTitleLine: string;
|
||||
subTitleLine: string;
|
||||
cardTitle: {
|
||||
dutyInfo: string;
|
||||
stepInfo: string;
|
||||
|
|
@ -29,6 +23,11 @@ export interface MainPageText {
|
|||
stepList: Array<{ title: string }>;
|
||||
tipsList: Array<{ title: string }>;
|
||||
|
||||
ticketList: {
|
||||
title: string;
|
||||
note: string;
|
||||
};
|
||||
|
||||
dutyCard: {
|
||||
offDuty: {
|
||||
title: string;
|
||||
|
|
@ -37,21 +36,15 @@ export interface MainPageText {
|
|||
};
|
||||
inDuty: {
|
||||
title: string;
|
||||
currentDutyText: (c: '0' | '1' | '2' | '3' | 'others') => string;
|
||||
currentDutyText: (c: 'off' | '1' | '2' | '3' | 'others') => string;
|
||||
inDutyCnt: (n: number) => string;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
export const mainPageZhCn: MainPageText = {
|
||||
normal: {
|
||||
recoverTime: '明天 13:30',
|
||||
reason: '正常下班',
|
||||
},
|
||||
titleLine: {
|
||||
main: '您好，这里是E志者协会',
|
||||
sub: '维修请至【东三-204】实验室',
|
||||
},
|
||||
mainTitleLine: '您好，这里是E志者协会',
|
||||
subTitleLine: '维修请至【东三-204】实验室',
|
||||
cardTitle: {
|
||||
dutyInfo: '值班情况',
|
||||
stepInfo: '维修步骤',
|
||||
|
|
@ -83,6 +76,10 @@ export const mainPageZhCn: MainPageText = {
|
|||
{ title: '204 也是实验室，请勿在内饮食~' },
|
||||
{ title: '我们是志愿服务，不收取任何礼物哦~' },
|
||||
],
|
||||
ticketList: {
|
||||
title: '预填写工单列表',
|
||||
note: '在这里查看所有的预填写工单！',
|
||||
},
|
||||
dutyCard: {
|
||||
offDuty: {
|
||||
title: '未值班',
|
||||
|
|
@ -93,7 +90,7 @@ export const mainPageZhCn: MainPageText = {
|
|||
title: '值班中',
|
||||
currentDutyText: (c) => {
|
||||
switch (c) {
|
||||
case '0':
|
||||
case 'off':
|
||||
return '当前未值班';
|
||||
case '1':
|
||||
return '第一班 13:30-16:00';
|
||||
|
|
@ -111,14 +108,8 @@ export const mainPageZhCn: MainPageText = {
|
|||
};
|
||||
|
||||
export const mainPageEnUs: MainPageText = {
|
||||
normal: {
|
||||
recoverTime: 'Tomorrow 13:30',
|
||||
reason: 'Normal shift',
|
||||
},
|
||||
titleLine: {
|
||||
main: 'Hi! This is EVA.',
|
||||
sub: 'For maintenance, please go to [204 Lab, E3 building]',
|
||||
},
|
||||
mainTitleLine: 'Hi! This is EVA.',
|
||||
subTitleLine: 'For maintenance, please go to [204 Lab, E3 building]',
|
||||
cardTitle: {
|
||||
dutyInfo: 'Duty Situation',
|
||||
stepInfo: 'Maintenance Steps',
|
||||
|
|
@ -150,6 +141,10 @@ export const mainPageEnUs: MainPageText = {
|
|||
{ title: '204 is also a laboratory. Do not eat inside.' },
|
||||
{ title: 'We are volunteers and do not take any gifts.' },
|
||||
],
|
||||
ticketList: {
|
||||
title: 'Pre-filling ticket list',
|
||||
note: 'Browse for all pre-filling tickets here!',
|
||||
},
|
||||
dutyCard: {
|
||||
offDuty: {
|
||||
title: 'Off Duty',
|
||||
|
|
@ -160,8 +155,8 @@ export const mainPageEnUs: MainPageText = {
|
|||
title: 'On Duty',
|
||||
currentDutyText: (c) => {
|
||||
switch (c) {
|
||||
case '0':
|
||||
return 'Normal Shift';
|
||||
case 'off':
|
||||
return 'Currently not on duty';
|
||||
case '1':
|
||||
return '1st Shift 13:30-16:00';
|
||||
case '2':
|
||||
|
|
|
|||
|
|
@ -1,16 +1,10 @@
|
|||
export interface MemberPageText {
|
||||
titleLine: {
|
||||
main: {
|
||||
index: string;
|
||||
login: string;
|
||||
logout: string;
|
||||
};
|
||||
sub: {
|
||||
index: string;
|
||||
login: string;
|
||||
logout: string;
|
||||
};
|
||||
};
|
||||
mainTitleLine: string;
|
||||
subTitleLine: string;
|
||||
loginMainTitleLine: string;
|
||||
loginSubTitleLine: string;
|
||||
logoutMainTitleLine: string;
|
||||
logoutSubTitleLine: string;
|
||||
cardTitle: {
|
||||
dutyInfo: string;
|
||||
stepInfo: string;
|
||||
|
|
@ -28,6 +22,9 @@ export interface MemberPageText {
|
|||
title: string;
|
||||
placeholder: string;
|
||||
};
|
||||
uncompletedTicket: {
|
||||
extra: string;
|
||||
};
|
||||
dutyCard: {
|
||||
offDuty: {
|
||||
title: string;
|
||||
|
|
@ -57,33 +54,22 @@ export interface MemberPageText {
|
|||
};
|
||||
stepList: Array<{ title: string }>;
|
||||
tipsList: Array<{ title: string }>;
|
||||
ticketList: {
|
||||
hint: string;
|
||||
title: string;
|
||||
note: string;
|
||||
};
|
||||
}
|
||||
|
||||
export const memberPageZhCn: MemberPageText = {
|
||||
titleLine: {
|
||||
main: {
|
||||
index: '您好，',
|
||||
login: '协会成员登录入口',
|
||||
logout: '协会成员登出',
|
||||
},
|
||||
sub: {
|
||||
index: '祝你满绩每一天',
|
||||
login: '请使用 EVA 统一身份认证，登录后点击下方按钮以扫描二维码',
|
||||
logout: '登出后须扫码重新登录！',
|
||||
},
|
||||
},
|
||||
mainTitleLine: '您好，',
|
||||
subTitleLine: '祝你满绩每一天',
|
||||
loginMainTitleLine: '协会成员登录入口',
|
||||
loginSubTitleLine: '请使用 EVA 统一身份认证，登录后点击下方按钮以扫描二维码',
|
||||
logoutMainTitleLine: '协会成员登出',
|
||||
logoutSubTitleLine: '登出后须扫码重新登录！',
|
||||
cardTitle: {
|
||||
dutyInfo: '值班情况',
|
||||
stepInfo: '维修步骤',
|
||||
tipsInfo: '注意事项',
|
||||
},
|
||||
dutyCount: {
|
||||
button: '更新',
|
||||
button: '更新值班人数',
|
||||
text: '当前值班人数：',
|
||||
},
|
||||
stuidText: {
|
||||
|
|
@ -94,6 +80,9 @@ export const memberPageZhCn: MemberPageText = {
|
|||
title: '密码',
|
||||
placeholder: '与 EVA 统一身份认证一致',
|
||||
},
|
||||
uncompletedTicket: {
|
||||
extra: '详细信息',
|
||||
},
|
||||
dutyCard: {
|
||||
offDuty: {
|
||||
title: '空闲',
|
||||
|
|
@ -146,34 +135,23 @@ export const memberPageZhCn: MemberPageText = {
|
|||
{ title: '离开 204 前清点好维修物资！' },
|
||||
{ title: '螺丝上了吗？电源排线插了吗？' },
|
||||
],
|
||||
ticketList: {
|
||||
hint: '七日内未完成工单',
|
||||
title: '预填写工单列表',
|
||||
note: '在这里查看所有的预填写工单！',
|
||||
},
|
||||
};
|
||||
|
||||
export const memberPageEnUs: MemberPageText = {
|
||||
titleLine: {
|
||||
main: {
|
||||
index: 'Hi! ',
|
||||
login: 'EVA Member Entry',
|
||||
logout: 'EVA Member Logout',
|
||||
},
|
||||
sub: {
|
||||
index: 'Have a great day!',
|
||||
login:
|
||||
mainTitleLine: 'Hi! ',
|
||||
subTitleLine: 'Have a great day!',
|
||||
loginMainTitleLine: 'EVA Member Entry',
|
||||
loginSubTitleLine:
|
||||
'Please use EVA Auth, log in and click the button below to scan the QR code',
|
||||
logout: 'After logging out, scan the code again to log back in!',
|
||||
},
|
||||
},
|
||||
logoutMainTitleLine: 'EVA Member Logout',
|
||||
logoutSubTitleLine: 'After logging out, scan the code again to log back in!',
|
||||
cardTitle: {
|
||||
dutyInfo: 'Duty Situation',
|
||||
stepInfo: 'Maintenance Steps',
|
||||
tipsInfo: 'Tips',
|
||||
},
|
||||
dutyCount: {
|
||||
button: 'Update',
|
||||
button: 'Update Duty Count',
|
||||
text: 'The duty count: ',
|
||||
},
|
||||
stuidText: {
|
||||
|
|
@ -184,6 +162,9 @@ export const memberPageEnUs: MemberPageText = {
|
|||
title: 'Password',
|
||||
placeholder: 'Consistent with EVA Auth',
|
||||
},
|
||||
uncompletedTicket: {
|
||||
extra: 'Details',
|
||||
},
|
||||
dutyCard: {
|
||||
offDuty: {
|
||||
title: 'Off Duty',
|
||||
|
|
@ -240,9 +221,4 @@ export const memberPageEnUs: MemberPageText = {
|
|||
{ title: '204 is a laboratory. Do not eat inside.' },
|
||||
{ title: 'Are the screws on? Is the power cable plugged in?' },
|
||||
],
|
||||
ticketList: {
|
||||
hint: 'Uncompleted tickets in 7 days',
|
||||
title: 'Pre-filling ticket list',
|
||||
note: 'Browse for all pre-filling tickets here!',
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@ export interface RepairPageText {
|
|||
title: string;
|
||||
note: string;
|
||||
extra: string;
|
||||
hint: string;
|
||||
nohint: string;
|
||||
};
|
||||
typeText: {
|
||||
computer: string;
|
||||
|
|
@ -53,8 +51,6 @@ export const repairPageZhCn: RepairPageText = {
|
|||
title: '',
|
||||
note: '',
|
||||
extra: '详细信息',
|
||||
hint: '我正在进行的工单',
|
||||
nohint: '暂无进行中的工单',
|
||||
},
|
||||
typeText: {
|
||||
computer: '电脑',
|
||||
|
|
@ -102,8 +98,6 @@ export const repairPageEnUs: RepairPageText = {
|
|||
title: '',
|
||||
note: '',
|
||||
extra: 'Details',
|
||||
hint: 'My continuing tickets',
|
||||
nohint: 'No continuing tickets',
|
||||
},
|
||||
typeText: {
|
||||
computer: 'Computer',
|
||||
|
|
|
|||
|
|
@ -6,39 +6,35 @@ type StatusStr = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7';
|
|||
|
||||
export interface TicketDetailText {
|
||||
stepItems: Array<StepItem>;
|
||||
createTicketMessage: string;
|
||||
statusModifyPrefix: string;
|
||||
statusModifyMessage: Map<StatusStr, string>;
|
||||
desc: {
|
||||
title: string;
|
||||
};
|
||||
descTitle: string;
|
||||
divider: string;
|
||||
info: {
|
||||
title: string;
|
||||
extra: string;
|
||||
};
|
||||
button: {
|
||||
tookAway: string;
|
||||
addToOreo: string;
|
||||
addNote: string;
|
||||
pick: string;
|
||||
status: string;
|
||||
};
|
||||
reminder: {
|
||||
title: string;
|
||||
error: string;
|
||||
r0: string;
|
||||
r1: string;
|
||||
r2: string;
|
||||
r3: string;
|
||||
};
|
||||
comment: {
|
||||
title: string;
|
||||
placeholder: string;
|
||||
createTicketMessage: string;
|
||||
statusModifyPrefix: string;
|
||||
};
|
||||
status: {
|
||||
button: string;
|
||||
title: string;
|
||||
cancel: string;
|
||||
status0: string;
|
||||
status1: string;
|
||||
status2: string;
|
||||
status3: string;
|
||||
status4: string;
|
||||
status5: string;
|
||||
status6: string;
|
||||
status7: string;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -49,6 +45,8 @@ export const ticketDetailZhCn: TicketDetailText = {
|
|||
{ title: '待取回' },
|
||||
{ title: '工单完成' },
|
||||
],
|
||||
createTicketMessage: '创建了维修',
|
||||
statusModifyPrefix: '将维修状态改为：',
|
||||
statusModifyMessage: new Map<StatusStr, string>([
|
||||
['0', '已创建/交接中'],
|
||||
['1', '维修中'],
|
||||
|
|
@ -59,38 +57,32 @@ export const ticketDetailZhCn: TicketDetailText = {
|
|||
['6', '维修翻车待取回'],
|
||||
['7', '维修翻车已取回'],
|
||||
]),
|
||||
desc: {
|
||||
title: '问题描述',
|
||||
},
|
||||
descTitle: '问题描述',
|
||||
divider: '评论 / 状态',
|
||||
info: {
|
||||
title: '机主姓名',
|
||||
extra: '联系方式',
|
||||
},
|
||||
divider: '评论 / 状态',
|
||||
button: {
|
||||
tookAway: '我已取回',
|
||||
addToOreo: '加入 Oreo',
|
||||
addNote: '添加评论',
|
||||
pick: '认领',
|
||||
status: '改变状态',
|
||||
},
|
||||
comment: {
|
||||
title: '添加评论',
|
||||
placeholder: '可以在这里交流机器情况、维修进度、提出问题~',
|
||||
createTicketMessage: '创建了维修',
|
||||
statusModifyPrefix: '将维修状态改为：',
|
||||
},
|
||||
reminder: {
|
||||
title: '注意事项！',
|
||||
error: '请重新确认机器状况！',
|
||||
r0: '是否进行维修？',
|
||||
r1: '螺丝是否装回？排线是否插好？',
|
||||
r2: '维修后机器是否已正常运行？',
|
||||
r3: '随机附件是否已经归还？',
|
||||
},
|
||||
status: {
|
||||
button: '改变工单状态',
|
||||
title: '请选择要改变成为的状态',
|
||||
cancel: '取消',
|
||||
status0: '已创建/交接中',
|
||||
status1: '维修中',
|
||||
status2: '劝退待取回',
|
||||
status3: '劝退已取回',
|
||||
status4: '维修成功待取回',
|
||||
status5: '维修成功已取回',
|
||||
status6: '维修翻车待取回',
|
||||
status7: '维修翻车已取回',
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -101,6 +93,8 @@ export const ticketDetailEnUs: TicketDetailText = {
|
|||
{ title: 'Finished' },
|
||||
{ title: 'Retrieved' },
|
||||
],
|
||||
createTicketMessage: 'Created ticket',
|
||||
statusModifyPrefix: 'Modified repair status to: ',
|
||||
statusModifyMessage: new Map<StatusStr, string>([
|
||||
['0', 'Created / Handovering'],
|
||||
['1', 'Repairing'],
|
||||
|
|
@ -111,38 +105,32 @@ export const ticketDetailEnUs: TicketDetailText = {
|
|||
['6', 'Pending Retrieval (Failed)'],
|
||||
['7', 'Retrieved (Failed)'],
|
||||
]),
|
||||
desc: {
|
||||
title: 'Description',
|
||||
},
|
||||
descTitle: 'Description',
|
||||
divider: 'Comment / Status',
|
||||
info: {
|
||||
title: 'Name',
|
||||
extra: 'Contact',
|
||||
},
|
||||
divider: 'Comment / Status',
|
||||
button: {
|
||||
tookAway: 'Already retrieved',
|
||||
addToOreo: 'Add to Oreo',
|
||||
addNote: 'Comment',
|
||||
pick: 'Pick',
|
||||
status: 'Change status',
|
||||
},
|
||||
comment: {
|
||||
title: 'Add comment',
|
||||
title: 'Add Comment',
|
||||
placeholder:
|
||||
'You can exchange information the device, the progress of repairs, and ask questions here.',
|
||||
createTicketMessage: 'Created ticket',
|
||||
statusModifyPrefix: 'Modified repair status to: ',
|
||||
},
|
||||
reminder: {
|
||||
title: 'Reminder',
|
||||
error: 'Please re-confirm the status of the device!',
|
||||
r0: 'Is the maintenance performed?',
|
||||
r1: 'Are the srews on? Is the power cable plugged in?',
|
||||
r2: 'Did the device operate well after maintenance?',
|
||||
r3: 'Are the attachments reverted?',
|
||||
},
|
||||
status: {
|
||||
button: 'Modify Status',
|
||||
title: 'Please select the status you want to modify to',
|
||||
cancel: 'Cancel',
|
||||
status0: 'Created / Handovering',
|
||||
status1: 'Repairing',
|
||||
status2: 'Pending Retrieval (Refused)',
|
||||
status3: 'Retrieved (Refused)',
|
||||
status4: 'Pending Retrieval (Finished)',
|
||||
status5: 'Retrieved (Finished)',
|
||||
status6: 'Pending Retrieval (Failed)',
|
||||
status7: 'Retrieved (Failed)',
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
export interface UserPageText {
|
||||
memberEntry: {
|
||||
prefix: string;
|
||||
affix: string;
|
||||
front: string;
|
||||
behind: string;
|
||||
};
|
||||
ticketColumn: {
|
||||
title: string;
|
||||
|
|
@ -27,8 +27,8 @@ export interface UserPageText {
|
|||
|
||||
export const userPageZhCn: UserPageText = {
|
||||
memberEntry: {
|
||||
prefix: '再点击 ',
|
||||
affix: ' 次以进入协会成员登录页面',
|
||||
front: '再点击 ',
|
||||
behind: ' 次以进入协会成员登录页面',
|
||||
},
|
||||
ticketColumn: {
|
||||
title: '我的工单',
|
||||
|
|
@ -54,8 +54,8 @@ export const userPageZhCn: UserPageText = {
|
|||
|
||||
export const userPageEnUs: UserPageText = {
|
||||
memberEntry: {
|
||||
prefix: 'Click ',
|
||||
affix: ' more times to enter member login page',
|
||||
front: 'Click ',
|
||||
behind: ' more times to enter member login page',
|
||||
},
|
||||
ticketColumn: {
|
||||
title: 'My Tickets',
|
||||
|
|
|
|||
|
|
@ -6,10 +6,7 @@ import { getUrl } from '.';
|
|||
|
||||
export function addToOreo(that: TicketDetail) {
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
oreo: true,
|
||||
},
|
||||
isOreoLoading: true,
|
||||
});
|
||||
Taro.request({
|
||||
url: getUrl('/tickets/addtooreo'),
|
||||
|
|
@ -22,10 +19,7 @@ export function addToOreo(that: TicketDetail) {
|
|||
.then((res) => {
|
||||
console.log(res.data);
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
oreo: false,
|
||||
},
|
||||
isOreoLoading: false,
|
||||
});
|
||||
Taro.atMessage({
|
||||
message: pt.get().button.submitText.success,
|
||||
|
|
@ -35,10 +29,7 @@ export function addToOreo(that: TicketDetail) {
|
|||
.catch((err) => {
|
||||
console.log(err.errMsg);
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
oreo: false,
|
||||
},
|
||||
isOreoLoading: false,
|
||||
});
|
||||
Taro.atMessage({
|
||||
message: pt.get().button.submitText.error + err.errMsg,
|
||||
|
|
|
|||
|
|
@ -6,12 +6,9 @@ import { getUrl } from '.';
|
|||
|
||||
const reLaunchInterval = 1000;
|
||||
|
||||
export function changeStatus(that: TicketDetail) {
|
||||
export function changeStatus(that: TicketDetail, status: number) {
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
status: true,
|
||||
},
|
||||
isStatusLoading: true,
|
||||
});
|
||||
Taro.request({
|
||||
url: getUrl('/tickets/update'),
|
||||
|
|
@ -19,16 +16,13 @@ export function changeStatus(that: TicketDetail) {
|
|||
data: {
|
||||
token: wechatUser.getToken(),
|
||||
id: that.state.id,
|
||||
status: that.state.statusToBe,
|
||||
status: status,
|
||||
},
|
||||
})
|
||||
.then((res) => {
|
||||
console.log(res.data);
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
status: false,
|
||||
},
|
||||
isStatusLoading: false,
|
||||
});
|
||||
Taro.atMessage({
|
||||
message: pt.get().button.submitText.success,
|
||||
|
|
@ -43,10 +37,7 @@ export function changeStatus(that: TicketDetail) {
|
|||
.catch((err) => {
|
||||
console.log(err.errMsg);
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
status: false,
|
||||
},
|
||||
isStatusLoading: false,
|
||||
});
|
||||
Taro.atMessage({
|
||||
message: pt.get().button.submitText.error + err.errMsg,
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ export function getCurrentTicket(that: RepairPage) {
|
|||
.then((res) => {
|
||||
const data = res.data.data;
|
||||
let newIdNameList: Array<Map<number, string>> = [];
|
||||
if (data.list.length !== 0) {
|
||||
data.list.map((ticket: TicketListItem) => {
|
||||
if (
|
||||
ticket['status'] !== 3 &&
|
||||
|
|
@ -30,7 +29,6 @@ export function getCurrentTicket(that: RepairPage) {
|
|||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
that.setState({
|
||||
currentTicketsIdName: newIdNameList,
|
||||
});
|
||||
|
|
|
|||
|
|
@ -20,10 +20,28 @@ export function getDutyInfo(that: MainPage) {
|
|||
return;
|
||||
}
|
||||
const data = res.data.data;
|
||||
if (data.isInDuty) {
|
||||
that.setState({
|
||||
rs: former.trans(true),
|
||||
dutyData: data,
|
||||
dutyData: {
|
||||
isInDuty: data.isInDuty,
|
||||
inDutyCnt: data.inDutyCnt,
|
||||
currentDuty: data.currentDuty,
|
||||
otherDutyTime: data.otherDutyTime,
|
||||
place: data.place,
|
||||
},
|
||||
});
|
||||
} else {
|
||||
that.setState({
|
||||
rs: former.trans(true),
|
||||
dutyData: {
|
||||
isInDuty: data.isInDuty,
|
||||
offDutyReason: data.offDutyReason,
|
||||
dutyRecoverTime: data.dutyRecoverTime,
|
||||
place: data.place,
|
||||
},
|
||||
});
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err.errMsg);
|
||||
|
|
|
|||
|
|
@ -13,24 +13,19 @@ export function getDisable(that: TicketDetail, id: number) {
|
|||
})
|
||||
.then((res) => {
|
||||
const data = res.data.data;
|
||||
let isDisable_main = that.state.isDisable_main;
|
||||
if (data.status === 3 || data.status === 5 || data.status === 7) {
|
||||
isDisable_main.retrieve = true;
|
||||
isDisable_main.comment = true;
|
||||
that.setState({
|
||||
isRetrieveDisable_main: true,
|
||||
isCommentDisable_main: true,
|
||||
});
|
||||
}
|
||||
if (wechatUser.getAccess()) {
|
||||
if (data.workers.includes(wechatUser.getInfo().name)) {
|
||||
isDisable_main.pick = true;
|
||||
}
|
||||
}
|
||||
that.setState({
|
||||
isDisable_main: {
|
||||
...that.state.isDisable_main,
|
||||
retrieve: isDisable_main.retrieve,
|
||||
comment: isDisable_main.comment,
|
||||
pick: isDisable_main.pick,
|
||||
},
|
||||
isPickDisable_main: true,
|
||||
});
|
||||
}
|
||||
}
|
||||
})
|
||||
.catch((reason) => {
|
||||
console.log(reason.errMsg);
|
||||
|
|
|
|||
|
|
@ -8,10 +8,7 @@ const reLaunchInterval = 1000;
|
|||
|
||||
export function pickTicket(that: TicketDetail) {
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
pick: true,
|
||||
},
|
||||
isPickLoading: true,
|
||||
});
|
||||
Taro.request({
|
||||
url: getUrl('/tickets/pick'),
|
||||
|
|
@ -24,10 +21,7 @@ export function pickTicket(that: TicketDetail) {
|
|||
.then((res) => {
|
||||
console.log(res.data);
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
pick: false,
|
||||
},
|
||||
isPickLoading: false,
|
||||
});
|
||||
Taro.atMessage({
|
||||
message: pt.get().button.submitText.success,
|
||||
|
|
@ -42,10 +36,7 @@ export function pickTicket(that: TicketDetail) {
|
|||
.catch((err) => {
|
||||
console.log(err.errMsg);
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
pick: false,
|
||||
},
|
||||
isPickLoading: false,
|
||||
});
|
||||
Taro.atMessage({
|
||||
message: pt.get().button.submitText.error + err.errMsg,
|
||||
|
|
|
|||
|
|
@ -8,10 +8,7 @@ const reLaunchInterval = 1000;
|
|||
|
||||
export function retrieve(that: TicketDetail) {
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
retrieve: true,
|
||||
},
|
||||
isRetrieveLoading: true,
|
||||
});
|
||||
Taro.request({
|
||||
url: getUrl('/tickets/retrieve'),
|
||||
|
|
@ -24,10 +21,7 @@ export function retrieve(that: TicketDetail) {
|
|||
.then((res) => {
|
||||
console.log(res.data);
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
retrieve: false,
|
||||
},
|
||||
isRetrieveLoading: false,
|
||||
});
|
||||
Taro.atMessage({
|
||||
message: pt.get().button.submitText.success,
|
||||
|
|
@ -42,10 +36,7 @@ export function retrieve(that: TicketDetail) {
|
|||
.catch((err) => {
|
||||
console.log(err.errMsg);
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
retrieve: false,
|
||||
},
|
||||
isRetrieveLoading: false,
|
||||
});
|
||||
Taro.atMessage({
|
||||
message: pt.get().button.submitText.error + err.errMsg,
|
||||
|
|
|
|||
|
|
@ -8,10 +8,7 @@ const reLaunchInterval = 1000;
|
|||
|
||||
export function submitComment(that: TicketDetail) {
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
comment: true,
|
||||
},
|
||||
isCommentLoading: true,
|
||||
});
|
||||
Taro.request({
|
||||
url: getUrl('/report'),
|
||||
|
|
@ -24,10 +21,7 @@ export function submitComment(that: TicketDetail) {
|
|||
.then((res) => {
|
||||
console.log(res.data);
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
comment: false,
|
||||
},
|
||||
isCommentLoading: false,
|
||||
});
|
||||
Taro.atMessage({
|
||||
message: pt.get().button.submitText.success,
|
||||
|
|
@ -42,10 +36,7 @@ export function submitComment(that: TicketDetail) {
|
|||
.catch((err) => {
|
||||
console.log(err.errMsg);
|
||||
that.setState({
|
||||
isLoading: {
|
||||
...that.state.isLoading,
|
||||
comment: false,
|
||||
},
|
||||
isCommentLoading: false,
|
||||
});
|
||||
Taro.atMessage({
|
||||
message: pt.get().button.submitText.error + err.errMsg,
|
||||
|
|
|
|||
Loading…
Reference in New Issue