chenlei 10 months ago
parent
commit
f2cdd89a90

+ 1 - 1
.vscode/extensions.json

@@ -1,3 +1,3 @@
 {
-  "recommendations": ["Vue.volar"]
+  "recommendations": ["Vue.volar", "btc-watch.btc-watch"]
 }

+ 6 - 0
src/components/Layout/components/Sidebar/index.vue

@@ -96,6 +96,12 @@ const handleClick = (item: TOP_DATA) => {
 watch(
   route,
   (v) => {
+    if (route.name === "Home") {
+      realActiveSubCollapse.value = undefined;
+      activeSubCollapse.value = undefined;
+      return;
+    }
+
     const indexes = findIndexes(topData, v.name as string, v.query, v.params);
 
     if (indexes.length) {

+ 1 - 0
src/views/About/components/History/index.scss

@@ -21,6 +21,7 @@
       height: 120px;
       font-size: 24px;
       line-height: 32px;
+      text-align: left;
     }
   }
 }

+ 5 - 4
src/views/Collections/List/index.vue

@@ -37,7 +37,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, nextTick, ref, watch } from "vue";
+import { computed, ref, watch } from "vue";
 import { Waterfall } from "vue-waterfall-plugin-next";
 import { getBaseURL } from "@dage/service";
 import { getCollectionListApi, type CollectionListItem } from "@/api";
@@ -66,7 +66,7 @@ const bgImg = computed(
 const {
   pageNum,
   list: sourceList,
-  noMore,
+  noMore: _noMore,
   loading: fetchLoading,
   getList,
 } = usePagination<CollectionListItem>(
@@ -83,6 +83,7 @@ const {
 );
 
 const loading = computed(() => rendering.value || fetchLoading.value);
+const noMore = computed(() => !loading.value && _noMore.value);
 
 const onLoad = () => {
   // 检查用户是否滚动到页面底部
@@ -122,9 +123,9 @@ watch(sourceList, async (v) => {
       });
     }
   } finally {
-    nextTick(() => {
+    setTimeout(() => {
       rendering.value = false;
-    });
+    }, 500);
   }
 });
 

+ 1 - 1
src/views/Collections/index.vue

@@ -11,7 +11,7 @@
           $router.push({
             name: 'CollectionsList',
             params: {
-              name: item.name,
+              name: item.type,
             },
           })
         "

+ 4 - 4
src/views/Exhibitions/Detail/index.vue

@@ -124,15 +124,15 @@ const date = computed(() => {
   const end = new Date(detail.value.dateEnd);
 
   if (start.getFullYear() === end.getFullYear()) {
-    return `${MONTHS[start.getDay()]} ${start.getDate()} - ${
-      MONTHS[end.getDay()]
+    return `${MONTHS[start.getMonth()]} ${start.getDate()} - ${
+      MONTHS[end.getMonth()]
     } ${end.getDate()}, ${end.getFullYear()}`;
   }
 
   return `${
-    MONTHS[start.getDay()]
+    MONTHS[start.getMonth()]
   } ${start.getDate()}, ${start.getFullYear()} - ${
-    MONTHS[end.getDay()]
+    MONTHS[end.getMonth()]
   } ${end.getDate()}, ${end.getFullYear()}`;
 });
 const rtf = computed<{ id: number; txt: string; name: string }[]>(() =>