Skip to content

W
walk_daka_h5
Commit e9b1408a by Caiyijun
Options

修复一些样式问题

parent 92f53f9f
Showing with 131 additions and 99 deletions
src/components/NoticeBonus.vue
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
<style> <style>
.notice_bonus { .notice_bonus {
width: 3.6rem; width: 3.6rem;
height: .32rem; height: .44rem;
border-radius: .06rem; border-radius: .22rem;
background: rgba(255, 255, 255, .2); background: rgba(255, 255, 255, .2);
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -33,13 +33,13 @@ ...@@ -33,13 +33,13 @@
.msg_container { .msg_container {
flex: 1; flex: 1;
height: .32rem; height: .34rem;
transform-style: preserve-3d; transform-style: preserve-3d;
overflow: hidden; overflow: hidden;
} }
.notice_msg { .notice_msg {
font-size: .2rem; font-size: .24rem;
color: #fff; color: #fff;
line-height: .32rem; line-height: .32rem;
text-align: center; text-align: center;
......
src/components/axios/api.js
...@@ -424,6 +424,17 @@ export function pop_up_windows() { ...@@ -424,6 +424,17 @@ export function pop_up_windows() {
}) })
} }
//参与挑战
export function daka_info(grade){
return fetch({
url: api.daka_info,
method: 'GET',
params: {
grade: grade
}
})
}
//有新接口的时候像上面那样再来一次 //有新接口的时候像上面那样再来一次
// //修改昵称接口 // //修改昵称接口
......
src/components/axios/fetch.js
...@@ -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': window['userData']?window['userData'].token:'' // 'Authorization': window['userData']?window['userData'].token:''
'Authorization':"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLCJvcGVuX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsInVuaW9uX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsImV4cCI6MTU1NDI5MjEwOX0.Qp6mudnew6XyX4xsDgV9J2wgimUBHdaSWN9zqBSeUfg" 'Authorization':"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLCJvcGVuX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsInVuaW9uX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsImV4cCI6MTU1NDMxMTMzMH0.4UEG6I9K0JARU5KDMW-Xwx13DMniYelsmI-qWd97e_c"
// 'token_in_header': global_.token,//token从全局变量那里传过来 // 'token_in_header': global_.token,//token从全局变量那里传过来
}, },
timeout: 30 * 1000 // 30秒超时 timeout: 30 * 1000 // 30秒超时
......
src/components/axios/url.js
//也可以像下面这样，区分环境或者区分服务器等等 //也可以像下面这样，区分环境或者区分服务器等等
let service = 'dev'; let service = 'dev'
// let service = 'prod'; // let service = 'prod';
let api = ''; let api = ''
if (service === 'dev') { if (service === 'dev') {
/**dev开发**/ /**dev开发**/
api = ''; api = ''
} else if (service === 'prod') { } else if (service === 'prod') {
/**prod部署**/ /**prod部署**/
api = 'https://miniapp-api.wxatech.com/game-bsdk'; api = 'https://miniapp-api.wxatech.com/game-bsdk'
} }
let trackApi = ''; let trackApi = ''
if (service === 'dev') { if (service === 'dev') {
/**dev开发**/ /**dev开发**/
trackApi = 'https://test-api.wxagame.com/game-track'; trackApi = 'https://test-api.wxagame.com/game-track'
} else if (service === 'prod') { } else if (service === 'prod') {
/**prod部署**/ /**prod部署**/
trackApi = 'https://minigame.api.wxagame.com/game-track'; trackApi = 'https://minigame.api.wxagame.com/game-track'
} }
export default { export default {
/**个人中心start**/ /**个人中心start**/
//1 打卡查询 GET /api/v1/daka_status //1 打卡查询 GET /api/v1/daka_status
dakaStatusPath: `${api}/api/v1/daka_status`, dakaStatusPath: `${api}/api/v1/daka_status`,
//2 打卡操作 POST /api/v1/daka //2 打卡操作 POST /api/v1/daka
dakaPath: `${api}/api/v1/daka`, dakaPath: `${api}/api/v1/daka`,
//3 打卡记录 GET /api/v1/daka_records //3 打卡记录 GET /api/v1/daka_records
dakaRecordsTotalPath: `${api}/api/v1/daka_records/total`, dakaRecordsTotalPath: `${api}/api/v1/daka_records/total`,
dakaRecordsListPath: `${api}/api/v1/daka_records/list`, dakaRecordsListPath: `${api}/api/v1/daka_records/list`,
dakaRecordsDetailPath: `${api}/api/v1/daka_records/detail`, dakaRecordsDetailPath: `${api}/api/v1/daka_records/detail`,
//4 走马灯、玩法 GET /api/v1/game_info //4 走马灯、玩法 GET /api/v1/game_info
gameInfoPath: `${api}/api/v1/game_info`, gameInfoPath: `${api}/api/v1/game_info`,
//5 余额查询 GET /api/v1/balance_query //5 余额查询 GET /api/v1/balance_query
balanceQueryPath: `${api}/api/v1/balance_query`, balanceQueryPath: `${api}/api/v1/balance_query`,
//6 余额提现 GET /api/v1/balance_withdraw //6 余额提现 GET /api/v1/balance_withdraw
balanceWithdrawPath: `${api}/api/v1/balance_withdraw`, balanceWithdrawPath: `${api}/api/v1/balance_withdraw`,
//7 常见问题 GET /api/v1/faq //7 常见问题 GET /api/v1/faq
faqPath: `${api}/api/v1/faq`, faqPath: `${api}/api/v1/faq`,
//8 客服 GET /api/v1/kefu //8 客服 GET /api/v1/kefu
kefuPath: `${api}/api/v1/kefu`, kefuPath: `${api}/api/v1/kefu`,
//9 关注公众号 GET /api/v1/oc_follow //9 关注公众号 GET /api/v1/oc_follow
ocFollowPath: `${api}/api/v1/oc_follow`, ocFollowPath: `${api}/api/v1/oc_follow`,
//10 报名支付 GET /api/v1/daka_pay //10 报名支付 GET /api/v1/daka_pay
dakaPayPath: `${api}/api/v1/daka_pay`, dakaPayPath: `${api}/api/v1/daka_pay`,
//11 jssdk注入 //11 jssdk注入
jssdkPath: `${api}/api/v1/config/jssdk`, jssdkPath: `${api}/api/v1/config/jssdk`,
// 12 提现banner GET /api/v1/config/withdraw_banner // 12 提现banner GET /api/v1/config/withdraw_banner
withdrawBannerPath: `${api}/api/v1/config/withdraw_banner`, withdrawBannerPath: `${api}/api/v1/config/withdraw_banner`,
// 13 用户复活卡，免契约金卡信息 GET /api/v1/user_cards // 13 用户复活卡，免契约金卡信息 GET /api/v1/user_cards
userCardPath: `${api}/api/v1/user_cards`, userCardPath: `${api}/api/v1/user_cards`,
// 14 分享内容 /api/v1/config/share_content // 14 分享内容 /api/v1/config/share_content
shareContentPath: `${api}/api/v1/config/share_content`, shareContentPath: `${api}/api/v1/config/share_content`,
// 15 获取规则文本 /api/v1/get_rule // 15 获取规则文本 /api/v1/get_rule
getRulePath: `${api}/api/v1/get_rule`, getRulePath: `${api}/api/v1/get_rule`,
// 16 数据埋点 /api/v1/tracking // 16 数据埋点 /api/v1/tracking
trackingPath: `${api}/api/v1/tracking`, trackingPath: `${api}/api/v1/tracking`,
// 17 关注公众号图片 /api/v1/liin_share_image // 17 关注公众号图片 /api/v1/liin_share_image
liinShareImagePath: `${api}/api/v1/liin_share_image`, liinShareImagePath: `${api}/api/v1/liin_share_image`,
// 18 每日分享图 /api/v1/daily_share_image // 18 每日分享图 /api/v1/daily_share_image
dailyShareImagePath: `${api}/api/v1/qrcode_url`, dailyShareImagePath: `${api}/api/v1/qrcode_url`,
// 19 每日排行榜 /api/v1/daka_rank // 19 每日排行榜 /api/v1/daka_rank
dakaRankPath: `${api}/api/v1/daka_rank`, dakaRankPath: `${api}/api/v1/daka_rank`,
// 20 新用户 /api/v1/first_daka // 20 新用户 /api/v1/first_daka
firstDakaPath: `${api}/api/v1/first_daka`, firstDakaPath: `${api}/api/v1/first_daka`,
// 21 个人排名 /api/v1/person_rank_info // 21 个人排名 /api/v1/person_rank_info
personRankInfoPath: `${api}/api/v1/person_rank_info`, personRankInfoPath: `${api}/api/v1/person_rank_info`,
// 22 用户当月打卡状态查询 // 22 用户当月打卡状态查询
daka_status_list: `${api}/api/v1/daka_status/list`, daka_status_list: `${api}/api/v1/daka_status/list`,
// 23 每日故事详情 // 23 每日故事详情
story_detail: `${api}/api/v1/story/detail`, story_detail: `${api}/api/v1/story/detail`,
// 24 每日故事列表 // 24 每日故事列表
story_list: `${api}/api/v1/story/list`, story_list: `${api}/api/v1/story/list`,
// 25 记录详情 // 25 记录详情
daka_records_detail: `${api}/api/v1/daka_records/detail`, daka_records_detail: `${api}/api/v1/daka_records/detail`,
// 25 规则详情 // 25 规则详情
daka_rule: `${api}/api/v1/daka_rule`, daka_rule: `${api}/api/v1/daka_rule`,
// 26 红包 /api/v1/withdraw_img // 26 红包 /api/v1/withdraw_img
withdraw_img: `${api}/api/v1/withdraw_img`, withdraw_img: `${api}/api/v1/withdraw_img`,
// 27 提现明细 /api/v1/withdraw_log // 27 提现明细 /api/v1/withdraw_log
withdraw_log: `${api}/api/v1/withdraw_log`, withdraw_log: `${api}/api/v1/withdraw_log`,
// 首页数据 // 首页数据
daka_index: `${api}/api/v1/daka_index`, daka_index: `${api}/api/v1/daka_index`,
// 判断用户是否参与比赛 // 判断用户是否参与比赛
select_user_signup: `${api}/api/v1/select_user_signup`, select_user_signup: `${api}/api/v1/select_user_signup`,
// 比赛详情 // 比赛详情
daka_status_detail: `${api}/api/v1/daka_status/detail`, daka_status_detail: `${api}/api/v1/daka_status/detail`,
// 比赛详情弹窗 // 比赛详情弹窗
pop_up_windows: `${api}/api/v1/pop_up_windows`, pop_up_windows: `${api}/api/v1/pop_up_windows`,
//首页第一项立即报名
daka_info: `${api}/api/v1/daka_info`,
} }
src/views/HaveJoinedGame.vue
...@@ -101,9 +101,9 @@ ...@@ -101,9 +101,9 @@
data() { data() {
return { return {
swiperOption: { swiperOption: {
slidesPerView: "auto", slidesPerView: 'auto',
centeredSlides: true, centeredSlides: true,
spaceBetween: 10 spaceBetween: 10,
}, },
bet_bonus: '0.00', bet_bonus: '0.00',
next_signup: false, next_signup: false,
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<style lang="less" scoped> <style lang="less" scoped>
.swiper-container { .swiper-container {
margin-left: 0 !important; /*margin-left: 0 !important;*/
} }
.swiper-slide { .swiper-slide {
......
src/views/MainPage.vue
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
z-index: 999; z-index: 999;
box-shadow: 0 -0.01rem 0 #e5e5e5;
.bottom-tab { .bottom-tab {
flex: 1; flex: 1;
height: 100%; height: 100%;
......
src/views/SignUp.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<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">3天健步挑战赛</div> <div class="card-title">3天健步挑战赛</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"> <div class="info-item" v-if="item.status===0||item.status===2">
<div class="item-title">达标人数</div> <div class="item-title">达标人数</div>
...@@ -31,11 +31,16 @@ ...@@ -31,11 +31,16 @@
<div class="item-money">{{item.total_money || '0.00'}}</div> <div class="item-money">{{item.total_money || '0.00'}}</div>
</div> </div>
</div> </div>
<div class="card-btn" v-if="item.status===1&&item.already_join===0" @click="goOtherPage('PartakeChallenge')"> <div class="card-btn" v-if="item.status===1&&item.already_join===0" data-item="item"
<div>参与挑战</div> @click="goOtherPage('PartakeChallenge')">
<div class="btn-title">参与挑战</div>
<div class="card-btn-tip">（每日目标{{item.target_step}}步）</div> <div class="card-btn-tip">（每日目标{{item.target_step}}步）</div>
</div> </div>
<div class="card-btn" :style="item.status!==1?'background:#32A1F6;':''" v-else @click="goWhereDetail(item)">{{item.status===1?'已报名':'查看详情'}}</div> <div class="card-btn" :style="item.status!==1? item.status === 2 ? 'background:#ccc'
:'background:#32A1F6' : ''"
v-else
@click="goWhereDetail(item)">{{item.status===1?'已报名':'查看详情'}}
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -89,6 +94,7 @@ ...@@ -89,6 +94,7 @@
this.getPageData(level); this.getPageData(level);
}, },
goOtherPage(pageName) { goOtherPage(pageName) {
console.log('pageName',pageName)
this.$router.push({ name: pageName }); this.$router.push({ name: pageName });
}, },
goWhereDetail(item) { goWhereDetail(item) {
...@@ -333,14 +339,18 @@ ...@@ -333,14 +339,18 @@
margin-top: 0.28rem; margin-top: 0.28rem;
} }
.card-time { .card-time {
font-size: 0.22rem; background: rgba(0,0,0,0.1);
line-height: 1; padding:0 0.24rem;
border-radius: .24rem;
height: .46rem;
font-size: 0.26rem;
line-height: .46rem;
color: #fff; color: #fff;
margin-top: 0.16rem; margin-top: 0.16rem;
} }
.card-info { .card-info {
width: 100%; width: 100%;
margin-top: 0.56rem; margin-top: 0.7rem;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
...@@ -374,7 +384,7 @@ ...@@ -374,7 +384,7 @@
} }
.card-btn { .card-btn {
width: 4rem; width: 4rem;
height: 0.8rem; height: 0.88rem;
background: #fabd21; background: #fabd21;
border-radius: 0.74rem; border-radius: 0.74rem;
box-shadow: 0 0.02rem 0.04rem 0 rgba(0, 0, 0, 0.2); box-shadow: 0 0.02rem 0.04rem 0 rgba(0, 0, 0, 0.2);
...@@ -383,6 +393,8 @@ ...@@ -383,6 +393,8 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: 0.3rem; font-size: 0.3rem;
font-weight: bold;
letter-spacing: 0.01rem;
line-height: 1; line-height: 1;
color: #fff; color: #fff;
position: absolute; position: absolute;
...@@ -392,6 +404,11 @@ ...@@ -392,6 +404,11 @@
.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;
}
.btn-title{
font-size: .34rem;
font-weight: bold;
} }
} }
} }
......
src/views/UserCenter.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<img class="user-avatar" :src="userData.avatar"> <img class="user-avatar" :src="userData.avatar">
<div class="user_msg"> <div class="user_msg">
<div class="user_nickname">{{userData.nickname|textFormatter}}</div> <div class="user_nickname">{{userData.nickname|textFormatter}}</div>
<div class="user_number">昵称：{{userData.student_num|textFormatter}}</div> <!--<div class="user_number">昵称：{{userData.student_num|textFormatter}}</div>-->
</div> </div>
<div class="btn_container"> <div class="btn_container">
<div class="btn_item" v-for="item in btnList" @click="jumpTo(item)"> <div class="btn_item" v-for="item in btnList" @click="jumpTo(item)">
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
position: relative; position: relative;
overflow-y: scroll; overflow-y: scroll;
background: #f8f8f8; background: #f8f8f8;
padding-bottom: 0.1rem;
.banner { .banner {
width: 100%; width: 100%;
height: 2.6rem; height: 2.6rem;
...@@ -144,7 +145,7 @@ ...@@ -144,7 +145,7 @@
width: 6.9rem; width: 6.9rem;
margin: 1.76rem auto 0; margin: 1.76rem auto 0;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
box-shadow: 0 .02rem .14rem 0 rgba(180, 197, 200, 0.5); box-shadow: 0 .05rem .14rem 0 rgba(180, 197, 200, 0.5);
position: relative; position: relative;
.user-avatar { .user-avatar {
overflow: hidden; overflow: hidden;
......
src/views/Wallet.vue
...@@ -217,13 +217,13 @@ ...@@ -217,13 +217,13 @@
.Wallet .money_input span.dollar { .Wallet .money_input span.dollar {
font-size: 0.48rem; font-size: 0.48rem;
color: #282828; color: #282828;
margin-bottom: .2rem; /*margin-bottom: .2rem;*/
} }
.Wallet .money_input input { .Wallet .money_input input {
border: 0; border: 0;
outline: 0; outline: 0;
font-size: 0.28rem; font-size: 0.48rem;
color: #282828; color: #282828;
display: inline-block; display: inline-block;
/*margin-left: 0.4rem;*/ /*margin-left: 0.4rem;*/
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
.Wallet .money_input .get_all { .Wallet .money_input .get_all {
float: right; float: right;
color: #52526e; color: rgba(87, 107, 149, 1);
font-size: 0.3rem; font-size: 0.3rem;
} }
......
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