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
b603bd7e
Commit
b603bd7e
authored
Apr 15, 2019
by
穆启卓
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
改文案
parent
1af0a6b4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
7 deletions
+4
-7
fetch.js
src/components/axios/fetch.js
+1
-1
ChallengeDetail.vue
src/views/ChallengeDetail.vue
+1
-1
HaveJoinedGame.vue
src/views/HaveJoinedGame.vue
+2
-5
No files found.
src/components/axios/fetch.js
View file @
b603bd7e
...
@@ -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.eyJ1c2VyX2lkIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLCJvcGVuX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsInVuaW9uX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsImV4cCI6MTU1NT
E3MDIxOH0.fEIhvDaUlX5NKBm4XUvZFs8lMmIWMq11sfE_Wt_wRZE
"
'Authorization'
:
process
.
env
.
NODE_ENV
===
'production'
?
(
window
[
'userData'
]
?
window
[
'userData'
].
token
:
''
)
:
"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLCJvcGVuX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsInVuaW9uX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsImV4cCI6MTU1NT
Q5NDA1NX0.acPAbeYPuN15Dm_CwoXqd8cOJPswgFVuSSL_VfTD3GM
"
// '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 @
b603bd7e
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
</div>
</div>
<div
class=
"section-item"
>
<div
class=
"section-item"
>
<div
class=
"item-value"
>
{{
pageData
.
bet_rate
}}
</div>
<div
class=
"item-value"
>
{{
pageData
.
bet_rate
}}
</div>
<div
class=
"item-key"
>
收益率
</div>
<div
class=
"item-key"
>
最高
收益率
</div>
</div>
</div>
</div>
</div>
<div
class=
"game-info-section"
>
<div
class=
"game-info-section"
>
...
...
src/views/HaveJoinedGame.vue
View file @
b603bd7e
...
@@ -42,13 +42,10 @@
...
@@ -42,13 +42,10 @@
<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"
>
<!-- 已淘汰 1-->
<!-- 0: 未开始 1:比赛中 2:已结束 3:已淘汰-->
<!-- 0: 未开始 1:比赛中 2:已结束 3:已淘汰-->
<span
v-if=
"item.is_complete == 2"
>
未达标(
{{
item
.
step_num
}}
步)
</span>
<span
v-if=
"item.is_complete == 2"
>
未达标(
{{
item
.
step_num
}}
步)
</span>
<span
v-else-if=
"item.status == 3 && item.is_complete != 2"
>
已失去比赛资格
</span>
<span
v-else-if=
"item.is_complete != 2 && item.status == 3"
>
已失去比赛资格
</span>
<span
v-else-if=
"item.is_complete == 1 && item.status == 2"
>
已达标(
{{
item
.
step_num
}}
步)
</span>
<span
v-else-if=
"item.is_complete == 1 && (item.status == 1 || item.status == 2)"
>
已达标(
{{
item
.
step_num
}}
步)
</span>
<span
v-else-if=
"item.status == 1 && item.is_complete == 1"
>
今天达标了
</span>
<!-- 今天进行中-->
<span
v-else-if=
"item.is_complete == 0 && item.status == 1"
>
(
{{
item
.
step_num
}}
/
{{
target_steps
}}
步)
</span>
<span
v-else-if=
"item.is_complete == 0 && item.status == 1"
>
(
{{
item
.
step_num
}}
/
{{
target_steps
}}
步)
</span>
</div>
</div>
</
template
>
</
template
>
...
...
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