From e146adeecc1edde9d2c69f2aa3b2dc48a4817ad9 Mon Sep 17 00:00:00 2001
From: thofx <usnail@yeah.net>
Date: Sat, 22 Jul 2023 18:46:54 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/@layouts/styles/_default-layout.scss |  4 ++++
 src/components/NoDataFound.vue           | 26 ++++++++++++++----------
 src/components/cards/MediaCard.vue       |  2 +-
 src/layouts/default.vue                  |  9 ++++++--
 src/pages/ranking.vue                    |  2 +-
 src/pages/resource.vue                   |  2 +-
 src/router/index.ts                      |  1 +
 src/views/plugin/PluginCardListView.vue  |  2 +-
 8 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/@layouts/styles/_default-layout.scss b/src/@layouts/styles/_default-layout.scss
index 745a6a93..306549cc 100644
--- a/src/@layouts/styles/_default-layout.scss
+++ b/src/@layouts/styles/_default-layout.scss
@@ -38,6 +38,10 @@ body,
   // TODO: Use grid gutter variable here
   padding-block: 0.5rem;
   padding-top: calc(env(safe-area-inset-top) + 70px);
+  display: flex;
+  .page-content-container {
+    flex: 1;
+  }
 }
 
 .layout-footer {
diff --git a/src/components/NoDataFound.vue b/src/components/NoDataFound.vue
index 09bd7d67..015d471d 100644
--- a/src/components/NoDataFound.vue
+++ b/src/components/NoDataFound.vue
@@ -54,17 +54,21 @@ interface Props {
 <style lang="scss">
 @use '@core/scss/pages/misc.scss';
 
-.misc-wrapper .misc-footer-tree {
-  position: absolute;
-  z-index: 1;
-  inline-size: 15.625rem;
-  inset-block-end: 3.5rem;
-  inset-inline-start: 0.375rem;
-}
+.misc-wrapper {
+  position: relative;
 
-.misc-wrapper .misc-footer-img {
-  position: absolute;
-  inline-size: 100%;
-  inset-block-end: 0;
+  .misc-footer-tree {
+    position: absolute;
+    z-index: 1;
+    inline-size: 15.625rem;
+    inset-block-end: 3.5rem;
+    inset-inline-start: 0.375rem;
+  }
+
+  .misc-footer-img {
+    position: absolute;
+    inline-size: 100%;
+    inset-block-end: 0;
+  }
 }
 </style>
diff --git a/src/components/cards/MediaCard.vue b/src/components/cards/MediaCard.vue
index 19ab2f8a..bd244290 100644
--- a/src/components/cards/MediaCard.vue
+++ b/src/components/cards/MediaCard.vue
@@ -16,7 +16,7 @@ const props = defineProps({
 })
 
 // 提示框
-const $toast = useToast()
+const $toast = useToast({ position: 'top' })
 
 // 图片加载状态
 const isImageLoaded = ref(false)
diff --git a/src/layouts/default.vue b/src/layouts/default.vue
index 4bd3b41f..2cd3e8ff 100644
--- a/src/layouts/default.vue
+++ b/src/layouts/default.vue
@@ -4,11 +4,16 @@ import DefaultLayoutWithVerticalNav from './components/DefaultLayoutWithVertical
 
 <template>
   <DefaultLayoutWithVerticalNav>
-    <RouterView />
+    <router-view v-slot="{ Component }">
+      <keep-alive>
+        <component :is="Component" v-if="$route.meta.keepAlive" :key="$route.name" />
+      </keep-alive>
+      <component :is="Component" v-if="!$route.meta.keepAlive" :key="$route.name" />
+    </router-view>
   </DefaultLayoutWithVerticalNav>
 </template>
 
 <style lang="scss">
 // As we are using `layouts` plugin we need its styles to be imported
-@use "@layouts/styles/default-layout";
+@use '@layouts/styles/default-layout';
 </style>
diff --git a/src/pages/ranking.vue b/src/pages/ranking.vue
index cfa6f400..dd5e1964 100644
--- a/src/pages/ranking.vue
+++ b/src/pages/ranking.vue
@@ -166,7 +166,7 @@ import MediaCardSlideView from '@/views/discover/MediaCardSlideView.vue'
   </div>
 </template>
 
-<style type="text/css">
+<style lang="css">
 .slider-header {
   position: relative;
   display: flex;
diff --git a/src/pages/resource.vue b/src/pages/resource.vue
index 5f063e66..841b46c5 100644
--- a/src/pages/resource.vue
+++ b/src/pages/resource.vue
@@ -12,7 +12,7 @@ const type = route.query?.type?.toString() ?? ''
 </script>
 
 <template>
-  <div>
+  <div class="relative">
     <TorrentCardListView
       :keyword="keyword"
       :type="type"
diff --git a/src/router/index.ts b/src/router/index.ts
index b018671c..3e283326 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -23,6 +23,7 @@ const router = createRouter({
           path: 'ranking',
           component: () => import('../pages/ranking.vue'),
           meta: {
+            keepAlive: true,
             requiresAuth: true,
           },
         },
diff --git a/src/views/plugin/PluginCardListView.vue b/src/views/plugin/PluginCardListView.vue
index 778de470..4c52bc70 100644
--- a/src/views/plugin/PluginCardListView.vue
+++ b/src/views/plugin/PluginCardListView.vue
@@ -87,7 +87,7 @@ onBeforeMount(fetchData)
         icon="mdi-plus"
         v-bind="props"
         size="x-large"
-        class="fixed right-5 bottom-5"
+        class="fixed right-5"
       />
     </template>
 

From 7d33036e33b2b2b76d006a50050f63e2182e35da Mon Sep 17 00:00:00 2001
From: thofx <usnail@yeah.net>
Date: Sat, 22 Jul 2023 19:11:59 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/@layouts/styles/_default-layout.scss | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/@layouts/styles/_default-layout.scss b/src/@layouts/styles/_default-layout.scss
index 306549cc..6c53a850 100644
--- a/src/@layouts/styles/_default-layout.scss
+++ b/src/@layouts/styles/_default-layout.scss
@@ -6,11 +6,15 @@
 
 html {
   min-height: calc(100% + env(safe-area-inset-top));
-  //background: rgb(var(--v-theme-background));
+}
+
+@media screen and (max-width: 900px) {
+  html, body {
+    background: rgb(var(--v-theme-background));
+  }
 }
 
 body {
-  //background: rgb(var(--v-theme-background));
   overscroll-behavior-y: contain;
   --webkit-overflow-scrolling: touch;
 }
@@ -34,13 +38,20 @@ body,
   @include mixins.boxed-content(true);
 
   flex-grow: 1;
-  overflow:hidden;
+  overflow: hidden;
   // TODO: Use grid gutter variable here
   padding-block: 0.5rem;
   padding-top: calc(env(safe-area-inset-top) + 70px);
   display: flex;
+
   .page-content-container {
     flex: 1;
+    display: flex;
+
+    & > div:first-child {
+      flex: auto;
+      position: relative;
+    }
   }
 }
 

From 0d1f7cd791b9fba768085eb07b992d58da16a8eb Mon Sep 17 00:00:00 2001
From: thofx <usnail@yeah.net>
Date: Sat, 22 Jul 2023 19:12:11 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/resource.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/resource.vue b/src/pages/resource.vue
index 841b46c5..5f063e66 100644
--- a/src/pages/resource.vue
+++ b/src/pages/resource.vue
@@ -12,7 +12,7 @@ const type = route.query?.type?.toString() ?? ''
 </script>
 
 <template>
-  <div class="relative">
+  <div>
     <TorrentCardListView
       :keyword="keyword"
       :type="type"

From 0e8e408b0768b844216218c658d9b2eb1c4301e0 Mon Sep 17 00:00:00 2001
From: thofx <usnail@yeah.net>
Date: Sat, 22 Jul 2023 19:19:26 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/styles.scss | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/styles/styles.scss b/src/styles/styles.scss
index d932478e..12947dc5 100644
--- a/src/styles/styles.scss
+++ b/src/styles/styles.scss
@@ -53,21 +53,6 @@
 
 
 
-/* router view transition fade-slide */
-.fade-slide-leave-active,
-.fade-slide-enter-active {
-  transition: all 0.3s;
-}
-
-.fade-slide-enter-from {
-  opacity: 0;
-  transform: translateX(-30px);
-}
-
-.fade-slide-leave-to {
-  opacity: 0;
-  transform: translateX(30px);
-}
 
 /* router view transition fade-slide */
 .fade-slide-leave-active,
@@ -77,10 +62,10 @@
 
 .fade-slide-enter-from {
   opacity: 0;
-  transform: translateX(-45px);
+  transform: translateY(-45px);
 }
 
 .fade-slide-leave-to {
   opacity: 0;
-  transform: translateX(45px);
+  transform: translateY(45px);
 }