diff --git a/apps/brand/controllers/brand.js b/apps/brand/controllers/brand.js
index 729c35a..d323ca9 100644
--- a/apps/brand/controllers/brand.js
+++ b/apps/brand/controllers/brand.js
@@ -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;
diff --git a/apps/editorial/controllers/editorial.js b/apps/editorial/controllers/editorial.js
index 539f429..979a295 100644
--- a/apps/editorial/controllers/editorial.js
+++ b/apps/editorial/controllers/editorial.js
@@ -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,
diff --git a/apps/editorial/models/editorial.js b/apps/editorial/models/editorial.js
index 27882a4..5483695 100644
--- a/apps/editorial/models/editorial.js
+++ b/apps/editorial/models/editorial.js
@@ -36,6 +36,7 @@ const _processListData = (list) => {
});
_.forEach(list.list.artList, (data) => {
+ // console.log(data)
if (data.author) {
listData = _.assign(listData, {
@@ -151,7 +152,6 @@ const _processHeadData = (list) => {
_.forEach(list, function(data, index) {
if (index === 0) {
-
data.isPraise = data.isPraise === 'Y';
data.isFavor = data.isFavor === 'Y';
@@ -340,13 +340,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 {
diff --git a/apps/me/views/partial/collection.hbs b/apps/me/views/partial/collection.hbs
index 378a19b..a0622f9 100644
--- a/apps/me/views/partial/collection.hbs
+++ b/apps/me/views/partial/collection.hbs
@@ -7,7 +7,7 @@
<a href="/me/collection"><span class="badge"></span>商品收藏</a>
</li>
<li class="{{#if brand}}active{{/if}}">
- <a href="/me/collection/brand"><span class="badge"></span>店铺收藏</a>
+ <a href="/me/collection/brand"><span class="badge"></span>品牌收藏</a>
</li>
<li class="{{#if editorial}}active{{/if}}">
<a href="/me/collection/editorial"><span class="badge"></span>资讯收藏</a>
diff --git a/apps/me/views/partial/collection/brand.hbs b/apps/me/views/partial/collection/brand.hbs
index 1844d98..90cb93b 100644
--- a/apps/me/views/partial/collection/brand.hbs
+++ b/apps/me/views/partial/collection/brand.hbs
@@ -1,7 +1,9 @@
{{# data}}
{{#if total}}
+
<div class="favorite-brands">
+ <span class="num">您共收藏了{{total}}个品牌</span>
<div class="brands-list clearfix">
{{#each brandList}}
<div class="brand-raw clearfix">
diff --git a/apps/me/views/partial/collection/editorial.hbs b/apps/me/views/partial/collection/editorial.hbs
index ada82bc..f6252c1 100644
--- a/apps/me/views/partial/collection/editorial.hbs
+++ b/apps/me/views/partial/collection/editorial.hbs
@@ -2,6 +2,7 @@
{{#if total}}
<div class="favorite-editorials">
+ <span class="num">您共收藏了{{total}}篇文章</span>
<div class="editorial-list clearfix">
{{#each editorialList}}
<div class="editorial-raw clearfix" data-id="{{id}}">
diff --git a/config/common.js b/config/common.js
index 4f3f87d..8b5d946 100644
--- a/config/common.js
+++ b/config/common.js
@@ -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://testapi.yoho.cn:28078/', // devapi.yoho.cn:58078 testapi.yoho.cn:28078 devapi.yoho.cn:58078
+ service: 'http://testservice.yoho.cn:28077/', // testservice.yoho.cn:28077 devservice.yoho.cn:58077
search: 'http://192.168.102.216:8080/yohosearch/'
},
useOneapm: false,
diff --git a/public/scss/editorial/_detail.css b/public/scss/editorial/_detail.css
index fdfe826..d278c0e 100644
--- a/public/scss/editorial/_detail.css
+++ b/public/scss/editorial/_detail.css
@@ -202,7 +202,7 @@
}
.brands {
- width: 950px;
+ width: 960px;
padding: 30px 0 30px 30px;
overflow: hidden;
@@ -242,6 +242,10 @@
}
}
+ .brand:nth-child(7n) {
+ margin-right: 0;
+ }
+
.user-handle {
float: right;
ul {
diff --git a/public/scss/me/favorite/_brand.css b/public/scss/me/favorite/_brand.css
index e6b3117..503b174 100644
--- a/public/scss/me/favorite/_brand.css
+++ b/public/scss/me/favorite/_brand.css
@@ -1,4 +1,13 @@
.favorite-brands {
+ position: relative;
+
+ .num {
+ position: absolute;
+ top: -30px;
+ left: 600px;
+ font-size: 16px;
+ color: #666;
+ }
.brand-raw > div {
float: left;
diff --git a/public/scss/me/favorite/_editorial.css b/public/scss/me/favorite/_editorial.css
index 97275c8..fefab8d 100644
--- a/public/scss/me/favorite/_editorial.css
+++ b/public/scss/me/favorite/_editorial.css
@@ -1,4 +1,13 @@
.favorite-editorials {
+ position: relative;
+
+ .num {
+ position: absolute;
+ top: -30px;
+ left: 600px;
+ font-size: 16px;
+ color: #666;
+ }
.editorial-raw > div {
float: left;