no message

This commit is contained in:
wangdongbo 2026-02-12 15:06:49 +08:00
parent f2bad7b3de
commit 253970b860
7 changed files with 54 additions and 46 deletions

View File

@ -1,4 +1,5 @@
<template> <template>
<full-page mainClass="bg-white">
<view class="article-detail-page"> <view class="article-detail-page">
<view v-if="loading" class="loading-container"> <view v-if="loading" class="loading-container">
<uni-icons type="spinner-cycle" size="40" color="#999" /> <uni-icons type="spinner-cycle" size="40" color="#999" />
@ -22,10 +23,12 @@
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
</full-page>
</template> </template>
<script setup> <script setup>
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import FullPage from "@/components/full-page.vue";
import api from "@/utils/api.js"; import api from "@/utils/api.js";
import { ref } from "vue"; import { ref } from "vue";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@ -40,7 +43,7 @@ const articleData = ref({
}); });
let articleId = ""; let articleId = "";
const corpId = ref('') const corpId = ref("");
const markArticleRead = async () => { const markArticleRead = async () => {
const unionid = account.value?.unionid; const unionid = account.value?.unionid;
@ -91,7 +94,10 @@ const loadArticle = async () => {
loading.value = true; loading.value = true;
error.value = ""; error.value = "";
try { 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) { if (res.success && res.data) {
// //

View File

@ -407,7 +407,7 @@ $primary-color: #0877F1;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 12rpx 20rpx; padding: 12rpx 20rpx;
padding-bottom: env(safe-area-inset-bottom); padding-bottom: 40rpx;
gap: 12rpx; gap: 12rpx;
} }
@ -514,7 +514,7 @@ $primary-color: #0877F1;
background: #fff; background: #fff;
border-top: 1rpx solid #eee; border-top: 1rpx solid #eee;
padding: 20rpx 0 20rpx 60rpx; padding: 20rpx 0 20rpx 60rpx;
padding-bottom: env(safe-area-inset-bottom); padding-bottom: 40rpx;
gap: 40rpx 50rpx; gap: 40rpx 50rpx;
flex-wrap: wrap; flex-wrap: wrap;
background-color: #f5f5f5; background-color: #f5f5f5;
@ -544,7 +544,7 @@ $primary-color: #0877F1;
background-color: white; background-color: white;
border-top: 1rpx solid #e0e0e0; border-top: 1rpx solid #e0e0e0;
padding: 16rpx; padding: 16rpx;
margin-bottom: env(safe-area-inset-bottom); margin-bottom: 40rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
@ -689,7 +689,7 @@ $primary-color: #0877F1;
width: 100%; width: 100%;
max-height: 80vh; max-height: 80vh;
padding: 20rpx; padding: 20rpx;
padding-bottom: calc(20rpx + env(safe-area-inset-bottom)); padding-bottom: calc(20rpx + 40rpx);
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
margin: 0; margin: 0;
@ -821,7 +821,7 @@ $primary-color: #0877F1;
background-color: white; background-color: white;
width: auto; width: auto;
padding: 32rpx 20rpx 48rpx 20rpx; padding: 32rpx 20rpx 48rpx 20rpx;
padding-bottom: calc(48rpx + env(safe-area-inset-bottom)); padding-bottom: calc(48rpx + 40rpx);
text-align: center; text-align: center;
margin: 0 auto; margin: 0 auto;
position: relative; position: relative;

View File

@ -36,6 +36,8 @@ const handleApply = () => {
padding: 20rpx 32rpx; padding: 20rpx 32rpx;
background-color: #f5f5f5; background-color: #f5f5f5;
box-sizing: border-box; box-sizing: border-box;
position:absolute;
bottom: 40rpx;
} }
.apply-card { .apply-card {

View File

@ -12,11 +12,10 @@
</template> </template>
<script setup> <script setup>
const emit = defineEmits(["cancel"]);
const emit = defineEmits(['cancel']);
const handleCancel = () => { const handleCancel = () => {
emit('cancel'); emit("cancel");
}; };
</script> </script>
@ -26,6 +25,8 @@ const handleCancel = () => {
padding: 20rpx 32rpx; padding: 20rpx 32rpx;
background-color: #f5f5f5; background-color: #f5f5f5;
box-sizing: border-box; box-sizing: border-box;
position: absolute;
bottom: 40rpx;
} }
.cancel-card { .cancel-card {

View File

@ -58,8 +58,8 @@ export default function useGroupChat(groupID) {
return member.isTeamMember ? '/static/default-avatar.svg' : '/static/default-patient-avatar.png' return member.isTeamMember ? '/static/default-avatar.svg' : '/static/default-patient-avatar.png'
} }
// 获取群聊信息和成员头像 // 获取群聊信息和成员头像
async function getGroupInfo() { async function getGroupInfo(id) {
const gid = typeof groupID === 'string' ? groupID : groupID.value const gid = id || groupID;
if (!gid) return if (!gid) return
try { try {
@ -73,7 +73,6 @@ export default function useGroupChat(groupID) {
status: groupResult.data.orderStatus || 'active', status: groupResult.data.orderStatus || 'active',
teamId: groupResult.data.teamId teamId: groupResult.data.teamId
} }
// 2. 如果有teamId获取团队成员头像和名称 // 2. 如果有teamId获取团队成员头像和名称
if (groupResult.data.teamId) { if (groupResult.data.teamId) {
const memberMap = await teamStore.getTeamMemberAvatarsAndName(groupResult.data.teamId) const memberMap = await teamStore.getTeamMemberAvatarsAndName(groupResult.data.teamId)
@ -111,13 +110,14 @@ export default function useGroupChat(groupID) {
} }
} }
onShow(() => { // onShow(() => {
getGroupInfo()
})
onUnload(() => { // getGroupInfo()
// 清理资源 // })
})
// onUnload(() => {
// // 清理资源
// })
return { return {
groupInfo, groupInfo,

View File

@ -456,7 +456,7 @@ onLoad(async (options) => {
if (options.userID) { if (options.userID) {
chatInfo.value.userID = options.userID; chatInfo.value.userID = options.userID;
} }
await getGroupInfo(groupId.value);
// //
uni.onKeyboardHeightChange((res) => { uni.onKeyboardHeightChange((res) => {
console.log("键盘高度变化:", res.height); console.log("键盘高度变化:", res.height);
@ -474,7 +474,6 @@ onLoad(async (options) => {
}); });
// chatMember // chatMember
await getGroupInfo();
checkLoginAndInitTIM(); checkLoginAndInitTIM();
updateNavigationTitle(); updateNavigationTitle();

View File

@ -40,10 +40,10 @@ export default defineStore("teamStore", () => {
// 获取团队成员头像和名称映射 // 获取团队成员头像和名称映射
async function getTeamMemberAvatarsAndName(teamId) { async function getTeamMemberAvatarsAndName(teamId) {
if (!teamId || !account.value?.corpId) return {};
if (!teamId) return {};
const res = await api('getTeamMemberAvatarsAndName', { const res = await api('getTeamMemberAvatarsAndName', {
teamId, teamId
corpId: account.value.corpId
}, false); }, false);
if (res && res.success && res.data) { if (res && res.success && res.data) {
return res.data; return res.data;