From 253970b86017ee8bf8bfe9a70663ea0e18fe4682 Mon Sep 17 00:00:00 2001
From: wangdongbo <949818794@qq.com>
Date: Thu, 12 Feb 2026 15:06:49 +0800
Subject: [PATCH] no message

---
 pages/article/article-detail.vue            | 52 ++++++++++++---------
 pages/message/chat.scss                     | 10 ++--
 pages/message/components/consult-apply.vue  |  2 +
 pages/message/components/consult-cancel.vue |  7 +--
 pages/message/hooks/use-group-chat.js       | 18 +++----
 pages/message/index.vue                     |  5 +-
 store/team.js                               |  6 +--
 7 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/pages/article/article-detail.vue b/pages/article/article-detail.vue
index 5e1e900..4de34d3 100644
--- a/pages/article/article-detail.vue
+++ b/pages/article/article-detail.vue
@@ -1,31 +1,34 @@
 <template>
-  <view class="article-detail-page">
-    <view v-if="loading" class="loading-container">
-      <uni-icons type="spinner-cycle" size="40" color="#999" />
-      <text class="loading-text">加载中...</text>
-    </view>
-
-    <view v-else-if="error" class="error-container">
-      <text class="error-text">{{ error }}</text>
-      <button class="retry-btn" @click="loadArticle">重试</button>
-    </view>
-
-    <scroll-view v-else scroll-y class="article-content">
-      <view class="article-header">
-        <text class="article-title">{{ articleData.title }}</text>
-        <text class="article-date">{{ articleData.date }}</text>
+  <full-page mainClass="bg-white">
+    <view class="article-detail-page">
+      <view v-if="loading" class="loading-container">
+        <uni-icons type="spinner-cycle" size="40" color="#999" />
+        <text class="loading-text">加载中...</text>
       </view>
-      <view class="article-body">
-        <view class="rich-text-wrapper">
-          <rich-text :nodes="articleData.content"></rich-text>
+
+      <view v-else-if="error" class="error-container">
+        <text class="error-text">{{ error }}</text>
+        <button class="retry-btn" @click="loadArticle">重试</button>
+      </view>
+
+      <scroll-view v-else scroll-y class="article-content">
+        <view class="article-header">
+          <text class="article-title">{{ articleData.title }}</text>
+          <text class="article-date">{{ articleData.date }}</text>
         </view>
-      </view>
-    </scroll-view>
-  </view>
+        <view class="article-body">
+          <view class="rich-text-wrapper">
+            <rich-text :nodes="articleData.content"></rich-text>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </full-page>
 </template>
 
 <script setup>
 import { onLoad } from "@dcloudio/uni-app";
+import FullPage from "@/components/full-page.vue";
 import api from "@/utils/api.js";
 import { ref } from "vue";
 import { storeToRefs } from "pinia";
@@ -40,7 +43,7 @@ const articleData = ref({
 });
 
 let articleId = "";
-const corpId = ref('')
+const corpId = ref("");
 
 const markArticleRead = async () => {
   const unionid = account.value?.unionid;
@@ -91,7 +94,10 @@ const loadArticle = async () => {
   loading.value = true;
   error.value = "";
   try {
-    const res = await api("getArticle", { id: articleId, corpId: corpId.value });
+    const res = await api("getArticle", {
+      id: articleId,
+      corpId: corpId.value,
+    });
 
     if (res.success && res.data) {
       // 格式化日期
diff --git a/pages/message/chat.scss b/pages/message/chat.scss
index 8cdb88e..b44dbf3 100644
--- a/pages/message/chat.scss
+++ b/pages/message/chat.scss
@@ -407,7 +407,7 @@ $primary-color: #0877F1;
   display: flex;
   align-items: center;
   padding: 12rpx 20rpx;
-  padding-bottom: env(safe-area-inset-bottom);
+  padding-bottom: 40rpx;
   gap: 12rpx;
 }
 
@@ -514,7 +514,7 @@ $primary-color: #0877F1;
   background: #fff;
   border-top: 1rpx solid #eee;
   padding: 20rpx 0 20rpx 60rpx;
-  padding-bottom: env(safe-area-inset-bottom);
+  padding-bottom: 40rpx;
   gap: 40rpx 50rpx;
   flex-wrap: wrap;
   background-color: #f5f5f5;
@@ -544,7 +544,7 @@ $primary-color: #0877F1;
   background-color: white;
   border-top: 1rpx solid #e0e0e0;
   padding: 16rpx;
-  margin-bottom: env(safe-area-inset-bottom);
+  margin-bottom: 40rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -689,7 +689,7 @@ $primary-color: #0877F1;
   width: 100%;
   max-height: 80vh;
   padding: 20rpx;
-  padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+  padding-bottom: calc(20rpx + 40rpx);
   position: relative;
   box-sizing: border-box;
   margin: 0;
@@ -821,7 +821,7 @@ $primary-color: #0877F1;
   background-color: white;
   width: auto;
   padding: 32rpx 20rpx 48rpx 20rpx;
-  padding-bottom: calc(48rpx + env(safe-area-inset-bottom));
+  padding-bottom: calc(48rpx + 40rpx);
   text-align: center;
   margin: 0 auto;
   position: relative;
diff --git a/pages/message/components/consult-apply.vue b/pages/message/components/consult-apply.vue
index f3cd5f8..bf86d75 100644
--- a/pages/message/components/consult-apply.vue
+++ b/pages/message/components/consult-apply.vue
@@ -36,6 +36,8 @@ const handleApply = () => {
   padding: 20rpx 32rpx;
   background-color: #f5f5f5;
   box-sizing: border-box;
+  position:absolute;
+  bottom: 40rpx;
 }
 
 .apply-card {
diff --git a/pages/message/components/consult-cancel.vue b/pages/message/components/consult-cancel.vue
index 115f47b..734d4ae 100644
--- a/pages/message/components/consult-cancel.vue
+++ b/pages/message/components/consult-cancel.vue
@@ -12,11 +12,10 @@
 </template>
 
 <script setup>
-
-const emit = defineEmits(['cancel']);
+const emit = defineEmits(["cancel"]);
 
 const handleCancel = () => {
-  emit('cancel');
+  emit("cancel");
 };
 </script>
 
@@ -26,6 +25,8 @@ const handleCancel = () => {
   padding: 20rpx 32rpx;
   background-color: #f5f5f5;
   box-sizing: border-box;
+  position: absolute;
+  bottom: 40rpx;
 }
 
 .cancel-card {
diff --git a/pages/message/hooks/use-group-chat.js b/pages/message/hooks/use-group-chat.js
index 9b09377..6e7014c 100644
--- a/pages/message/hooks/use-group-chat.js
+++ b/pages/message/hooks/use-group-chat.js
@@ -58,8 +58,8 @@ export default function useGroupChat(groupID) {
     return member.isTeamMember ? '/static/default-avatar.svg' : '/static/default-patient-avatar.png'
   }
   // 获取群聊信息和成员头像
-  async function getGroupInfo() {
-    const gid = typeof groupID === 'string' ? groupID : groupID.value
+  async function getGroupInfo(id) {
+    const gid = id || groupID;
     if (!gid) return
 
     try {
@@ -73,7 +73,6 @@ export default function useGroupChat(groupID) {
           status: groupResult.data.orderStatus || 'active',
           teamId: groupResult.data.teamId
         }
-
         // 2. 如果有teamId，获取团队成员头像和名称
         if (groupResult.data.teamId) {
           const memberMap = await teamStore.getTeamMemberAvatarsAndName(groupResult.data.teamId)
@@ -111,13 +110,14 @@ export default function useGroupChat(groupID) {
     }
   }
 
-  onShow(() => {
-    getGroupInfo()
-  })
+  // onShow(() => {
 
-  onUnload(() => {
-    // 清理资源
-  })
+  //   getGroupInfo()
+  // })
+
+  // onUnload(() => {
+  //   // 清理资源
+  // })
 
   return {
     groupInfo,
diff --git a/pages/message/index.vue b/pages/message/index.vue
index 88a2618..3dd1fb0 100644
--- a/pages/message/index.vue
+++ b/pages/message/index.vue
@@ -456,7 +456,7 @@ onLoad(async (options) => {
   if (options.userID) {
     chatInfo.value.userID = options.userID;
   }
-
+  await getGroupInfo(groupId.value);
   // 监听键盘高度变化
   uni.onKeyboardHeightChange((res) => {
     console.log("键盘高度变化:", res.height);
@@ -474,8 +474,7 @@ onLoad(async (options) => {
   });
 
   // 先获取群组信息和成员信息，确保 chatMember 已初始化
-  await getGroupInfo();
-  
+
   checkLoginAndInitTIM();
   updateNavigationTitle();
 });
diff --git a/store/team.js b/store/team.js
index 0b1956e..63661ac 100644
--- a/store/team.js
+++ b/store/team.js
@@ -40,10 +40,10 @@ export default defineStore("teamStore", () => {
 
   // 获取团队成员头像和名称映射
   async function getTeamMemberAvatarsAndName(teamId) {
-    if (!teamId || !account.value?.corpId) return {};
+
+    if (!teamId) return {};
     const res = await api('getTeamMemberAvatarsAndName', {
-      teamId,
-      corpId: account.value.corpId
+      teamId
     }, false);
     if (res && res.success && res.data) {
       return res.data;