diff --git a/.env.development b/.env.development index 5d2f580..3d6e829 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ # 应用模块接口 -VITE_SERVER_URL=https://server.gxwebsoft.com/api -API_BASE=https://cms-api.websoft.top/api +VITE_SERVER_URL=https://server.gxbsnx.com/api +API_BASE=https://server.gxbsnx.com/api #API_BASE=http://127.0.0.1:9001/api #VITE_SERVER_URL=http://127.0.0.1:8000/api diff --git a/.env.production b/.env.production index 3ff109c..2da41ff 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ # 基础模块 -VITE_SERVER_URL=https://server.gxwebsoft.com/api +VITE_SERVER_URL=https://server.gxbsnx.com/api # 应用模块 -API_BASE=https://cms-api.websoft.top/api +API_BASE=https://server.gxbsnx.com/api diff --git a/assets/css/main.css b/assets/css/main.css index f09300c..09552de 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -12,14 +12,14 @@ .head-bg { width: 100% !important; - background: url('https://gxbsnx.com/Temp/images/new/imgimg4.png'); + background: url('http://img.gxbsnx.com/Temp/images/new/imgimg4.png'); height: 39px; display: flex; justify-items: center; clear: both; } .menu-bg{ - background: url('https://www.gxbsnx.com/Temp/images/background/back_green.png') repeat-x top center; + background: url('http://img.gxbsnx.com/Temp/images/background/back_green.png') repeat-x top center; background-size: 100% 100%; clear: both; } diff --git a/components/AppFooter/Copyright/Copyright.vue b/components/AppFooter/Copyright/Copyright.vue index 9b7c6e0..9d378d5 100644 --- a/components/AppFooter/Copyright/Copyright.vue +++ b/components/AppFooter/Copyright/Copyright.vue @@ -17,7 +17,7 @@ const config = useConfigInfo(); 备案号：{{ config?.icpNo }}
- Powered by 云·企业官网 + Powered by 云·企业官网
@@ -37,7 +37,7 @@ const config = useConfigInfo(); 备案号：{{ config?.icpNo }}
- Powered by 云·企业官网 + Powered by 云·企业官网
diff --git a/components/AppHeader/AppHeader.vue b/components/AppHeader/AppHeader.vue index a68dae6..64e2da9 100644 --- a/components/AppHeader/AppHeader.vue +++ b/components/AppHeader/AppHeader.vue @@ -9,7 +9,7 @@
- +
diff --git a/components/AppHeader/TopBar/TopBar.vue b/components/AppHeader/TopBar/TopBar.vue index c2ba946..54011d6 100644 --- a/components/AppHeader/TopBar/TopBar.vue +++ b/components/AppHeader/TopBar/TopBar.vue @@ -10,6 +10,15 @@ const drawer = ref(false); const onSearch = () => { window.location.href = `/${i18n.locale.value}/search/${keyword.value}`; } + +const route = useRoute(); +watch( + () => route.params.keywords, + (text) => { + keyword.value = String(text); + }, + { immediate: true } +);
@@ -51,6 +51,7 @@ import dayjs from "dayjs"; import {getViews} from "~/utils/common"; import {pageCmsArticle} from "~/api/cms/cmsArticle"; import {FILE_SERVER} from "~/config"; +import {pageCmsArticleContent} from "~/api/cms/cmsArticleContent"; const route = useRoute(); const router = useRouter(); @@ -69,17 +70,17 @@ const where = reactive({ keywords: undefined, page: 1, limit: 12, - status: 0, - parentId: undefined, - categoryId: undefined, - lang: i18n.locale.value + // status: 0, + // parentId: undefined, + // categoryId: undefined, + // lang: i18n.locale.value }); // 加载页面数据 const reload = async () => { list.value = []; - pageCmsArticle(where).then(response => { + pageCmsArticleContent(where).then(response => { list.value = response?.list || []; total.value = response?.count || 0; }) diff --git a/pages/user/components/Auth.vue b/pages/user/components/Auth.vue index ca17132..f773125 100644 --- a/pages/user/components/Auth.vue +++ b/pages/user/components/Auth.vue @@ -58,7 +58,7 @@