osredm_test
/
osredm-comp-custom
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

update

This commit is contained in:
以说 2022-06-06 11:01:30 +08:00
parent c6a71d2bc1
commit 118c667be3
25 changed files with 98 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/assets/css/Home.css
View File

@ -1,16 +0,0 @@
.video{
margin: 30px 15px;
}
.content{
margin-bottom: 30px;
}
.content-font{
display: flex;
}

25
src/assets/css/common.css
View File

@ -13,7 +13,6 @@
.card{
/*display: flex;*/
background-color: white;
width: 51vw;
box-shadow: 0 4px 10px 0 rgba(0,0,0,0.15);
@ -22,28 +21,4 @@
.content-button{
margin: 2vw 24.5vw 15px;
text-align: right;
}
.edit-button{
display:inline-block;
line-height:1;
white-space:nowrap;
cursor:pointer;
background:#FFF;
border:1px solid #DCDFE6;
color:#606266;
-webkit-appearance:none;
text-align:center;
-webkit-box-sizing:border-box;
box-sizing:border-box;
outline:0;
margin:0;
-webkit-transition:.1s;
transition:.1s;
font-weight:500;
-moz-user-select:none;
-webkit-user-select:none;
-ms-user-select:none;
padding:10px 20px;
font-size:14px;
border-radius:4px
}

5
src/components/AdminHeader.vue
View File

@ -1,7 +1,6 @@
<template>
<div>
<el-menu :default-active="activeIndex" class="nav" mode="horizontal" @select="handleSelect">
<!-- <el-menu-item index="0"><el-image :src="logoImg" style="width: 120px"/></el-menu-item>-->
<el-image @click="backOsredm" :src="osredmLogo" style="width: 120px; margin-right: 50px; cursor: pointer;"/>
<el-submenu index="9" >
<template slot="title">相关配置</template>
@ -17,7 +16,7 @@ export default {
name: "AdminHeader",
data() {
return {
osredmLogo: require("../assets/logo/osredmLogo.svg"),
osredmLogo: require("@/assets/logo/osredmLogo.svg"),
activeIndex: '1',
activeIndex2: '1'
};
@ -33,6 +32,6 @@ export default {
}
</script>
<style src="./../assets/css/Header.css" scoped>
<style src="@/assets/css/Header.css" scoped>
</style>

4
src/components/Footer.vue
View File

@ -30,12 +30,12 @@ export default {
name: "Footer",
data(){
return{
osredmLogo: require("../assets/logo/osredmLogo-white.svg")
osredmLogo: require("@/assets/logo/osredmLogo-white.svg")
}
}
}
</script>
<style src="./../assets/css/Footer.css" scoped>
<style src="@/assets/css/Footer.css" scoped>
</style>

8
src/components/Header.vue
View File

@ -27,7 +27,7 @@
<el-menu-item index="chart" >数据统计</el-menu-item>
<el-menu-item index="rank" >排行榜</el-menu-item>
<el-menu-item index="chat" >交流互动</el-menu-item>
<el-menu-item index="contact" >联系我们</el-menu-item>
<el-menu-item index="contactUs" >联系我们</el-menu-item>
<!-- 根据用户权限是否展示 -->
<el-submenu index="manage" v-if="rankIf">
<template slot="title">后台管理</template>
@ -48,8 +48,8 @@ export default {
data() {
return {
banner: require("../assets/logo/banner.jpg"),
osredmLogo: require("../assets/logo/osredmLogo.svg"),
banner: require("@/assets/logo/banner.jpg"),
osredmLogo: require("@/assets/logo/osredmLogo.svg"),
activeIndex: "home", /* 启动默认显示页 */
userName: "",
@ -143,6 +143,6 @@ export default {
</script>
<style src="./../assets/css/Header.css" scoped>
<style src="@/assets/css/Header.css" scoped>
</style>

3
src/main.js
View File

@ -12,8 +12,7 @@ import mavonEditor from 'mavon-editor'
import 'mavon-editor/dist/css/index.css'
// 图标
// import "/src/assets/icon/iconfont.css"
import "/src/assets/Icon/iconfont.css"
import "/src/assets/icon/iconfont.css"
/* // echarts
import * as echarts from 'echarts';
// 时间

2
src/pages/Admin/Setting.vue
View File

@ -11,4 +11,4 @@ export default {
<style scoped>
</style>
<style src="./../../assets/css/common.css" scoped/>
<style src="@/assets/css/common.css" scoped/>

2
src/pages/Apply/Apply.vue
View File

@ -13,4 +13,4 @@ export default {
<style scoped>
</style>
<style src="./../../assets/css/common.css" scoped/>
<style src="@/assets/css/common.css" scoped/>

2
src/pages/Chat.vue → src/pages/Chat/Chat.vue
View File

@ -14,4 +14,4 @@ export default {
</style>
<style src="./../assets/css/common.css" scoped/>
<style src="@/assets/css/common.css" scoped/>

0
src/pages/Chat/ChatEdit.vue Normal file
View File

2
src/pages/ContactUs.vue → src/pages/ContactUs/ContactUs.vue
View File

@ -12,4 +12,4 @@ export default {
</style>
<style src="./../assets/css/common.css" scoped/>
<style src="@/assets/css/common.css" scoped/>

0
src/pages/ContactUs/ContactUsEdit.vue Normal file
View File

2
src/pages/Data/Chart.vue
View File

@ -13,4 +13,4 @@ export default {
<style scoped>
</style>
<style src="./../../assets/css/common.css" scoped/>
<style src="@/assets/css/common.css" scoped/>

2
src/pages/Data/Rank.vue
View File

@ -13,4 +13,4 @@ export default {
<style scoped>
</style>
<style src="./../../assets/css/common.css" scoped/>
<style src="@/assets/css/common.css" scoped/>

2
src/pages/Guide.vue → src/pages/Guide/Guide.vue
View File

@ -14,4 +14,4 @@ export default {
</style>
<style src="./../assets/css/common.css" scoped/>
<style src="@/assets/css/common.css" scoped/>

0
src/pages/Guide/GuideEdit.vue Normal file
View File

23
src/pages/Home.vue → src/pages/Home/Home.vue
View File

@ -2,8 +2,9 @@
<div>
<div class="content-button">
<button class="edit-button">编辑</button>
<el-button type="primary" plain class="edit-button">编辑</el-button>
</div>
<div class="content">
<div class="card">
<div>
@ -14,17 +15,18 @@
</Video>
</div>
<div class="content">
<p class="content-font">{{content}}</p>
<p class="content-font">{{ content }}</p>
</div>
</div>
</div>
</div>
</template>
<script>
// import 'mavon-editor/dist/css/index.css'
import Video from "../components/Video";
import Video from "@/components/Video";
export default {
name: "Home",
@ -43,7 +45,18 @@ export default {
}
</script>
<style src="./../assets/css/Home.css" scoped>
<style src="@/assets/css/common.css" scoped>
.video{
margin: 30px 15px;
}
.content{
margin-bottom: 30px;
}
.content-font{
display: flex;
}
</style>
<style src="./../assets/css/common.css" scoped/>

2
src/pages/HomeEdit.vue → src/pages/Home/HomeEdit.vue
View File

@ -27,6 +27,6 @@ export default {
}
</script>
<style src="./../assets/css/common.css" scoped>
<style src="@/assets/css/common.css" scoped>
</style>

18
src/pages/Intro.vue
View File

@ -1,18 +0,0 @@
<template>
<div class="content">
赛事简介
</div>
</template>
<script>
export default {
name: "Intro"
}
</script>
<style scoped>
</style>
<style src="./../assets/css/common.css" scoped/>

2
src/pages/Manage/ApplyList.vue
View File

@ -11,4 +11,4 @@ export default {
<style scoped>
</style>
<style src="./../../assets/css/common.css" scoped/>
<style src="@/assets/css/common.css" scoped/>

2
src/pages/Manage/SubmitList.vue
View File

@ -11,4 +11,4 @@ export default {
<style scoped>
</style>
<style src="./../../assets/css/common.css" scoped/>
<style src="@/assets/css/common.css" scoped/>

2
src/pages/Notice.vue → src/pages/Notice/Notice.vue
View File

@ -12,4 +12,4 @@ export default {
</style>
<style src="./../assets/css/common.css" scoped/>
<style src="@/assets/css/common.css" scoped/>

0
src/pages/Notice/NoticeEdit.vue Normal file
View File

2
src/pages/Submit/Submit.vue
View File

@ -11,4 +11,4 @@ export default {
<style scoped>
</style>
<style src="./../../assets/css/common.css" scoped/>
<style src="@/assets/css/common.css" scoped/>

94
src/router/index.js
View File

@ -11,33 +11,17 @@ let routes = [
redirect: '/home',
children:[
{
// 首页
// 赛事首页
path: "/home",
component: () => import("@/pages/Home"),
component: () => import("@/pages/Home/Home"),
meta: {
title: '红山开源社区'
},
},
{
// 首页编辑页面
// 赛事首页编辑
path: "/homeEdit",
component: () => import("@/pages/HomeEdit"),
meta: {
title: '红山开源社区'
},
},
{
// 赛事简介
path: "/intro",
component: () => import("@/pages/Intro"),
meta: {
title: '红山开源社区'
},
},
{
// 通知公告
path: "/notice",
component: () => import("@/pages/Notice"),
component: () => import("@/pages/Home/HomeEdit"),
meta: {
title: '红山开源社区'
},
@ -45,23 +29,39 @@ let routes = [
{
// 赛事指南
path: "/guide",
component: () => import("@/pages/Guide"),
component: () => import("@/pages/Guide/Guide"),
meta: {
title: '红山开源社区'
},
},
{
// 交流互动
path: "/chat",
component: () => import("@/pages/Chat"),
// 赛事指南编辑
path: "/guideEdit",
component: () => import("@/pages/Guide/GuideEdit"),
meta: {
title: '红山开源社区'
},
},
{
// 联系我们
path: "/contact",
component: () => import("@/pages/ContactUs"),
// 通知公告
path: "/notice",
component: () => import("@/pages/Notice/Notice"),
meta: {
title: '红山开源社区'
},
},
{
// 通知公告编辑
path: "/noticeEdit",
component: () => import("@/pages/Notice/NoticeEdit"),
meta: {
title: '红山开源社区'
},
},
{
// 参赛报名
path: "/apply",
component: () => import("@/pages/Apply/Apply"),
meta: {
title: '红山开源社区'
},
@ -90,6 +90,38 @@ let routes = [
title: '红山开源社区'
},
},
{
// 交流互动
path: "/chat",
component: () => import("@/pages/Chat/Chat"),
meta: {
title: '红山开源社区'
},
},
{
// 交流互动编辑
path: "/chatEdit",
component: () => import("@/pages/Chat/ChatEdit"),
meta: {
title: '红山开源社区'
},
},
{
// 联系我们
path: "/contactUs",
component: () => import("@/pages/ContactUs/ContactUs"),
meta: {
title: '红山开源社区'
},
},
{
// 联系我们编辑
path: "/contactUsEdit",
component: () => import("@/pages/ContactUs/ContactUsEdit"),
meta: {
title: '红山开源社区'
},
},
{
// 报名列表
path: "/applyList",
@ -106,14 +138,6 @@ let routes = [
title: '红山开源社区'
},
},
{
// 作品列表
path: "/apply",
component: () => import("@/pages/Apply/Apply"),
meta: {
title: '红山开源社区'
},
}
]
},
{