Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuywap-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
陈峰
2018-08-01 10:58:40 +0800
Commit
890b1d8ffff5f85d89daeb1e64a6fb28b7a8c10f
2 parents
2c4e29b3
fbbd0fb8
Merge branch 'hotfix/payCenter' into 'master'
fix alipay fix alipay See merge request
!1496
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
2 deletions
apps/cart/controllers/pay.js
apps/cart/views/action/pay/pay-center.hbs
package.json
public/scss/home/_pay.css
apps/cart/controllers/pay.js
View file @
890b1d8
...
...
@@ -107,6 +107,17 @@ const payCenter = (req, res, next) => {
isOldUser
:
Boolean
(
req
.
cookies
.
_isOldUser
&&
req
.
cookies
.
_isOldUser
===
'4'
)
};
if
(
_
.
get
(
req
,
'app.locals.wap.pay.alipayclose'
,
false
))
{
_
.
set
(
responseData
.
payAppInfo
,
'[0]'
,
{
appIcon
:
''
,
appId
:
'alipay'
,
app
:
'支付宝支付'
,
hint
:
'支付宝服务暂不可用'
,
subHint
:
'推荐使用有货APP进行支付'
,
disable
:
true
});
}
res
.
render
(
'pay/pay-center'
,
responseData
);
})().
catch
(
next
);
};
...
...
apps/cart/views/action/pay/pay-center.hbs
View file @
890b1d8
...
...
@@ -4,7 +4,7 @@
{{/if}}
<div
class=
"payapp-list"
>
{{#
payAppInfo
}}
<div
class=
"box"
id=
"
{{
appId
}}
"
data-href=
"
{{
payLink
}}
"
>
<div
class=
"box
{{#
disable
}}
disable
{{/
disable
}}
"
id=
"
{{
appId
}}
"
data-href=
"
{{
payLink
}}
"
>
<div
class=
"icon"
>
{{#if
appIcon
}}
<img
src=
"
{{
appIcon
}}
"
alt=
"app图标"
>
...
...
package.json
View file @
890b1d8
{
"name"
:
"yohobuywap-node"
,
"version"
:
"6.6.2
4
"
,
"version"
:
"6.6.2
5
"
,
"private"
:
true
,
"description"
:
"A New Yohobuy Project With Express"
,
"repository"
:
{
...
...
public/scss/home/_pay.css
View file @
890b1d8
...
...
@@ -66,6 +66,17 @@
}
}
.disable
{
.icon
{
opacity
:
0.2
;
}
.hint
,
.app
{
color
:
#ccc
;
}
}
/* 加载中 */
.loading-toast
{
...
...
Please
register
or
login
to post a comment