diff --git a/ruoyi-ui/src/api/officialWebsite/getPageData.js b/ruoyi-ui/src/api/officialWebsite/getPageData.js
index 1fbc7e3..b4cd365 100644
--- a/ruoyi-ui/src/api/officialWebsite/getPageData.js
+++ b/ruoyi-ui/src/api/officialWebsite/getPageData.js
@@ -15,3 +15,9 @@ export function getPageColumn(data) {
data
})
}
+export function getContent(id) {
+ return request({
+ url: '/api/content/' + id ,
+ method: 'get',
+ })
+}
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index fc69cf1..ae03a7e 100644
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request'
NProgress.configure({ showSpinner: false })
-const whiteList = ['/login', '/register', '/virtually', '/sb','/about','/platform','/teaching','/team','/committee','/competition','/contact' ]
+const whiteList = ['/login', '/register', '/virtually', '/sb','/about','/platform','/teaching','/team','/committee','/competition','/contact','/details','/about' ]
router.beforeEach((to, from, next) => {
NProgress.start()
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 3fb2446..b9aa83f 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -42,15 +42,21 @@ export const constantRoutes = [
]
},
{
- path: '/virtually',
+ path: '/virtually',//首页
name:'virtually',
component: () => import('@/views/home'),
hidden: true
},
{
- path: '/sb',//测试
- name:'sb',
- component: () => import('@/views/sb'),
+ path: '/list',//查看更多 列表页
+ name:'list',
+ component: () => import('@/views/officialWebsite/list'),
+ hidden: true
+ },
+ {
+ path: '/details',//查看更多 详情页
+ name:'details',
+ component: () => import('@/views/officialWebsite/details'),
hidden: true
},
{
@@ -121,7 +127,6 @@ export const constantRoutes = [
},
{
path: '/login',
-
component: () => import('@/views/login'),
hidden: true
},
diff --git a/ruoyi-ui/src/views/home.vue b/ruoyi-ui/src/views/home.vue
index 3c367f4..843dc84 100644
--- a/ruoyi-ui/src/views/home.vue
+++ b/ruoyi-ui/src/views/home.vue
@@ -59,7 +59,7 @@
-
+
{{ item.contentTitle }}
@@ -92,7 +92,7 @@
-
+
{{ item.contentTitle }}
@@ -112,7 +112,7 @@
-
+
{{ item.contentTitle }}
@@ -143,7 +143,7 @@
-
+
@@ -156,10 +156,11 @@
3750
-
+
-

@@ -188,6 +189,7 @@ export default {
},
data() {
return {
+
Serial:0,
baseInfo:"",
categoryQuery: {
@@ -313,6 +315,20 @@ export default {
this.$router.push('/contact');
}
},
+ goDeatail(data){
+ console.log(data)
+ if(data.linkType == 0){
+ this.$router.push({
+ name: 'details',
+ query:{ id: data.id }
+ });
+ }
+ if(data.linkType == 1){
+ window.open(data.link, '_blank');
+
+ }
+
+ },
/** 顶部tab列表 */
tabLsit() {
getTab().then(response => {
@@ -337,12 +353,13 @@ export default {
}
index += 1
})
-
+ console.log('newList',this.newList)
// 通知公告赋值
this.noticeList = res.data[1].children.list
// 比赛
this.nationalVirtualLass = res.data[2].children.list
+ console.log( '362', this.nationalVirtualLass)
this.nationalVirtualLass.forEach(item => {
item.contentImg = process.env.VUE_APP_BASE_API + item.contentImg
})
@@ -881,7 +898,6 @@ export default {
.backmo{
width: 100%;
height: 100%;
-
position: absolute;
top: 0;
left: 0;
@@ -895,12 +911,13 @@ export default {
border: 1px solid #eee;
margin-bottom: 20px;
position: relative;
-
}
.news11 .news11-list .news11-list-item:hover>.backmo {
transition: background-color 0.5s;
background-color: rgba(0, 0, 0, 0.46) !important;
+ color: #fff;
+
}
.news11 .news11-list .news11-list-item .img {
width: 100%;
diff --git a/ruoyi-ui/src/views/officialWebsite/Components/header.vue b/ruoyi-ui/src/views/officialWebsite/Components/header.vue
index 8de1a91..adb273a 100644
--- a/ruoyi-ui/src/views/officialWebsite/Components/header.vue
+++ b/ruoyi-ui/src/views/officialWebsite/Components/header.vue
@@ -17,14 +17,14 @@
-
-
搜索
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/officialWebsite/details.vue b/ruoyi-ui/src/views/officialWebsite/details.vue
index 286216e..e703ad4 100644
--- a/ruoyi-ui/src/views/officialWebsite/details.vue
+++ b/ruoyi-ui/src/views/officialWebsite/details.vue
@@ -8,84 +8,22 @@
-
-
-

-
首页 详情
+
+
{{info.contentTitle}}
+
+
+
+
![]()
+
-
-
- {{ item.categoryName }}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -93,7 +31,7 @@
+
+