fe / yoho-blk · Commits

Go to a project

Authored by zhangxiaoru
Commit 86852235585cb6696eebec33378e0b5bfd5c4b6e 1 parent cc2581f3

editorial

Inline Side-by-side
Showing 8 changed files with 31 additions and 16 deletions
@@ -13,16 +13,16 @@ const brand = require('../models/brand'); @@ -13,16 +13,16 @@ const brand = require('../models/brand');
13 * @param res 13 * @param res
14 */ 14 */
15 const index = (req, res, next) => { 15 const index = (req, res, next) => {
16 - let channel = req.cookies._Channel || 'men'; 16 + let channel = req.cookies._Channel || '301';
17 let contentCode = ''; 17 let contentCode = '';
18 let name = ''; 18 let name = '';
19 let link = ''; 19 let link = '';
20 20
21 - if (channel === 'women') { 21 + if (channel === '302') {
22 contentCode = '527079e6c46d0f125eb46b835968971b'; 22 contentCode = '527079e6c46d0f125eb46b835968971b';
23 name = 'WOMEN首页'; 23 name = 'WOMEN首页';
24 link = 'http://www.yohoblk.com/women'; 24 link = 'http://www.yohoblk.com/women';
25 - } else if (channel === 'lifestyle') { 25 + } else if (channel === '303') {
26 contentCode = '94b5ed607b6d565ffc29c2c04be121dc'; 26 contentCode = '94b5ed607b6d565ffc29c2c04be121dc';
27 name = 'LIFT STYLE首页'; 27 name = 'LIFT STYLE首页';
28 link = 'http://www.yohoblk.com/lifestyle'; 28 link = 'http://www.yohoblk.com/lifestyle';
@@ -20,16 +20,16 @@ const index = (req, res, next) => { @@ -20,16 +20,16 @@ const index = (req, res, next) => {
20 let limit = req.query.limit || 20; 20 let limit = req.query.limit || 20;
21 let appType = 1; 21 let appType = 1;
22 let udid = md5(req.ip); 22 let udid = md5(req.ip);
23 - let channel = req.cookies._Channel || 'women'; 23 + let channel = req.cookies._Channel || '301';
24 let gender = ''; 24 let gender = '';
25 let name = ''; 25 let name = '';
26 let link = ''; 26 let link = '';
27 27
28 - if (channel === 'men') { 28 + if (channel === '301') {
29 gender = '1,3'; 29 gender = '1,3';
30 name = 'MEN首页'; 30 name = 'MEN首页';
31 link = 'http://www.yohoblk.com'; 31 link = 'http://www.yohoblk.com';
32 - } else if (channel === 'women') { 32 + } else if (channel === '302') {
33 gender = '2,3'; 33 gender = '2,3';
34 name = 'WOMEN首页'; 34 name = 'WOMEN首页';
35 link = 'http://www.yohoblk.com/women'; 35 link = 'http://www.yohoblk.com/women';
@@ -85,17 +85,17 @@ const list = (req, res) => { @@ -85,17 +85,17 @@ const list = (req, res) => {
85 let tag = req.query.query; 85 let tag = req.query.query;
86 let authorId = req.query.authorId; 86 let authorId = req.query.authorId;
87 let udid = md5(req.ip); 87 let udid = md5(req.ip);
88 - let channel = req.cookies._Channel || 'men'; 88 + let channel = req.cookies._Channel || '301';
89 let gender = ''; 89 let gender = '';
90 let name = ''; 90 let name = '';
91 let link = ''; 91 let link = '';
92 let appType = 1; 92 let appType = 1;
93 93
94 - if (channel === 'men') { 94 + if (channel === '301') {
95 gender = '1,3'; 95 gender = '1,3';
96 name = 'MEN首页'; 96 name = 'MEN首页';
97 link = 'http://www.yohoblk.com'; 97 link = 'http://www.yohoblk.com';
98 - } else if (channel === 'women') { 98 + } else if (channel === '302') {
99 gender = '2,3'; 99 gender = '2,3';
100 name = 'WOMEN首页'; 100 name = 'WOMEN首页';
101 link = 'http://www.yohoblk.com/women'; 101 link = 'http://www.yohoblk.com/women';
@@ -156,14 +156,14 @@ const detail = (req, res, next) => { @@ -156,14 +156,14 @@ const detail = (req, res, next) => {
156 let appType = 1; 156 let appType = 1;
157 let uid = req.user.uid; 157 let uid = req.user.uid;
158 let udid = md5(req.ip); 158 let udid = md5(req.ip);
159 - let channel = req.cookies._Channel || 'men'; 159 + let channel = req.cookies._Channel || '301';
160 let name = ''; 160 let name = '';
161 let link = ''; 161 let link = '';
162 162
163 - if (channel === 'men') { 163 + if (channel === '301') {
164 name = 'MEN首页'; 164 name = 'MEN首页';
165 link = 'http://www.yohoblk.com'; 165 link = 'http://www.yohoblk.com';
166 - } else if (channel === 'women') { 166 + } else if (channel === '302') {
167 name = 'WOMEN首页'; 167 name = 'WOMEN首页';
168 link = 'http://www.yohoblk.com/women'; 168 link = 'http://www.yohoblk.com/women';
169 } else { 169 } else {
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 <h4> 2 <h4>
3 <span class="comment-num">{{total}}</span> 3 <span class="comment-num">{{total}}</span>
4 条评论 4 条评论
  5 + <b></b>
5 </h4> 6 </h4>
6 <p class="comments-empty">还没有评论，快抢沙发吧</p> 7 <p class="comments-empty">还没有评论，快抢沙发吧</p>
7 <div class="commnets-resultwrapper"> 8 <div class="commnets-resultwrapper">
@@ -74,7 +74,7 @@ function shareBase(options) { @@ -74,7 +74,7 @@ function shareBase(options) {
74 sharebox = defOption.self.closest('.share-to').find('.weixin-share-box'); 74 sharebox = defOption.self.closest('.share-to').find('.weixin-share-box');
75 75
76 if (sharebox.length > 0) { 76 if (sharebox.length > 0) {
77 - shareCon = '<i class="iconfont top ">&#xe617;</i><div class="con"><p class="pic"><img src="' + 77 + shareCon = '<i class="top"></i><div class="con"><p class="pic"><img src="' +
78 openUrl + '" /></p><h2>分享到微信朋友圈</h2><p class="w">打开微信使用“扫一扫“<br/>即可将网页分享到我的朋友圈。</p></div>'; 78 openUrl + '" /></p><h2>分享到微信朋友圈</h2><p class="w">打开微信使用“扫一扫“<br/>即可将网页分享到我的朋友圈。</p></div>';
79 sharebox.find('div').length > 0 ? sharebox.show() : sharebox.html(shareCon).show(); 79 sharebox.find('div').length > 0 ? sharebox.show() : sharebox.html(shareCon).show();
80 } 80 }
@@ -46,10 +46,13 @@ @@ -46,10 +46,13 @@
46 position: absolute; 46 position: absolute;
47 color: #bbb; 47 color: #bbb;
48 background: #fff; 48 background: #fff;
49 - width: 18px;  
50 - left: 50px; 49 + width: 12px;
  50 + left: 89px;
51 z-index: 100; 51 z-index: 100;
52 - width: 18px; 52 + height: 12px;
  53 + display: block;
  54 + background-image: resolve('layout/up.png');
  55 + top: 17px;
53 } 56 }
54 } 57 }
55 58
@@ -461,10 +461,21 @@ @@ -461,10 +461,21 @@
461 position: relative; 461 position: relative;
462 line-height: 32px; 462 line-height: 32px;
463 border-bottom: 1px solid #bbb; 463 border-bottom: 1px solid #bbb;
  464 + position: relative;
464 465
465 .comment-num { 466 .comment-num {
466 color: #379ed6; 467 color: #379ed6;
467 } 468 }
  469 +
  470 + b {
  471 + display: block;
  472 + width: 12px;
  473 + height: 7px;
  474 + background: #fff;
  475 + background-image: resolve('layout/down.png');
  476 + position: absolute;
  477 + left: 15px;
  478 + }
468 } 479 }
469 480
470 .comment-pager { 481 .comment-pager {