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

解决冲突

This commit is contained in:
unknown 2022-06-07 12:09:42 +08:00
parent ffce703e8c 38833ba86d
commit 849043d4fc
7 changed files with 267 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,24 +1,53 @@
.content{
margin: 0 6vw 2vw;
display: flex;
justify-content: center;
align-items: center;
/* 编辑按钮 */
.content-button {
margin: 2vw 16.5vw 1vw;
text-align: right;
}
.breadcrumb{
.breadcrumb {
margin: 2vw 0;
font-size: 1.1rem;
}
.card{
/*display: flex;*/
background-color: white;
width: 51vw;
box-shadow: 0 4px 10px 0 rgba(0,0,0,0.15);
/* 面板 */
.content {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
margin: 0 6vw 3vw;
}
.content ul {
list-style-type: none;
}
/* 卡片内容 */
.card {
background-color: white;
width: 66vw;
box-shadow: 0 4px 10px 0 rgba(0,0,0,0.15);
margin-bottom: 3vw;
}
.card-content {
display: block;
position: relative;
float: left;
margin: 2vw;
}
.card-img {
position: relative;
float: left;
width: 55%;
height: auto;
}
.content-button{
margin: 2vw 24vw 15px;
text-align: right;
}
}
/* 分割线 */
.el-divider {
width: 95%;
height: 2px;
margin: 1vw auto;
}

4
src/components/Header.vue
View File

@ -82,8 +82,8 @@ export default {
case "chart":
pageUtils.openPage(this.$router,"/" +this.$route.params.compId +"/chart")
break;
case "contact":
pageUtils.openPage(this.$router,"/" +this.$route.params.compId +"/contact")
case "contactUs":
pageUtils.openPage(this.$router,"/" +this.$route.params.compId +"/contactUs")
break;
case "applyList":
pageUtils.openPage(this.$router,"/" +this.$route.params.compId +"/applyList")

49
src/pages/Chat/Chat.vue
View File

@ -1,6 +1,38 @@
<template>
<div class="content">
交流互动
<div>
<div class="content-button">
<el-button plain class="edit-button">编辑</el-button>
</div>
<div class="content">
<div class="white"></div>
<div class="card">
<el-image :src="chat" class="card-img"/>
<div class="card-content">
<div>dadasdadsad</div>
<div>dsvdsvsdvsdvds</div>
</div>
</div>
<div class="card">
<div class="chat-link">
<div class="chat-link">
<el-image :src="chat_link1" class="img-link"/>
<div class="chat-link">参赛资讯</div>
</div>
<div class="chat-link">
<el-image :src="chat_link2" class="img-link"/>
<div class="chat-link">选手交流</div>
</div>
<div class="chat-link">
<el-image :src="chat_link3" class="img-link"/>
<div class="chat-link">专家答疑</div>
</div>
</div>
</div>
</div>
</div>
</template>
@ -12,6 +44,19 @@ export default {
<style scoped>
.white {
height: 66px;
}
.chat-link {
display: flex;
margin: 1vw auto;
}
.img-link {
width: 25%;
height: auto;
}
</style>
<style src="@/assets/css/common.css" scoped/>

18
src/pages/ContactUs/ContactUs.vue
View File

@ -1,5 +1,21 @@
<template>
<div class="content">联系我们</div>
<div>
<div class="content-button">
<el-button plain class="edit-button">编辑</el-button>
</div>
<div class="content">
<div class="card">
<el-image :src="chat" class="card-img"/>
<div class="card-content">
<div>dadasdadsad</div>
<div>dsvdsvsdvsdvds</div>
</div>
</div>
</div>
</div>
</template>
<script>

23
src/pages/Guide/Guide.vue
View File

@ -1,12 +1,29 @@
<template>
<div class="content">
赛事指南
<div>
<div class="content-button">
<el-button plain class="edit-button">编辑</el-button>
</div>
<div class="content">
<div class="card">
<div class="card-content">
<div>{{ content }}</div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: "Guide"
name: "Guide",
data(){
return{
content:'赛事指南赛事指南赛事指南赛事指南赛事指南赛事指南',
}
}
}
</script>

138
src/pages/Home/Home.vue
View File

@ -1,70 +1,68 @@
<template>
<div>
<div class="content-button">
<el-button plain class="edit-button">编辑</el-button>
</div>
<div class="content">
<div class="card">
<div>
<Video
:title="videoTitle"
:src="videoSrc"
class="video">
</Video>
</div>
<div class="content">
<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 pageUtils from "@/utils/pageUtils";
export default {
name: "Home",
components: {
Video
},
data(){
return{
data: "",
videoTitle:"标题",
videoSrc:"https://outin-396971199eed11e991a100163e1c7426.oss-cn-shanghai.aliyuncs.com/sv/34277901-180465b8b73/34277901-180465b8b73.mp4",
videoWidth: "100%",
content:'测试内容测试内容测试内容'
}
},
methods:{
checkComp(){
pageUtils.checkComp(this.$router,this.$route.params.compId,this.$api)
}
},
mounted() {
this.checkComp()
}
}
</script>
<style src="@/assets/css/common.css" scoped>
.video{
margin: 30px 15px;
}
.content{
margin-bottom: 30px;
}
.content-font{
display: flex;
}
</style>
<template>
<div>
<div class="content-button">
<el-button plain class="edit-button">编辑</el-button>
</div>
<div class="content">
<div class="card">
<div>
<Video
:title="videoTitle"
:src="videoSrc"
class="video">
</Video>
</div>
<div class="card-content">
<div>{{ content }}</div>
</div>
</div>
</div>
</div>
</template>
<script>
// import 'mavon-editor/dist/css/index.css'
import Video from "@/components/Video";
import pageUtils from "@/utils/pageUtils";
export default {
name: "Home",
components: {
Video
},
data(){
return{
data: "",
videoTitle:"标题",
videoSrc:"https://outin-396971199eed11e991a100163e1c7426.oss-cn-shanghai.aliyuncs.com/sv/34277901-180465b8b73/34277901-180465b8b73.mp4",
videoWidth: "100%",
content:'测试内容测试内容测试内容'
}
},
methods:{
checkComp(){
pageUtils.checkComp(this.$router,this.$route.params.compId,this.$api)
}
},
mounted() {
this.checkComp()
}
}
</script>
<style scoped>
.video {
margin: 1vw;
}
</style>
<style src="@/assets/css/common.css" scoped/>
>>>>>>> master

73
src/pages/Notice/Notice.vue
View File

@ -1,15 +1,84 @@
<template>
<div class="content">通知公告</div>
<div>
<div class="content-button">
<el-button plain class="edit-button">新增</el-button>
</div>
<div class="content">
<ul>
<!-- <li v-for="item in noticeAll" :key="item.noticeId" class="card">
<div class="notice-content-top">{ noticeTop }</div>
<el-divider></el-divider>
<div class="notice-content-middle">{ noticeMiddle }</div>
<el-divider></el-divider>
<div class="notice-content-date">{ noticeDate }</div>
</li> -->
<li class="card">
<div class="notice-content-top">1111111</div>
<el-divider></el-divider>
<div class="notice-content-middle">阿圣诞节快乐大萨达多上厕所带参数的爱吃啥</div>
<el-divider></el-divider>
<div class="notice-content-bottom">2022.06.06</div>
</li>
<li class="card">
<div class="notice-content-top">2222222222</div>
<el-divider></el-divider>
<div class="notice-content-middle">SV山东省任女士谁说的SV的SV的SV额</div>
<el-divider></el-divider>
<div class="notice-content-bottom">2022.06.06</div>
</li>
</ul>
</div>
</div>
</template>
<script>
export default {
name: "Notice"
name: "Notice",
data(){
return{
noticeAll:[],
noticeId: "",
noticeTop: "",
noticeMiddle: "",
noticeDate: "",
}
},
methods: {
//时间渲染：表格内容显示 日期格式
dateFormat:function(row,column){
var date = row[column.property];
if(date === undefined || date == "" || date == null){
return ''
}
return this.$moment(date).format("YYYY-MM-DD HH:mm:ss")
},
},
}
</script>
<style scoped>
.notice-content-top {
padding: 1vw 2vw 0vw;
text-align: left;
}
.notice-content-bottom {
padding: 0vw 2vw 1vw;
text-align: right;
}
</style>
<style src="@/assets/css/common.css" scoped/>