Commit a7297aea by 穆启卓

复活卡

parent 4034c167
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
<div class="sign-up-page"> <div class="sign-up-page">
<!-- 左上角查看步数按钮 --> <!-- 左上角查看步数按钮 -->
<!-- <img class="view-steps-btn" src="../images/SignUp/sy_bushu.png"> --> <!-- <img class="view-steps-btn" src="../images/SignUp/sy_bushu.png"> -->
<!-- 右上角复活卡 -->
<Reborn></Reborn>
<!-- 信息广播 --> <!-- 信息广播 -->
<NoticeBonus class="notice-broadcast"></NoticeBonus> <NoticeBonus class="notice-broadcast"></NoticeBonus>
<!-- 挑战赛卡片 --> <!-- 挑战赛卡片 -->
...@@ -33,7 +35,7 @@ ...@@ -33,7 +35,7 @@
<div class="statusnormal" v-if="item.status===2 || item.status===0 || item.status===3" @click="goWhereDetail(item)"> <div class="statusnormal" v-if="item.status===2 || item.status===0 || item.status===3" @click="goWhereDetail(item)">
{{(item.status===2 || item.status===0) {{(item.status===2 || item.status===0)
? (item.status===0&&item.already_join===1) ? '立即打卡': '查看详情' : '已淘汰'}} ? (item.status===0&&item.already_join===1) ? '立即打卡': '查看详情' : '已淘汰'}}
<img src="../images/SignUp/detail_bg.png" alt=""> <img src="../images/SignUp/detail_bg.png">
</div> </div>
</div> </div>
<!-- 没有关注公众号弹窗 --> <!-- 没有关注公众号弹窗 -->
...@@ -51,6 +53,7 @@ import NoticeBonus from "@/components/NoticeBonus.vue"; ...@@ -51,6 +53,7 @@ import NoticeBonus from "@/components/NoticeBonus.vue";
import Free from "@/components/Free.vue"; import Free from "@/components/Free.vue";
import Modal from "@/components/Modal.vue"; import Modal from "@/components/Modal.vue";
import PayFailModal from "@/components/PayFailModal.vue"; import PayFailModal from "@/components/PayFailModal.vue";
import Reborn from "@/components/Reborn.vue";
import { import {
dakaPay, dakaPay,
track, track,
...@@ -66,6 +69,7 @@ export default { ...@@ -66,6 +69,7 @@ export default {
NoticeBonus, NoticeBonus,
Modal, Modal,
Free, Free,
Reborn,
PayFailModal PayFailModal
}, },
data() { data() {
...@@ -79,8 +83,7 @@ export default { ...@@ -79,8 +83,7 @@ export default {
isShowPayFail: false, isShowPayFail: false,
isFollow: false, isFollow: false,
gameList: [], gameList: [],
followInfo: { followInfo: {},
},
needFollow: false needFollow: false
}; };
}, },
...@@ -90,9 +93,9 @@ export default { ...@@ -90,9 +93,9 @@ export default {
}, },
methods: { methods: {
goOtherPage(pageName) { goOtherPage(pageName) {
if(!this.followInfo.follow){ if (!this.followInfo.follow) {
this.needFollow = true this.needFollow = true;
return return;
} }
console.log("pageName", pageName); console.log("pageName", pageName);
this.$router.push({ name: pageName }); this.$router.push({ name: pageName });
...@@ -128,8 +131,8 @@ export default { ...@@ -128,8 +131,8 @@ export default {
select_follow().then(res => { select_follow().then(res => {
console.log(res); console.log(res);
if (res.code == 0) { if (res.code == 0) {
this.followInfo = res.data this.followInfo = res.data;
sessionStorage.setItem('followInfo',JSON.stringify(res.data)) sessionStorage.setItem("followInfo", JSON.stringify(res.data));
} }
}); });
}, },
...@@ -261,7 +264,7 @@ export default { ...@@ -261,7 +264,7 @@ export default {
}, },
closePopup() { closePopup() {
this.needFollow = false; this.needFollow = false;
}, }
} }
}; };
</script> </script>
...@@ -281,7 +284,6 @@ export default { ...@@ -281,7 +284,6 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.view-steps-btn { .view-steps-btn {
flex-shrink: 0; flex-shrink: 0;
width: 1.11rem; width: 1.11rem;
...@@ -291,12 +293,10 @@ export default { ...@@ -291,12 +293,10 @@ export default {
left: 0; left: 0;
top: 1.22rem; top: 1.22rem;
} }
.notice-broadcast { .notice-broadcast {
flex-shrink: 0; flex-shrink: 0;
margin: 4.3rem 0 0.18rem; margin: 4.3rem 0 0.18rem;
} }
.challenge-card { .challenge-card {
flex-shrink: 0; flex-shrink: 0;
width: 6.9rem; width: 6.9rem;
...@@ -308,7 +308,6 @@ export default { ...@@ -308,7 +308,6 @@ export default {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
position: relative; position: relative;
.corner-marker { .corner-marker {
width: 1.39rem; width: 1.39rem;
height: 1.39rem; height: 1.39rem;
...@@ -316,14 +315,12 @@ export default { ...@@ -316,14 +315,12 @@ export default {
top: -0.02rem; top: -0.02rem;
right: -0.02rem; right: -0.02rem;
} }
.card-title { .card-title {
font-size: 0.34rem; font-size: 0.34rem;
line-height: 1; line-height: 1;
color: #fff; color: #fff;
margin-top: 0.28rem; margin-top: 0.28rem;
} }
.card-time { .card-time {
background: rgba(0, 0, 0, 0.1); background: rgba(0, 0, 0, 0.1);
padding: 0 0.24rem; padding: 0 0.24rem;
...@@ -336,7 +333,6 @@ export default { ...@@ -336,7 +333,6 @@ export default {
color: #fff; color: #fff;
margin-top: 0.16rem; margin-top: 0.16rem;
} }
.card-info { .card-info {
width: 100%; width: 100%;
margin-top: 0.7rem; margin-top: 0.7rem;
...@@ -349,24 +345,20 @@ export default { ...@@ -349,24 +345,20 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
&:first-child { &:first-child {
border-left: none; border-left: none;
} }
.item-title { .item-title {
font-size: 0.28rem; font-size: 0.28rem;
line-height: 0.8; line-height: 0.8;
color: #fff; color: #fff;
} }
.item-content { .item-content {
font-size: 0.48rem; font-size: 0.48rem;
line-height: 0.8; line-height: 0.8;
color: #fff; color: #fff;
margin-top: 0.12rem; margin-top: 0.12rem;
} }
.item-money { .item-money {
font-size: 0.48rem; font-size: 0.48rem;
line-height: 0.8; line-height: 0.8;
...@@ -375,7 +367,6 @@ export default { ...@@ -375,7 +367,6 @@ export default {
} }
} }
} }
.statusnormal { .statusnormal {
position: absolute; position: absolute;
bottom: 0.38rem; bottom: 0.38rem;
...@@ -394,7 +385,6 @@ export default { ...@@ -394,7 +385,6 @@ export default {
height: 15px; height: 15px;
} }
} }
.card-btn { .card-btn {
width: 4rem; width: 4rem;
height: 0.88rem; height: 0.88rem;
...@@ -414,13 +404,11 @@ export default { ...@@ -414,13 +404,11 @@ export default {
bottom: 0.38rem; bottom: 0.38rem;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
.card-btn-tip { .card-btn-tip {
font-size: 0.22rem; font-size: 0.22rem;
margin-top: 0.06rem; margin-top: 0.06rem;
font-weight: normal; font-weight: normal;
} }
.btn-title { .btn-title {
font-size: 0.34rem; font-size: 0.34rem;
font-weight: bold; font-weight: bold;
...@@ -455,8 +443,8 @@ export default { ...@@ -455,8 +443,8 @@ export default {
width: 0.58rem; width: 0.58rem;
height: 0.58rem; height: 0.58rem;
position: absolute; position: absolute;
top: -.88rem; top: -0.88rem;
right: 0 right: 0;
} }
} }
} }
......
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 to comment