This commit is contained in:
zzc
2026-06-15 19:38:40 +08:00
parent 082cd011d2
commit f256df8f94
18 changed files with 33 additions and 11 deletions

View File

@@ -132,6 +132,9 @@ import {
import LoginPopup from "@/components/LoginPopup/LoginPopup.vue";
const DEFAULT_AVATAR = "/static/images/icon/robot.png";
const APPROVED_AVATAR = "/static/images/icon/approved.png";
const REJECTED_AVATAR = "/static/images/icon/rejected.png";
const PENDING_AVATAR = "/static/images/icon/pending.png";
const userStore = useUserStore();
const loginPopupRef = ref(null);
@@ -266,7 +269,17 @@ const formatDayLabel = (day) => {
const resolveAvatar = (item) => {
const avatar = item?.fromUser?.avatar;
if (!avatar) return DEFAULT_AVATAR;
if (!avatar) {
if(item.title.includes("已通过")) {
return APPROVED_AVATAR;
} else if(item.title.includes("未通过")) {
return REJECTED_AVATAR;
} else if(item.title.includes("已提交审核")) {
return PENDING_AVATAR;
} else {
return DEFAULT_AVATAR;
}
}
return String(avatar).startsWith("http") ? avatar : `${FILE_BASE_URL}${avatar}`;
};
@@ -281,6 +294,8 @@ const resolveActionText = (item) => {
};
const resolveJumpText = (item) => {
if(item.title.includes("已提交审核") || item.title.includes("未通过")) return "";
if (item.itemId) return "查看评分详情";
if (item.topicId) return "查看话题";
return "查看消息";
@@ -423,6 +438,7 @@ const markSingleAsRead = async (item) => {
const handleItemTap = async (item) => {
await markSingleAsRead(item);
if(item.title.includes("未通过") || item.title.includes("已提交审核")) return
handleNavigate(item);
};

View File

@@ -26,8 +26,8 @@
<text class="nickname" @tap="handleUserClick">{{ userInfo.nickName }}</text>
<view class="tags-container" v-if="isLoggedIn && userStats.label && userStats.label.length">
<text class="sparkle-icon"></text>
<text class="tags-text">{{ userStats.label.join(' | ') }}</text>
<!-- <text class="sparkle-icon"></text>
<text class="tags-text">{{ userStats.label.join(' | ') }}</text> -->
</view>
<view class="tags-container" v-else-if="!isLoggedIn">
<text class="tags-text">点击登录解锁更多功能</text>

View File

@@ -75,7 +75,7 @@ const loadData = async (page = 1) => {
try {
loading.value = true;
const res = await fetchUserTopics(page);
const list = res?.data?.records || res?.records || res?.list || [];
const list = res?.list || [];
// 如果是第一页,先清空原有数据
if (page === 1) {

View File

@@ -295,7 +295,13 @@ const confirmAddItem = async () => {
});
uni.hideLoading();
uni.showToast({ title: '添加成功', icon: 'success' });
// uni.showToast({ title: '添加成功', icon: 'success' });
if (successPopupRef.value) {
successPopupRef.value.show({
emoji: '🎉',
label: '请耐心等待管理员审核'
}, 'release');
}
// 重置表单并关闭弹窗
newItem.value = { name: '', avatar: '' };