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
zhangxiaoru
9 years ago
Commit
61b42c2108d47793e04613382b51c7955228af54
1 parent
c1168b2d
editorial
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
9 deletions
apps/brand/controllers/brand.js
apps/editorial/controllers/editorial.js
apps/editorial/models/editorial.js
public/scss/editorial/_detail.css
apps/brand/controllers/brand.js
View file @
61b42c2
...
...
@@ -21,15 +21,15 @@ const index = (req, res, next) => {
if
(
channel
===
'women'
)
{
contentCode
=
'527079e6c46d0f125eb46b835968971b'
;
name
=
'WOMEN首页'
;
link
=
'http://www.yohoblk.com'
;
link
=
'http://www.yohoblk.com
/women
'
;
}
else
if
(
channel
===
'lifestyle'
)
{
contentCode
=
'94b5ed607b6d565ffc29c2c04be121dc'
;
name
=
'LIFT STYLE首页'
;
link
=
'http://www.yohoblk.com/
women
'
;
link
=
'http://www.yohoblk.com/
lifestyle
'
;
}
else
{
contentCode
=
'81886aaa5e82e3741bc1ba1e04ec7706'
;
name
=
'MEN首页'
;
link
=
'http://www.yohoblk.com
/lifestyle
'
;
link
=
'http://www.yohoblk.com'
;
}
let
appType
=
1
;
...
...
apps/editorial/controllers/editorial.js
View file @
61b42c2
...
...
@@ -124,7 +124,7 @@ const list = (req, res) => {
},
{
pathTitle
:
'资讯'
,
name
:
req
.
query
.
query
name
:
req
.
query
.
query
||
result
.
authorName
}
],
pathTitle
:
req
.
query
.
query
||
result
.
authorName
,
...
...
apps/editorial/models/editorial.js
View file @
61b42c2
...
...
@@ -151,7 +151,6 @@ const _processHeadData = (list) => {
_
.
forEach
(
list
,
function
(
data
,
index
)
{
if
(
index
===
0
)
{
data
.
isPraise
=
data
.
isPraise
===
'Y'
;
data
.
isFavor
=
data
.
isFavor
===
'Y'
;
...
...
@@ -340,13 +339,19 @@ const _processContentData = (list) => {
* @param id
* @returns {*}
*/
const
_getHeadData
=
(
id
,
uid
,
udid
,
appType
)
=>
{
return
serviceAPI
.
get
(
'/guang/api/*/article/getArticleBaseInfo'
,
{
let
par
=
{
id
:
id
,
uid
:
uid
,
udid
:
udid
,
app_type
:
appType
}).
then
((
result
)
=>
{
};
if
(
uid
)
{
par
.
uid
=
uid
;
}
return
serviceAPI
.
get
(
'/guang/api/*/article/getArticleBaseInfo'
,
par
).
then
((
result
)
=>
{
if
(
result
&&
result
.
code
===
200
)
{
return
result
.
data
;
}
else
{
...
...
public/scss/editorial/_detail.css
View file @
61b42c2
...
...
@@ -202,7 +202,7 @@
}
.brands
{
width
:
9
5
0px
;
width
:
9
6
0px
;
padding
:
30px
0
30px
30px
;
overflow
:
hidden
;
...
...
@@ -242,6 +242,10 @@
}
}
.brand
:nth-child
(
7n
)
{
margin-right
:
0
;
}
.user-handle
{
float
:
right
;
ul
{
...
...
Please
register
or
login
to post a comment