From 7ced70ab2147ce2ef95e59fc5f15c2e72aace585 Mon Sep 17 00:00:00 2001
From: Dawn_Ocean <1785590531@qq.com>
Date: Mon, 18 Mar 2024 14:08:52 +0800
Subject: [PATCH] fix Fixstatus; add support to all statuses
---
src/assets/icons/MyTickets/clock.svg | 1 +
src/common.ts | 2 +-
.../TicketListItem/TicketListItem.tsx | 13 +++++----
src/plain-text/TicketList.ts | 28 +++++++++++--------
src/service/myTicket.ts | 10 +++++--
5 files changed, 35 insertions(+), 19 deletions(-)
create mode 100644 src/assets/icons/MyTickets/clock.svg
diff --git a/src/assets/icons/MyTickets/clock.svg b/src/assets/icons/MyTickets/clock.svg
new file mode 100644
index 0000000..b79ea85
--- /dev/null
+++ b/src/assets/icons/MyTickets/clock.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/common.ts b/src/common.ts
index cc18efe..ab62755 100644
--- a/src/common.ts
+++ b/src/common.ts
@@ -1,4 +1,4 @@
-export type FixStatus = 0 | 1 | 2 | 3 | 4 | 5;
+export type FixStatus = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7;
export type Info = {
phone: string;
diff --git a/src/components/TicketListItem/TicketListItem.tsx b/src/components/TicketListItem/TicketListItem.tsx
index 316c2e5..967020f 100644
--- a/src/components/TicketListItem/TicketListItem.tsx
+++ b/src/components/TicketListItem/TicketListItem.tsx
@@ -3,10 +3,10 @@ import repair from '@/assets/icons/MyTickets/repair.svg';
import finished from '@/assets/icons/MyTickets/finished.svg';
import tick from '@/assets/icons/MyTickets/tick.svg';
import fail from '@/assets/icons/MyTickets/fail.svg';
+import clock from '@/assets/icons/MyTickets/clock.svg';
import pt from '@/plain-text';
import Taro from '@tarojs/taro';
-
-type FixStatus = 1 | 2 | 3 | 4 | 5;
+import { FixStatus } from '@/common';
export class TicketListItem {
id: number;
@@ -29,11 +29,14 @@ export class TicketListItem {
this.status = status;
this.createAt = createAt;
this.iconMap = new Map([
+ [0, repair],
[1, repair],
- [2, repair],
+ [2, clock],
[3, finished],
- [4, tick],
- [5, fail],
+ [4, clock],
+ [5, finished],
+ [6, clock],
+ [7, fail],
]);
}
diff --git a/src/plain-text/TicketList.ts b/src/plain-text/TicketList.ts
index 7e40fde..d9c52d9 100644
--- a/src/plain-text/TicketList.ts
+++ b/src/plain-text/TicketList.ts
@@ -1,4 +1,4 @@
-type FixStatus = 1 | 2 | 3 | 4 | 5;
+import { FixStatus } from '@/common';
export interface TicketListText {
createdAt(time: string): string;
@@ -10,11 +10,14 @@ export const ticketListZhCn: TicketListText = {
return '创建于' + ' ' + time;
},
statusMap: new Map([
- [1, '创建成功'],
- [2, '维修中'],
- [3, '待取回'],
- [4, '已取回'],
- [5, '已取回'],
+ [0, '已创建/交接中'],
+ [1, '维修中'],
+ [2, '劝退待取回'],
+ [3, '劝退已取回'],
+ [4, '维修成功待取回'],
+ [5, '维修成功已取回'],
+ [6, '维修翻车待取回'],
+ [7, '维修翻车已取回'],
]),
};
@@ -23,10 +26,13 @@ export const ticketListEnUs: TicketListText = {
return 'Created at' + ' ' + time;
},
statusMap: new Map([
- [1, 'Created'],
- [2, 'Repairing'],
- [3, 'Pending Retrieval'],
- [4, 'Retrieved'],
- [5, 'Retrieved'],
+ [0, 'Created / Handovering'],
+ [1, 'Repairing'],
+ [2, 'Pending Retrieval (Refused)'],
+ [3, 'Retrieved (Refused)'],
+ [4, 'Pending Retrieval (Finished)'],
+ [5, 'Retrieved (Finished)'],
+ [4, 'Pending Retrieval (Failed)'],
+ [5, 'Retrieved (Failed)'],
]),
};
diff --git a/src/service/myTicket.ts b/src/service/myTicket.ts
index b90e705..f2834b6 100644
--- a/src/service/myTicket.ts
+++ b/src/service/myTicket.ts
@@ -2,6 +2,7 @@ import MyTicketPage from '@/pages/user/myTicket/myTicket';
import { TicketListItem } from '@/components/TicketListItem/TicketListItem';
import Taro from '@tarojs/taro';
import moment from 'moment';
+import { FixStatus } from '@/common';
import { getUrl } from '.';
export function getMyTicketList(that: MyTicketPage) {
@@ -23,14 +24,19 @@ export function getMyTicketList(that: MyTicketPage) {
that.setState({
rs: former.trans(true),
fixList: res.data.data.list.map(
- (item) =>
+ (item: {
+ id: number;
+ device: string;
+ deviceModel: string;
+ status: FixStatus;
+ createdTime: moment.MomentInput;
+ }) =>
new TicketListItem(
item.id,
item.device,
item.deviceModel,
item.status,
moment(item.createdTime),
- item.isMember,
),
),
});