From 57f36f0b64b9b37ed98e9aeeef5cd73c4cf22467 Mon Sep 17 00:00:00 2001
From: Twilight <im@ivampiresp.com>
Date: Mon, 16 Sep 2024 21:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=BB=9A=E5=8A=A8?=
 =?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/components/chat/Chat.vue  |  2 +-
 src/layouts/DefaultLayout.vue | 10 ++++++++--
 src/pages/index.vue           | 16 ----------------
 src/stores/app.ts             |  1 +
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue
index 75de0cb..3cd8952 100644
--- a/src/components/chat/Chat.vue
+++ b/src/components/chat/Chat.vue
@@ -22,7 +22,7 @@
 
       <div
         class="fixed bottom-0 left-0 right-0"
-        :class="!appStore.contentScrollOnBottom ? 'hidden' : 'mb-6'"
+        :class="!appStore.contentScrollOnBottom &&  appStore.contentScrollable ? 'hidden' : 'mb-6'"
       >
         <!-- <div
           class="mx-auto w-2xl max-w-2xl text-center mb-3 animate__animated animate__pulse text-lg"
diff --git a/src/layouts/DefaultLayout.vue b/src/layouts/DefaultLayout.vue
index b0079d6..b4d1ee3 100644
--- a/src/layouts/DefaultLayout.vue
+++ b/src/layouts/DefaultLayout.vue
@@ -29,11 +29,17 @@ const onScroll = (e: Event) => {
   const clientHeight = target.clientHeight;
 
   appStore.contentScrollHeight = scrollHeight;
-  appStore.contentScrollOnBottom = scrollTop + clientHeight >= scrollHeight
+  appStore.contentScrollOnBottom = scrollTop + clientHeight >= scrollHeight;
   // 当前位置
   appStore.contentScrollPosition = scrollTop;
-}
 
+  // 检测是否能滚动（如果内容的高度还没有超过可视区域的高度）
+  if (scrollHeight > clientHeight) {
+    appStore.contentScrollable = true;
+  } else {
+    appStore.contentScrollable = false;
+  }
+};
 </script>
 
 <template>
diff --git a/src/pages/index.vue b/src/pages/index.vue
index eea0fb9..502bacd 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -1,20 +1,4 @@
-<script setup lang="ts">
-import { useMessage } from "naive-ui";
-import { useUserStore } from "../stores/user";
-import chat from "../components/chat/Chat.vue";
-const message = useMessage();
-const userStore = useUserStore();
-
-</script>
-
 <template>
-  <!-- <router-link to="auth/login">go</router-link> -->
-  <!-- <n-dropdown trigger="hover" :options="options" @select="handleSelect">
-    <n-button>找个地方休息111</n-button>
-  </n-dropdown>
-
-  <n-button @click="logout()">退出登录</n-button> -->
-
   <Chat />
 </template>
 
diff --git a/src/stores/app.ts b/src/stores/app.ts
index a7d2560..0f3e936 100644
--- a/src/stores/app.ts
+++ b/src/stores/app.ts
@@ -8,5 +8,6 @@ export const useAppStore = defineStore("app", {
     contentScrollHeight: 0,
     contentScrollPosition: 0,
     contentScrollOnBottom: false,
+    contentScrollable: false,
   }),
 });