Skip to content

W
walk_daka_h5
Commit 851f1a68 by 穆启卓
Options

1

parent 47579fa5
Showing with 114 additions and 77 deletions
src/components/axios/api.js
......@@ -414,6 +414,16 @@ export function daka_status_detail(week, grade) {
})
}
// 比赛详情弹窗
export function pop_up_windows() {
return fetch({
url: api.pop_up_windows,
method: 'GET',
params: {
}
})
}
//有新接口的时候像上面那样再来一次
// //修改昵称接口
......
src/components/axios/url.js
......@@ -87,4 +87,6 @@ export default {
select_user_signup: `${api}/api/v1/select_user_signup`,
// 比赛详情
daka_status_detail: `${api}/api/v1/daka_status/detail`,
// 比赛详情弹窗
pop_up_windows: `${api}/api/v1/pop_up_windows`,
}
src/views/Author.vue
......@@ -34,7 +34,7 @@
// alert(inviter + "test2")
this.$http
.post("/game-bsdk/api/v1/auth_login", {
.post("/game-bsdk/api/v1/oa_auth_login", {
js_code: code,
inviter_id: inviter || "",
from_type: from_type || ""
......
src/views/HaveJoinedGame.vue
......@@ -3,79 +3,45 @@
<Title class="page-title" @goback="goback" show_back="true" v-if="currentPage()==='HaveJoinedGame'"></Title>
<div class="game-bonus-container">
<div class="bonus-title">本期累计奖励金（元）</div>
<div class="bonus-amount">6.86</div>
<div class="bonus-amount">{{bet_bonus}}</div>
</div>
<div class="game-title">5000步七日耐力赛</div>
<div class="game-time">开赛时间：3月11日 00:00-3月17日24:00</div>
<div class="game-title">{{target_steps}}步三日耐力赛</div>
<div class="game-time">开赛时间：{{period_start}} — {{period_end}}</div>
<div class="target-people-container">
<img class="target-img" src="../images/HaveJoinedGame/ic_shoes.png">
<div class="target-people-text">每日5000步达标</div>
<div class="target-people-text">每日{{target_steps}}步达标</div>
<img class="people-img" src="../images/HaveJoinedGame/ic_people.png">
<div class="target-people-text">已有2468人参赛</div>
<div class="target-people-text">已有{{total_signup}}人参赛</div>
</div>
<div class="hr"></div>
<swiper :options="swiperOption" class="game-scroll-container">
<swiper-slide>
<swiper-slide v-for="(item,index) in record_list" :key="index">
<div class="game-scroll-item">
<div class="item-title-status">
<div class="item-title">第一天</div>
<div class="item-status0">未开始</div>
<div class="item-title">第{{item.days}}天</div>
<div :class="item.status===0?'item-status0':item.status===1?'item-status1':item.status===2?'item-status2':'item-status2'">
{{item.status===0?'未开始':item.status===1?'比赛中':item.status===2?'已结束':'已淘汰'}}
</div>
</div>
<div class="item-income" style="visibility: hidden;">
<div class="item-amount">2.56</div>
<div class="item-income" :style="item.status===1?'':'visibility: hidden;'">
<div class="item-amount">{{item.money}}</div>
<div class="item-text">(元) 预计收益</div>
</div>
<div class="item-progress-num">
<div class="item-num" v-if="true">还有01天03小时56秒开始</div>
<div class="item-num" v-if="item.status===0">还有{{item.tsp}}开始</div>
<!-- <div class="item-num" v-if="item.status===0">还有01天03小时56秒开始</div> -->
<template v-else>
<div class="item-progress" :style="'width: '+rate/100*2.46+'rem;'"></div>
<div class="item-num">2635/5000步</div>
</template>
</div>
</div>
</swiper-slide>
<swiper-slide>
<div class="game-scroll-item">
<div class="item-title-status">
<div class="item-title">第一天</div>
<div class="item-status1">比赛中</div>
</div>
<div class="item-income">
<div class="item-amount">2.56</div>
<div class="item-text">(元) 预计收益</div>
</div>
<div class="item-progress-num">
<div class="item-num" v-if="false">还有01天03小时56秒开始</div>
<template v-else>
<div class="item-progress" :style="'width: '+rate/100*2.46+'rem;'"></div>
<div class="item-num">2635/5000步</div>
</template>
</div>
</div>
</swiper-slide>
<swiper-slide>
<div class="game-scroll-item">
<div class="item-title-status">
<div class="item-title">第一天</div>
<div class="item-status2">已淘汰</div>
</div>
<div class="item-income" style="visibility: hidden;">
<div class="item-amount">2.56</div>
<div class="item-text">(元) 预计收益</div>
</div>
<div class="item-progress-num">
<div class="item-num" v-if="false">还有01天03小时56秒开始</div>
<template v-else>
<div class="item-progress" :style="'width: '+rate/100*2.46+'rem;'"></div>
<div class="item-num">2635/5000步</div>
<div class="item-progress" :style="'width: '+item.rate/100*2.46+'rem;'"></div>
<div class="item-num">{{item.step_num}}/{{target_steps}}步</div>
</template>
</div>
</div>
</swiper-slide>
</swiper>
<div class="func-btn" @click="goOtherPage('GoXCX')">提交今日步数</div>
<div class="next-func-btn" v-if="next_signup" @click="joinNextGame()">报名下一期</div>
<!-- 报名成功弹框 -->
<!-- <div class="game-status-popup">
<div class="game-status-popup" v-if="false">
<div class="game-status-container">
<img class="status-icon" src="../images/HaveJoinedGame/pop_bmcg_title.png">
<img class="join-success-banner" src="../images/HaveJoinedGame/pop_bmcg_img.png">
......@@ -84,44 +50,44 @@
<div class="popup-btn1 green-btn">邀请好友来参赛</div>
<img class="close-btn" src="../images/common/pop_ic_close.png">
</div>
</div> -->
</div>
<!-- 恭喜达标弹框 -->
<!-- <div class="game-status-popup">
<div class="game-status-popup" v-if="popupData.window && popupData.daka_done">
<div class="game-status-container">
<img class="status-icon" src="../images/HaveJoinedGame/pop_gxdb_title.png">
<div class="status-date">第2日达标</div>
<div class="status-date">第{{popupData.days}}日达标</div>
<div class="status-money">
<div class="popup-text3">返还契约金</div>
<div class="popup-text4">1.00<span>元</span></div>
<div class="popup-text5">第0311期5000步7日耐力赛</div>
<div class="popup-text4">{{popupData.money}}<span>元</span></div>
<div class="popup-text5">第{{popupData.week}}期{{popupData.target_steps}}步3日耐力赛</div>
</div>
<div class="popup-text6">5000步达标，今天走了6823步</div>
<div class="popup-text6">{{popupData.target_steps}}步达标，今天走了{{popupData.step_num}}步</div>
<div class="popup-btn1 green-btn">炫耀一下</div>
<img class="close-btn" src="../images/common/pop_ic_close.png">
<img class="close-btn" src="../images/common/pop_ic_close.png" @click="closePopup()">
</div>
</div> -->
</div>
<!-- 你已被淘汰弹框 -->
<!-- <div class="game-status-popup">
<div class="game-status-popup" v-else-if="popupData.window && !popupData.daka_done">
<div class="game-status-container">
<img class="status-icon" src="../images/HaveJoinedGame/pop_out_title.png">
<div class="status-date">第3日未达标</div>
<div class="status-date">第{{popupData.days}}日未达标</div>
<div class="status-money">
<div class="popup-text3">扣除契约金</div>
<div class="popup-text4">1.00<span>元</span></div>
<div class="popup-text5">第0311期5000步7日耐力赛</div>
<div class="popup-text4">{{popupData.money}}<span>元</span></div>
<div class="popup-text5">第{{popupData.week}}期{{popupData.target_steps}}步3日耐力赛</div>
</div>
<div class="popup-text6">5000步达标，今天走了6823步</div>
<div class="popup-text7">已达标3天，契约金已返还至你的钱包</div>
<div class="popup-btn1 yellow-btn">报名下一期</div>
<img class="close-btn" src="../images/common/pop_ic_close.png">
<div class="popup-text6">{{popupData.target_steps}}步达标，今天走了{{popupData.step_num}}步</div>
<div class="popup-text7">已达标{{popupData.days}}天，契约金已返还至你的钱包</div>
<div class="popup-btn1 yellow-btn" @click="joinNextGame()">报名下一期</div>
<img class="close-btn" src="../images/common/pop_ic_close.png" @click="closePopup()">
</div>
</div> -->
</div>
</div>
</template>
<script>
import Title from "@/components/Title.vue";
import {daka_status_detail} from "@/components/axios/api";
import {daka_status_detail, pop_up_windows} from "@/components/axios/api";
import "swiper/dist/css/swiper.css";
import {swiper, swiperSlide} from "vue-awesome-swiper";
......@@ -134,18 +100,37 @@
},
data() {
return {
rate: 50,
swiperOption: {
slidesPerView: "auto",
centeredSlides: true,
spaceBetween: 10
}
},
bet_bonus: '0.00',
next_signup: false,
period_end: '',
period_start: '',
total_signup: 0,
target_steps: 0,
record_list: [],
popupData: {}
}
},
created() {
this.getPageData();
this.isPopup();
},
methods: {
joinNextGame() {
this.$router.push({
name: 'PartakeChallenge',
query: {
nextGame: true
}
});
},
closePopup() {
this.popupData.window = false;
},
goback() {
history.go(-1);
},
......@@ -161,7 +146,23 @@
grade = sessionStorage.getItem('bushuType');
}
daka_status_detail(this.$route.query.week, grade).then(res => {
console.log(res)
const pageData = res.data;
if (res.code === 0) {
this.bet_bonus = pageData.bet_bonus;
this.next_signup = pageData.next_signup;
this.period_end = pageData.period_end;
this.period_start = pageData.period_start;
this.total_signup = pageData.total_signup;
this.target_steps = pageData.target_steps;
this.record_list = pageData.record_list;
}
})
},
isPopup() {
pop_up_windows().then(res => {
if (res.code === 0) {
this.popupData = res.data;
}
})
}
}
......@@ -388,6 +389,17 @@
text-align: center;
margin-top: 1.2rem;
}
.next-func-btn {
width: 5.6rem;
border-radius: 0.92rem;
background: #0ebfdf;
font-size: 0.4rem;
line-height: 0.92rem;
color: #fff;
font-weight: bold;
text-align: center;
margin-top: .3rem;
}
}
.game-status-popup {
......
src/views/PartakeChallenge.vue
......@@ -107,7 +107,11 @@
this.isShowPayFail = !this.isShowPayFail
},
payToSign() {
dakaPay(1).then(response => {
let nextGame = 0;
if (this.$route.query.nextGame) {
nextGame = 2;
}
dakaPay(sessionStorage.getItem("bushuType"), nextGame).then(response => {
if (response.code == 1) {
this.showModal("温馨提示", response.msg);
return;
......
src/views/Record.vue
......@@ -23,8 +23,8 @@
</div>
</div>
<div class="card-container-list" @scroll="onScroll">
<div class="card-item" v-for="(item,index) in recordList.records" @click="toRecordDetail(item)">
<div class="card-title">{{item.period}}期-{{item.grade}}步{{item.total_days}}日耐力赛（第{{item.days}}天）</div>
<div class="card-item" v-for="(item,index) in recordList.records" @click="goWhereDetail(item.week, item.grade)">
<div class="card-title">{{item.week}}期-{{item.target_steps}}步{{item.total_days}}日耐力赛（第{{item.days}}天）</div>
<div class="card-detail-container">
<div class="detail-item">
<div class="item-title">累计奖励金(元)</div>
......@@ -85,6 +85,15 @@
sessionStorage.setItem("selectedRecord", JSON.stringify(item));
this.$router.push({name: "RecordDetail"})
},
goWhereDetail(week, grade) {
sessionStorage.setItem('bushuType', grade);
this.$router.push({
name: 'HaveJoinedGame',
query: {
week: week
}
});
},
onScroll(event) {
if (this.recordList.next_page && this.canScroll) {
let offsetHeight = event.currentTarget.offsetHeight,
......
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