Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuy-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
1
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
周少峰
8 years ago
Commit
2d5482ca463c959b472be009540461db4e868f3e
2 parents
e6a82641
33f654e9
Merge branch 'hotfix/baseshopName'
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
5 deletions
apps/passport/controllers/login.js
apps/product/models/detail-hotarea-service.js
apps/product/models/list.js
apps/product/models/shop-service.js
package.json
public/scss/product/_list.css
apps/passport/controllers/login.js
View file @
2d5482c
...
...
@@ -173,7 +173,7 @@ const local = {
return
`
$
{
config
.
siteUrl
}
/home`
;
}
}());
console
.
log
(
user
.
uid
);
AuthHelper
.
syncUserSession
(
user
.
uid
,
req
,
res
).
then
(()
=>
{
res
.
json
({
code
:
200
,
...
...
apps/product/models/detail-hotarea-service.js
View file @
2d5482c
...
...
@@ -56,8 +56,8 @@ const indexAsync = pid => {
marketPrice
:
cur
.
product
.
productPriceBo
.
formatMarketPrice
,
productName
:
cur
.
product
.
productName
,
href
:
helpers
.
getUrlBySkc
(
_
.
head
(
goods
.
goodsImagesList
).
productId
,
_
.
head
(
goods
.
goodsImagesList
).
goodsId
,
_
.
get
(
goods
,
'goodsImagesList[0].productId'
,
''
),
_
.
get
(
goods
,
'goodsImagesList[0].goodsId'
,
''
),
cur
.
product
.
cnAlphabet
)
};
...
...
apps/product/models/list.js
View file @
2d5482c
...
...
@@ -902,6 +902,7 @@ const getBaseShopData = (params, extra, channel, shopId) => {
shopIntro
:
`
/
about
?
shopId
=
$
{
shopId
}
`
,
coled
:
_
.
get
(
result
[
2
],
'data.is_favorite'
,
'N'
)
===
'Y'
});
_
.
set
(
resData
,
'brand.shopBanner'
,
decorator
.
shopTopBannerBase
);
_
.
unset
(
resData
,
'brand.brandBanner'
);
...
...
@@ -914,6 +915,7 @@ const getBaseShopData = (params, extra, channel, shopId) => {
if
(
result
[
2
].
code
===
200
)
{
let
shopName
=
_
.
get
(
result
[
2
],
'data.shop_name'
,
''
);
_
.
set
(
resData
,
'brand.shopBanner.shopName'
,
shopName
);
_
.
set
(
resData
,
'brand.pathNav[2]'
,
{
name
:
shopName
,
pathTitle
:
shopName
...
...
apps/product/models/shop-service.js
View file @
2d5482c
...
...
@@ -72,7 +72,7 @@ const _signboard = data => {
});
return
{
title
:
result
[
0
].
title
||
''
,
title
:
''
,
list
:
result
};
};
...
...
package.json
View file @
2d5482c
{
"name"
:
"yohobuy-node"
,
"version"
:
"5.0.
8
"
,
"version"
:
"5.0.
9
"
,
"private"
:
true
,
"description"
:
"A New Yohobuy Project With Express"
,
"repository"
:
{
...
...
public/scss/product/_list.css
View file @
2d5482c
...
...
@@ -57,6 +57,13 @@
width
:
1150px
;
margin
:
0
auto
;
.shop-name
{
margin-left
:
60px
;
font-size
:
32px
;
float
:
left
;
border
:
none
;
}
.shop-favor
{
margin-right
:
60px
;
}
...
...
Please
register
or
login
to post a comment