Commit c8de5b26 by mamingqun

sdfjklsadfjklasfjklasfsd

parent b0c19e39
...@@ -23,17 +23,15 @@ ...@@ -23,17 +23,15 @@
<div class="you">{{item.point_num}}</div> <div class="you">{{item.point_num}}</div>
</li> </li>
</ul> </ul>
</div> --> </div>-->
<div class="newBox"> <div class="newBox">
<div class="topBox123"> <div class="topBox123">
<div class="title"> <div class="title">
<div class="mainTitle"> <div class="mainTitle">获奖名单</div>
获奖名单
</div>
<!-- <div class="subTitle"> <!-- <div class="subTitle">
<div class="clock"></div> <div class="clock"></div>
<div class="text">&nbsp;{{this.time}}</div> <div class="text">&nbsp;{{this.time}}</div>
</div> --> </div>-->
</div> </div>
</div> </div>
<ul class="listArr"> <ul class="listArr">
...@@ -46,7 +44,7 @@ ...@@ -46,7 +44,7 @@
</li> </li>
<li class="middleBox" v-for="(item, index) in huojiang" :key="index"> <li class="middleBox" v-for="(item, index) in huojiang" :key="index">
<div class="wrap"> <div class="wrap">
<div class="zuo">{{item.num|prizeFilter}}</div> <div class="zuo">{{prizeFilterssss(item.num)}}</div>
<div class="zhong">{{item.desc}}</div> <div class="zhong">{{item.desc}}</div>
<!-- <div class="you">{{item.point_num}}</div> --> <!-- <div class="you">{{item.point_num}}</div> -->
</div> </div>
...@@ -62,11 +60,54 @@ ...@@ -62,11 +60,54 @@
export default { export default {
props: { props: {
huojiang: {}, huojiang: {},
time: {} time: {},
huojingTitle: {}
}, },
data() { data() {
return {}; return {};
}, },
computed: {
titleSort() {
if (this.huojingTitle) {
var newArr = []
var arr = this.huojingTitle.sort((a, b) => {
return a.award - b.award > 0
})
arr.forEach(element => {
newArr.push(element.title)
});
return newArr
}
}
},
methods: {
prizeFilterssss(val) {
val = Number(val);
var name = null;
switch (val) {
case 1:
name = this.titleSort[0] || '金奖';
break;
case 2:
name = this.titleSort[1] || '银奖';
break;
case 3:
name = this.titleSort[2] || '铜奖';
break;
case 4:
name = this.titleSort[3] || '人气奖';
break;
// case 8:
// name = '入围奖';
// break;
default:
name = '';
break;
}
return name;
}
},
filters: { filters: {
prizeFilter(val) { prizeFilter(val) {
val = Number(val); val = Number(val);
...@@ -117,7 +158,7 @@ export default { ...@@ -117,7 +158,7 @@ export default {
.newBox { .newBox {
.topBox123 { .topBox123 {
height: 170px; height: 170px;
background: url('~@/pages/index/assets/images/topBar.png') no-repeat; background: url("~@/pages/index/assets/images/topBar.png") no-repeat;
background-size: 100% auto; background-size: 100% auto;
padding: 1px; padding: 1px;
...@@ -143,7 +184,7 @@ export default { ...@@ -143,7 +184,7 @@ export default {
.clock { .clock {
width: 18px; width: 18px;
height: 18px; height: 18px;
background: url('~@/pages/index/assets/images/shizhong.png') background: url("~@/pages/index/assets/images/shizhong.png")
no-repeat; no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
...@@ -158,15 +199,14 @@ export default { ...@@ -158,15 +199,14 @@ export default {
} }
.middleBox { .middleBox {
background: url('~@/pages/index/assets/images/middleBar.png') background: url("~@/pages/index/assets/images/middleBar.png") repeat-y;
repeat-y;
background-size: 100% auto; background-size: 100% auto;
} }
.listArr { .listArr {
// margin-top: 20px; // margin-top: 20px;
.wrap{ .wrap {
width: 580px; width: 580px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
...@@ -210,8 +250,8 @@ export default { ...@@ -210,8 +250,8 @@ export default {
.bottomBox { .bottomBox {
height: 75px; height: 75px;
background: url('~@/pages/index/assets/images/bottomBar.png') background: url("~@/pages/index/assets/images/bottomBar.png") no-repeat
no-repeat bottom; bottom;
background-size: 100% auto; background-size: 100% auto;
} }
} }
......
import store from '../store'; import store from '../store';
// // api地址 // api地址
// var server = 'http://web-comment.canskj.cn/new'; var server = 'http://web-comment.canskj.cn/new';
// var extra = '8'; var extra = '8';
// //包装的地址 //包装的地址
// var wrapHref = 'http://web-comment.canskj.cn/home/contest/h5/8'; var wrapHref = 'http://web-comment.canskj.cn/home/contest/h5/8';
// //首页地址 //首页地址
// var indexHref = 'http://web-comment.iyunfish.cn/home/contest/h5/8'; var indexHref = 'http://web-comment.iyunfish.cn/home/contest/h5/8';
// // 个人中心地址 // 个人中心地址
// var userCenterHref = 'http://web-comment.iyunfish.cn/home/contest/h5/newuser/8'; var userCenterHref = 'http://web-comment.iyunfish.cn/home/contest/h5/newuser/8';
// var shareImg = 'http://web-comment.iyunfish.cn/home/contest/h5/static/share1.jpg'; var shareImg = 'http://web-comment.iyunfish.cn/home/contest/h5/static/share1.jpg';
// api地址 // // api地址
var server = 'http://wanda-qj.iyunfish.com/new'; // var server = 'http://wanda-qj.iyunfish.com/new';
var extra = '8'; // var extra = '8';
//包装的地址 // //包装的地址
var wrapHref = 'http://wanda-qj.maxrocky.com/home/contest/h5/8'; // var wrapHref = 'http://wanda-qj.maxrocky.com/home/contest/h5/8';
//首页地址 // //首页地址
var indexHref = 'http://wanda-qj.iyunfish.com/home/contest/h5/8'; // var indexHref = 'http://wanda-qj.iyunfish.com/home/contest/h5/8';
// 个人中心地址 // // 个人中心地址
var userCenterHref = 'http://wanda-qj.iyunfish.com/home/contest/h5/newuser/8'; // var userCenterHref = 'http://wanda-qj.iyunfish.com/home/contest/h5/newuser/8';
var shareImg = 'http://wanda-qj.iyunfish.com/home/contest/h5/static/share1.jpg'; // var shareImg = 'http://wanda-qj.iyunfish.com/home/contest/h5/static/share1.jpg';
export default{ export default{
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<div class="contentBox" v-if="tabActive === 3" ref="prizeBox" id="prizeContent"> <div class="contentBox" v-if="tabActive === 3" ref="prizeBox" id="prizeContent">
<!-- <div class="contentBox" ref="prizeBox" id="prizeContent"> --> <!-- <div class="contentBox" ref="prizeBox" id="prizeContent"> -->
<div class="subContent"> <div class="subContent">
<PrizeBox :huojiang="huojiang" :time="currentTime"></PrizeBox> <PrizeBox :huojiang="huojiang" :huojingTitle="huojingTitle" :time="currentTime"></PrizeBox>
<div class="prizeWrap" v-if="huojiang"> <div class="prizeWrap" v-if="huojiang">
<!-- <div class="prizeWrap"> --> <!-- <div class="prizeWrap"> -->
<CardPrize <CardPrize
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment