From 2701deb9ccd92dc765ad9b1e638b919996e39e9c Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Wed, 19 Feb 2025 14:11:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GoodsItems/index.vue |  6 ++---
 src/pages.json                      |  7 +++++
 src/pages/index/index.vue           | 14 +++++++++-
 src/pages/index/msgDetails.vue      | 40 +++++++++++++++++++++++++++++
 src/pages/message-pages/index.vue   |  4 +--
 5 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/index/msgDetails.vue

diff --git a/src/components/GoodsItems/index.vue b/src/components/GoodsItems/index.vue
index 231010d..d73f808 100644
--- a/src/components/GoodsItems/index.vue
+++ b/src/components/GoodsItems/index.vue
@@ -11,12 +11,12 @@
             </view>
 
             <view class="address-box">
-                <van-text-ellipsis :content="`${goodsInfo.companyName}`" />
+                <van-text-ellipsis :content="` ${goodsInfo.companyName}`" />
             </view>
 
-            <view>
+            <!-- <view>
                 <van-text-ellipsis :content="`${goodsInfo.companyName}`" />
-            </view>
+            </view> -->
             <view>
                 <view>
                     <van-icon name="phone-o" />
diff --git a/src/pages.json b/src/pages.json
index e2732d1..2ad8711 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -174,6 +174,13 @@
             "style": {
                 "navigationStyle": "custom"
             }
+        },
+        // 公告详情
+        {
+            "path": "pages/index/msgDetails",
+            "style": {
+                "navigationBarTitleText": "公告详情"
+            }
         }
     ],
     "tabBar": {
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 1d19f1f..03a1ff3 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -20,7 +20,10 @@
                             class="notice-swipe"
                         >
                             <van-swipe-item :key="item.noticeId" v-for="item in noticeListMessage">
-                                <van-text-ellipsis :content="item.noticeTitle" />
+                                <van-text-ellipsis
+                                    :content="item.noticeTitle"
+                                    @click="handleMsg(item)"
+                                />
                             </van-swipe-item>
                         </van-swipe>
                     </van-notice-bar>
@@ -200,6 +203,15 @@ const onJumpClassFilter = (type) => {
     })
 }
 
+// 点击消息
+const handleMsg = (item) => {
+    console.log('🚀 ~ handleMsg ~ item:', item)
+    const params = item
+    uni.navigateTo({
+        url: `/pages/index/msgDetails?params=${JSON.stringify(params)}`,
+    })
+}
+
 onLoad(() => {
     finished.value = true
     userCompanyName.value = memberStore?.userCompanyName
diff --git a/src/pages/index/msgDetails.vue b/src/pages/index/msgDetails.vue
new file mode 100644
index 0000000..ad748cd
--- /dev/null
+++ b/src/pages/index/msgDetails.vue
@@ -0,0 +1,40 @@
+<template>
+    <div class="container">
+        <h4>{{ msgItem.noticeTitle }}</h4>
+        <div
+            style="
+                display: flex;
+                justify-content: space-between;
+                line-height: 1.9;
+                margin-bottom: 20px;
+            "
+        >
+            <div>发布人: {{ msgItem.createBy }}</div>
+            <div>发布时间: {{ msgItem.createTime }}</div>
+        </div>
+        <p>{{ msgItem.noticeContent }}</p>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { onLoad } from '@dcloudio/uni-app'
+import { reactive } from 'vue'
+
+let msgItem: any = reactive({})
+
+onLoad((opt: any) => {
+    console.log('🚀 ~ onLoad ~ opt:', opt)
+    msgItem = JSON.parse(opt.params)
+    console.log('🚀 ~ onLoad ~ msgItem:', msgItem)
+})
+</script>
+
+<style scoped lang="scss">
+.container {
+    padding: 20px;
+    // 长文本换行
+    word-wrap: break-word;
+    word-break: break-all;
+    white-space: pre-wrap;
+}
+</style>
diff --git a/src/pages/message-pages/index.vue b/src/pages/message-pages/index.vue
index 7c296a9..e2926b1 100644
--- a/src/pages/message-pages/index.vue
+++ b/src/pages/message-pages/index.vue
@@ -3,7 +3,7 @@
     <view class="h5-container message-pages">
         <view style="padding: 15px">
             <van-icon name="arrow-left" @click="onClickLeft" />
-            <text style="color: #000"> {{ sendParams.toCompanyName }} </text>
+            <text style="color: #000"> {{ sendParams.toCompanyName || '' }} </text>
         </view>
 
         <scroll-view scroll-y style="padding-bottom: 60px">
@@ -98,7 +98,7 @@ onLoad((options) => {
     myCompanyId.value = memberStore.userInfo?.companyId
     sendParams.value.toCompany = options?.id
     sendParams.value.toUser = options?.ownId
-    sendParams.value.toCompanyName = options?.name
+    sendParams.value.toCompanyName = options?.name == 'null' ? '系统通知' : options?.name
     sendParams.value.fromCompanyName = memberStore.userCompanyName
 })