From 33ecf5fc38a1ff098ef9fc802e0c92a7d5e66513 Mon Sep 17 00:00:00 2001
From: dinphy <dinphy1205@126.com>
Date: Wed, 12 Feb 2025 19:33:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feature:=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=AF=84=E8=AE=BA=E4=BF=A1=E6=81=AF=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=EF=BC=8C=E7=94=A8=E6=88=B7=E8=AE=BE=E7=BD=AE=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=20=E5=A2=9E=E5=8A=A0=E9=82=AE=E4=BB=B6=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=90=8E=EF=BC=8C=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E6=9C=89=E5=A7=93=E5=90=8D=E3=80=81?=
 =?UTF-8?q?=E7=BD=91=E7=AB=99=E5=92=8C=E9=82=AE=E7=AE=B1=EF=BC=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C=E4=B8=8D=E4=BD=B3=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=90=8E=EF=BC=9A=201.=20=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=BE=93=E5=85=A5=E6=A1=86=E9=BB=98=E8=AE=A4=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=EF=BC=8C=E6=9C=AA=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=B7=B3=E5=8A=A8=E7=9A=84=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA=202.=20=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BA=E6=8C=89=E9=92=AE=E6=9B=B4=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E5=8F=91=E9=80=81=E2=80=9D=EF=BC=8C=E4=B8=8E=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E5=9B=BE=E6=A0=87=EF=BC=8Cemoji=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E5=B9=B6=E6=8E=92=E5=9C=A8=E4=B8=80=E8=B5=B7=203.=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=AE=BE=E7=BD=AE=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/components/CommentBox.vue | 15 ++++++++++-----
 front/components/MemoEdit.vue   |  4 +---
 front/pages/user/settings.vue   |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/front/components/CommentBox.vue b/front/components/CommentBox.vue
index d4ca5263..775c8939 100644
--- a/front/components/CommentBox.vue
+++ b/front/components/CommentBox.vue
@@ -1,18 +1,20 @@
 <template>
   <div class="px-4 py-2 flex flex-col gap-2 mt-2" v-if="currentCommentBox === pid">
     <div class="relative">
-      <UTextarea :rows="3" autofocus :placeholder="replyTo ? `回复给${replyTo}` : ''" v-model="state.content"/>
-      <div class="animate-bounce absolute right-2 bottom-1 cursor-pointer text-xl select-none" @click="toggleEmoji">😊
+      <UTextarea :rows="4" autofocus :placeholder="replyTo ? `回复给${replyTo}` : ''" v-model="state.content"/>
+      <div class="flex gap-2 absolute right-3 bottom-2">
+        <UIcon v-if="!global.userinfo.token" class="text-[#9fc84a] w-6 h-6 animate-bounce cursor-pointer" name="i-carbon-user-avatar" @click="toggleUser"/>
+        <UIcon class="text-[#9fc84a] w-6 h-6 cursor-pointer select-none" name="i-carbon-face-satisfied" @click="toggleEmoji"/>
+        <UButton class="cursor-pointer text-xs" color="white" @click="comment">发送</UButton>
       </div>
     </div>
     <Emoji v-if="emojiShow" @selected="emojiSelected"/>
-    <div class="flex gap-1">
+    <div v-if="userShow" class="flex gap-1">
       <template v-if="!global.userinfo.token">
         <UInput placeholder="姓名" v-model="state.username"/>
         <UInput placeholder="网站" v-model="state.website"/>
         <UInput placeholder="邮箱" v-model="state.email"/>
       </template>
-      <UButton color="white" @click="comment">发布评论</UButton>
     </div>
   </div>
 </template>
@@ -40,6 +42,7 @@ const localCommentUserinfo = useStorage('localCommentUserinfo', {
   website: "",
   email: "",
 })
+const userShow = ref(false)
 const emojiShow = ref(false)
 const currentCommentBox = useState('currentCommentBox')
 const sysConfig = useState<SysConfigVO>('sysConfig')
@@ -88,7 +91,9 @@ const doComment = async (token?: string) => {
   memoChangedEvent.emit(props.memoId)
 }
 
-
+const toggleUser = () => {
+  userShow.value = !userShow.value
+}
 const toggleEmoji = () => {
   emojiShow.value = !emojiShow.value
 }
diff --git a/front/components/MemoEdit.vue b/front/components/MemoEdit.vue
index 5b1e54d1..20a8dba2 100644
--- a/front/components/MemoEdit.vue
+++ b/front/components/MemoEdit.vue
@@ -22,9 +22,7 @@
     <div class="w-full" @contextmenu.prevent="onContextMenu">
       <div class="relative">
         <UTextarea ref="contentRef" v-model="state.content" :rows="8" autoresize padded autofocus/>
-        <div class="animate-bounce absolute right-2 bottom-1 cursor-pointer text-xl select-none" @click="toggleEmoji">
-          😊
-        </div>
+        <UIcon class="text-[#9fc84a] w-6 h-6 animate-bounce absolute right-2 bottom-1 cursor-pointer select-none" name="i-carbon-face-satisfied" @click="toggleEmoji"/>
       </div>
 
       <Emoji v-if="emojiShow" @selected="emojiSelected" @close="emojiShow=false"/>
diff --git a/front/pages/user/settings.vue b/front/pages/user/settings.vue
index bf3e4ae4..2d2eecf0 100644
--- a/front/pages/user/settings.vue
+++ b/front/pages/user/settings.vue
@@ -66,7 +66,7 @@ const reload = async () => {
 const save = async () => {
   await useMyFetch('/user/saveProfile', state)
   toast.success("保存成功")
-  await reload()
+  location.reload()
 }
 
 const uploadAvatarUrl = async (files: FileList) => {

From a68500509d4b5db7c0200ee427034a564d71515d Mon Sep 17 00:00:00 2001
From: JerryWang <gaediy@gmail.com>
Date: Thu, 13 Feb 2025 17:30:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E5=8E=BB=E6=8E=89=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E7=9A=84=E8=B7=B3=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/components/CommentBox.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/components/CommentBox.vue b/front/components/CommentBox.vue
index 775c8939..e81e15d2 100644
--- a/front/components/CommentBox.vue
+++ b/front/components/CommentBox.vue
@@ -3,7 +3,7 @@
     <div class="relative">
       <UTextarea :rows="4" autofocus :placeholder="replyTo ? `回复给${replyTo}` : ''" v-model="state.content"/>
       <div class="flex gap-2 absolute right-3 bottom-2">
-        <UIcon v-if="!global.userinfo.token" class="text-[#9fc84a] w-6 h-6 animate-bounce cursor-pointer" name="i-carbon-user-avatar" @click="toggleUser"/>
+        <UIcon v-if="!global.userinfo.token" class="text-[#9fc84a] w-6 h-6 cursor-pointer" name="i-carbon-user-avatar" @click="toggleUser"/>
         <UIcon class="text-[#9fc84a] w-6 h-6 cursor-pointer select-none" name="i-carbon-face-satisfied" @click="toggleEmoji"/>
         <UButton class="cursor-pointer text-xs" color="white" @click="comment">发送</UButton>
       </div>