diff --git a/src/assets/css/home-style.css b/src/assets/css/home-style.css index 653e5eb..24facce 100644 --- a/src/assets/css/home-style.css +++ b/src/assets/css/home-style.css @@ -549,6 +549,8 @@ body.light-mode .video-bg:before { .content-section-title { color: var(--content-title-color); margin-bottom: 14px; + font-size: 20px; + font-weight: bold; } .content-section ul { display: flex; @@ -828,12 +830,13 @@ body.light-mode .video-bg:before { .app-card { display: flex; flex-direction: column; - width: calc(33.3% - 20px); + /*width: calc(33.3% - 20px);*/ + width: 200px; font-size: 16px; background-color: var(--content-bg); border-radius: 14px; border: 1px solid var(--theme-bg-color); - padding: 20px; + padding: 10px; cursor: pointer; transition: 0.3s ease; } @@ -865,8 +868,10 @@ body.light-mode .video-bg:before { .app-card-buttons { display: flex; align-items: center; + justify-content: space-between; + width: 180px; margin-left: auto; - margin-top: 16px; + margin-top: 5px; } @media screen and (max-width: 1110px) { .app-card { diff --git a/src/components/home/HomeHeader.vue b/src/components/home/HomeHeader.vue index 932b7e1..f83878c 100644 --- a/src/components/home/HomeHeader.vue +++ b/src/components/home/HomeHeader.vue @@ -249,9 +249,9 @@ export default { return { TabsValue: '1', tabList: [ - {path: '/home', libel: 'ALL'}, + {path: '/home', libel: '首页'}, {path: '/news', libel: '今日热点'}, - {path: '/navDetail', libel: '网站详情'}, + // {path: '/nav', libel: '网站详情'}, {path: '/myNav', libel: '我的导航'}, ], loginDialogVisible: false, diff --git a/src/components/home/HomePage.vue b/src/components/home/HomePage.vue index 04ca3ec..389446e 100644 --- a/src/components/home/HomePage.vue +++ b/src/components/home/HomePage.vue @@ -5,7 +5,12 @@ - +
+
{{item.name}}
+
+ +
+
@@ -15,6 +20,8 @@ import $ from 'jquery' import CarouselComponent from "@/components/home/Carousel.vue"; import NavList from "@/components/home/NavList.vue"; import NoticeComponent from "@/components/home/Notice.vue"; +import axios from "axios"; +import Vue from "vue"; export default { name:"HomePage", components:{ @@ -24,14 +31,15 @@ export default { }, data() { return { - + navList:[], }}, mounted() { - this.Fun1(); - this.Fun2(); - this.Fun3(); - this.Fun4(); + this.fun1(); + this.fun2(); + this.fun3(); + this.fun4(); this.dropdownFun(); + this.getNavList(); }, created() { @@ -40,7 +48,28 @@ export default { }, methods: { - Fun1(){ + // 获取导航详情列表 + getNavList() { + let _this=this; + axios({ + method: 'post', + url: '/api/UrlAndCate/disposeBookmarkExhibitedToJsonNew', + }).then(function (res) { + if(res.data){ + _this.navList=res.data; + } + }).catch((error)=>{ + Vue.prototype.$notify.error({ + title: '错误', + message: error===null?'':error, + offset: 0 + }); + }) + + }, + + + fun1(){ $(document).click(function (e) { var container = $(".status-button"); var dd = $(".dropdown"); @@ -49,7 +78,7 @@ export default { } }); }, - Fun2(){ + fun2(){ $(".status-button:not(.open)").on("click", function () { $(".overlay-app").addClass("is-active"); }); @@ -57,12 +86,12 @@ export default { $(".overlay-app").removeClass("is-active"); }); }, - Fun3(){ + fun3(){ $(".status-button:not(.open)").click(function () { $(".pop-up").addClass("visible"); }); }, - Fun4(){ + fun4(){ $(".pop-up .close").click(function () { $(".pop-up").removeClass("visible"); }); diff --git a/src/components/home/LeftSide.vue b/src/components/home/LeftSide.vue index 771b06a..7dce200 100644 --- a/src/components/home/LeftSide.vue +++ b/src/components/home/LeftSide.vue @@ -26,7 +26,7 @@
快速导航
- + @@ -69,41 +69,10 @@ export default { }, data() { return { - data: [{ - label: '一级 1', - children: [{ - label: '二级 1-1', - children: [{ - label: '三级 1-1-1' - }] - }] - }, { - label: '一级 2', - children: [{ - label: '二级 2-1', - children: [{ - label: '三级 2-1-1' - }] - }, { - label: '二级 2-2', - children: [{ - label: '三级 2-2-1' - }] - }] - }, { - label: '一级 3', - children: [{ - label: '二级 3-1', - children: [{ - label: '三级 3-1-1' - }] - }, { - label: '二级 3-2', - children: [{ - label: '三级 3-2-1' - }] - }] - }] + defaultProps: { + children: 'childUC', + label: 'name' + } }}, mounted() { diff --git a/src/components/home/NavList.vue b/src/components/home/NavList.vue index 4c11598..4e13144 100644 --- a/src/components/home/NavList.vue +++ b/src/components/home/NavList.vue @@ -1,74 +1,144 @@ \ No newline at end of file diff --git a/src/components/myNav/MyNav.vue b/src/components/myNav/MyNav.vue index 53aed8c..cd21986 100644 --- a/src/components/myNav/MyNav.vue +++ b/src/components/myNav/MyNav.vue @@ -1,112 +1,6 @@