dianliang/school_website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website

Browse Source
This commit is contained in:
xiao-fajia 2024-08-03 15:26:40 +08:00
commit 7663345f28
3 changed files with 101 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-ui/src/api/officialWebsite/getPageData.js
View File

@ -21,3 +21,10 @@ export function getContent(id) {
method: 'get',
})
}
export function getbaseInfo() {
return request({
url: '/api/baseInfo',
method: 'get',
})
}

62
ruoyi-ui/src/views/officialWebsite/competition.vue
View File

@ -22,7 +22,7 @@
</div>
</div>
<div class="committee-cont">
<div class="tabber-box " v-if="false" >
<div class="tabber-box " v-if="currentActive == 5" >
<div class="titel_">赛区参赛报名表（本科组）</div>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="180px" class="demo-ruleForm">
<div style="display: flex;">
@ -118,34 +118,26 @@
<div v-if="currentActive == 3" v-html="nav[3].children.list[0].contentDetail"></div>
<div v-for="(item, index) in nav " :key=index>
<div class="about-conts-item1" v-if="currentActive == index">
<div v-if="currentActive != 3 && currentActive != 2 " class="neirong" v-html="pageContextList[index]"></div>
<div class="wrapbox">
<div v-if="currentActive == 2 " v-for="(item,index) in nav[2].children.list" @click="goDeatail(item)" >
<div v-if="currentActive == 0 || currentActive == 1 " class="neirong" v-html="pageContextList[index]"></div>
</div>
</div>
<div v-if="currentActive == 2 " class="wrapbox">
<div class="rsr" v-for="(item,index) in nav[2].children.list" @click="goDeatail(item)" >
<img :src=" imgurl + item.contentImg" style="width: 255px;height: 220px">
<div>{{item.contentTitle}}</div>
<div class="size-t">{{item.contentTitle}}</div>
</div>
</div>
<div v-if="currentActive == 4 " class="wrapbox">
<div class="rsr" v-for="(item,index) in nav[2].children.list" @click="goDeatail(item)" >
<img :src=" imgurl + item.contentImg" style="width: 255px;height: 220px">
<div class="size-t">{{item.contentTitle}}</div>
</div>
</div>
<div v-show="currentActive == 2 || currentActive ==4" >
<page-util :category-id="categoryId" @event-message="handleDataFromPage" />
</div>
<!-- <div class="news">
<div class="news-list">
<div class="item" v-for="(item, index) in 8">
<div class="tts">
关于开展第二届跨专业虚拟仿真综合实习的通知关于开展第二届跨专业虚拟仿真综合实习的通知关于开展第二届跨专业虚拟仿真综合实习的通知关于开展第二届跨专业虚拟仿真综合实习的通知关于开展第二届跨专业虚拟仿真综合实习的通知
</div>
<div class="time">2024-05-20</div>
</div>
</div>
<div class="page">
<el-pagination background layout="prev, pager, next" :total="1000" class="">
</el-pagination>
</div>
</div> -->
<div class="anniu" v-show="currentActive == 1 " >去报名</div>
</div>
<footers></footers>
@ -155,7 +147,7 @@
<script>
import { Swiper, SwiperSlide } from "vue-awesome-swiper";
import "swiper/css/swiper.min.css";
import { getPageData, getPageColumn } from "@/api/officialWebsite/getPageData";
import { getPageData, getPageColumn,getbaseInfo } from "@/api/officialWebsite/getPageData";
import footers from '@/views/officialWebsite/Components/footer.vue'
import headers from '@/views/officialWebsite/Components/header.vue'
import PageUtil from '@/views/officialWebsite/Components/page'
@ -173,6 +165,7 @@ export default {
},
data() {
return {
registerStatus:0,
imgurl:process.env.VUE_APP_BASE_API,
ruleForm: {
@ -230,11 +223,16 @@ export default {
if (this.currentActive == value) {
return
}
this.currentActive = value
this.categoryId = this.nav[value].id
// console.log(this.nav,'nav' )
},
initPageData() {
getbaseInfo().then(res=>{
this.registerStatus = res.data.registerStatus
console.log(res,'5')
})
this.categoryId = this.$route.query.id
// console.log(this.$route.query.id, this.categoryId)
let routeParam = {
@ -271,6 +269,18 @@ export default {
</script>
<style scoped lang="scss">
.anniu{
width: 150px;
height: 50px;
display: flex;
align-items: center;
justify-content: center;
background: #00A0E8;
color: #fff;
margin: 15px auto;
border-radius: 8px;
cursor: pointer;
}
/* .container {
background: #F5F5F5;
} */
@ -391,6 +401,9 @@ export default {
box-sizing: border-box;
padding: 15px;
}
.rsr{
width: 20%;
}
.ny-banner {
width: 100%;
}
@ -717,4 +730,9 @@ export default {
padding: 15px;
margin: 15px auto;
}
.size-t{
width: 100%;
height: 50px;
text-align: center;
}
</style>

51
ruoyi-ui/src/views/officialWebsite/xufang.vue
View File

@ -723,4 +723,55 @@ export default {
justify-content: center;
margin-bottom: 50px;
}
::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;
}
.page-box{
width: 80%;
margin: 10px auto;
}
</style>