Commit 5dfa9064 by 穆启卓

步数打卡修改内容:

1、复活卡弹窗:【已获得X张复活卡】修改为【注:每位好友即可被邀请1次】
2、比赛详情页:用户步数已达标,第X天后面加上【奖金将于12点后发放至账户中】,奖金已到账后,更改为【奖金已到账】
3、挑战明细页:比赛结束但没发放奖金时标题后面加上,奖金正在结算中
parent fbc2d059
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<div class="desc">每期比赛只能获得1次复活机会</div> <div class="desc">每期比赛只能获得1次复活机会</div>
<div class="desc">未达标次日11:50后复活机会自动生效</div> <div class="desc">未达标次日11:50后复活机会自动生效</div>
<div class="invite-btn" @click="inviteFriend">立即邀请好友参赛</div> <div class="invite-btn" @click="inviteFriend">立即邀请好友参赛</div>
<div class="desc">已获得<span>{{rebornNum}}</span>张复活卡</div> <div class="desc">注:每位好友仅可被邀请1次</div>
</div> </div>
<ShareModal v-on:close="closeShareModal" v-if="showShareModal"></ShareModal> <ShareModal v-on:close="closeShareModal" v-if="showShareModal"></ShareModal>
</div> </div>
......
...@@ -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.eyJ1c2VyX2lkIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLCJvcGVuX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsInVuaW9uX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsImV4cCI6MTU1NjEwOTM4Nn0.o26I2NiWACmHP-t-oCSCm0AU0bYtdxONE7NZKfEHQmw" 'Authorization': process.env.NODE_ENV === 'production' ? (window['userData'] ? window['userData'].token : '') : "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLCJvcGVuX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsInVuaW9uX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsImV4cCI6MTU1NjM3NjU4OX0.-bDnbP7j0_Uins2O7jHxdIYG846P756F-c0UsCuRwO8"
// 'token_in_header': global_.token,//token从全局变量那里传过来 // 'token_in_header': global_.token,//token从全局变量那里传过来
}, },
timeout: 30 * 1000 // 30秒超时 timeout: 30 * 1000 // 30秒超时
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<swiper-slide v-for="(item,index) in record_list" :key="index"> <swiper-slide v-for="(item,index) in record_list" :key="index">
<div class="game-scroll-item"> <div class="game-scroll-item">
<div class="item-title-status"> <div class="item-title-status">
<div class="item-title">{{item.days}}</div> <div class="item-title">{{item.days}}{{item.is_complete === 1 ? (item.money ? '(奖金已到账)' : '(奖金将于12点后发放至账户中)') : ''}}</div>
<!-- status 0:未开始 1:比赛中 2:已结束 3:已淘汰--> <!-- status 0:未开始 1:比赛中 2:已结束(已达标) 3:已淘汰(未达标)-->
<!-- is_complete 0:比赛中 1:已达标 2:未达标--> <!-- is_complete 0:比赛中 1:已达标 2:未达标-->
<div class="item-status0" v-if="item.status === 0">未开始</div> <div class="item-status0" v-if="item.status === 0">未开始</div>
<div class="item-status1" v-else-if="item.status === 1 && item.is_complete === 1">已达标</div> <div class="item-status1" v-else-if="item.status === 1 && item.is_complete === 1">已达标</div>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<template v-else> <template v-else>
<div class="item-progress" :style="'width: '+item.rate/100*2.46+'rem;'" v-if="index ==0 || (index > 0 && record_list[index-1].status != 3)"></div> <div class="item-progress" :style="'width: '+item.rate/100*2.46+'rem;'" v-if="index ==0 || (index > 0 && record_list[index-1].status != 3)"></div>
<div class="item-num"> <div class="item-num">
<!-- status 0:未开始 1:比赛中 2:已结束 3:已淘汰--> <!-- status 0:未开始 1:比赛中 2:已结束(已达标) 3:已淘汰(未达标)-->
<!-- is_complete 0:比赛中 1:已达标 2:未达标--> <!-- is_complete 0:比赛中 1:已达标 2:未达标-->
<span v-if="item.status === 1 && item.is_complete === 1">比赛中({{item.step_num}}步)</span> <span v-if="item.status === 1 && item.is_complete === 1">比赛中({{item.step_num}}步)</span>
<span v-else-if="item.status === 1">({{item.step_num}}/{{target_steps}}步)</span> <span v-else-if="item.status === 1">({{item.step_num}}/{{target_steps}}步)</span>
......
...@@ -24,7 +24,11 @@ ...@@ -24,7 +24,11 @@
</div> </div>
<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">{{item.week}}期-{{item.target_steps}}{{item.total_days}}日耐力赛<template v-if="item.days">(第{{item.days}}天)</template></div> <div class="card-title">
{{String(item.week).slice(4, 8)}}期-{{item.target_steps}}{{item.total_days}}日耐力赛
<template v-if="item.days">(第{{item.days}}天)</template>
<template v-if="item.at_present === 1 && !item.money">(奖金正在结算中)</template>
</div>
<div class="card-detail-container"> <div class="card-detail-container">
<div class="detail-item"> <div class="detail-item">
<div class="item-title">累计奖励金(元)</div> <div class="item-title">累计奖励金(元)</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