Commit 1f8e51d8 by 穆启卓

已报名XXX期和同页面跳转注释了 改成 邀请好友来比赛

邀请好友来比赛  改成  邀请好友一起比赛
parent 5dff25e9
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="share-btn" @click="inviteFriend" v-if="pageData.daka_signup">邀请好友来参</div> <div class="share-btn" @click="inviteFriend" v-if="pageData.daka_signup">邀请好友一起比</div>
<div class="share-btn" style="background: #fabd21;" @click="goOtherPage('PartakeChallenge')" v-else>立即报名{{pageData.newGameWeek}}</div> <div class="share-btn" style="background: #fabd21;" @click="goOtherPage('PartakeChallenge')" v-else>立即报名{{pageData.newGameWeek}}</div>
<ShareModal v-on:close="closeShareModal" v-if="showShareModal"></ShareModal> <ShareModal v-on:close="closeShareModal" v-if="showShareModal"></ShareModal>
</div> </div>
......
...@@ -63,9 +63,10 @@ ...@@ -63,9 +63,10 @@
</swiper-slide> </swiper-slide>
<div class="swiper-pagination" slot="pagination" style="opacity: 0"></div> <div class="swiper-pagination" slot="pagination" style="opacity: 0"></div>
</swiper> </swiper>
<div class="func-btn green-btn" @click="inviteFriend" v-if="record_list.length&&record_list[0].status === 0">邀请好友来参</div> <div class="func-btn green-btn" @click="inviteFriend" v-if="record_list.length&&record_list[0].status === 0">邀请好友一起比</div>
<div class="func-btn" @click="changeXcxPopup()" v-else>提交今日步数</div> <div class="func-btn" @click="changeXcxPopup()" v-else>提交今日步数</div>
<div class="next-func-btn" :style="next_period?'background: #5f95e7;':''" v-if="next_signup" @click="joinNextGame()">{{next_period?`已报名${String(next_period).slice(4,8)}期`:'报名下一期'}}</div> <div class="next-func-btn" v-if="next_signup" @click="joinNextGame()">{{next_period?'邀请好友一起比赛':'报名下一期'}}</div>
<!-- <div class="next-func-btn" :style="next_period?'background: #5f95e7;':''" v-if="next_signup" @click="joinNextGame()">{{next_period?`已报名${String(next_period).slice(4,8)}期`:'报名下一期'}}</div> -->
<div class="game-rule-container" @click="goOtherPage('Rule')"> <div class="game-rule-container" @click="goOtherPage('Rule')">
<img src="../images/HaveJoinedGame/que1.png"> <img src="../images/HaveJoinedGame/que1.png">
<div>活动规则</div> <div>活动规则</div>
...@@ -79,7 +80,7 @@ ...@@ -79,7 +80,7 @@
<span>每日24点前</span>打开「步步运动赚」小程序,手动提交今日步数,否则可能导致无法分钱哦! <span>每日24点前</span>打开「步步运动赚」小程序,手动提交今日步数,否则可能导致无法分钱哦!
</div> </div>
<div class="popup-text2">注:微信暂不支持小程序实时更新步数</div> <div class="popup-text2">注:微信暂不支持小程序实时更新步数</div>
<div class="popup-btn1 green-btn" @click="inviteFriend">邀请好友来参</div> <div class="popup-btn1 green-btn" @click="inviteFriend">邀请好友一起比</div>
<img class="close-btn" src="../images/common/pop_ic_close.png" @click="closePayPopup()"> <img class="close-btn" src="../images/common/pop_ic_close.png" @click="closePayPopup()">
</div> </div>
</div> </div>
...@@ -98,7 +99,7 @@ ...@@ -98,7 +99,7 @@
</div> </div>
<div class="popup-text6">{{popupData.target_steps}}步达标,今天走了{{popupData.step_num}}步</div> <div class="popup-text6">{{popupData.target_steps}}步达标,今天走了{{popupData.step_num}}步</div>
<div class="popup-text7">{{popupData.days===popupData.all_days?'奖励金':'契约金'}}将于12点后返还至钱包中</div> <div class="popup-text7">{{popupData.days===popupData.all_days?'奖励金':'契约金'}}将于12点后返还至钱包中</div>
<div class="popup-btn1 green-btn" @click="inviteFriend">邀请好友来参</div> <div class="popup-btn1 green-btn" @click="inviteFriend">邀请好友一起比</div>
<img class="close-btn" src="../images/common/pop_ic_close.png" @click="closePopup()"> <img class="close-btn" src="../images/common/pop_ic_close.png" @click="closePopup()">
</div> </div>
</div> </div>
...@@ -227,13 +228,14 @@ export default { ...@@ -227,13 +228,14 @@ export default {
}, },
joinNextGame() { joinNextGame() {
if (this.next_period) { if (this.next_period) {
this.$router.push({ // this.$router.push({
name: "HaveJoinedGame", // name: "HaveJoinedGame",
query: { // query: {
week: this.next_period // week: this.next_period
} // }
}); // });
this.reload(); // this.reload();
this.inviteFriend();
} else { } else {
this.$router.push({ this.$router.push({
name: "PartakeChallenge", name: "PartakeChallenge",
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<!-- status 1 未开始 0 比赛中 2 已结束 3 已淘汰--> <!-- status 1 未开始 0 比赛中 2 已结束 3 已淘汰-->
<!-- already_join 0 未参赛 1 已参赛 --> <!-- already_join 0 未参赛 1 已参赛 -->
<div class="card-btn" v-if="item.status === 1 && item.already_join === 0">参与挑战</div> <div class="card-btn" v-if="item.status === 1 && item.already_join === 0">参与挑战</div>
<div class="card-btn" v-else-if="item.status === 1 && item.already_join === 1" @click.stop="inviteFriend">邀请好友来参</div> <div class="card-btn" v-else-if="item.status === 1 && item.already_join === 1" @click.stop="inviteFriend">邀请好友一起比</div>
<div class="statusnormal" v-else> <div class="statusnormal" v-else>
<div v-if="item.status === 0 && item.already_join === 1">立即打卡</div> <div v-if="item.status === 0 && item.already_join === 1">立即打卡</div>
<div v-else-if="item.status === 3 && item.already_join === 1">已淘汰</div> <div v-else-if="item.status === 3 && item.already_join === 1">已淘汰</div>
......
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