diff --git a/ruoyi-ui/src/views/officialWebsite/Components/page/index.vue b/ruoyi-ui/src/views/officialWebsite/Components/page/index.vue index ac820ab..d43bdf3 100644 --- a/ruoyi-ui/src/views/officialWebsite/Components/page/index.vue +++ b/ruoyi-ui/src/views/officialWebsite/Components/page/index.vue @@ -64,12 +64,16 @@ export default { initPageData() { // console.log(1, this.queryParams) // console.log(this.queryParams.pageNum) - getPageData(this.queryParams).then(res => { - // console.log('列表',res) - this.listinfo = res.data.list; - this.total =res.data.total; - this.$emit('event-message', this.listinfo) - }) + if (this.queryParams.categoryId !== ''){ + getPageData(this.queryParams).then(res => { + // console.log('列表',res) + this.listinfo = res.data.list; + this.total =res.data.total; + this.$emit('event-message', this.listinfo) + }) + }else { + this.$emit('event-message', []) + } }, }, } diff --git a/ruoyi-ui/src/views/officialWebsite/committee.vue b/ruoyi-ui/src/views/officialWebsite/committee.vue index c8fd11a..6ab4998 100644 --- a/ruoyi-ui/src/views/officialWebsite/committee.vue +++ b/ruoyi-ui/src/views/officialWebsite/committee.vue @@ -21,29 +21,29 @@ -
-
+
+
{{item.contentTitle}}
{{item.publishDate}}
-
- -
+ +
+
-
+
-
-
{{item.contentTitle}}
-
{{item.publishDate}}
+
+ +
-
- -
+ + +
@@ -52,7 +52,9 @@
- + + +
@@ -95,7 +97,7 @@ export default { input4: "" } }, - mounted() { + created() { // 页面加载完毕调用 this.initPageData(); }, @@ -105,12 +107,18 @@ export default { methods: { handleDataFromPage(data){ - if (this.currentActive == 0){ + if (this.currentActive === 0){ this.onelist = data } - if (this.currentActive == 2){ + if (this.currentActive === 2){ this.twolist = data } + // if (this.currentActive == 0){ + // this.onelist = data + // } + // if (this.currentActive == 2){ + // this.twolist = data + // } }, goDeatail(data){ @@ -132,12 +140,17 @@ export default { }, // 触发导航 getCurrentActive(value) { - if (this.currentActive === 0){ - this.categoryId = this.oneid - } - if (this.currentActive === 1){ - this.categoryId = this.twoid + // console.log(1,value, this.currentActive, this.categoryId) + if (this.value !== 1){ + this.categoryId = this.nav[value].id } + // console.log(2, this.currentActive, this.categoryId) + // if (this.currentActive === 0){ + // this.categoryId = this.oneid + // } + // if (this.currentActive === 1){ + // this.categoryId = this.twoid + // } if (this.currentActive == value) { return } @@ -145,6 +158,7 @@ export default { if (value === 1){ this.getContentByCategoryId(this.nav[value].id) } + }, initPageData() { @@ -613,5 +627,8 @@ export default { .noticeRsr:hover{ color: #00A0E8; cursor: pointer; +} +committee-cont2{ + } diff --git a/ruoyi-ui/src/views/officialWebsite/competition.vue b/ruoyi-ui/src/views/officialWebsite/competition.vue index ae46fcf..21d5b9c 100644 --- a/ruoyi-ui/src/views/officialWebsite/competition.vue +++ b/ruoyi-ui/src/views/officialWebsite/competition.vue @@ -404,7 +404,13 @@ export default { } this.currentActive = value - this.categoryId = value === 5 ? this.getNoticeId() : this.nav[value].id; + this.categoryId = "" + + if (value === 5){ + this.categoryId = this.getNoticeId() + }else { + this.categoryId = this.nav[value].id; + } // console.log(this.nav,'nav' ) }, initPageData() { diff --git a/ruoyi-ui/src/views/officialWebsite/news.vue b/ruoyi-ui/src/views/officialWebsite/news.vue index b3b408b..e25ea13 100644 --- a/ruoyi-ui/src/views/officialWebsite/news.vue +++ b/ruoyi-ui/src/views/officialWebsite/news.vue @@ -39,9 +39,9 @@ -
-
- +
+ +
diff --git a/ruoyi-ui/src/views/officialWebsite/platform.vue b/ruoyi-ui/src/views/officialWebsite/platform.vue index 03ae3ec..50a3997 100644 --- a/ruoyi-ui/src/views/officialWebsite/platform.vue +++ b/ruoyi-ui/src/views/officialWebsite/platform.vue @@ -21,6 +21,7 @@
+
@@ -29,7 +30,7 @@
-
+
@@ -120,6 +121,7 @@ export default { } }, handleDataFromPage(data){ + console.log(data) this.onelist = data }, // 触发导航 diff --git a/ruoyi-ui/src/views/officialWebsite/team.vue b/ruoyi-ui/src/views/officialWebsite/team.vue index 0f6db9c..677fc72 100644 --- a/ruoyi-ui/src/views/officialWebsite/team.vue +++ b/ruoyi-ui/src/views/officialWebsite/team.vue @@ -66,7 +66,7 @@
-
+
@@ -660,4 +660,52 @@ export default { line-height: 18px; } +/* 圆形分页按钮样式 */ +::v-deep .el-pagination .el-pager li:not(.disabled) { + border-radius: 100%; + /* 圆形 */ + width: 50px; + height: 50px; + /* 按钮高度 */ + line-height: 50px; + /* 文字垂直居中 */ + text-align: center; + /* 文字水平居中 */ + margin: 0 15px; + /* 按钮间距 */ + border-radius: 50%; + width: 50px; + height: 50px; + background: #FFFFFF; + + border: 1px solid #DDDDDD; +} + +/* 选中的页码按钮样式 */ +::v-deep .el-pagination .el-pager .active { + background-color: #005375; +; + /* 背景颜色 */ + color: #fff; + /* 文字颜色 */ +} + +::v-deep .el-pagination.is-background .btn-next, +::v-deep .el-pagination.is-background .btn-prev { + + background-color: #f4f4f5; + color: #333; + margin: 0 15px; + border-radius: 50%; + width: 50px; + height: 50px; + background: #FFFFFF; + + border: 1px solid #DDDDDD; +} + +::v-deep .el-pagination .btn-next .el-icon, +::v-deep .el-pagination .btn-prev .el-icon { + font-size: 18px; +}