From 5fbe526e2e6d5569a9c804160e2e6fd0f52117ee Mon Sep 17 00:00:00 2001
From: expdsn <18111002318@163.com>
Date: Fri, 15 Nov 2024 18:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86=E7=BB=84=E4=BB=B6=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96;=E7=83=AD=E7=82=B9=E8=B5=84?=
 =?UTF-8?q?=E8=AE=AF=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=B0=8F=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E7=9A=84=E5=90=8D=E7=A7=B0=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widgets/calendar/Modal.tsx | 22 +++++++++++-----------
 src/widgets/hotspot/Small.tsx  |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/widgets/calendar/Modal.tsx b/src/widgets/calendar/Modal.tsx
index b98b4ee..09aa28d 100644
--- a/src/widgets/calendar/Modal.tsx
+++ b/src/widgets/calendar/Modal.tsx
@@ -33,7 +33,9 @@ export default defineComponent(() => {
             <span class={'text-[48px] font-extrabold pt-2'}>{store.state.select.format('D')}</span>
             <span>{store.state.select.format('ddd')}</span>
             <span>
-              本年第{store.state.select.diff(store.state.select.set('date', 1).set('months', 0), 'weeks')}周，第
+              本年第
+              {store.state.select.diff(store.state.select.set('date', 1).set('months', 0), 'weeks')}
+              周，第
               {store.state.select.diff(store.state.select.set('date', 1).set('month', 0), 'day')}天
             </span>
             <div class={'w-[138px] h-[1px] flex-shrink-0 my-7 bg-black/10 relative'}></div>
@@ -56,10 +58,8 @@ export default defineComponent(() => {
                 >
                   宜
                 </div>
-                <div class={'flex flex-col text-[#666] text-[14px]'}>
-                  {lunar.value.getDayYi().map((item: any) => {
-                    return <div class={'flex items-center'}>{item}，</div>
-                  })}
+                <div class={'flex-1 w-0 text-[#666] text-[14px]'}>
+                  {lunar.value.getDayYi().join(',')}
                 </div>
               </div>
               <div class={'flex  w-full  gap-x-5'}>
@@ -70,10 +70,8 @@ export default defineComponent(() => {
                 >
                   忌
                 </div>
-                <div class={'flex flex-col text-[#666] text-[14px]'}>
-                  {lunar.value.getDayJi().map((item: any) => {
-                    return <div class={'flex items-center'}>{item}，</div>
-                  })}
+                <div class={'flex-1 w-0 text-[#666] text-[14px]'}>
+                  {lunar.value.getDayJi().join(',')}
                 </div>
               </div>
             </div>
@@ -158,8 +156,10 @@ export default defineComponent(() => {
                         dayjs(),
                         'day'
                       ),
-                      'border-transparent border-solid': !el.day.isSame(dayjs(), 'day') && !el.day.isSame(store.state.select, 'day'),
-                      'border-[#76d7f2] border-solid border-[1px]': !el.day.isSame(dayjs(), 'day') && el.day.isSame(store.state.select, 'day'),
+                      'border-transparent border-solid':
+                        !el.day.isSame(dayjs(), 'day') && !el.day.isSame(store.state.select, 'day'),
+                      'border-[#76d7f2] border-solid border-[1px]':
+                        !el.day.isSame(dayjs(), 'day') && el.day.isSame(store.state.select, 'day')
                     }
                   )}
                 >
diff --git a/src/widgets/hotspot/Small.tsx b/src/widgets/hotspot/Small.tsx
index 31a6ffa..2f238d1 100644
--- a/src/widgets/hotspot/Small.tsx
+++ b/src/widgets/hotspot/Small.tsx
@@ -10,7 +10,7 @@ export default defineComponent(() => {
       <img class={'w-[48px] h-[48px]'} src={'/tab/icons/hot_information_icon.png'}></img>
       <div class={'flex-1 flex justify-center'}>
         <div class="flex-col flex">
-          <span class={'text-[16px] text-white'}>热点折扣</span>
+          <span class={'text-[16px] text-white'}>热点资讯</span>
           <div class={'flex items-center text-[#fffc] text-[12px] '}>
             立即查看
             <div>