Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
walk_daka_h5
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
穆启卓
walk_daka_h5
Commits
ad573325
Commit
ad573325
authored
Apr 04, 2019
by
Caiyijun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change
parent
95cd33bb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
36 deletions
+8
-36
fetch.js
src/components/axios/fetch.js
+1
-1
ChallengeDetail.vue
src/views/ChallengeDetail.vue
+2
-2
HaveJoinedGame.vue
src/views/HaveJoinedGame.vue
+3
-32
SignUp.vue
src/views/SignUp.vue
+2
-1
No files found.
src/components/axios/fetch.js
View file @
ad573325
...
@@ -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.eyJ1c2VyX2lkIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLCJvcGVuX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsInVuaW9uX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsImV4cCI6MTU1ND
Q1NzU3Mn0.ehCAENl8zjdMyF4y44Z2-XEascaDhEbUF3BaNsWbfY8
"
'Authorization'
:
process
.
env
.
NODE_ENV
===
'production'
?
(
window
[
'userData'
]
?
window
[
'userData'
].
token
:
''
)
:
"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLCJvcGVuX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsInVuaW9uX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsImV4cCI6MTU1ND
U2MjA2Mn0.eHkAuqQpoZb34KbCAyVzNaunn4Knn77jfC0N5DG5JD0
"
// 'token_in_header': global_.token,//token从全局变量那里传过来
// 'token_in_header': global_.token,//token从全局变量那里传过来
},
},
timeout
:
30
*
1000
// 30秒超时
timeout
:
30
*
1000
// 30秒超时
...
...
src/views/ChallengeDetail.vue
View file @
ad573325
...
@@ -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
.
target_step
}}
步3日
耐力赛
</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"
>
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
}
}
},
},
mounted
()
{
mounted
()
{
console
.
log
(
"this.pageType"
,
this
.
page
_type
)
console
.
log
(
"this.pageType"
,
this
.
page
Data
)
if
(
window
[
"userData"
])
{
if
(
window
[
"userData"
])
{
this
.
userData
=
window
[
"userData"
]
this
.
userData
=
window
[
"userData"
]
}
else
{
}
else
{
...
...
src/views/HaveJoinedGame.vue
View file @
ad573325
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,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
}}
步
3
日耐力赛
</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"
>
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
<div
class=
"hr"
></div>
<div
class=
"hr"
></div>
<!--
<div
style=
"height: 2.68rem;"
>
v-if="showSwiper" -->
<!--
<div
style=
"height: 2.68rem;"
>
v-if="showSwiper" -->
<swiper
:options=
"swiperOption"
ref=
"mySwiper"
class=
"game-scroll-container"
v-
if
=
"showSwiper"
>
<swiper
:options=
"swiperOption"
ref=
"mySwiper"
class=
"game-scroll-container"
v-
show
=
"showSwiper"
>
<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"
>
...
@@ -220,26 +220,7 @@ export default {
...
@@ -220,26 +220,7 @@ export default {
});
});
},
},
goOtherPage
(
pageName
)
{
goOtherPage
(
pageName
)
{
if
(
pageName
==
"Rule"
)
{
this
.
$router
.
push
({
name
:
pageName
});
// console.log('规则')
let
params
=
this
.
target_steps
;
let
p
=
0
;
console
.
log
(
params
);
if
(
params
==
3000
)
{
p
=
1
;
}
else
if
(
params
==
5000
)
{
p
=
2
;
}
else
if
(
params
==
8000
)
{
p
=
3
;
}
this
.
$router
.
push
({
name
:
pageName
,
params
:
{
level
:
p
}
});
}
else
{
// console.log('提交步数')
this
.
$router
.
push
({
name
:
pageName
});
}
// let params = this.target_steps
// console.log('params',params)
// this.$router.push({name: pageName})
},
},
closePayPopup
()
{
closePayPopup
()
{
this
.
userHavePaidGame
=
false
;
this
.
userHavePaidGame
=
false
;
...
@@ -250,9 +231,6 @@ export default {
...
@@ -250,9 +231,6 @@ export default {
goback
()
{
goback
()
{
history
.
go
(
-
1
);
history
.
go
(
-
1
);
},
},
// goOtherPage(pageName) {
// this.$router.push({name: pageName})
// },
currentPage
()
{
currentPage
()
{
return
this
.
$router
.
history
.
current
.
name
;
return
this
.
$router
.
history
.
current
.
name
;
},
},
...
@@ -269,13 +247,6 @@ export default {
...
@@ -269,13 +247,6 @@ export default {
index
index
);
);
}
}
// if(item.days
<
currentDay
){
// if(item.step_num
<
item
.
target_steps
){
// console.log('未达标')
// }else{
//
// }
// }
});
});
}
}
this
.
bet_bonus
=
pageData
.
bet_bonus
;
this
.
bet_bonus
=
pageData
.
bet_bonus
;
...
...
src/views/SignUp.vue
View file @
ad573325
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,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
}}
期
- 3天
耐力赛
</div>
<div
class=
"card-title"
>
{{
item
.
action
}}
期耐力赛
</div>
<div
<div
class=
"card-time"
class=
"card-time"
>
{{
item
.
already_join
===
1
?
'已参赛'
:
'未参赛'
}}
{{
item
.
period_start
}}
-
{{
item
.
period_end
}}
</div>
>
{{
item
.
already_join
===
1
?
'已参赛'
:
'未参赛'
}}
{{
item
.
period_start
}}
-
{{
item
.
period_end
}}
</div>
...
@@ -115,6 +115,7 @@ export default {
...
@@ -115,6 +115,7 @@ export default {
}
}
});
});
}
else
{
}
else
{
console
.
log
(
'item'
,
item
)
// 未报名
// 未报名
sessionStorage
.
setItem
(
"ChallengeDetailData"
,
JSON
.
stringify
(
item
));
sessionStorage
.
setItem
(
"ChallengeDetailData"
,
JSON
.
stringify
(
item
));
this
.
$router
.
push
({
name
:
"ChallengeDetail"
});
this
.
$router
.
push
({
name
:
"ChallengeDetail"
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment