Merge remote-tracking branch 'origin/main'

src/components/detail/imageWatch.vue

@@ -6,7 +6,7 @@
                     indicator-position="none" ref="carousel" @change="carouselChange">
                     <el-carousel-item v-for="(item, i) in list" :key="i">
                         <div class="dis-f jus-x al-item" v-if="item">
-                            <div class="img-box dis-f jus-x" v-if="item['type'] != 'attachment'">
+                            <div class="img-box dis-f jus-x" style="width:auto;" v-if="item['type'] != 'attachment'">
                                 <video :autoplay="false" controls :src="item.url || item['videourl']"></video>
                             </div>
                             <div class="img-box dis-f jus-x" v-else>

src/components/user/systematic-notification-pop.vue

@@ -21,7 +21,7 @@
             </div>
 
             <div class="flex1 list scrollbar" @scroll="handleScroll">
-                <div class="empty-box" v-if="false">
+                <div class="empty-box" v-if="list.length == 0 && !state">
                     <empty-duck></empty-duck>
                 </div>
                 <template v-for="(item, index) in list" :key="index">
@@ -147,11 +147,11 @@ let show = ref(false) //是否展示
 let qrcode = ref("") // 关注二维码
 let issubscribe = ref(0) // 是否已经关注公众号
 let list = ref([]) // 列表数据
-let state = false // 请求状态
+let state = ref(false) // 请求状态
 let page = 1 // 页数
 const init = () => {
-    if (page == 0 || state) return
-    state = true
+    if (page == 0 || state.value) return
+    state.value = true
     proxy.$post("/tenement/pc/api/user/messageList", {
         page
     }).then((res) => {
@@ -168,12 +168,12 @@ const init = () => {
     }).catch((err) => {
         emit('close')
     }).finally(() => {
-        state = false
+        state.value = false
     })
 }
 
 const handleScroll = (event) => {
-    if (page == 0 || state) return
+    if (page == 0 || state.value) return
     const scrollContainer = event.target; // 获取滚动容器元素
     const scrollHeight = scrollContainer.scrollHeight; // 元素内容的总高度
     const scrollTop = scrollContainer.scrollTop; // 滚动条距离滚动容器顶部的距离