flat:合并冲突

2025-12-03 11:08:53 +08:00
parent 268648868f 7ce14fa7e2
commit 0d5e3024bc
4 changed files with 15 additions and 4 deletions
--- a/pages/msglog/unread.vue
+++ b/pages/msglog/unread.vue
@@ -1,6 +1,6 @@
 <template>
    <scroll-view scroll-y class="main-scroll">
-        <view class="scrollmain">
+        <view v-if="unreadMsgList.length" class="scrollmain">
            <view
                class="list-card press-button"
                v-for="(item, index) in unreadMsgList"
@@ -35,6 +35,7 @@
            </view>
            <empty v-if="!unreadMsgList.length"></empty>
        </view>
+        <empty v-else pdTop="200" content="暂无消息~"></empty>
    </scroll-view>
 </template>