增加昵称和部门的匹配

pages/conversation/conversationList/components/ConversationItem.vue

@@ -10,7 +10,11 @@
         size="46"
       />
       <view class="details">
-        <text class="conversation_name">{{ source.showName }}</text>
+        <text class="conversation_name">{{ source.showName }}
+          <template v-if="!isGroup && source.deptName">
+            <text class="dept_name" :style="{backgroundColor: source.color, color: '#fff', padding: '2px 8px', borderRadius: '8px', fontSize: '20rpx', marginLeft: '8rpx'}">{{ source.deptName }}</text>
+          </template>
+        </text>
         <view class="lastest_msg_wrap">
           <text class="lastest_msg_content">{{ latestMessage }}</text>
         </view>
@@ -106,6 +110,14 @@ export default {
         @include nomalEllipsis();
         max-width: 40vw;
         font-size: 28rpx;
+        display: inline-flex;
+        align-items: center;
+      }
+      .dept_name {
+        display: inline-block;
+        line-height: 1.2;
+        vertical-align: middle;
+        margin-left: 8rpx;
       }
 
       .lastest_msg_wrap {