Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mr-julyedu
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
baiguangyao
mr-julyedu
Commits
f7352bb1
Commit
f7352bb1
authored
Nov 01, 2019
by
wangshuo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
水平测试用时格式化
parent
907d938f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
1 deletions
+23
-1
src/components/blessingPreheat/rankList/index.js
+14
-1
src/components/order/payOrder/PayOrder.js
+9
-0
No files found.
src/components/blessingPreheat/rankList/index.js
View file @
f7352bb1
...
@@ -23,6 +23,19 @@ export default class RankList extends Component {
...
@@ -23,6 +23,19 @@ export default class RankList extends Component {
});
});
}
}
formart
=
(
time
)
=>
{
let
date
=
time
*
1000
,
hours
=
0
,
minutes
=
0
,
seconds
=
0
;
hours
=
`
${
parseInt
(
date
/
(
60
*
60
*
1000
))}
`
.
padStart
(
2
,
0
);
minutes
=
`
${
parseInt
((
date
-
hours
*
3600000
)
/
60000
)}
`
.
padStart
(
2
,
0
);
seconds
=
`
${
parseInt
(
(
date
-
hours
*
3600000
-
minutes
*
60000
)
/
1000
)}
`
.
padStart
(
2
,
0
);
return
`
${
minutes
}
'
${
seconds
}
"`
;
}
render
()
{
render
()
{
let
{
rankList
}
=
this
.
state
;
let
{
rankList
}
=
this
.
state
;
return
(
return
(
...
@@ -55,7 +68,7 @@ export default class RankList extends Component {
...
@@ -55,7 +68,7 @@ export default class RankList extends Component {
<
img
className
=
"user__avatar"
src
=
{
item
.
avatar
}
/
>
<
img
className
=
"user__avatar"
src
=
{
item
.
avatar
}
/
>
<
span
className
=
"user__name"
>
{
item
.
user_name
}
<
/span
>
<
span
className
=
"user__name"
>
{
item
.
user_name
}
<
/span
>
<
/div
>
<
/div
>
<
div
className
=
'table__body table_head__time'
>
{
item
.
cost_time
}
<
/div
>
<
div
className
=
'table__body table_head__time'
>
{
this
.
formart
(
item
.
cost_time
)
}
<
/div
>
<
div
className
=
'table__body table_head__score'
>
{
item
.
score
}
<
/div
>
<
div
className
=
'table__body table_head__score'
>
{
item
.
score
}
<
/div
>
<
div
className
=
'table__body table_head__prize'
>
{
item
.
prize
}
<
/div
>
<
div
className
=
'table__body table_head__prize'
>
{
item
.
prize
}
<
/div
>
<
/div
>
<
/div
>
...
...
src/components/order/payOrder/PayOrder.js
View file @
f7352bb1
...
@@ -112,6 +112,15 @@ export default class PayOrder extends Component {
...
@@ -112,6 +112,15 @@ export default class PayOrder extends Component {
// 微信内部-支付
// 微信内部-支付
if
(
is_weixin
())
{
if
(
is_weixin
())
{
window
.
location
.
href
=
"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri="
+
encodeURIComponent
(
window
.
location
.
href
+
"&aa=bb"
).
toLowerCase
()
+
"&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect"
;
window
.
location
.
href
=
"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri="
+
encodeURIComponent
(
window
.
location
.
href
+
"&aa=bb"
).
toLowerCase
()
+
"&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect"
;
// if(window.location.href.indexOf('aa=bb') === -1){
// localStorage.setItem('a', '第一次');
// window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=" + encodeURIComponent(window.location.href + "&aa=bb").toLowerCase() + "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
// }
// if(window.location.href.indexOf('aa=bb') > 0) {
// localStorage.setItem('a', '多次');
// let newHref = window.location.href.slice(0, window.location.href.indexOf('aa=bb')-1);
// window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=" + encodeURIComponent(newHref + "&aa=bb").toLowerCase() + "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
// }
}
else
{
}
else
{
// 微信外部-支付
// 微信外部-支付
http
.
get
(
`
${
API
[
'base-api'
]}
/pay/wxpay/wap_charge/oid/
${
orderId
}
`
).
then
((
res
)
=>
{
http
.
get
(
`
${
API
[
'base-api'
]}
/pay/wxpay/wap_charge/oid/
${
orderId
}
`
).
then
((
res
)
=>
{
...
...
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