xyyd
/
xyyd-fatfox
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日历组件展示优化;热点资讯组件，小布局时显示的名称错误

This commit is contained in:
expdsn 2024-11-15 18:24:12 +08:00
parent cc46aafb3b
commit 5fbe526e2e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/widgets/calendar/Modal.tsx
View File

@ -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')
}
)}
>

2
src/widgets/hotspot/Small.tsx
View File

@ -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>