fix Fixstatus; add support to all statuses

src/assets/icons/MyTickets/clock.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1710604932901" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4288" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M512 121.6c217.6 0 390.4 172.8 390.4 390.4S729.6 902.4 512 902.4 121.6 729.6 121.6 512 294.4 121.6 512 121.6m0-89.6C246.4 32 32 249.6 32 512s217.6 480 480 480 480-217.6 480-480S774.4 32 512 32z" p-id="4289"></path><path d="M675.2 512H508.8V284.8c0-25.6-19.2-41.6-41.6-41.6H464c-25.6 0-41.6 19.2-41.6 41.6v272c0 25.6 19.2 41.6 41.6 41.6h214.4c25.6 0 44.8-22.4 44.8-44.8s-22.4-41.6-48-41.6z" p-id="4290"></path></svg>

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;

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';
-
+import { FixStatus } from '@/common';
-type FixStatus = 1 | 2 | 3 | 4 | 5;
 
 export class TicketListItem {
   id: number;
@@ -29,11 +29,14 @@ export class TicketListItem {
     this.status = status;
     this.createAt = createAt;
     this.iconMap = new Map<FixStatus, string>([
+      [0, repair],
       [1, repair],
-      [2, repair],
+      [2, clock],
       [3, finished],
-      [4, tick],
+      [4, clock],
-      [5, fail],
+      [5, finished],
+      [6, clock],
+      [7, fail],
     ]);
   }
 

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, '创建成功'],
+    [0, '已创建/交接中'],
-    [2, '维修中'],
+    [1, '维修中'],
-    [3, '待取回'],
+    [2, '劝退待取回'],
-    [4, '已取回'],
+    [3, '劝退已取回'],
-    [5, '已取回'],
+    [4, '维修成功待取回'],
+    [5, '维修成功已取回'],
+    [6, '维修翻车待取回'],
+    [7, '维修翻车已取回'],
   ]),
 };
 
@@ -23,10 +26,13 @@ export const ticketListEnUs: TicketListText = {
     return 'Created at' + ' ' + time;
   },
   statusMap: new Map([
-    [1, 'Created'],
+    [0, 'Created / Handovering'],
-    [2, 'Repairing'],
+    [1, 'Repairing'],
-    [3, 'Pending Retrieval'],
+    [2, 'Pending Retrieval (Refused)'],
-    [4, 'Retrieved'],
+    [3, 'Retrieved (Refused)'],
-    [5, 'Retrieved'],
+    [4, 'Pending Retrieval (Finished)'],
+    [5, 'Retrieved (Finished)'],
+    [4, 'Pending Retrieval (Failed)'],
+    [5, 'Retrieved (Failed)'],
   ]),
 };

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,
             ),
         ),
       });