From 4d853cc5afd62a2fdf58447a232b463ecbf2cb91 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Mon, 2 Jun 2025 17:07:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.vue         |  1 +
 src/pages/index/msgDetails.vue    |  4 ++--
 src/pages/message-pages/index.vue | 21 +++++++++++++++------
 src/pages/message/index.vue       |  2 +-
 src/pages/my/index.vue            |  4 ++--
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index f167ae7..361a0ae 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -246,6 +246,7 @@ const onJumpClassFilter = (type) => {
 const handleMsg = (item) => {
     console.log('🚀 ~ handleMsg ~ item:', item)
     const params = item
+    params.noticeContent = decodeURIComponent(item.noticeContent)
     uni.navigateTo({
         url: `/pages/index/msgDetails?params=${JSON.stringify(params)}`,
     })
diff --git a/src/pages/index/msgDetails.vue b/src/pages/index/msgDetails.vue
index ad748cd..cffb834 100644
--- a/src/pages/index/msgDetails.vue
+++ b/src/pages/index/msgDetails.vue
@@ -12,7 +12,7 @@
             <div>发布人: {{ msgItem.createBy }}</div>
             <div>发布时间: {{ msgItem.createTime }}</div>
         </div>
-        <p>{{ msgItem.noticeContent }}</p>
+        <div v-html="msgItem.noticeContent"></div>
     </div>
 </template>
 
@@ -24,7 +24,7 @@ let msgItem: any = reactive({})
 
 onLoad((opt: any) => {
     console.log('🚀 ~ onLoad ~ opt:', opt)
-    msgItem = JSON.parse(opt.params)
+    msgItem = opt.params ? JSON.parse(opt.params) : {}
     console.log('🚀 ~ onLoad ~ msgItem:', msgItem)
 })
 </script>
diff --git a/src/pages/message-pages/index.vue b/src/pages/message-pages/index.vue
index e2926b1..6f07fdb 100644
--- a/src/pages/message-pages/index.vue
+++ b/src/pages/message-pages/index.vue
@@ -50,6 +50,7 @@ import { useMemberStore } from '@/stores/index.js'
 import { onLoad, onShow, onHide, onUnload } from '@dcloudio/uni-app'
 import { debounce } from 'lodash-es'
 import { sendMessageAPI, getMessageInfoAPI, isReadMessageAPI } from '@/services/message/index.js'
+const loading = ref(false)
 const memberStore = useMemberStore()
 const messageInterval = ref(null)
 const messageList = ref([])
@@ -85,12 +86,20 @@ const isReadMessageData = async () => {
 
 // 发送按钮
 const onSendMessage = debounce(async () => {
-    const res = await sendMessageAPI(sendParams.value)
-    if (res.code === 200) {
-        getMessageInfoData()
-        sendParams.value.messageContent = ''
-    } else {
-        showNotify({ type: 'success', message: '发送失败' })
+    console.log('🚀 ~ onSendMessage ~ onSendMessage:', !sendParams.value.messageContent)
+    if (loading.value || !sendParams.value.messageContent) return
+    loading.value = true
+    try {
+        const res = await sendMessageAPI(sendParams.value)
+        loading.value = false
+        if (res.code === 200) {
+            getMessageInfoData()
+            sendParams.value.messageContent = ''
+        } else {
+            showNotify({ type: 'success', message: '发送失败' })
+        }
+    } catch (error) {
+        loading.value = false
     }
 }, 500)
 
diff --git a/src/pages/message/index.vue b/src/pages/message/index.vue
index e8673b1..e78482c 100644
--- a/src/pages/message/index.vue
+++ b/src/pages/message/index.vue
@@ -53,7 +53,7 @@
                             <!-- <text class="message-count"> 
                                 
                             </text> -->
-                            <van-badge dot v-if="item.isRead != 1"> </van-badge>
+                            <van-badge dot v-if="item.isRead != 1 && userCompanyId == item.toCompany"> </van-badge>
                         </view>
                     </view>
                 </view>
diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue
index 0b2a62a..128c488 100644
--- a/src/pages/my/index.vue
+++ b/src/pages/my/index.vue
@@ -47,12 +47,12 @@
                             <text>承租订单</text>
                         </view>
                     </van-grid-item>
-                    <van-grid-item @click="handleEquipment">
+                    <!-- <van-grid-item @click="handleEquipment">
                         <view>
                             <van-icon name="coupon" />
                             <text>出租设备查询</text>
                         </view>
-                    </van-grid-item>
+                    </van-grid-item> -->
                 </van-grid>
             </van-cell-group>
         </view>