From 84507f72147b15c0b617769cb64f91c8b414de03 Mon Sep 17 00:00:00 2001
From: Dawn_Ocean <1785590531@qq.com>
Date: Thu, 14 Mar 2024 12:09:51 +0800
Subject: [PATCH] refactor ticketListItem

---
 src/components/TicketListItem/TicketListItem.config.ts |  3 +++
 src/components/TicketListItem/TicketListItem.scss      |  0
 .../TicketListItem}/TicketListItem.tsx                 |  0
 src/pages/repair/repair.tsx                            |  3 +++
 src/pages/user/myTicket/myTicket.tsx                   |  2 +-
 src/service/currentTicket.ts                           | 10 ++++++++++
 src/service/myTicket.ts                                |  2 +-
 7 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 src/components/TicketListItem/TicketListItem.config.ts
 create mode 100644 src/components/TicketListItem/TicketListItem.scss
 rename src/{pages/user/myTicket => components/TicketListItem}/TicketListItem.tsx (100%)

diff --git a/src/components/TicketListItem/TicketListItem.config.ts b/src/components/TicketListItem/TicketListItem.config.ts
new file mode 100644
index 0000000..fd50080
--- /dev/null
+++ b/src/components/TicketListItem/TicketListItem.config.ts
@@ -0,0 +1,3 @@
+export default {
+  component: true,
+};
diff --git a/src/components/TicketListItem/TicketListItem.scss b/src/components/TicketListItem/TicketListItem.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/user/myTicket/TicketListItem.tsx b/src/components/TicketListItem/TicketListItem.tsx
similarity index 100%
rename from src/pages/user/myTicket/TicketListItem.tsx
rename to src/components/TicketListItem/TicketListItem.tsx
diff --git a/src/pages/repair/repair.tsx b/src/pages/repair/repair.tsx
index f0f78cb..b86242f 100644
--- a/src/pages/repair/repair.tsx
+++ b/src/pages/repair/repair.tsx
@@ -16,6 +16,7 @@ import { submitTicket } from '@/service/submitTicket';
 import type CustomTabBar from '@/custom-tab-bar';
 import repairLogo from '@/assets/icons/RepairPage/repair.svg';
 import DetailFramework from '@/components/DetailFramework/DetailFramework';
+import { TicketListItem } from '@/components/TicketListItem/TicketListItem';
 import './repair.scss';
 
 interface RepairPageState {
@@ -28,6 +29,7 @@ interface RepairPageState {
   isLoading: boolean;
   isDisable: boolean;
   checkedList: Array<number>;
+  currentTicket: Array<TicketListItem>;
 }
 
 const submitInterval = 5000;
@@ -43,6 +45,7 @@ export default class RepairPage extends Component<{}, RepairPageState> {
     isLoading: false,
     isDisable: true,
     checkedList: [0],
+    currentTicket: [],
   };
 
   componentDidMount(): void {
diff --git a/src/pages/user/myTicket/myTicket.tsx b/src/pages/user/myTicket/myTicket.tsx
index 68d45f4..e4ac320 100644
--- a/src/pages/user/myTicket/myTicket.tsx
+++ b/src/pages/user/myTicket/myTicket.tsx
@@ -6,8 +6,8 @@ import moment from 'moment';
 import pt from '@/plain-text';
 import { RequestState } from '@/service';
 import { getMyTicketList } from '@/service/myTicket';
+import { TicketListItem } from '@/components/TicketListItem/TicketListItem';
 import './myTicket.scss';
-import { TicketListItem } from './TicketListItem';
 
 interface MyTicketState {
   fixList: Array<TicketListItem>;
diff --git a/src/service/currentTicket.ts b/src/service/currentTicket.ts
index 4768fbf..1c4bfe6 100644
--- a/src/service/currentTicket.ts
+++ b/src/service/currentTicket.ts
@@ -1,5 +1,6 @@
 import RepairPage from '@/pages/repair/repair';
 import Taro from '@tarojs/taro';
+import { TicketListItem } from '@/components/TicketListItem/TicketListItem';
 import { getUrl } from '.';
 
 export function getCurrentTicket(that: RepairPage) {
@@ -12,6 +13,15 @@ export function getCurrentTicket(that: RepairPage) {
   })
     .then((res) => {
       const data = res.data.data;
+      const currentTicket: Array<TicketListItem> = [];
+      data.list.array.forEach((ticket: TicketListItem) => {
+        if (ticket['status'] != 5) {
+          currentTicket.push(ticket);
+        }
+      });
+      that.setState({
+        currentTicket: currentTicket,
+      });
     })
     .catch((err) => {
       console.log(err);
diff --git a/src/service/myTicket.ts b/src/service/myTicket.ts
index 6738842..409c5a1 100644
--- a/src/service/myTicket.ts
+++ b/src/service/myTicket.ts
@@ -1,5 +1,5 @@
 import MyTicketPage from '@/pages/user/myTicket/myTicket';
-import { TicketListItem } from '@/pages/user/myTicket/TicketListItem';
+import { TicketListItem } from '@/components/TicketListItem/TicketListItem';
 import Taro from '@tarojs/taro';
 import moment from 'moment';
 import { getUrl } from '.';