From 822ff0a51d0697b5f45528efcae0f1499dcc91db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=98=93?=
 <105188049+xiaoyiweb@users.noreply.github.com>
Date: Thu, 1 Feb 2024 18:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=B8=BB=E9=A2=98=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=20=E4=BC=98=E5=8C=96=E6=8A=96=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chat/index.html                               |  5 -
 chat/src/layout/footerBar/index.vue           |  2 +-
 chat/src/layout/siderBar/index.vue            |  6 +-
 chat/src/views/chat/chatBase.vue              | 84 +++++++---------
 .../views/chat/components/Header/index.vue    |  7 +-
 chat/src/views/chat/hooks/useScroll.ts        | 98 ++++++++++---------
 6 files changed, 98 insertions(+), 104 deletions(-)

diff --git a/chat/index.html b/chat/index.html
index 92d43d6..07819aa 100644
--- a/chat/index.html
+++ b/chat/index.html
@@ -190,11 +190,6 @@
 					}
 				}
 			}
-
-			console.log(
-        "%c本项目作者----小易，联系QQ：805239273",
-        "background-color:rgb(30,30,30);border-radius:4px;font-size:12px;padding:4px;color:rgb(220,208,129);"
-      )
 		</script>
 </body>
 
diff --git a/chat/src/layout/footerBar/index.vue b/chat/src/layout/footerBar/index.vue
index 98e7dc2..c256a69 100644
--- a/chat/src/layout/footerBar/index.vue
+++ b/chat/src/layout/footerBar/index.vue
@@ -80,7 +80,7 @@ onBeforeMount(() => {
       <a
         v-for="item in menuLista"
         :key="item.id"
-        :class="[isActive(item) ? 'text-[#4b9e5f] dark:text-[#86dfba]' : '']"
+        :class="[isActive(item) ? 'text-[#3076fd] dark:text-[#3076fd]' : '']"
         class="cursor-pointer text-center leading-4"
         @click="handleToPage(item)"
       >
diff --git a/chat/src/layout/siderBar/index.vue b/chat/src/layout/siderBar/index.vue
index eaa12f7..ab02ce0 100644
--- a/chat/src/layout/siderBar/index.vue
+++ b/chat/src/layout/siderBar/index.vue
@@ -221,7 +221,7 @@ watch(
                     class="text-2xl transition-all"
                     :class="[
                       isActive(item)
-                        ? 'text-[#4b9e5f] dark:text-[#86dfba]'
+                        ? 'text-[#3076fd] dark:text-[#3076fd]'
                         : '',
                     ]"
                   />
@@ -235,7 +235,7 @@ watch(
               class="text-[12px] mt-1 margin-auto whitespace-nowrap overflow-hidden"
               :class="[
                 isActive(item)
-                  ? 'text-[#4b9e5f] dark:text-[#86dfba] '
+                  ? 'text-[#3076fd] dark:text-[#86dfba] '
                   : 'text-[#999999]',
               ]"
             >{{ item.menuTipText }}</span> -->
@@ -334,7 +334,7 @@ watch(
 }
 
 .btns {
-  box-shadow: 0 5px 16px #16993b;
+  box-shadow: 0 5px 16px #0636e6;
 }
 
 .borderRadis {
diff --git a/chat/src/views/chat/chatBase.vue b/chat/src/views/chat/chatBase.vue
index 1eda1be..d7312f3 100644
--- a/chat/src/views/chat/chatBase.vue
+++ b/chat/src/views/chat/chatBase.vue
@@ -122,7 +122,7 @@ const firstScroll = ref<boolean>(true)
 const tipsRef = ref<any>(null)
 const tipText = ref('')
 const tipsHeight = ref<any>(null)
-const dataBase64 = ref(null)
+let dataBase64 = ref(null)
 const fileName = ref('')
 const isImageFile = ref(false)
 const showDeleteIcon = ref(false)
@@ -279,6 +279,7 @@ async function uploadFile() {
   } finally {
     dataBase64.value = null
     curFile = null
+    showProgressModal.value = false
   }
 }
 
@@ -838,14 +839,14 @@ onUnmounted(() => {
           <NTooltip trigger="hover" placement="bottom-end" :disabled="isMobile">
             <template #trigger>
               <button
-                class="shrink0 flex h-8 w-8 items-center justify-center rounded border transition hover:bg-[#eef0f3] dark:border-neutral-700 dark:hover:bg-[#33373c]"
+                class="shrink0 flex h-8 w-8 items-center justify-center rounded border transition dark:border-neutral-700"
+                :class="{ 'bg-[#5782f4]': !usingContext }"
                 @click="toggleUsingContext"
               >
                 <span
-                  class=""
                   :class="{
                     'text-[#3076fd]': usingContext,
-                    'text-[#a8071a]': !usingContext,
+                    'text-[#ffffff]': !usingContext,
                   }"
                   ><SvgIcon
                     class="text-lg"
@@ -913,55 +914,42 @@ onUnmounted(() => {
               />
             </div>
           </div>
-
-          <NTooltip v-if="isMobile" trigger="hover" :disabled="isMobile">
+          <NTooltip trigger="hover" :disabled="isMobile">
             <template #trigger>
               <button
-                class="shrink0 flex h-8 w-8 items-center justify-center rounded border transition hover:bg-[#eef0f3] dark:border-neutral-700 dark:hover:bg-[#33373c]"
-                @click="handleSignIn"
-              >
-                <span class="text-base text-slate-500 dark:text-slate-400">
-                  <SvgIcon icon="streamline-emojis:wrapped-gift-1" />
-                </span>
-              </button>
-            </template>
-            签到领福利
-          </NTooltip>
-          <NPopover v-if="isMobile" trigger="click">
-            <template #trigger>
-              <button
-                class="shrink0 flex h-8 w-8 items-center justify-center rounded border transition dark:border-neutral-700 dark:hover:bg-[#33373c]"
+                class="shrink0 flex h-8 w-8 items-center justify-center rounded border transition dark:border-neutral-700"
+                @click="toggleUsingNetwork"
+                :class="{ 'bg-[#5782f4]': usingNetwork }"
               >
                 <span class="text-base text-slate-500 dark:text-slate-400">
                   <SvgIcon
-                    :icon="
-                      theme === 'dark'
-                        ? 'noto-v1:last-quarter-moon-face'
-                        : 'twemoji:sun'
-                    "
+                    icon="zondicons:network"
+                    class="cursor-pointer mb-0.5"
+                    :class="{
+                      'text-[#3076fd]': !usingNetwork,
+                      'text-[#fff]': usingNetwork,
+                    }"
                   />
                 </span>
               </button>
             </template>
-            <div>
-              <div class="flex items-center gap-4">
-                <template v-for="item of themeOptions" :key="item.key">
-                  <NButton
-                    size="small"
-                    :type="item.key === theme ? 'info' : undefined"
-                    @click="appStore.setTheme(item.key)"
-                  >
-                    <template #icon>
-                      <SvgIcon
-                        :icon="item.icon"
-                        :style="{ color: item.color }"
-                      />
-                    </template>
-                  </NButton>
-                </template>
-              </div>
-            </div>
-          </NPopover>
+            {{ usingNetwork ? '关闭' : '开启' }}联网访问
+          </NTooltip>
+          <button
+            v-show="isMobile"
+            @click="appStore.setTheme(theme === 'dark' ? 'light' : 'dark')"
+            class="shrink0 flex h-8 w-8 items-center justify-center rounded border transition dark:border-neutral-700 dark:hover:bg-[#33373c]"
+          >
+            <span class="text-base text-slate-500 dark:text-slate-400">
+              <SvgIcon
+                :icon="
+                  theme === 'dark'
+                    ? 'noto-v1:last-quarter-moon-face'
+                    : 'twemoji:sun'
+                "
+              />
+            </span>
+          </button>
           <NTooltip trigger="hover" :disabled="isMobile" placement="bottom">
             <template #trigger>
               <NButton
@@ -1109,7 +1097,7 @@ onUnmounted(() => {
                   </div>
                 </div>
                 <div class="flex justify-between items-center">
-                  <div
+                  <!-- <div
                     class="flex items-center text-neutral-400 cursor-pointer hover:text-[#3076fd]"
                   >
                     <span class="ml-2 mr-2 text-xs" @click="toggleUsingNetwork"
@@ -1136,7 +1124,7 @@ onUnmounted(() => {
                     >
                       |
                     </div>
-                  </div>
+                  </div> -->
 
                   <NButton
                     type="primary"
@@ -1176,7 +1164,7 @@ onUnmounted(() => {
         >{{ globaelConfig?.filingNumber }}</a
       >
     </div>
-    <!-- <NModal v-model:show="showProgressModal" :mask-closable="false">
+    <NModal v-model:show="showProgressModal" :mask-closable="false">
       <NCard
         style="width: 80%"
         title="上传文件中"
@@ -1192,7 +1180,7 @@ onUnmounted(() => {
           processing
         />
       </NCard>
-    </NModal> -->
+    </NModal>
   </div>
 </template>
 
diff --git a/chat/src/views/chat/components/Header/index.vue b/chat/src/views/chat/components/Header/index.vue
index a8dd874..65cc12a 100644
--- a/chat/src/views/chat/components/Header/index.vue
+++ b/chat/src/views/chat/components/Header/index.vue
@@ -180,7 +180,7 @@ function handleSignIn() {
                 </div>
               </div>
             </NPopover> -->
-            <!--
+            
             <NTooltip v-if="isMobile" trigger="hover" :disabled="isMobile">
               <template #trigger>
                 <button
@@ -193,12 +193,13 @@ function handleSignIn() {
                 </button>
               </template>
               签到领福利
-            </NTooltip> -->
+            </NTooltip>
             <NTooltip trigger="hover" :disabled="isMobile">
               <template #trigger>
                 <button
                   class="flex h-8 w-8 items-center justify-center rounded border transition hover:bg-[#eef0f3] dark:border-neutral-700 dark:hover:bg-[#33373c]"
                   @click="handleExport"
+                   v-show="!isMobile"
                 >
                   <span class="text-base text-slate-500 dark:text-slate-400">
                     <SvgIcon
@@ -215,7 +216,7 @@ function handleSignIn() {
                   class="flex h-8 w-8 items-center justify-center rounded border transition hover:bg-[#eef0f3] dark:border-neutral-700 dark:hover:bg-[#33373c]"
                   @click="handleClear"
                 >
-                  <span class="text-base text-slate-500 dark:text-slate-400"><SvgIcon icon="material-symbols:delete-outline" /></span>
+                  <span class="text-base text-slate-500 dark:text-slate-400"><SvgIcon icon="material-symbols:delete-outline"/></span>
                 </button>
               </template>
               删除本页内容
diff --git a/chat/src/views/chat/hooks/useScroll.ts b/chat/src/views/chat/hooks/useScroll.ts
index 9421852..15748c5 100644
--- a/chat/src/views/chat/hooks/useScroll.ts
+++ b/chat/src/views/chat/hooks/useScroll.ts
@@ -1,61 +1,71 @@
-import type { Ref } from 'vue'
-import { nextTick, ref } from 'vue'
+import type { Ref } from "vue";
+import { nextTick, ref } from "vue";
 
-type ScrollElement = HTMLDivElement | null
+type ScrollElement = HTMLDivElement | null;
 
 interface ScrollReturn {
-  scrollRef: Ref<ScrollElement>
-  scrollToBottom: () => Promise<void>
-  scrollToTop: () => Promise<void>
-  scrollToBottomIfAtBottom: () => Promise<void>
+	scrollRef: Ref<ScrollElement>;
+	scrollToBottom: () => Promise<void>;
+	scrollToTop: () => Promise<void>;
+	scrollToBottomIfAtBottom: () => Promise<void>;
 }
 
 // 节流函数
 function throttle(func: () => void, delay: number) {
-  let isThrottled = false;
+	let isThrottled = false;
 
-  return function throttledFunction() {
-    if (!isThrottled) {
-      func();
-      isThrottled = true;
-      setTimeout(() => {
-        isThrottled = false;
-      }, delay);
-    }
-  };
+	return function throttledFunction() {
+		if (!isThrottled) {
+			func();
+			isThrottled = true;
+			setTimeout(() => {
+				isThrottled = false;
+			}, delay);
+		}
+	};
 }
 
 export function useScroll(): ScrollReturn {
-  const scrollRef = ref<ScrollElement>(null)
+	const scrollRef = ref<ScrollElement>(null);
 
-  const scrollToBottom = async () => {
-    await nextTick()
-    if (scrollRef.value)
-      scrollRef.value.scrollTop = scrollRef.value.scrollHeight
-  }
+	const scrollToBottom = async () => {
+		let previous = 0;
+		let now = Date.now();
+		if (now - previous > 1000) {
+			previous = now;
+			await nextTick();
+			if (scrollRef.value)
+				scrollRef.value.scrollTop = scrollRef.value.scrollHeight;
+		}
+	};
 
-  const scrollToTop = async () => {
-    await nextTick()
-    if (scrollRef.value)
-      scrollRef.value.scrollTop = 0
-  }
+	const scrollToTop = async () => {
+		await nextTick();
+		if (scrollRef.value) scrollRef.value.scrollTop = 0;
+	};
 
-  // 使用节流函数包装 scrollToBottomIfAtBottom
-  const throttledScrollToBottomIfAtBottom = throttle(scrollToBottomIfAtBottom, 100);
+	// 使用节流函数包装 scrollToBottomIfAtBottom
+	const throttledScrollToBottomIfAtBottom = throttle(
+		scrollToBottomIfAtBottom,
+		100
+	);
 
-  async function scrollToBottomIfAtBottom() {
-    if (scrollRef.value) {
-      const threshold = 300;
-      const distanceToBottom = scrollRef.value.scrollHeight - scrollRef.value.scrollTop - scrollRef.value.clientHeight;
-      if (distanceToBottom <= threshold)
-        scrollRef.value.scrollTop = scrollRef.value.scrollHeight;
-    }
-  }
+	async function scrollToBottomIfAtBottom() {
+		if (scrollRef.value) {
+			const threshold = 300;
+			const distanceToBottom =
+				scrollRef.value.scrollHeight -
+				scrollRef.value.scrollTop -
+				scrollRef.value.clientHeight;
+			if (distanceToBottom <= threshold)
+				scrollRef.value.scrollTop = scrollRef.value.scrollHeight;
+		}
+	}
 
-  return {
-    scrollRef,
-    scrollToBottom,
-    scrollToTop,
-    scrollToBottomIfAtBottom: throttledScrollToBottomIfAtBottom,
-  }
+	return {
+		scrollRef,
+		scrollToBottom,
+		scrollToTop,
+		scrollToBottomIfAtBottom: throttledScrollToBottomIfAtBottom,
+	};
 }