From 0234cf68586e67053a4de67efe32374a2a6e8c86 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Fri, 18 Feb 2022 11:16:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/messageCell.vue    | 12 ++--
 pages/im/components/messagePreview.vue | 78 +++++++++++++++-----------
 2 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue
index 60cc614..e53c2b5 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -6,11 +6,12 @@
         </view>
         <view class="content">
             <view class="header">
-                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3" class='qun'>[群]</text></view>
+                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3"
+                        class='qun'>[群]</text></view>
                 <view class="time">{{ item.sentTime|timeCustomCN }}</view>
             </view>
-            <message-preview class="preview" :msg="item.latestMessage" :conversationType="item.conversationType"
-                :user="item.latestMessage.userInfo" />
+            <message-preview class="preview" :msg="item.latestMessage" :draft="item.draft"
+                :conversationType="item.conversationType" :user="item.latestMessage.userInfo" />
         </view>
     </view>
 </template>
@@ -26,6 +27,9 @@
                     return {}
                 }
             }
+        },
+        mounted() {
+          console.log(this.item);  
         },
         computed: {
             contact() {
@@ -58,7 +62,7 @@
             box-sizing: border-box;
             position: relative;
             flex: 1;
-            
+
 
             border-bottom-width: 0.5px !important;
             border-color: #f9f9f9 !important;
diff --git a/pages/im/components/messagePreview.vue b/pages/im/components/messagePreview.vue
index e8450ca..2120904 100644
--- a/pages/im/components/messagePreview.vue
+++ b/pages/im/components/messagePreview.vue
@@ -1,32 +1,37 @@
 <template>
-    <view>
-        <view class="preview" v-if="msg.objectName=='RC:TxtMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>{{ msg.content || '' }}
-        </view>
-        <view class="preview" v-if="msg.objectName=='RC:HQVCMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>[语音]
-        </view>
-        <view class="preview" v-if="msg.objectName=='RC:ImgMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>[图片]
-        </view>
-        <view class="preview" v-if="msg.objectName=='RC:GIFMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>[表情]
-        </view>
-        <view class="preview" v-if="msg.objectName=='RC:FileMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>[文件]
-        </view>
-        <view class="preview" v-if="msg.objectName=='RC:LBSMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>[位置]
-        </view>
-        <view class="preview" v-if="msg.objectName=='RC:AudioMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>[语音通话]
-        </view>
-        <view class="preview" v-if="msg.objectName=='RC:VideoMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>[视频通话]
+    <view>
+        <view class="preview" v-if="draft">
+            <text class="draft">[草稿]</text> {{ draft }}
         </view>
-        <view class="preview" v-if="msg.objectName=='RC:GrpNtf'">
-            [{{ msg.message }}]
-        </view>
+        <block v-else>
+            <view class="preview" v-if="msg.objectName=='RC:TxtMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>{{ msg.content || '' }}
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:HQVCMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>[语音]
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:ImgMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>[图片]
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:GIFMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>[表情]
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:FileMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>[文件]
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:LBSMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>[位置]
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:AudioMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>[语音通话]
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:VideoMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>[视频通话]
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:GrpNtf'">
+                [{{ msg.message }}]
+            </view>
+        </block>
     </view>
 </template>
 
@@ -36,10 +41,14 @@
             msg: {
                 type: Object,
                 default: {}
-            },
-            conversationType: {
-                type: Number,
-                default: 0
+            },
+            conversationType: {
+                type: Number,
+                default: 0
+            },
+            draft: {
+                type: String,
+                default: ''
             },
             user: {
                 type: Object,
@@ -63,6 +72,11 @@
         height: 32rpx;
         line-height: 32rpx;
         width: 520rpx;
-        @extend .nowrap;
+        @extend .nowrap;
+        
+        .draft {
+            color: $text-price;
+            padding-right: 10rpx;
+        }
     }
 </style>