Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yoho-blk
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
1
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
姜枫
9 years ago
Commit
d6c022bea852a992927e92dc5d43cbe9f5aecf68
1 parent
396826b5
fix bugs
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
7 deletions
apps/help/controllers/help.js
apps/product/models/helpers.js
apps/shopping/helpers/payment.js
config/common.js
public/js/help/help.page.js
public/scss/product/_list.css
apps/help/controllers/help.js
View file @
d6c022b
...
...
@@ -61,11 +61,12 @@ const index = (req, res) => {
let
data
=
Object
.
assign
(
getData
(
id
),
helpModel
.
menuData
());
let
nav
=
[
{
link
:
global
.
yoho
.
config
.
sitUrl
,
link
:
global
.
yoho
.
config
.
sit
e
Url
,
name
:
'YOHO!BLK首页'
},
{
name
:
'帮助中心'
name
:
'帮助中心'
,
link
:
'/help'
}
];
...
...
apps/product/models/helpers.js
View file @
d6c022b
...
...
@@ -88,10 +88,16 @@ const helpers = {
* @returns {*[]}
*/
genders
(
gender
)
{
let
defaults
=
{
'1,3'
:
'男士'
,
'2,3'
:
'女士'
};
if
(
gender
)
{
return
Object
.
keys
(
gender
).
map
(
g
=>
{
return
{
name
:
gender
[
g
],
name
:
defaults
[
g
],
value
:
g
};
});
...
...
apps/shopping/helpers/payment.js
View file @
d6c022b
...
...
@@ -52,12 +52,15 @@ const Payment = {
let
bankRecord
=
result
[
2
];
let
bankCode
=
''
;
// 暂时写成'', 参考php代码 Payment.php:564
console
.
log
(
paymentRecord
);
if
(
!
paymentRecord
||
paymentRecord
.
code
!==
200
||
!
prePayResult
||
prePayResult
.
code
!==
200
)
{
let
message
=
paymentRecord
&&
paymentRecord
.
message
?
paymentRecord
.
message
:
'系统繁忙,请稍后再试'
;
return
{
code
:
400
,
message
:
message
};
}
if
(
bankRecord
&&
bankRecord
.
bankCode
)
{
return
PayData
.
updateOrderPayBank
(
order
.
orderCode
,
method
,
bankCode
);
}
else
{
...
...
config/common.js
View file @
d6c022b
...
...
@@ -22,8 +22,8 @@ module.exports = {
},
cookieDomain
:
'yohoblk.com'
,
domains
:
{
api
:
'http://dev-api.yohops.com:9999/'
,
// devapi.yoho.cn:58078 testapi.yoho.cn:28078 devapi.yoho.cn:58078
service
:
'http://dev-service.yohops.com:9999/'
,
// testservice.yoho.cn:28077 devservice.yoho.cn:58077
api
:
'http://api-test1.yohops.com:9999/'
,
// devapi.yoho.cn:58078 testapi.yoho.cn:28078 devapi.yoho.cn:58078
service
:
'http://service-test1.yohops.com:9999/'
,
// testservice.yoho.cn:28077 devservice.yoho.cn:58077
search
:
'http://192.168.102.216:8080/yohosearch/'
},
useOneapm
:
false
,
...
...
@@ -106,8 +106,8 @@ if (isProduction) {
Object
.
assign
(
module
.
exports
,
{
appName
:
'www.yohoblk.com for test'
,
domains
:
{
api
:
'http://testapi.yoho.cn:28078/'
,
service
:
'http://testservice.yoho.cn:28077/'
,
api
:
'http://api-test1.yohops.com:9999/'
,
service
:
'http://service-test1.yohops.com:9999/'
,
search
:
'http://192.168.102.216:8080/yohosearch/'
},
useOneapm
:
true
,
...
...
@@ -118,6 +118,9 @@ if (isProduction) {
session
:
[
'127.0.0.1:12111'
],
timeout
:
1000
,
retries
:
0
},
pay
:
{
serviceNotify
:
'http://service-test1.yohops.com:9999/'
}
});
}
...
...
public/js/help/help.page.js
View file @
d6c022b
...
...
@@ -29,6 +29,7 @@ $subsets.click(function() {
$
(
'.smll-category'
).
hide
();
$
(
'.subsets'
).
children
(
'.plus'
).
css
(
'background-image'
,
'url(\'../img/help/plus.png\')'
);
$child
.
show
();
$subsets
.
removeClass
(
'open'
);
$this
.
addClass
(
'open'
).
children
(
'.plus'
).
css
(
'background-image'
,
'url(\'../img/help/minus.png\')'
);
}
});
...
...
public/scss/product/_list.css
View file @
d6c022b
...
...
@@ -44,6 +44,7 @@
font-size
:
14px
;
font-weight
:
700
;
margin-left
:
10px
;
cursor
:
pointer
;
}
.input-radio
label
.round-color
{
...
...
Please
register
or
login
to post a comment