diff --git a/public/logo.svg b/public/logo.svg index bb12aa1..2ca361a 100644 --- a/public/logo.svg +++ b/public/logo.svg @@ -1,6 +1,6 @@ - - - + + + + + \ No newline at end of file diff --git a/src/assets/index.scss b/src/assets/index.scss index e782190..b7b010d 100644 --- a/src/assets/index.scss +++ b/src/assets/index.scss @@ -40,7 +40,7 @@ body { } .app-header { - @apply w-full navigation-container flex justify-between items-center p-basic fixed top-0 inset-x-0; + @apply w-full navigation-container flex justify-between items-center p-basic fixed top-0 inset-x-0 bg-white/90; z-index: var(--header-z-index); height: var(--app-header-header); } diff --git a/src/pages/news/components/search-panel.tsx b/src/pages/news/components/search-panel.tsx index 76053d6..14871b7 100644 --- a/src/pages/news/components/search-panel.tsx +++ b/src/pages/news/components/search-panel.tsx @@ -26,6 +26,7 @@ export default function SearchPanel({onSearch}: SearchPanelProps) { const [panelVisible, {setTrue, setFalse}] = useBoolean(false) const [params, setParams] = useSetState({ pagination, + time_flag:1 }); const [prevSearchName, setPrevSearchName] = useState() @@ -103,7 +104,7 @@ export default function SearchPanel({onSearch}: SearchPanelProps) { /> diff --git a/src/pages/news/index.tsx b/src/pages/news/index.tsx index 0c1b78d..5afed3a 100644 --- a/src/pages/news/index.tsx +++ b/src/pages/news/index.tsx @@ -16,7 +16,7 @@ import ButtonToTop from "@/components/scoller/button-to-top.tsx"; export default function NewsIndex() { const [params, setParams] = useState({ - pagination: {page: 1, limit: 12} + pagination: {page: 1, limit: 12},time_flag:1 }) const [checkedId, setCheckedId] = useState([]) const [activeNews, setActiveNews] = useState() @@ -154,13 +154,13 @@ export default function NewsIndex() { }
-
来源: {item.media_name}
+
来源: {item.data_source_name}
-
{formatTime(item.publish_time)}
+
{formatTime(item.publish_time,'min')}
+ className={`checkbox mt-1`}> {item.internal_article_id > 0 ? - : + 已推送 : { handleCheckChange(item.id) }}/>} diff --git a/src/pages/user/components/main-bg.jpg b/src/pages/user/components/main-bg.jpg index b11887d..231bd46 100644 Binary files a/src/pages/user/components/main-bg.jpg and b/src/pages/user/components/main-bg.jpg differ diff --git a/src/pages/user/style.module.scss b/src/pages/user/style.module.scss index 86151fc..bcb6d03 100644 --- a/src/pages/user/style.module.scss +++ b/src/pages/user/style.module.scss @@ -1,12 +1,14 @@ .main { @apply py-10; - background-color: rgb(244, 247, 252); + background: url(./components/main-bg.jpg) no-repeat center; + background-size: cover; height: calc(100vh - var(--app-header-header)); min-height: 500px; align-items: center; display: flex; overflow: hidden; justify-content: right; + } .boxLogin { diff --git a/src/util/strings.ts b/src/util/strings.ts index bbf9bed..759015a 100644 --- a/src/util/strings.ts +++ b/src/util/strings.ts @@ -55,8 +55,13 @@ function getDayjs(time:any){ return dayjs(time); } -export function formatTime(time:any,template = 'YYYY-MM-DD HH:mm:ss') { - if(!time) return '-'; +export function formatTime(time: any, template: 'min' | 'date' | string = 'YYYY-MM-DD HH:mm:ss') { + if (!time) return '-'; + if (template == 'min') { + template = 'YYYY-MM-DD HH:mm' + } else if (template == 'date') { + template = 'YYYY-MM-DD' + } return getDayjs(time).format(template) }