Merge branch 'master' of http://gogs.sxdirectpurchase.com:3000/18790411793/qianzhi-message

TUIKit-House/components/TUIChat/message-list/message-elements/message-bubble.vue

@@ -312,7 +312,7 @@ function openReadUserPanel() {
         }
 
         .content-in {
-          background: #fbfbfb;
+          background: #fff;
           border-radius: 0 10px 10px;
         }
 

TUIKit/components/TUIChat/message-list/message-elements/message-bubble.vue

@@ -330,7 +330,7 @@ function openReadUserPanel() {
         }
 
         .content-in {
-          background: #fbfbfb;
+          background: #fff;
           border-radius: 0 10px 10px;
         }
 

TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue

@@ -20,11 +20,11 @@
             >
           </div>
         </div>
-        <div class="tips">{{isCustom.desc}}</div>
+        <div class="tips">{{ isCustom.desc }}</div>
       </div>
     </template>
     <!-- 发送联系方式 -->
-    <template v-else-if="isCustom.businessID === CHAT_MSG_CUSTOM_TYPE.PHONE">
+    <!-- <template v-else-if="isCustom.businessID === CHAT_MSG_CUSTOM_TYPE.PHONE">
       <div class="phone">
         <img
           src="https://qcloudimg.tencent-cloud.cn/trisys/assets/product/images/SOOZNXCHkHcm50wX2ndp4.png"
@@ -42,42 +42,39 @@
         >
         <span>复制</span>
       </div>
-    </template>
+    </template> -->
     <!-- 面试邀请 -->
-    <template v-else-if="isCustom.businessID === CHAT_MSG_CUSTOM_TYPE.ORDER">
+    <template v-if="isCustom.businessID === 'interview_message'">
       <div class="order">
         <div class="header">
-          <img :src="isCustom.imageUrl" />
+          <img
+            :src="
+              isCustom.companyLogo
+                ? isCustom.companyLogo
+                : 'https://oss.qianzhi-y.com/h5/images/static/my/set/my-head-ico.png'
+            "
+          />
           <div class="main">
-            <h1>您已发起面试邀请</h1>
-            <span></span>
+            <h1>发起面试邀请</h1>
+            <span>{{ isCustom.companyName }}</span>
           </div>
         </div>
-        <div class="xian"></div>
         <div class="contont">
           <div>
             <p class="title">面试时间</p>
-            <p class="value">{{ isCustom.interviewtime }}</p>
+            <p class="value">{{ isCustom.interviewTime }}</p>
           </div>
           <div>
             <p class="title">面试地点</p>
-            <p class="value">{{ isCustom.Interviewlocation }}</p>
+            <p class="value">{{ isCustom.interviewAddress }}</p>
           </div>
           <div>
             <p class="title">联系方式</p>
-            <p class="value">{{ isCustom.name }}{{ isCustom.iphone }}</p>
+            <p class="value">{{ isCustom.contact }}</p>
           </div>
         </div>
-        <div class="xian"></div>
-        <div class="phone_footer">
-          <span>等待接受</span>
-        </div>
       </div>
     </template>
-    
-    <template v-else>
-      <span v-html="content.custom" ></span>
-    </template>
   </div>
 </template>
 
@@ -101,7 +98,7 @@ const props = withDefaults(defineProps<Props>(), {
   messageItem: undefined,
   content: undefined,
 });
-const userType = ref(uni.getStorageSync("userId").includes("A"));
+const userType = ref(uni.getStorageSync("recruitUserId").includes("A"));
 console.log("1123123", userType);
 
 const custom = ref();
@@ -135,6 +132,7 @@ function copyTo(content) {
 const AcceptInvitation = () => {
   //普通用户接受邀请
 };
+// 此方法中不能在控制台打印信息，会卡死浏览器
 watchEffect(() => {
   custom.value = props.content;
   message.value = props.messageItem;
@@ -158,7 +156,6 @@ const openLink = (url: any) => {
   background: linear-gradient(180deg, #ffdeb2 0%, #ffecc7 100%);
   border-radius: 16rpx;
   .contont {
-    
     display: flex;
     flex-direction: row;
     align-items: center;