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

pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue

@@ -151,7 +151,11 @@ const lastMsgContent = computed(() => {
 		let _str = "[多媒体]";
 
 		if (!lastMsg.text && lastMsg.attachment && lastMsg.attachment.raw) {
-			_str = "[职位] " + JSON.parse(lastMsg.attachment.raw).title;
+			if(!lastMsg.text && lastMsg.attachment && lastMsg.attachment.raw && lastMsg.attachment.ext == '.mp4' && lastMsg.attachment.url){
+				_str = "[视频]";
+			}else{
+				_str = "[职位] " + JSON.parse(lastMsg.attachment.raw).title;
+			}
 		}
 		if (!lastMsg.text && lastMsg.attachment && lastMsg.attachment.ext == ".mp3") {
 			_str = "[语音]";

root/NEUIKit/pages/user-card/my-detail/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="wrapper g_bg_f_5">
+  <div class="wrapper g_bg_f_5" style="background-color: #ededed;">
     <!-- <NavBar :title="t('PersonalPageText')" /> -->
 		<div style="height: 10px;"></div>
     <div class="userInfo-item-wrapper">

utils/common.js

@@ -10,8 +10,8 @@ let data = {
       fadanBaseImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/",
       loginText: '请登录',
       coziID: '7537572244600471579',
-      // baseUrl:"https://daotian.matripe.com.cn",// 网络请求的基础路径
+      baseUrl:"https://daotian.matripe.com.cn",// 网络请求的基础路径
-      baseUrl: "http://192.168.3.83:8001", // 网络请求的基础路径
+      // baseUrl: "http://192.168.3.83:8001", // 网络请求的基础路径
       // #ifdef MP-WEIXIN
       version: uni.getAccountInfoSync().miniProgram.version || "1.0.16",
       // #endif