fe / yohobuywap-node · Commits

Go to a project

Authored by 沈志敏
Commit ee7dc909cb81bdae093a0e2db97aea10b7a2f243 1 parent a792b8c1

5.2 微信商城（WAP页面页头优化）11328

Inline Side-by-side
Showing 24 changed files with 148 additions and 74 deletions
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 'use strict'; 7 'use strict';
8 8
9 const headerModel = require('../../../doraemon/models/header'); // 头部model 9 const headerModel = require('../../../doraemon/models/header'); // 头部model
  10 +const footerModel = require('../../../doraemon/models/footer_tab'); // 底部tab
10 const indexModel = require('../models/brand'); 11 const indexModel = require('../models/brand');
11 12
12 /** 13 /**
@@ -16,17 +17,11 @@ const indexModel = require('../models/brand'); @@ -16,17 +17,11 @@ const indexModel = require('../models/brand');
16 * @param int channel 1表示男生频道, 2表示女生频道, 3表示潮童频道, 4表示创意生活频道 17 * @param int channel 1表示男生频道, 2表示女生频道, 3表示潮童频道, 4表示创意生活频道
17 */ 18 */
18 let index = (req, res, next) => { 19 let index = (req, res, next) => {
19 -  
20 - let headerData = headerModel.setNav({  
21 - navTitle: '品牌一览'  
22 - });  
23 -  
24 let responseData = { 20 let responseData = {
25 - pageHeader: headerData,  
26 module: 'channel', 21 module: 'channel',
27 page: 'brand', 22 page: 'brand',
28 - title: '品牌一览 | Yoho!Buy有货 | 潮流购物逛不停',  
29 - //pageFooter: true 23 + title: req.yoho.isWechat ? '品牌一览' : '品牌一览 | Yoho!Buy有货 | 潮流购物逛不停',
  24 + showFooterTab: footerModel.getUrlData('category')
30 }; 25 };
31 26
32 let param = { 27 let param = {
@@ -59,7 +54,7 @@ let search = (req, res, next) => { @@ -59,7 +54,7 @@ let search = (req, res, next) => {
59 pageHeader: headerData, 54 pageHeader: headerData,
60 module: 'channel', 55 module: 'channel',
61 page: 'brand', 56 page: 'brand',
62 - title: '品牌一览 | Yoho!Buy有货 | 潮流购物逛不停', 57 + title: req.yoho.isWechat ? '品牌一览' : '品牌一览 | Yoho!Buy有货 | 潮流购物逛不停',
63 pageFooter: true 58 pageFooter: true
64 }; 59 };
65 60
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 */ 3 */
4 'use strict'; 4 'use strict';
5 const cateModel = require('../models/cate'); 5 const cateModel = require('../models/cate');
6 -const headerModel = require('../../../doraemon/models/header'); 6 +const footerModel = require('../../../doraemon/models/footer_tab'); // 底部tab
7 const helpers = global.yoho.helpers; 7 const helpers = global.yoho.helpers;
8 8
9 let index = (req, res, next) => { 9 let index = (req, res, next) => {
@@ -12,15 +12,13 @@ let index = (req, res, next) => { @@ -12,15 +12,13 @@ let index = (req, res, next) => {
12 module: 'channel', 12 module: 'channel',
13 page: 'cate', 13 page: 'cate',
14 title: '商品分类', 14 title: '商品分类',
15 - pageHeader: headerModel.setNav({  
16 - navTitle: '商品分类'  
17 - }),  
18 pageFooter: false, 15 pageFooter: false,
19 category: { 16 category: {
20 nav: result.nav, 17 nav: result.nav,
21 list: result.list, 18 list: result.list,
22 searchUrl: helpers.urlFormat('/search', null, 'search') 19 searchUrl: helpers.urlFormat('/search', null, 'search')
23 - } 20 + },
  21 + showFooterTab: footerModel.getUrlData('category')
24 }); 22 });
25 }).catch(next); 23 }).catch(next);
26 }; 24 };
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 'use strict'; 6 'use strict';
7 const _ = require('lodash'); 7 const _ = require('lodash');
8 const channelModel = require('../models/channel'); 8 const channelModel = require('../models/channel');
  9 +const footerModel = require('../../../doraemon/models/footer_tab'); // 底部tab
9 10
10 const helpers = global.yoho.helpers; 11 const helpers = global.yoho.helpers;
11 12
@@ -16,13 +17,7 @@ let _renderData = { @@ -16,13 +17,7 @@ let _renderData = {
16 searchUrl: helpers.urlFormat('/search', null, 'search') 17 searchUrl: helpers.urlFormat('/search', null, 'search')
17 }, 18 },
18 maybeLike: true, 19 maybeLike: true,
19 - showFooterTab: {  
20 - indexUrl: helpers.urlFormat('/?go=1'), // 首页  
21 - categoryUrl: helpers.urlFormat('/cate'), // 分类  
22 - guangUrl: helpers.urlFormat('', null, 'guang'), // 逛首页  
23 - shoppingCartUrl: helpers.urlFormat('/cart/index/index'), // 购物车  
24 - mineUrl: helpers.urlFormat('/home') // 个人中心  
25 - }, 20 + showFooterTab: footerModel.getUrlData('home'),
26 pageFooter: true 21 pageFooter: true
27 }; 22 };
28 23
@@ -38,6 +33,7 @@ let _channelPage = (req, res, data) => { @@ -38,6 +33,7 @@ let _channelPage = (req, res, data) => {
38 gender: data.gender, 33 gender: data.gender,
39 uid: _.toString(req.user.uid) 34 uid: _.toString(req.user.uid)
40 }).then(result => { 35 }).then(result => {
  36 + _renderData.homeHeader.isWechat = req.yoho.isWechat;
41 res.render('channel', Object.assign({}, _renderData, data, result)); 37 res.render('channel', Object.assign({}, _renderData, data, result));
42 }); 38 });
43 }; 39 };
@@ -86,7 +82,7 @@ let switchChannel = (req, res, next) => { @@ -86,7 +82,7 @@ let switchChannel = (req, res, next) => {
86 let boys = (req, res, next) => { 82 let boys = (req, res, next) => {
87 _channelPage(req, res, { 83 _channelPage(req, res, {
88 gender: 'boys', 84 gender: 'boys',
89 - title: '男生首页', 85 + title: req.yoho.isWechat ? '男生' : '男生首页',
90 boysHomePage: true 86 boysHomePage: true
91 }).catch(next); // TODO 我们在路由处理的最上层的方法处理catch 87 }).catch(next); // TODO 我们在路由处理的最上层的方法处理catch
92 }; 88 };
@@ -97,7 +93,7 @@ let boys = (req, res, next) => { @@ -97,7 +93,7 @@ let boys = (req, res, next) => {
97 let girls = (req, res, next) => { 93 let girls = (req, res, next) => {
98 _channelPage(req, res, { 94 _channelPage(req, res, {
99 gender: 'girls', 95 gender: 'girls',
100 - title: '女生首页', 96 + title: req.yoho.isWechat ? '女生' : '女生首页',
101 girlsHomePage: true 97 girlsHomePage: true
102 }).catch(next); 98 }).catch(next);
103 }; 99 };
@@ -109,7 +105,7 @@ let girls = (req, res, next) => { @@ -109,7 +105,7 @@ let girls = (req, res, next) => {
109 let kids = (req, res, next) => { 105 let kids = (req, res, next) => {
110 _channelPage(req, res, { 106 _channelPage(req, res, {
111 gender: 'kids', 107 gender: 'kids',
112 - title: '潮童首页', 108 + title: req.yoho.isWechat ? '潮童' : '潮童首页',
113 kidsHomePage: true 109 kidsHomePage: true
114 }).catch(next); 110 }).catch(next);
115 }; 111 };
@@ -120,7 +116,7 @@ let kids = (req, res, next) => { @@ -120,7 +116,7 @@ let kids = (req, res, next) => {
120 let lifestyle = (req, res, next) => { 116 let lifestyle = (req, res, next) => {
121 _channelPage(req, res, { 117 _channelPage(req, res, {
122 gender: 'lifestyle', 118 gender: 'lifestyle',
123 - title: '创意生活首页', 119 + title: req.yoho.isWechat ? '创意生活' : '创意生活首页',
124 lifestyleHomePage: true 120 lifestyleHomePage: true
125 }).catch(next); 121 }).catch(next);
126 }; 122 };
@@ -116,8 +116,6 @@ const getBrandByChannel = (channel) => { @@ -116,8 +116,6 @@ const getBrandByChannel = (channel) => {
116 searchUrl: helpers.urlFormat('/brands/search', null), 116 searchUrl: helpers.urlFormat('/brands/search', null),
117 brandPage: true, 117 brandPage: true,
118 118
119 - // pageFooter: true,  
120 - showDownloadApp: true,  
121 brandType: '全部品牌', 119 brandType: '全部品牌',
122 secondBrandType: '新入驻品牌', 120 secondBrandType: '新入驻品牌',
123 thirdBrandType: '热门品牌', 121 thirdBrandType: '热门品牌',
@@ -436,6 +434,7 @@ const branchSearch = (params) => { @@ -436,6 +434,7 @@ const branchSearch = (params) => {
436 return api.all([ 434 return api.all([
437 435
438 getBrandForSearch(params.channel), 436 getBrandForSearch(params.channel),
  437 +
439 // branchSearchHistory(params), 438 // branchSearchHistory(params),
440 branchSearchHot(), 439 branchSearchHot(),
441 440
@@ -542,6 +541,7 @@ const delBrandSearchHistory = (param) => { @@ -542,6 +541,7 @@ const delBrandSearchHistory = (param) => {
542 541
543 }); 542 });
544 }; 543 };
  544 +
545 /** 545 /**
546 * [异步获取用户最近搜索词] 546 * [异步获取用户最近搜索词]
547 */ 547 */
@@ -570,7 +570,7 @@ const branchSearchHistoryAsync = (uid) => { @@ -570,7 +570,7 @@ const branchSearchHistoryAsync = (uid) => {
570 570
571 return build; 571 return build;
572 }); 572 });
573 -} 573 +};
574 574
575 module.exports = { 575 module.exports = {
576 getBrandByChannel, 576 getBrandByChannel,
@@ -37,25 +37,23 @@ const bottomBannerCode = contentCodeConfig.bottom; @@ -37,25 +37,23 @@ const bottomBannerCode = contentCodeConfig.bottom;
37 * 频道选择页 默认数据 37 * 频道选择页 默认数据
38 * @type {Object} 38 * @type {Object}
39 */ 39 */
40 -const channelList = [  
41 - { 40 +const channelList = [{
42 href: '/boys', 41 href: '/boys',
43 title: '男生', 42 title: '男生',
44 entitle: 'BOYS' 43 entitle: 'BOYS'
45 - }, { 44 +}, {
46 href: '/girls', 45 href: '/girls',
47 title: '女生', 46 title: '女生',
48 entitle: 'GIRLS' 47 entitle: 'GIRLS'
49 - }, { 48 +}, {
50 href: '/kids', 49 href: '/kids',
51 title: '潮童', 50 title: '潮童',
52 entitle: 'KIDS' 51 entitle: 'KIDS'
53 - }, { 52 +}, {
54 href: '/lifestyle', 53 href: '/lifestyle',
55 title: '创意生活', 54 title: '创意生活',
56 entitle: 'LIFESTYLE' 55 entitle: 'LIFESTYLE'
57 - }  
58 -]; 56 +}];
59 57
60 /** 58 /**
61 * 获取二级菜单顶部颜色 59 * 获取二级菜单顶部颜色
@@ -101,3 +101,4 @@ @@ -101,3 +101,4 @@
101 101
102 {{/channel}} 102 {{/channel}}
103 </div> 103 </div>
  104 +{{> footer-tab}}
@@ -45,3 +45,4 @@ @@ -45,3 +45,4 @@
45 </div> 45 </div>
46 {{/ category}} 46 {{/ category}}
47 </div> 47 </div>
  48 +{{> footer-tab}}
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 {{> channel/banner-bottom}} 25 {{> channel/banner-bottom}}
26 {{/bannerBottom}} 26 {{/bannerBottom}}
27 27
28 - {{> channel/footer-tab}} 28 + {{> footer-tab}}
29 29
30 <div class="overlay"></div> 30 <div class="overlay"></div>
31 </div> 31 </div>
1 <div class="home-header clearfix" {{# bgColor}}style="background-color:{{.}};background-image:none"{{/ bgColor}}> 1 <div class="home-header clearfix" {{# bgColor}}style="background-color:{{.}};background-image:none"{{/ bgColor}}>
  2 + {{#unless isWechat}}
2 <span class="nav-btn iconfont">&#xe60b;</span> 3 <span class="nav-btn iconfont">&#xe60b;</span>
3 <span class="logo"></span> 4 <span class="logo"></span>
4 <span class="search-btn iconfont"><a href="{{searchUrl}}">&#xe60f;</a></span> 5 <span class="search-btn iconfont"><a href="{{searchUrl}}">&#xe60f;</a></span>
  6 + {{^}}
  7 + <span class="nav-btn iconfont">&#xe60b;</span>
  8 + <div class="search-input">
  9 + <a href="{{searchUrl}}">
  10 + <i class="search-icon iconfont">&#xe60f;</i>
  11 + <p>休闲/运动鞋</p>
  12 + </a>
  13 + </div>
  14 + {{/unless}}
5 </div> 15 </div>
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 const mRoot = '../models'; 8 const mRoot = '../models';
9 const indexModel = require(`${mRoot}/index`); 9 const indexModel = require(`${mRoot}/index`);
10 const headerModel = require('../../../doraemon/models/header'); // 头部model 10 const headerModel = require('../../../doraemon/models/header'); // 头部model
  11 +const footerModel = require('../../../doraemon/models/footer_tab'); // 底部tab
11 const guangProcess = require(`${global.utils}/guang-process`); 12 const guangProcess = require(`${global.utils}/guang-process`);
12 const stringProcess = require(`${global.utils}/string-process`); 13 const stringProcess = require(`${global.utils}/string-process`);
13 const Promise = require('bluebird'); 14 const Promise = require('bluebird');
@@ -76,7 +77,11 @@ const editor = (req, res, next) => { @@ -76,7 +77,11 @@ const editor = (req, res, next) => {
76 const pageData = (req, res, next) => { 77 const pageData = (req, res, next) => {
77 /* 判断是不是AJAX请求 */ 78 /* 判断是不是AJAX请求 */
78 if (!req.xhr) { 79 if (!req.xhr) {
79 - res.json({ code: 400, message: '非法请求', data: '' }); 80 + res.json({
  81 + code: 400,
  82 + message: '非法请求',
  83 + data: ''
  84 + });
80 return; 85 return;
81 } 86 }
82 87
@@ -94,11 +99,19 @@ const pageData = (req, res, next) => { @@ -94,11 +99,19 @@ const pageData = (req, res, next) => {
94 udid = req.sessionID; 99 udid = req.sessionID;
95 100
96 if (!stringProcess.isNumeric(sortId)) { 101 if (!stringProcess.isNumeric(sortId)) {
97 - res.json({ code: 400, message: '参数错误', data: '' }); 102 + res.json({
  103 + code: 400,
  104 + message: '参数错误',
  105 + data: ''
  106 + });
98 return; 107 return;
99 } 108 }
100 if (!page && !isNaN(page)) { 109 if (!page && !isNaN(page)) {
101 - res.json({ code: 400, message: '参数错误', data: '' }); 110 + res.json({
  111 + code: 400,
  112 + message: '参数错误',
  113 + data: ''
  114 + });
102 return; 115 return;
103 } 116 }
104 if (!authorId && isNaN(authorId)) { 117 if (!authorId && isNaN(authorId)) {
@@ -106,9 +119,15 @@ const pageData = (req, res, next) => { @@ -106,9 +119,15 @@ const pageData = (req, res, next) => {
106 } 119 }
107 return indexModel.getPageData(gender, sortId, uid, udid, page, tag, authorId, isApp, showAuthor, isTab).then(data => { 120 return indexModel.getPageData(gender, sortId, uid, udid, page, tag, authorId, isApp, showAuthor, isTab).then(data => {
108 if (data) { 121 if (data) {
109 - res.render('index/page', Object.assign(data, { layout: false })); 122 + res.render('index/page', Object.assign(data, {
  123 + layout: false
  124 + }));
110 } else { 125 } else {
111 - res.json({ code: 400, message: '', data: '' }); 126 + res.json({
  127 + code: 400,
  128 + message: '',
  129 + data: ''
  130 + });
112 } 131 }
113 }).catch(next); 132 }).catch(next);
114 133
@@ -121,25 +140,17 @@ const pageData = (req, res, next) => { @@ -121,25 +140,17 @@ const pageData = (req, res, next) => {
121 * @param next 140 * @param next
122 */ 141 */
123 const index = (req, res, next) => { 142 const index = (req, res, next) => {
124 - let headerData = headerModel.setNav({  
125 - navTitle: '逛'  
126 - });  
127 -  
128 let responseData = { 143 let responseData = {
129 - pageHeader: headerData,  
130 module: 'guang', 144 module: 'guang',
131 page: 'index', 145 page: 'index',
132 - title: '逛 | Yoho!Buy有货 | 潮流购物逛不停',  
133 - pageFooter: true 146 + title: req.yoho.isWechat ? '逛' : '逛 | Yoho!Buy有货 | 潮流购物逛不停',
  147 + showFooterTab: footerModel.getUrlData('guang')
134 }; 148 };
135 149
136 let param = { 150 let param = {
137 uid: req.user.uid, 151 uid: req.user.uid,
138 -  
139 udid: req.user.udid, 152 udid: req.user.udid,
140 -  
141 type: req.query.type || '0', 153 type: req.query.type || '0',
142 -  
143 gender: req.query.gender || '1,3' 154 gender: req.query.gender || '1,3'
144 }; 155 };
145 156
@@ -165,7 +176,7 @@ const tag = (req, res, next) => { @@ -165,7 +176,7 @@ const tag = (req, res, next) => {
165 pageHeader: headerData, 176 pageHeader: headerData,
166 module: 'guang', 177 module: 'guang',
167 page: 'index-editor', 178 page: 'index-editor',
168 - title: tagTitle + ' | Yoho!Buy有货 | 潮流购物逛不停' 179 + title: req.yoho.isWechat ? tagTitle : tagTitle + ' | Yoho!Buy有货 | 潮流购物逛不停'
169 }; 180 };
170 181
171 let param = { 182 let param = {
@@ -45,3 +45,4 @@ @@ -45,3 +45,4 @@
45 <input id="gender" type="hidden" value={{gender}}> 45 <input id="gender" type="hidden" value={{gender}}>
46 {{/ guang}} 46 {{/ guang}}
47 </div> 47 </div>
  48 +{{> footer-tab}}
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 'use strict'; 7 'use strict';
8 8
9 const headerModel = require('../../../doraemon/models/header'); // 头部model 9 const headerModel = require('../../../doraemon/models/header'); // 头部model
  10 +const footerModel = require('../../../doraemon/models/footer_tab'); // 底部tab
10 const indexModel = require('../models/index'); 11 const indexModel = require('../models/index');
11 12
12 /** 13 /**
@@ -22,11 +23,6 @@ exports.index = (req, res, next) => { @@ -22,11 +23,6 @@ exports.index = (req, res, next) => {
22 udid: require('md5')(req.ip) 23 udid: require('md5')(req.ip)
23 }; 24 };
24 25
25 - let headerData = headerModel.setNav({  
26 - navTitle: '个人中心',  
27 - backUrl: '//m.yohobuy.com/?go=1'  
28 - });  
29 -  
30 indexModel.index(params).then(result => { 26 indexModel.index(params).then(result => {
31 if (result) { 27 if (result) {
32 res.render('home', Object.assign(result, { 28 res.render('home', Object.assign(result, {
@@ -34,11 +30,11 @@ exports.index = (req, res, next) => { @@ -34,11 +30,11 @@ exports.index = (req, res, next) => {
34 module: 'home', 30 module: 'home',
35 page: 'index', 31 page: 'index',
36 title: 'Yoho!Buy 有货', 32 title: 'Yoho!Buy 有货',
37 - pageHeader: headerData,  
38 pageFooter: true, 33 pageFooter: true,
39 pageChannel: { 34 pageChannel: {
40 boys: true 35 boys: true
41 - } 36 + },
  37 + showFooterTab: footerModel.getUrlData('mine')
42 })); 38 }));
43 } 39 }
44 }).catch(next); 40 }).catch(next);
@@ -206,4 +202,3 @@ exports.preferential = (req, res, next) => { @@ -206,4 +202,3 @@ exports.preferential = (req, res, next) => {
206 }).catch(next); 202 }).catch(next);
207 203
208 }; 204 };
209 -  
@@ -14,15 +14,13 @@ const orderDetailData = (req, res, next) => { @@ -14,15 +14,13 @@ const orderDetailData = (req, res, next) => {
14 let orderCode = req.query.order_code; 14 let orderCode = req.query.order_code;
15 15
16 orderDetailModel.orderDetailData(uid, orderCode).then(result => { 16 orderDetailModel.orderDetailData(uid, orderCode).then(result => {
17 - 17 + result.serviceUrl = 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=';
18 res.render('orderDetail', { 18 res.render('orderDetail', {
19 module: 'home', 19 module: 'home',
20 page: 'order-detail', 20 page: 'order-detail',
21 pageHeader: headerModel.setNav({ 21 pageHeader: headerModel.setNav({
22 navTitle: '订单详情', 22 navTitle: '订单详情',
23 - navBtn: false,  
24 - orderDetail: true,  
25 - serviceUrl: 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=', 23 + navBtn: false
26 }), 24 }),
27 title: '订单详情', 25 title: '订单详情',
28 pageFooter: true, 26 pageFooter: true,
@@ -84,7 +84,9 @@ const _getAddressData = (params) => { @@ -84,7 +84,9 @@ const _getAddressData = (params) => {
84 return api.get('', { 84 return api.get('', {
85 method: 'app.address.gethidden', 85 method: 'app.address.gethidden',
86 uid: params.uid 86 uid: params.uid
87 - }, {code: 200}); 87 + }, {
  88 + code: 200
  89 + });
88 } else { 90 } else {
89 return false; 91 return false;
90 } 92 }
@@ -98,7 +100,6 @@ const _getAddressData = (params) => { @@ -98,7 +100,6 @@ const _getAddressData = (params) => {
98 const index = (params) => { 100 const index = (params) => {
99 let finalResult = { 101 let finalResult = {
100 myIndexPage: true, 102 myIndexPage: true,
101 - showDownloadApp: true,  
102 navHome: true, 103 navHome: true,
103 pageFooter: true, 104 pageFooter: true,
104 refundExchangeNum: 0, 105 refundExchangeNum: 0,
@@ -132,5 +132,5 @@ @@ -132,5 +132,5 @@
132 {{> common/suspend-cart}} 132 {{> common/suspend-cart}}
133 </div> 133 </div>
134 134
135 -{{> download-app}} 135 +{{> footer-tab}}
136 136
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
37 <span >订单状态：{{statusStr}}</span> 37 <span >订单状态：{{statusStr}}</span>
38 <span>下单时间：<b class="createTime">{{createTime}}</b></span> 38 <span>下单时间：<b class="createTime">{{createTime}}</b></span>
39 </p> 39 </p>
  40 + <a href="{{serviceUrl}}" target="_blank" class="iconfont icon-right">&#xe63c;</a>
40 </div> 41 </div>
41 {{#if logisticsUrl}} 42 {{#if logisticsUrl}}
42 <a class="logistics sub" href="{{logisticsUrl}}"> 43 <a class="logistics sub" href="{{logisticsUrl}}">
@@ -35,7 +35,8 @@ exports.index = (req, res, next) => { @@ -35,7 +35,8 @@ exports.index = (req, res, next) => {
35 35
36 outletModel.getContent(categoryId, yhChannel, contentcode).then(result => { 36 outletModel.getContent(categoryId, yhChannel, contentcode).then(result => {
37 res.render('outlet', Object.assign({ 37 res.render('outlet', Object.assign({
38 - pageHeader: headerData 38 + pageHeader: headerData,
  39 + title: req.yoho.isWechat ? '奥莱' : 'OUTLET',
39 }, result)); 40 }, result));
40 }).catch(next); 41 }).catch(next);
41 }; 42 };
  1 +/**
  2 + * common head model
  3 + * @author: biao<bill.zhao@yoho.cn>
  4 + * @date: 2016/05/12
  5 + */
  6 +
  7 +'use strict';
  8 +
  9 +const helpers = global.yoho.helpers;
  10 +
  11 +exports.getUrlData = function(type) {
  12 + const urlData = {
  13 + indexUrl: helpers.urlFormat('/?go=1'), // 首页
  14 + categoryUrl: helpers.urlFormat('/cate'), // 分类
  15 + guangUrl: helpers.urlFormat('', null, 'guang'), // 逛首页
  16 + shoppingCartUrl: helpers.urlFormat('/cart/index/index'), // 购物车
  17 + mineUrl: helpers.urlFormat('/home') // 个人中心
  18 + };
  19 +
  20 + switch (type) {
  21 + case 'home':
  22 + urlData.boysHomePage = true;
  23 + break;
  24 + case 'category':
  25 + urlData.categoryPage = true;
  26 + break;
  27 + case 'guang':
  28 + urlData.guangHome = true;
  29 + break;
  30 + case 'shoppingCart':
  31 + urlData.shoppingCartPage = true;
  32 + break;
  33 + case 'mine':
  34 + urlData.minePage = true;
  35 + break;
  36 + }
  37 +
  38 + return urlData;
  39 +};
@@ -47,8 +47,10 @@ @@ -47,8 +47,10 @@
47 {{/if}} 47 {{/if}}
48 48
49 {{#unless isApp}} 49 {{#unless isApp}}
  50 + {{#unless isWechat}}
50 {{> header}} 51 {{> header}}
51 {{/unless}} 52 {{/unless}}
  53 + {{/unless}}
52 54
53 {{{body}}} 55 {{{body}}}
54 {{> footer}} 56 {{> footer}}
@@ -36,9 +36,6 @@ @@ -36,9 +36,6 @@
36 {{channel}} <span class="iconfont">&#xe616;</span> 36 {{channel}} <span class="iconfont">&#xe616;</span>
37 </span> 37 </span>
38 {{/saleNav}} 38 {{/saleNav}}
39 - {{#orderDetail}}  
40 - <a href="{{serviceUrl}}" target="_blank" class="iconfont nav-home">&#xe63c;</a>  
41 - {{/orderDetail}}  
42 </header> 39 </header>
43 {{#if saleNav.list}} 40 {{#if saleNav.list}}
44 <div class="sale-nav-select"> 41 <div class="sale-nav-select">
1 @import "search"; 1 @import "search";
2 .brand-page { 2 .brand-page {
3 .re-pos-search { 3 .re-pos-search {
4 - top: 170px !important; 4 + top: 80px !important;
5 } 5 }
6 6
7 .hide-when-loading { 7 .hide-when-loading {
@@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
17 color: #aeaeae; 17 color: #aeaeae;
18 z-index: 3; 18 z-index: 3;
19 position: fixed; 19 position: fixed;
20 - top: 90px;  
21 border-bottom: 1px solid #e1e1e1; 20 border-bottom: 1px solid #e1e1e1;
22 background-color: #fff; 21 background-color: #fff;
23 22
@@ -210,7 +209,7 @@ @@ -210,7 +209,7 @@
210 } 209 }
211 210
212 .banner-top { 211 .banner-top {
213 - padding-top: 258px; 212 + padding-top: 168px;
214 background-color: #f8f8f8; 213 background-color: #f8f8f8;
215 } 214 }
216 215
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 line-height: 90px; 3 line-height: 90px;
4 background-image: linear-gradient(#323232, #414141); 4 background-image: linear-gradient(#323232, #414141);
5 position: relative; 5 position: relative;
  6 + overflow: hidden;
6 7
7 .iconfont { 8 .iconfont {
8 color: #fff; 9 color: #fff;
@@ -47,6 +48,30 @@ @@ -47,6 +48,30 @@
47 } 48 }
48 } 49 }
49 50
  51 + .search-input {
  52 + margin-left: 97px;
  53 + margin-top: 16px;
  54 + width: 490px;
  55 + height: 60px;
  56 + background: #f8f8f8;
  57 + border-radius: 50px;
  58 +
  59 + .search-icon {
  60 + position: absolute;
  61 + top: 0;
  62 + bottom: 0;
  63 + left: 110px;
  64 + color: #999;
  65 + }
  66 +
  67 + p {
  68 + color: #999;
  69 + padding-left: 50px;
  70 + height: 60px;
  71 + line-height: 60px;
  72 + }
  73 + }
  74 +
50 .iconfont.highlight { 75 .iconfont.highlight {
51 background: rgba(200, 200, 200, 0.4); 76 background: rgba(200, 200, 200, 0.4);
52 } 77 }
@@ -49,6 +49,11 @@ @@ -49,6 +49,11 @@
49 .iconfont { 49 .iconfont {
50 left: 0; 50 left: 0;
51 } 51 }
  52 +
  53 + .icon-right {
  54 + right: 25px;
  55 + left: auto;
  56 + }
52 } 57 }
53 58
54 .logistics { 59 .logistics {