From 9931b23337698019523d75f56e784b120ccd2475 Mon Sep 17 00:00:00 2001
From: Dawn_Ocean <1785590531@qq.com>
Date: Thu, 14 Mar 2024 16:51:21 +0800
Subject: [PATCH] wrap up detailframework in atcard in repair page

---
 mock/mytickets.json                           |  2 +-
 mock/ticketInfo.json                          |  4 +-
 .../DetailFramework/DetailFramework.tsx       |  4 +-
 src/pages/repair/repair.tsx                   | 40 +++++++++++++------
 src/plain-text/RepairPage.ts                  | 18 +++++++++
 src/service/currentTicket.ts                  | 18 ++++++---
 src/service/myTicket.ts                       | 17 +++-----
 .../{ticketsInfo.tsx => ticketsInfo.ts}       |  0
 8 files changed, 68 insertions(+), 35 deletions(-)
 rename src/service/{ticketsInfo.tsx => ticketsInfo.ts} (100%)

diff --git a/mock/mytickets.json b/mock/mytickets.json
index 67cfa70..78089bb 100644
--- a/mock/mytickets.json
+++ b/mock/mytickets.json
@@ -3,7 +3,7 @@
     {
       "id": 6830,
       "type": 1,
-      "status": 5,
+      "status": 2,
       "device": "主机",
       "deviceModel": "技嘉",
       "owner": "武技栏",
diff --git a/mock/ticketInfo.json b/mock/ticketInfo.json
index e9b1af8..9bf5947 100644
--- a/mock/ticketInfo.json
+++ b/mock/ticketInfo.json
@@ -1,5 +1,5 @@
 {
-  "id": 6847,
+  "id": 6830,
   "type": 1,
   "device": "华硕",
   "deviceModel": "灵耀X14",
@@ -8,7 +8,7 @@
   "description": "清灰",
   "workers": [],
   "createdTime": "2024-03-07T19:52:48.523303",
-  "status": 5,
+  "status": 2,
   "isConfirmed": false,
   "notes": [
     {
diff --git a/src/components/DetailFramework/DetailFramework.tsx b/src/components/DetailFramework/DetailFramework.tsx
index fc2175d..f14ec0e 100644
--- a/src/components/DetailFramework/DetailFramework.tsx
+++ b/src/components/DetailFramework/DetailFramework.tsx
@@ -131,7 +131,9 @@ export default class DetailFramework extends Component<
           </View>
         ) : (
           <View style={{ padding: 10 }}>
-            <NoteList noteList={[this.state.notes[-1]]} />
+            <NoteList
+              noteList={[this.state.notes[this.state.notes.length - 1]]}
+            />
           </View>
         )
       ) : (
diff --git a/src/pages/repair/repair.tsx b/src/pages/repair/repair.tsx
index b86242f..2ed6942 100644
--- a/src/pages/repair/repair.tsx
+++ b/src/pages/repair/repair.tsx
@@ -16,7 +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 { getCurrentTicket } from '@/service/currentTicket';
 import './repair.scss';
 
 interface RepairPageState {
@@ -29,11 +29,22 @@ interface RepairPageState {
   isLoading: boolean;
   isDisable: boolean;
   checkedList: Array<number>;
-  currentTicket: Array<TicketListItem>;
+  currentTicketsId: Array<number>;
 }
 
 const submitInterval = 5000;
 
+const middleButton = <View></View>;
+
+const isInfoShow = {
+  device: true,
+  createdTime: true,
+  description: false,
+  current: true,
+  notelist: true,
+  showAllNotes: false,
+};
+
 export default class RepairPage extends Component<{}, RepairPageState> {
   state = {
     type: 1 as 0 | 1,
@@ -45,10 +56,12 @@ export default class RepairPage extends Component<{}, RepairPageState> {
     isLoading: false,
     isDisable: true,
     checkedList: [0],
-    currentTicket: [],
+    currentTicketsId: [] as Array<number>,
   };
 
   componentDidMount(): void {
+    getCurrentTicket(this, middleButton, isInfoShow);
+
     setTimeout(() => {
       this.setState({
         isDisable: false,
@@ -149,19 +162,20 @@ export default class RepairPage extends Component<{}, RepairPageState> {
   }
 
   render(): ReactNode {
-    const middleButton = <View></View>;
-
-    const isInfoShow = {
-      device: true,
-      createdTime: true,
-      description: false,
-      current: true,
-      notelist: true,
-      showAllNotes: false,
-    };
+    const ticketsRenderer = this.state.currentTicketsId.map((id, idx) => (
+      <AtCard key={idx}>
+        <DetailFramework
+          id={id}
+          isInfoShow={isInfoShow}
+          middleButton={middleButton}
+        />
+      </AtCard>
+    ));
+    console.log(ticketsRenderer);
     return (
       <View>
         <AtMessage />
+        {ticketsRenderer}
         <AtCard
           note={pt.get().repairPage.cardText.note}
           title={pt.get().repairPage.cardText.title}
diff --git a/src/plain-text/RepairPage.ts b/src/plain-text/RepairPage.ts
index 727307a..6750f3f 100644
--- a/src/plain-text/RepairPage.ts
+++ b/src/plain-text/RepairPage.ts
@@ -1,4 +1,10 @@
 export interface RepairPageText {
+  currentTicket: {
+    errorMessage: string;
+    title: string;
+    note: string;
+    extra: string;
+  };
   typeText: {
     computer: string;
     appliance: string;
@@ -40,6 +46,12 @@ export interface RepairPageText {
 }
 
 export const repairPageZhCn: RepairPageText = {
+  currentTicket: {
+    errorMessage: '未获取到工单！',
+    title: '',
+    note: '',
+    extra: '',
+  },
   typeText: {
     computer: '电脑',
     appliance: '电器',
@@ -81,6 +93,12 @@ export const repairPageZhCn: RepairPageText = {
 };
 
 export const repairPageEnUs: RepairPageText = {
+  currentTicket: {
+    errorMessage: '未获取到工单！',
+    title: '',
+    note: '',
+    extra: '',
+  },
   typeText: {
     computer: 'Computer',
     appliance: 'Appliance',
diff --git a/src/service/currentTicket.ts b/src/service/currentTicket.ts
index 1c4bfe6..e261c99 100644
--- a/src/service/currentTicket.ts
+++ b/src/service/currentTicket.ts
@@ -1,9 +1,11 @@
 import RepairPage from '@/pages/repair/repair';
 import Taro from '@tarojs/taro';
 import { TicketListItem } from '@/components/TicketListItem/TicketListItem';
+import pt from '@/plain-text';
+import DetailFramework from '@/components/DetailFramework/DetailFramework';
 import { getUrl } from '.';
 
-export function getCurrentTicket(that: RepairPage) {
+export function getCurrentTicket(that: RepairPage, middleButton, isInfoShow) {
   Taro.request({
     url: getUrl('/user/mytickets'),
     method: 'GET',
@@ -13,17 +15,21 @@ 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);
+      let newIdList: Array<number> = [];
+      data.list.map((ticket: TicketListItem) => {
+        if (ticket['status'] !== 5) {
+          newIdList.push(ticket.id);
         }
       });
       that.setState({
-        currentTicket: currentTicket,
+        currentTicketsId: newIdList,
       });
     })
     .catch((err) => {
       console.log(err);
+      Taro.atMessage({
+        message: pt.get().button.submitText.error + err.toString(),
+        type: 'error',
+      });
     });
 }
diff --git a/src/service/myTicket.ts b/src/service/myTicket.ts
index 409c5a1..20c0e29 100644
--- a/src/service/myTicket.ts
+++ b/src/service/myTicket.ts
@@ -13,20 +13,15 @@ export function getMyTicketList(that: MyTicketPage) {
     },
   })
     .then((res) => {
+      let former = that.state.rs;
       if (!res.data.success) {
         that.setState({
-          rs: {
-            loading: false,
-            success: false,
-          },
+          rs: former.trans(false),
         });
         return;
       }
       that.setState({
-        rs: {
-          loading: false,
-          success: true,
-        },
+        rs: former.trans(true),
         fixList: res.data.data.list.map(
           (item) =>
             new TicketListItem(
@@ -40,11 +35,9 @@ export function getMyTicketList(that: MyTicketPage) {
       });
     })
     .catch((reason) => {
+      let former = that.state.rs;
       that.setState({
-        rs: {
-          loading: false,
-          success: false,
-        },
+        rs: former.trans(false),
       });
       console.log(reason);
     });
diff --git a/src/service/ticketsInfo.tsx b/src/service/ticketsInfo.ts
similarity index 100%
rename from src/service/ticketsInfo.tsx
rename to src/service/ticketsInfo.ts