From 3de05c7cfc7ec39b362646159bf3ffb2973ff63f Mon Sep 17 00:00:00 2001
From: Dawn_Ocean <1785590531@qq.com>
Date: Thu, 21 Mar 2024 11:08:10 +0800
Subject: [PATCH] add avatar in notecard

---
 mock/ticketInfo.json                 |  8 ++++----
 src/components/NoteCard/NoteCard.tsx | 24 ++++++++++++++++++------
 src/pages/TicketDetail/TicketNote.ts |  1 +
 src/service/ticketsInfo.ts           |  1 +
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/mock/ticketInfo.json b/mock/ticketInfo.json
index 9bf5947..417956f 100644
--- a/mock/ticketInfo.json
+++ b/mock/ticketInfo.json
@@ -12,7 +12,7 @@
   "isConfirmed": false,
   "notes": [
     {
-      "avatar": "https://....jpg",
+      "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
       "id": 21368,
       "op": "宇航员",
       "type": 0,
@@ -20,7 +20,7 @@
       "createdTime": "2024-03-07T19:52:48.523305"
     },
     {
-      "avatar": "https://....jpg",
+      "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
       "id": 21370,
       "op": "宇航员",
       "type": 2,
@@ -28,7 +28,7 @@
       "createdTime": "2024-03-07T19:58:27.838816"
     },
     {
-      "avatar": "https://....jpg",
+      "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
       "id": 21373,
       "op": "宇航员",
       "type": 2,
@@ -36,7 +36,7 @@
       "createdTime": "2024-03-07T20:28:12.070707"
     },
     {
-      "avatar": "https://....jpg",
+      "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png",
       "id": 21374,
       "op": "宇航员",
       "type": 2,
diff --git a/src/components/NoteCard/NoteCard.tsx b/src/components/NoteCard/NoteCard.tsx
index f219e37..a5bda8e 100644
--- a/src/components/NoteCard/NoteCard.tsx
+++ b/src/components/NoteCard/NoteCard.tsx
@@ -1,4 +1,4 @@
-import { View } from '@tarojs/components';
+import { Image, View } from '@tarojs/components';
 import { Component, ReactNode } from 'react';
 import { TicketNote, StatusStr } from '@/pages/TicketDetail/TicketNote';
 import pt from '@/plain-text';
@@ -35,12 +35,24 @@ export default class NoteCard extends Component<NoteCardProps, {}> {
     }
 
     return (
-      <View style={{ marginTop: '40rpx', marginBottom: '40rpx' }}>
-        <View className='at-article__p'>{note.op}</View>
-        <View className='at-article__info'>
-          {note.createdTime.format(timeFormat)}
+      <View className='at-row at-row__align--center'>
+        <View className='at-col at-col-1 at-col--auto'>
+          <Image
+            style='width: 70rpx; height: 70rpx; border-radius: 35px;'
+            src={note.avatar}
+            mode='aspectFit'
+          />
+        </View>
+        <View
+          className='at-col'
+          style={{ marginTop: '40rpx', marginBottom: '40rpx' }}
+        >
+          <View className='at-article__p'>{note.op}</View>
+          <View className='at-article__info'>
+            {note.createdTime.format(timeFormat)}
+          </View>
+          <View className='at-article__h3'>{message}</View>
         </View>
-        <View className='at-article__h3'>{message}</View>
       </View>
     );
   }
diff --git a/src/pages/TicketDetail/TicketNote.ts b/src/pages/TicketDetail/TicketNote.ts
index 85dae8e..cb8717b 100644
--- a/src/pages/TicketDetail/TicketNote.ts
+++ b/src/pages/TicketDetail/TicketNote.ts
@@ -12,6 +12,7 @@ export class TicketInfo {
 }
 
 export class TicketNote {
+  avatar: string;
   id: number;
   op: string;
   type: 0 | 1 | 2;
diff --git a/src/service/ticketsInfo.ts b/src/service/ticketsInfo.ts
index dce1a31..923ee31 100644
--- a/src/service/ticketsInfo.ts
+++ b/src/service/ticketsInfo.ts
@@ -36,6 +36,7 @@ export function getTicketInfo(that: DetailFramework, id: number) {
         const notes: Array<TicketNote> = [];
         data.notes.map((item) => {
           notes.push({
+            avatar: item.avatar,
             id: item.id,
             op: item.op,
             type: item.type,