Merge branch 'fix/0523-ch' into msb_test

src/manifest.json

@@ -2,7 +2,7 @@
     "name" : "马士兵严选",
     "appid" : "__UNI__3FB31B6",
     "description" : "",
-    "versionName" : "1.0.0",
+    "versionName" : "1.0.1",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */

src/pages/account/message/group.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 16:13:00
  * @LastEditors: ch
- * @LastEditTime: 2022-05-21 19:11:50
+ * @LastEditTime: 2022-05-27 15:32:18
  * @Description: file content
 -->
 <template>
@@ -17,7 +17,14 @@
 					<text class="msgItem--title">{{item.fromNickname}}</text>
 					<text class="msgItem--text" v-if="item.lastMessage">
 						<template v-if="item.lastMessage.type == msgType.TXT">{{item.lastMessage.payload.content || item.lastMessage.payload.text}}</template>
-						<template v-if="item.lastMessage.type == msgType.CUSTOM">[链接]</template>
+						<template v-if="item.lastMessage.type == msgType.CUSTOM">
+							<template v-if="item.lastMessage.payload.customType === 'orderAutoDelivery'">
+								{{item.lastMessage.payload.content}}
+							</template>
+							<template v-else>
+								[链接]
+							</template>
+						</template>
 						<template v-if="item.lastMessage.type == msgType.IMG">[图片]</template>
 						<template v-if="item.lastMessage.type == msgType.VIDEO">[视频]</template>
 					</text>

src/pages/account/message/system.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-26 14:32:03
  * @LastEditors: ch
- * @LastEditTime: 2022-05-26 21:36:41
+ * @LastEditTime: 2022-05-27 15:33:40
  * @Description: file content
 -->
 <template>
@@ -15,12 +15,12 @@
 				<view class="msg-item--con" @click="handleDetail(item)">
 					<image class="msg-item--img" :src="item.payload.productImageUrls ? item.payload.productImageUrls[0] : require('@/static/message/xt.png')" mode="widthFix"/>
 					<view class="msg-item--desc" v-if="item.payload.customType === 'orderAutoDelivery'">
+						<text>{{item.payload.content}}</text>
 						<template v-for="i in item.payload.virtualProductContentList">
 							<text class="msg-item--desc-link" v-if="i.shipType === 1"  @click="openLink(i)" :key="i.shipContent">[下载文件]</text>
 							<text v-else :key="i.shipContent">{{i.shipContent}}</text>
 						</template>
 					</view>
-					<view class="msg-item--desc" v-else>{{item.payload.content}}</view>
 				</view>
 		</view>
 		<u-loadmore status="loading" v-if="!msgData || !msgData.length"/>