From d525f0288b73608626e64f3122d27f2f45985191 Mon Sep 17 00:00:00 2001
From: Dawn_Ocean <1785590531@qq.com>
Date: Sun, 17 Mar 2024 02:05:08 +0800
Subject: [PATCH] add owner's info in ticketdetail

---
 src/common.ts                                 |  5 ++
 .../DetailFramework/DetailFramework.tsx       | 56 +++++++++++++++++--
 src/pages/TicketDetail/TicketDetail.tsx       |  1 +
 src/pages/TicketDetail/TicketNote.ts          |  3 +-
 src/plain-text/TicketDetail.ts                |  3 +
 src/service/ticketsInfo.ts                    |  4 ++
 6 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/src/common.ts b/src/common.ts
index 1335f8f..569e3eb 100644
--- a/src/common.ts
+++ b/src/common.ts
@@ -1 +1,6 @@
 export type FixStatus = 1 | 2 | 3 | 4 | 5;
+
+export type Info = {
+  phone: string;
+  name: string;
+};
diff --git a/src/components/DetailFramework/DetailFramework.tsx b/src/components/DetailFramework/DetailFramework.tsx
index c31f255..dd1fb39 100644
--- a/src/components/DetailFramework/DetailFramework.tsx
+++ b/src/components/DetailFramework/DetailFramework.tsx
@@ -74,6 +74,7 @@ export default class DetailFramework extends Component<
       current: true,
       notelist: true,
       showAllNotes: true,
+      info: true,
     },
   };
 
@@ -102,13 +103,56 @@ export default class DetailFramework extends Component<
         <View></View>
       ),
       description: this.props.isInfoShow['description'] ? (
-        <View style={{ marginTop: 10, marginBottom: 10 }}>
-          <AtCard title={pt.get().ticketDetail.descTitle}>
-            <View className='at-article__h3'>
-              {this.state.ticketInfo.description}
+        this.props.isInfoShow['info'] ? (
+          <View
+            className='at-row'
+            style={{ paddingTop: 10, paddingBottom: 10, width: '100%' }}
+          >
+            <View
+              className='at-col'
+              style={{
+                marginLeft: 10,
+                paddingRight: 5,
+                marginTop: 10,
+                marginBottom: 10,
+                width: '50%',
+              }}
+            >
+              <AtCard title={pt.get().ticketDetail.descTitle}>
+                <View className='at-article__h3'>
+                  {this.state.ticketInfo.description}
+                </View>
+              </AtCard>
             </View>
-          </AtCard>
-        </View>
+            <View
+              className='at-col'
+              style={{
+                marginLeft: 5,
+                paddingRight: 10,
+                marginTop: 10,
+                marginBottom: 10,
+                width: '50%',
+              }}
+            >
+              <AtCard title={pt.get().ticketDetail.infoTitle}>
+                <View className='at-article__h3'>
+                  {this.state.ticketInfo.info.name}
+                </View>
+                <View className='at-article__h3'>
+                  {this.state.ticketInfo.info.phone}
+                </View>
+              </AtCard>
+            </View>
+          </View>
+        ) : (
+          <View style={{ marginTop: 10, marginBottom: 10 }}>
+            <AtCard title={pt.get().ticketDetail.descTitle}>
+              <View className='at-article__h3'>
+                {this.state.ticketInfo.description}
+              </View>
+            </AtCard>
+          </View>
+        )
       ) : (
         <View></View>
       ),
diff --git a/src/pages/TicketDetail/TicketDetail.tsx b/src/pages/TicketDetail/TicketDetail.tsx
index 977459c..969207b 100644
--- a/src/pages/TicketDetail/TicketDetail.tsx
+++ b/src/pages/TicketDetail/TicketDetail.tsx
@@ -243,6 +243,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
       device: true,
       createdTime: true,
       description: true,
+      info: wechatUser.getAccess() ? true : false,
       current: true,
       notelist: true,
       showAllNotes: true,
diff --git a/src/pages/TicketDetail/TicketNote.ts b/src/pages/TicketDetail/TicketNote.ts
index b5d894c..995f6c4 100644
--- a/src/pages/TicketDetail/TicketNote.ts
+++ b/src/pages/TicketDetail/TicketNote.ts
@@ -1,4 +1,4 @@
-import { FixStatus } from '@/common';
+import { FixStatus, Info } from '@/common';
 
 export class TicketInfo {
   id: number;
@@ -8,6 +8,7 @@ export class TicketInfo {
   description: string;
   createdTime: moment.Moment;
   status: FixStatus;
+  info: Info;
 }
 
 export class TicketNote {
diff --git a/src/plain-text/TicketDetail.ts b/src/plain-text/TicketDetail.ts
index 7ee955c..86b5724 100644
--- a/src/plain-text/TicketDetail.ts
+++ b/src/plain-text/TicketDetail.ts
@@ -10,6 +10,7 @@ export interface TicketDetailText {
   statusModifyPrefix: string;
   statusModifyMessage: Map<StatusStr, string>;
   descTitle: string;
+  infoTitle: string;
   tookAway: string;
   addToOreo: string;
   addNote: string;
@@ -48,6 +49,7 @@ export const ticketDetailZhCn: TicketDetailText = {
     ['5', '维修成功已取回'],
   ]),
   descTitle: '问题描述',
+  infoTitle: '机主信息',
   tookAway: '已取回',
   addToOreo: '加入 Oreo',
   addNote: '添加评论',
@@ -86,6 +88,7 @@ export const ticketDetailEnUs: TicketDetailText = {
     ['5', 'Ticket finished'],
   ]),
   descTitle: 'Problem description',
+  infoTitle: 'Contact the owner',
   tookAway: 'Already retrieved',
   addToOreo: 'Add to Oreo',
   addNote: 'Comment',
diff --git a/src/service/ticketsInfo.ts b/src/service/ticketsInfo.ts
index 9e6c42d..dce1a31 100644
--- a/src/service/ticketsInfo.ts
+++ b/src/service/ticketsInfo.ts
@@ -28,6 +28,10 @@ export function getTicketInfo(that: DetailFramework, id: number) {
           description: data.description,
           createdTime: moment(data.createdTime as string),
           status: data.status,
+          info: {
+            phone: data.phone,
+            name: data.owner,
+          },
         };
         const notes: Array<TicketNote> = [];
         data.notes.map((item) => {