Merge branch 'master' of http://101.37.147.115:3000/mz666/apply-assistant-v3

root/NEUIKit/pages/Chat/message/message-item.vue

@@ -243,12 +243,6 @@
       " :msg="props.msg" />
 		<div class="msg-common" :style="{ flexDirection: !props.msg.isSelf ? 'row' : 'row-reverse' }"
 			v-else-if="props.msg.messageType == 100 && props.msg.attachment && JSON.parse(props.msg.attachment.raw).type == 100000">
-			<Avatar v-if="false" :account="props.msg.senderId" :teamId="
-		      conversationType ===
-		      V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM
-		        ? to
-		        : ''
-		    " :goto-user-card="true" />
 			<div class="job-card"
 				style="background-color: #ffffff;border-radius: 8px;padding: 12px;width: calc(100% - 24px);position: relative;left: 50%;transform: translateX(-50%);"
 				@tap="goDetail(JSON.parse(props.msg.attachment.raw).uniUrl,JSON.parse(props.msg.attachment.raw).jobId)">
@@ -288,6 +282,23 @@
 				</div>
 			</div>
 		</div>
+
+		<div class="msg-common" :style="{ flexDirection: !props.msg.isSelf ? 'row' : 'row-reverse' }"
+			v-else-if="props.msg.messageType == 100 && props.msg.text">
+			<Avatar :account="props.msg.senderId" :teamId="
+	      conversationType ===
+	      V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM
+	        ? to
+	        : ''
+	    " :goto-user-card="true" />
+			<!-- props.msg.text -->
+			<div class="msg-content">
+				<div class="msg-bg msg-bg-out" :style="{ fontSize: 16 + 'px' }">
+					<span class="msg-text">{{ props.msg.text }}</span>
+				</div>
+			</div>
+		</div>
+
 		<div class="msg-common" :style="{ flexDirection: !props.msg.isSelf ? 'row' : 'row-reverse' }" v-else>
 			<Avatar :account="props.msg.senderId" :teamId="
           conversationType ===
@@ -605,4 +616,30 @@
 		box-sizing: border-box;
 		max-width: 360rpx;
 	}
+	.msg-text {
+    color: #333;
+    font-size: 16px;
+    text-align: left;
+    overflow-y: auto;
+    word-break: break-all;
+    word-wrap: break-word;
+    white-space: break-spaces;
+  }
+	.msg-bg {
+  max-width: 360rpx;
+  overflow: hidden;
+  padding: 12px 16px;
+
+  &-in {
+    border-radius: 0 8px 8px 8px;
+    background-color: #ffffff;
+    margin-left: 8px;
+  }
+
+  &-out {
+    border-radius: 8px 0 8px 8px;
+    background-color: #d6e5f6;
+    margin-right: 8px;
+  }
+}
 </style>