diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 61a59b3..4455f50 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,16 +5,28 @@ - - - + + + + + + + + + - + + + + + + + - { - "keyToString": { - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "WebServerToolWindowFactoryState": "true", - "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true", - "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true", - "WebServerToolWindowPanel.toolwindow.show.date": "false", - "WebServerToolWindowPanel.toolwindow.show.permissions": "false", - "WebServerToolWindowPanel.toolwindow.show.size": "false", - "last_opened_file_path": "/Users/lizhong/Desktop/workspace/ReptileFront/reptileFront_nuxt/assets/images", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "yarn", - "settings.editor.selected.configurable": "reference.settings.ide.settings.file-colors", - "ts.external.directory.path": "/Applications/WebStorm.app/Contents/plugins/javascript-impl/jsLanguageServicesImpl/external", - "vue.rearranger.settings.migration": "true" + +}]]> - + @@ -82,7 +94,7 @@ - + @@ -115,8 +127,8 @@ - + @@ -142,7 +154,8 @@ - + + 1680082088939 diff --git a/api/Common.ts b/api/Common.ts index 43aa617..2311238 100644 --- a/api/Common.ts +++ b/api/Common.ts @@ -7,6 +7,9 @@ export default new class Common extends Http> { private readonly bottomMenu = '/index/bottomMenu' private readonly search_url = '/index/search' private readonly login_url = '/user/login' + private readonly carousel_url = '/index/carousel' + private readonly index_url = '/index/index' + private readonly captcha_url = 'http://research.mcnetmart.com/index.php?s=/captcha' handleUpload(file: any) { const formData = new FormData(); formData.append('file', file) @@ -27,5 +30,15 @@ export default new class Common extends Http> { return this.get(this.search_url, params) } + getCarousel(){ + return this.get(this.carousel_url, {category: '首页'}) + } + getIndexConfig(){ + return this.get(this.index_url) + } + + getCaptcha(){ + return this.get(this.captcha_url) + } } diff --git a/assets/style/config.scss b/assets/style/config.scss index 6bdca85..7076e1b 100644 --- a/assets/style/config.scss +++ b/assets/style/config.scss @@ -1,3 +1,4 @@ @import "color"; @import "public"; @import 'var/index'; + diff --git a/assets/style/var/index.scss b/assets/style/var/index.scss index 398d41f..4821429 100644 --- a/assets/style/var/index.scss +++ b/assets/style/var/index.scss @@ -30,3 +30,13 @@ $layout-mix-sider-fixed-z-index: 550; $preview-comp-z-index: 1000; $page-footer-z-index: 99; + + +@mixin ellipsis-line($line){ + word-break: break-word; + display: -webkit-box; + -webkit-line-clamp: $line; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; +} diff --git a/components/Banner/Search.vue b/components/Banner/Search.vue index 1b9f4b8..fd4ddc5 100644 --- a/components/Banner/Search.vue +++ b/components/Banner/Search.vue @@ -15,9 +15,11 @@ @@ -27,25 +29,43 @@ + diff --git a/components/Footer/Index.vue b/components/Footer/Index.vue index 54e5a1d..2175f28 100644 --- a/components/Footer/Index.vue +++ b/components/Footer/Index.vue @@ -7,7 +7,7 @@
Copyright © 2012-2025 北京中海通科技有限公司版权所有每ICP备xxxxxxxxxxxxxxx号 + >{{ store.$state.otherConfig?.icp_record }}
@@ -17,10 +17,13 @@ const menuList = ref([]); const {prefixCls} = useDesign('layout-footer'); const {commonApi} = useApi(); +const store = useAppStore() async function getData() { const menus = await commonApi.getBottomMenu() + const config = await commonApi.getIndexConfig() menuList.value = menus.data + store.setConfig(config.data) } getData() diff --git a/components/Header/Index.vue b/components/Header/Index.vue index cc937c9..68d18b4 100644 --- a/components/Header/Index.vue +++ b/components/Header/Index.vue @@ -15,10 +15,11 @@