Commit 08b15206 by 穆启卓

耐力赛为健步挑战赛

parent 1f8e51d8
...@@ -18,7 +18,7 @@ export function fetch(options) { ...@@ -18,7 +18,7 @@ export function fetch(options) {
//所有的请求都会带上这些配置,比如全局都要用的身份信息等。 //所有的请求都会带上这些配置,比如全局都要用的身份信息等。
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': process.env.NODE_ENV === 'production' ? (window['userData'] ? window['userData'].token : '') : "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLCJvcGVuX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsInVuaW9uX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsImV4cCI6MTU1NjM3NjU4OX0.-bDnbP7j0_Uins2O7jHxdIYG846P756F-c0UsCuRwO8" 'Authorization': process.env.NODE_ENV === 'production' ? (window['userData'] ? window['userData'].token : '') : "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLCJvcGVuX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsInVuaW9uX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsImV4cCI6MTU1NjY1NTA5NH0.TtTHx-6Qy00vxDJULrqSBpluCrf9Pvwr4nBLw2cCYzo"
// 'token_in_header': global_.token,//token从全局变量那里传过来 // 'token_in_header': global_.token,//token从全局变量那里传过来
}, },
timeout: 30 * 1000 // 30秒超时 timeout: 30 * 1000 // 30秒超时
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="amount-container-list" @scroll="onScroll"> <div class="amount-container-list" @scroll="onScroll">
<div class="amount-item" v-for="(item,index) in moneyLog"> <div class="amount-item" v-for="(item,index) in moneyLog">
<div class="left-item"> <div class="left-item">
<div class="left-title">{{item.week}}期-{{item.step}}{{item.days}}耐力</div> <div class="left-title">{{item.week}}期-{{item.step}}{{item.days}}健步挑战</div>
<div class="left-content">{{item.created_at}}</div> <div class="left-content">{{item.created_at}}</div>
</div> </div>
<div class="right-item"> <div class="right-item">
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div class="bonus-title" v-else>达标奖励金(元)</div> <div class="bonus-title" v-else>达标奖励金(元)</div>
<div class="bonus-amount">{{pageData.bet_bonus}}</div> <div class="bonus-amount">{{pageData.bet_bonus}}</div>
</div> </div>
<div class="game-title">{{pageData.action}}耐力</div> <div class="game-title">{{pageData.action}}健步挑战</div>
<div class="game-time">开赛时间:{{pageData.start_format}}{{pageData.end_format}}</div> <div class="game-time">开赛时间:{{pageData.start_format}}{{pageData.end_format}}</div>
<div class="hr"></div> <div class="hr"></div>
<div class="game-info-container"> <div class="game-info-container">
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="bonus-title">本期累计奖励金(元)</div> <div class="bonus-title">本期累计奖励金(元)</div>
<div class="bonus-amount">{{bet_bonus|moneyFormatter}}</div> <div class="bonus-amount">{{bet_bonus|moneyFormatter}}</div>
</div> </div>
<div class="game-title">{{target_steps}}{{record_list.length}}耐力</div> <div class="game-title">{{target_steps}}{{record_list.length}}健步挑战</div>
<div class="game-time">开赛时间:{{period_start}}{{period_end}}</div> <div class="game-time">开赛时间:{{period_start}}{{period_end}}</div>
<div class="target-people-container"> <div class="target-people-container">
<img class="target-img" src="../images/HaveJoinedGame/ic_shoes.png"> <img class="target-img" src="../images/HaveJoinedGame/ic_shoes.png">
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
{{popupData.yj_money|moneyFormatter}} {{popupData.yj_money|moneyFormatter}}
<span></span> <span></span>
</div> </div>
<div class="popup-text5">第{{String(popupData.week).substring(4,8)}}期{{popupData.target_steps}}步{{popupData.all_days}}日耐力</div> <div class="popup-text5">第{{String(popupData.week).substring(4,8)}}期{{popupData.target_steps}}步{{popupData.all_days}}日健步挑战</div>
</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>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
{{popupData.yj_money|moneyFormatter}} {{popupData.yj_money|moneyFormatter}}
<span></span> <span></span>
</div> </div>
<div class="popup-text5">第{{String(popupData.week).substring(4,8)}}期{{popupData.target_steps}}步{{popupData.all_days}}日耐力</div> <div class="popup-text5">第{{String(popupData.week).substring(4,8)}}期{{popupData.target_steps}}步{{popupData.all_days}}日健步挑战</div>
</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}}天,契约金已返还至你的钱包</div> <div class="popup-text7">已达标{{popupData.days}}天,契约金已返还至你的钱包</div>
......
<template> <template>
<div class="partake-challenge-page"> <div class="partake-challenge-page">
<Title class="page-title" title=" " v-on:goback="goback" show_back="true" v-if="currentPage()==='PartakeChallenge'"></Title> <Title class="page-title" title=" " v-on:goback="goback" show_back="true" v-if="currentPage()==='PartakeChallenge'"></Title>
<!-- 每日运动打卡耐力赛 --> <!-- 每日运动打卡健步挑战赛 -->
<div class="game-partake-container"> <div class="game-partake-container">
<div class="game-partake-title">每日运动打卡耐力</div> <div class="game-partake-title">每日运动打卡健步挑战</div>
<div class="game-choose-section"> <div class="game-choose-section">
<div class="choose-title">每日达标</div> <div class="choose-title">每日达标</div>
<div class="choose-content"> <div class="choose-content">
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<img class="section-icon" src="../images/PartakeChallenge/q1.png"> <img class="section-icon" src="../images/PartakeChallenge/q1.png">
<div class="section-content"> <div class="section-content">
<div class="content-title">报名参赛</div> <div class="content-title">报名参赛</div>
<div class="content-text">支付{{payMoney|moneyFormatter}}元运动契约金,即可加入{{partakeStepList.length&&partakeStepList[partakeStepIndex].step}}步日耐力赛,契约金平均分配到每个比赛日,每日结算1次。</div> <div class="content-text">支付{{payMoney|moneyFormatter}}元运动契约金,即可加入{{partakeStepList.length&&partakeStepList[partakeStepIndex].step}}步日健步挑战赛,契约金平均分配到每个比赛日,每日结算1次。</div>
</div> </div>
</div> </div>
<div class="game-introduce-section"> <div class="game-introduce-section">
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<div class="card-container-list" @scroll="onScroll"> <div class="card-container-list" @scroll="onScroll">
<div class="card-item" v-for="(item,index) in recordList.records" @click="goWhereDetail(item.week)" :key ="index"> <div class="card-item" v-for="(item,index) in recordList.records" @click="goWhereDetail(item.week)" :key ="index">
<div class="card-title"> <div class="card-title">
{{String(item.week).slice(4, 8)}}期-{{item.target_steps}}{{item.total_days}}耐力 {{String(item.week).slice(4, 8)}}期-{{item.target_steps}}{{item.total_days}}健步挑战
<template v-if="item.days">(第{{item.days}}天)</template> <template v-if="item.days">(第{{item.days}}天)</template>
<span v-if="item.at_present === 1 && !item.money"> 奖金结算中</span> <span v-if="item.at_present === 1 && !item.money"> 奖金结算中</span>
</div> </div>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="section2-title">参赛须知详情:</div> <div class="section2-title">参赛须知详情:</div>
<div class="content2-title">一、比赛规则</div> <div class="content2-title">一、比赛规则</div>
<div class="content2-item">1、每期比赛于比赛日00:00:00正式开始统计,到比赛日23: 59:59正式结束;用户缴纳当期比赛契约金后即可成功报名;比赛结束后达标用户将收到运动奖励金;</div> <div class="content2-item">1、每期比赛于比赛日00:00:00正式开始统计,到比赛日23: 59:59正式结束;用户缴纳当期比赛契约金后即可成功报名;比赛结束后达标用户将收到运动奖励金;</div>
<div class="content2-item">2、运动达标奖励金将于比赛结束后24小时内发放到达标用户钱包中(多日耐力赛比赛期间,契约金按日返还结算,单个比赛日总当天0点开始至24点结束,当日拥有参赛资格且达标的用户返回支付的契约金的一部分,比赛结束后契约金全部返还,并获得平台提供的相应奖励金,参赛用户如果未达标次数超过限额,则失去比赛资格);</div> <div class="content2-item">2、运动达标奖励金将于比赛结束后24小时内发放到达标用户钱包中(多日健步挑战赛比赛期间,契约金按日返还结算,单个比赛日总当天0点开始至24点结束,当日拥有参赛资格且达标的用户返回支付的契约金的一部分,比赛结束后契约金全部返还,并获得平台提供的相应奖励金,参赛用户如果未达标次数超过限额,则失去比赛资格);</div>
<div class="content2-title">二、注意事项</div> <div class="content2-title">二、注意事项</div>
<div class="content2-item">1、用户应保证设备的可靠性,以保证运动数据准确性。报名赛事的用户应保证自己设备的可靠性,例如保证电源电量充足,保证计步设备系统的运行白名单内,网络链接正常等;为了更好的保证运动数据的可靠性,比赛期间请保证一定频次手机微信登录;并按规则要求在比赛结束前进入手机微信完成步数上报确认操作;由于用户个人设备缺乏可靠性或未按活动规则操作导致的投诉,平台不予处理;</div> <div class="content2-item">1、用户应保证设备的可靠性,以保证运动数据准确性。报名赛事的用户应保证自己设备的可靠性,例如保证电源电量充足,保证计步设备系统的运行白名单内,网络链接正常等;为了更好的保证运动数据的可靠性,比赛期间请保证一定频次手机微信登录;并按规则要求在比赛结束前进入手机微信完成步数上报确认操作;由于用户个人设备缺乏可靠性或未按活动规则操作导致的投诉,平台不予处理;</div>
<div class="content2-item">2、运动达标时,如遇到转账失败未收到奖金的情况,可联系在线客服确认情况,情况属实可补发相应的奖金;</div> <div class="content2-item">2、运动达标时,如遇到转账失败未收到奖金的情况,可联系在线客服确认情况,情况属实可补发相应的奖金;</div>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<img class="corner-marker" src="@/images/SignUp/home_tag_bsz.png" v-if="item.status===0"> <img class="corner-marker" src="@/images/SignUp/home_tag_bsz.png" v-if="item.status===0">
<img class="corner-marker" src="@/images/SignUp/home_tag_zmz.png" v-if="item.status===1"> <img class="corner-marker" src="@/images/SignUp/home_tag_zmz.png" v-if="item.status===1">
<img class="corner-marker" src="@/images/SignUp/home_tag_yjs.png" v-if="item.status===2"> <img class="corner-marker" src="@/images/SignUp/home_tag_yjs.png" v-if="item.status===2">
<div class="card-title">{{item.action}}耐力</div> <div class="card-title">{{item.action}}健步挑战</div>
<div class="card-time">{{item.already_join===1?'已参赛':'未参赛'}} {{item.period_start}} - {{item.period_end}}</div> <div class="card-time">{{item.already_join===1?'已参赛':'未参赛'}} {{item.period_start}} - {{item.period_end}}</div>
<div class="card-info"> <div class="card-info">
<div class="info-item" v-if="(item.status===0||item.status===2)&&item.people_cnt"> <div class="info-item" v-if="(item.status===0||item.status===2)&&item.people_cnt">
......
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