fe / yohobuy-node · Commits

Go to a project

Authored by 徐祁xuqi
Commit 998d87d8bf813b77464bf82a8ccbd278de29a95e 2 parents 99806def 250af882

Merge remote-tracking branch 'origin/release/4.6'

Inline Side-by-side
Showing 14 changed files with 137 additions and 137 deletions
@@ -172,7 +172,7 @@ exports.getOutletsChannelData = (params, channel) => { @@ -172,7 +172,7 @@ exports.getOutletsChannelData = (params, channel) => {
172 } 172 }
173 173
174 // 限时嗨购 174 // 限时嗨购
175 - if (result[2].code === 200) { 175 + if (result[2].code === 200 && !_.isEmpty(result[2].data)) {
176 channelData.nearOver = outletsProcess.handleOutletsActivityData(result[2].data, '限时嗨购'); 176 channelData.nearOver = outletsProcess.handleOutletsActivityData(result[2].data, '限时嗨购');
177 } 177 }
178 178
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2016-06-02 15:50:47 3 * @Date: 2016-06-02 15:50:47
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 - * @Last Modified time: 2016-06-20 21:32:00 5 + * @Last Modified time: 2016-06-22 18:36:26
6 */ 6 */
7 7
8 'use strict'; 8 'use strict';
@@ -39,15 +39,15 @@ const handleFilterUrl = (originParam, newParam) => { @@ -39,15 +39,15 @@ const handleFilterUrl = (originParam, newParam) => {
39 const handleSaleNewSaleSortData = (params) => { 39 const handleSaleNewSaleSortData = (params) => {
40 return [{ 40 return [{
41 name: '1~3折', 41 name: '1~3折',
42 - href: handleFilterUrl(params, {p_d: '0.1,0.3'}), 42 + href: handleFilterUrl(params, { p_d: '0.1,0.3' }),
43 checked: params.p_d === '0.1,0.3' 43 checked: params.p_d === '0.1,0.3'
44 }, { 44 }, {
45 name: '4~6折', 45 name: '4~6折',
46 - href: handleFilterUrl(params, {p_d: '0.4,0.6'}), 46 + href: handleFilterUrl(params, { p_d: '0.4,0.6' }),
47 checked: params.p_d === '0.4,0.6' 47 checked: params.p_d === '0.4,0.6'
48 }, { 48 }, {
49 name: '7折以上', 49 name: '7折以上',
50 - href: handleFilterUrl(params, {p_d: '0.7,1'}), 50 + href: handleFilterUrl(params, { p_d: '0.7,1' }),
51 checked: params.p_d === '0.7,1' 51 checked: params.p_d === '0.7,1'
52 }]; 52 }];
53 }; 53 };
@@ -217,7 +217,7 @@ exports.handleSaleOptsData = (params, total, extra) => { @@ -217,7 +217,7 @@ exports.handleSaleOptsData = (params, total, extra) => {
217 217
218 switch (i) { 218 switch (i) {
219 case 0: 219 case 0:
220 - opt.href = handleFilterUrl(params, {order: 's_t_desc'}); 220 + opt.href = handleFilterUrl(params, { order: 's_t_desc' });
221 if (extra === 'discont') { // 如果是折扣专场 221 if (extra === 'discont') { // 如果是折扣专场
222 opt.name = '全部'; 222 opt.name = '全部';
223 if (_.isEmpty(params.order) || params.order === 's_t_desc') { 223 if (_.isEmpty(params.order) || params.order === 's_t_desc') {
@@ -238,16 +238,16 @@ exports.handleSaleOptsData = (params, total, extra) => { @@ -238,16 +238,16 @@ exports.handleSaleOptsData = (params, total, extra) => {
238 break; 238 break;
239 case 1: 239 case 1:
240 if (params.order !== 's_p_desc' && params.order !== 's_p_asc') { 240 if (params.order !== 's_p_desc' && params.order !== 's_p_asc') {
241 - opt.href = handleFilterUrl(params, {order: 's_p_desc'}); 241 + opt.href = handleFilterUrl(params, { order: 's_p_desc' });
242 opt.hasSortOrient = true; 242 opt.hasSortOrient = true;
243 } else { 243 } else {
244 opt.hasSortOrient = true; 244 opt.hasSortOrient = true;
245 opt.active = true; 245 opt.active = true;
246 if (params.order === 's_p_desc') { 246 if (params.order === 's_p_desc') {
247 - opt.href = handleFilterUrl(params, {order: 's_p_asc'}); 247 + opt.href = handleFilterUrl(params, { order: 's_p_asc' });
248 opt.desc = false; 248 opt.desc = false;
249 } else { 249 } else {
250 - opt.href = handleFilterUrl(params, {order: 's_p_desc'}); 250 + opt.href = handleFilterUrl(params, { order: 's_p_desc' });
251 opt.desc = true; 251 opt.desc = true;
252 } 252 }
253 } 253 }
@@ -256,16 +256,16 @@ exports.handleSaleOptsData = (params, total, extra) => { @@ -256,16 +256,16 @@ exports.handleSaleOptsData = (params, total, extra) => {
256 break; 256 break;
257 case 2: 257 case 2:
258 if (params.order !== 'p_d_desc' && params.order !== 'p_d_asc') { 258 if (params.order !== 'p_d_desc' && params.order !== 'p_d_asc') {
259 - opt.href = handleFilterUrl(params, {order: 'p_d_desc'}); 259 + opt.href = handleFilterUrl(params, { order: 'p_d_desc' });
260 opt.hasSortOrient = true; 260 opt.hasSortOrient = true;
261 } else { 261 } else {
262 opt.hasSortOrient = true; 262 opt.hasSortOrient = true;
263 opt.active = true; 263 opt.active = true;
264 if (params.order === 'p_d_desc') { 264 if (params.order === 'p_d_desc') {
265 - opt.href = handleFilterUrl(params, {order: 'p_d_asc'}); 265 + opt.href = handleFilterUrl(params, { order: 'p_d_asc' });
266 opt.desc = false; 266 opt.desc = false;
267 } else { 267 } else {
268 - opt.href = handleFilterUrl(params, {order: 'p_d_desc'}); 268 + opt.href = handleFilterUrl(params, { order: 'p_d_desc' });
269 opt.desc = true; 269 opt.desc = true;
270 } 270 }
271 } 271 }
@@ -274,16 +274,16 @@ exports.handleSaleOptsData = (params, total, extra) => { @@ -274,16 +274,16 @@ exports.handleSaleOptsData = (params, total, extra) => {
274 break; 274 break;
275 case 3: 275 case 3:
276 if (params.order !== 's_n_desc' && params.order !== 's_n_asc') { 276 if (params.order !== 's_n_desc' && params.order !== 's_n_asc') {
277 - opt.href = handleFilterUrl(params, {order: 's_n_desc'}); 277 + opt.href = handleFilterUrl(params, { order: 's_n_desc' });
278 opt.hasSortOrient = true; 278 opt.hasSortOrient = true;
279 } else { 279 } else {
280 opt.hasSortOrient = true; 280 opt.hasSortOrient = true;
281 opt.active = true; 281 opt.active = true;
282 if (params.order === 's_n_desc') { 282 if (params.order === 's_n_desc') {
283 - opt.href = handleFilterUrl(params, {order: 's_n_asc'}); 283 + opt.href = handleFilterUrl(params, { order: 's_n_asc' });
284 opt.desc = false; 284 opt.desc = false;
285 } else { 285 } else {
286 - opt.href = handleFilterUrl(params, {order: 's_n_desc'}); 286 + opt.href = handleFilterUrl(params, { order: 's_n_desc' });
287 opt.desc = true; 287 opt.desc = true;
288 } 288 }
289 } 289 }
@@ -299,13 +299,13 @@ exports.handleSaleOptsData = (params, total, extra) => { @@ -299,13 +299,13 @@ exports.handleSaleOptsData = (params, total, extra) => {
299 299
300 // 上下翻页数据处理 300 // 上下翻页数据处理
301 dest.pageCounts = [{ 301 dest.pageCounts = [{
302 - href: handleFilterUrl(params, {limit: 200}), 302 + href: handleFilterUrl(params, { limit: 200 }),
303 count: 200 303 count: 200
304 }, { 304 }, {
305 - href: handleFilterUrl(params, {limit: 100}), 305 + href: handleFilterUrl(params, { limit: 100 }),
306 count: 100 306 count: 100
307 }, { 307 }, {
308 - href: handleFilterUrl(params, {limit: 60}), 308 + href: handleFilterUrl(params, { limit: 60 }),
309 count: 60 309 count: 60
310 }]; 310 }];
311 311
@@ -322,17 +322,17 @@ exports.handleSaleOptsData = (params, total, extra) => { @@ -322,17 +322,17 @@ exports.handleSaleOptsData = (params, total, extra) => {
322 322
323 // 上一页下一页 323 // 上一页下一页
324 let preHref = (!_.isEmpty(params.page) && parseInt(params.page, 10) > 1) ? 324 let preHref = (!_.isEmpty(params.page) && parseInt(params.page, 10) > 1) ?
325 - parseInt(params.page, 10) - 1 : 1; 325 + parseInt(params.page, 10) - 1 : 1;
326 let nextHref = (!_.isEmpty(params.page)) ? parseInt(params.page, 10) + 1 : 2; 326 let nextHref = (!_.isEmpty(params.page)) ? parseInt(params.page, 10) + 1 : 2;
327 327
328 if (dest.pageCount > 1 && (parseInt(params.page, 10) !== 1) && 328 if (dest.pageCount > 1 && (parseInt(params.page, 10) !== 1) &&
329 (parseInt(params.page, 10) !== dest.pageCount)) { 329 (parseInt(params.page, 10) !== dest.pageCount)) {
330 - dest.preHref = handleFilterUrl(params, {page: preHref});  
331 - dest.nextHref = handleFilterUrl(params, {page: nextHref}); 330 + dest.preHref = handleFilterUrl(params, { page: preHref });
  331 + dest.nextHref = handleFilterUrl(params, { page: nextHref });
332 } else if (dest.pageCount > 1 && (parseInt(params.page, 10) === 1)) { 332 } else if (dest.pageCount > 1 && (parseInt(params.page, 10) === 1)) {
333 - dest.nextHref = handleFilterUrl(params, {page: nextHref}); 333 + dest.nextHref = handleFilterUrl(params, { page: nextHref });
334 } else if (dest.pageCount > 1 && (parseInt(params.page, 10) === dest.pageCount)) { 334 } else if (dest.pageCount > 1 && (parseInt(params.page, 10) === dest.pageCount)) {
335 - dest.preHref = handleFilterUrl(params, {page: preHref}); 335 + dest.preHref = handleFilterUrl(params, { page: preHref });
336 } 336 }
337 337
338 // 全部商品数 338 // 全部商品数
@@ -390,7 +390,7 @@ exports.handleSaleSortData = (origin, params, extra) => { @@ -390,7 +390,7 @@ exports.handleSaleSortData = (origin, params, extra) => {
390 name: value.category_name, 390 name: value.category_name,
391 num: value.node_count, 391 num: value.node_count,
392 childList: [], 392 childList: [],
393 - href: handleFilterUrl(params, {sort: value.relation_parameter.sort}), 393 + href: handleFilterUrl(params, { sort: value.relation_parameter.sort }),
394 active: params.sort === value.relation_parameter.sort 394 active: params.sort === value.relation_parameter.sort
395 }; 395 };
396 396
@@ -398,7 +398,7 @@ exports.handleSaleSortData = (origin, params, extra) => { @@ -398,7 +398,7 @@ exports.handleSaleSortData = (origin, params, extra) => {
398 category.childList.push({ 398 category.childList.push({
399 name: subValue.category_name, 399 name: subValue.category_name,
400 num: subValue.node_count, 400 num: subValue.node_count,
401 - href: handleFilterUrl(params, {sort: subValue.relation_parameter.sort}), 401 + href: handleFilterUrl(params, { sort: subValue.relation_parameter.sort }),
402 childActive: params.sort === subValue.relation_parameter.sort 402 childActive: params.sort === subValue.relation_parameter.sort
403 }); 403 });
404 if (params.sort === subValue.relation_parameter.sort) { 404 if (params.sort === subValue.relation_parameter.sort) {
@@ -424,16 +424,13 @@ exports.handleSaleFilterData = (origin, params) => { @@ -424,16 +424,13 @@ exports.handleSaleFilterData = (origin, params) => {
424 brand: { 424 brand: {
425 default: [], 425 default: [],
426 brandsShow: [], 426 brandsShow: [],
427 - brandIndex: [  
428 - {  
429 - index: 'all',  
430 - name: '全部'  
431 - },  
432 - {  
433 - index: '0-9',  
434 - name: '0~9'  
435 - }  
436 - ], 427 + brandIndex: [{
  428 + index: 'all',
  429 + name: '全部'
  430 + }, {
  431 + index: '0-9',
  432 + name: '0~9'
  433 + }],
437 showMore: true, 434 showMore: true,
438 showMulti: true 435 showMulti: true
439 }, 436 },
@@ -468,7 +465,7 @@ exports.handleSaleFilterData = (origin, params) => { @@ -468,7 +465,7 @@ exports.handleSaleFilterData = (origin, params) => {
468 checked: (typeof _.find(intBrands, o => { 465 checked: (typeof _.find(intBrands, o => {
469 return _.isEqual(o, value.id); 466 return _.isEqual(o, value.id);
470 }) !== 'undefined'), 467 }) !== 'undefined'),
471 - href: handleFilterUrl(params, {brand: value.id}), 468 + href: handleFilterUrl(params, { brand: value.id }),
472 name: value.brand_name, 469 name: value.brand_name,
473 key: value.brand_domain, 470 key: value.brand_domain,
474 id: value.id 471 id: value.id
@@ -501,9 +498,12 @@ exports.handleSaleFilterData = (origin, params) => { @@ -501,9 +498,12 @@ exports.handleSaleFilterData = (origin, params) => {
501 498
502 if (!_.isEmpty(origin.priceRange)) { 499 if (!_.isEmpty(origin.priceRange)) {
503 _.forEach(origin.priceRange, (value, key) => { 500 _.forEach(origin.priceRange, (value, key) => {
  501 + if (params.price === key) {
  502 + priceRangechecked = true;
  503 + }
504 let price = { 504 let price = {
505 checked: params.price === key, 505 checked: params.price === key,
506 - href: handleFilterUrl(params, {price: key}), 506 + href: handleFilterUrl(params, { price: key }),
507 name: value 507 name: value
508 }; 508 };
509 509
@@ -515,29 +515,28 @@ exports.handleSaleFilterData = (origin, params) => { @@ -515,29 +515,28 @@ exports.handleSaleFilterData = (origin, params) => {
515 if (!priceRangechecked && params.price) { 515 if (!priceRangechecked && params.price) {
516 let customPrice = _.split(params.price, ','); 516 let customPrice = _.split(params.price, ',');
517 517
518 - dest.customPrice = {  
519 - min: customPrice[0],  
520 - max: customPrice[1]  
521 - };  
522 - dest.checkedConditions.conditions.push({  
523 - name: '¥ ' + customPrice[0] + '-' + customPrice[1],  
524 - href: handleFilterUrl(params, {price: ''})  
525 - }); 518 + if (customPrice[1] !== '99999') {
  519 + dest.customPrice = {
  520 + min: customPrice[0],
  521 + max: customPrice[1]
  522 + };
  523 + dest.checkedConditions.conditions.push({
  524 + name: '¥ ' + customPrice[0] + '-' + customPrice[1],
  525 + href: handleFilterUrl(params, { price: '' })
  526 + });
  527 + }
526 } 528 }
527 529
528 // 处理性别数据 530 // 处理性别数据
529 - dest.gender = [  
530 - {  
531 - name: 'BOYS',  
532 - href: handleFilterUrl(params, {gender: '1,3'}),  
533 - checked: params.gender === '1,3'  
534 - },  
535 - {  
536 - name: 'GIRLS',  
537 - href: handleFilterUrl(params, {gender: '2,3'}),  
538 - checked: params.gender === '2,3'  
539 - }  
540 - ]; 531 + dest.gender = [{
  532 + name: 'BOYS',
  533 + href: handleFilterUrl(params, { gender: '1,3' }),
  534 + checked: params.gender === '1,3'
  535 + }, {
  536 + name: 'GIRLS',
  537 + href: handleFilterUrl(params, { gender: '2,3' }),
  538 + checked: params.gender === '2,3'
  539 + }];
541 540
542 // 最新降价数据处理 541 // 最新降价数据处理
543 if (parseInt(params.saleType, 10) === 3) { 542 if (parseInt(params.saleType, 10) === 3) {
@@ -636,30 +635,25 @@ exports.handleBannerData = (origin) => { @@ -636,30 +635,25 @@ exports.handleBannerData = (origin) => {
636 * @type {[type]} 635 * @type {[type]}
637 */ 636 */
638 exports.handlePathNavData = (data, params) => { 637 exports.handlePathNavData = (data, params) => {
639 - let pathNav = [  
640 - {  
641 - href: '/product/outlets', // TODO  
642 - name: 'OUTLET',  
643 - pathTitle: 'OUTLET'  
644 - }  
645 - ]; 638 + let pathNav = [{
  639 + href: '/product/outlets', // TODO
  640 + name: 'OUTLET',
  641 + pathTitle: 'OUTLET'
  642 + }];
646 643
647 _.forEach(data, (sort) => { 644 _.forEach(data, (sort) => {
648 if (!_.isEmpty(sort.sub)) { 645 if (!_.isEmpty(sort.sub)) {
649 _.forEach(sort.sub, misort => { 646 _.forEach(sort.sub, misort => {
650 if (misort.relation_parameter.sort === params.sort || misort.category_id === params.misort) { 647 if (misort.relation_parameter.sort === params.sort || misort.category_id === params.misort) {
651 - pathNav.push(  
652 - {  
653 - href: helpers.urlFormat('outlets/list', {sort: params.sort}),  
654 - name: sort.category_name,  
655 - pathTitle: sort.category_name  
656 - },  
657 - {  
658 - href: helpers.urlFormat('outlets/list', {sort: params.sort}),  
659 - name: misort.category_name,  
660 - pathTitle: misort.category_name  
661 - }  
662 - ); 648 + pathNav.push({
  649 + href: helpers.urlFormat('/product/outlets/list', { sort: params.sort }),
  650 + name: sort.category_name,
  651 + pathTitle: sort.category_name
  652 + }, {
  653 + href: helpers.urlFormat('/product/outlets/list', { sort: params.sort }),
  654 + name: misort.category_name,
  655 + pathTitle: misort.category_name
  656 + });
663 } 657 }
664 }); 658 });
665 } 659 }
@@ -696,7 +690,7 @@ exports.handlePagerData = (total, params) => { @@ -696,7 +690,7 @@ exports.handlePagerData = (total, params) => {
696 // 当前页为 1，一定没有上一页 690 // 当前页为 1，一定没有上一页
697 delete dest.prePage; 691 delete dest.prePage;
698 } else { 692 } else {
699 - dest.prePage.url = handleFilterUrl(params, {page: currentPage - 1}); 693 + dest.prePage.url = handleFilterUrl(params, { page: currentPage - 1 });
700 } 694 }
701 695
702 if (currentPage === totalPage) { 696 if (currentPage === totalPage) {
@@ -704,7 +698,7 @@ exports.handlePagerData = (total, params) => { @@ -704,7 +698,7 @@ exports.handlePagerData = (total, params) => {
704 // 当前页为最后一页，一定没有下一页 698 // 当前页为最后一页，一定没有下一页
705 delete dest.nextPage; 699 delete dest.nextPage;
706 } else { 700 } else {
707 - dest.nextPage.url = handleFilterUrl(params, {page: currentPage + 1}); 701 + dest.nextPage.url = handleFilterUrl(params, { page: currentPage + 1 });
708 } 702 }
709 703
710 // 页码临时数据 704 // 页码临时数据
@@ -713,7 +707,7 @@ exports.handlePagerData = (total, params) => { @@ -713,7 +707,7 @@ exports.handlePagerData = (total, params) => {
713 if (currentPage > 2 && currentPage <= totalPage - 2) { 707 if (currentPage > 2 && currentPage <= totalPage - 2) {
714 for (let i = currentPage - 2; i <= ((currentPage + 2) > totalPage ? totalPage : (currentPage + 2)); i++) { 708 for (let i = currentPage - 2; i <= ((currentPage + 2) > totalPage ? totalPage : (currentPage + 2)); i++) {
715 pages.push({ 709 pages.push({
716 - url: handleFilterUrl(params, {page: i}), 710 + url: handleFilterUrl(params, { page: i }),
717 num: i, 711 num: i,
718 cur: currentPage === i 712 cur: currentPage === i
719 }); 713 });
@@ -723,7 +717,7 @@ exports.handlePagerData = (total, params) => { @@ -723,7 +717,7 @@ exports.handlePagerData = (total, params) => {
723 } else if (currentPage <= 2) { 717 } else if (currentPage <= 2) {
724 for (let i = 1; i <= (totalPage < 5 ? totalPage : 5); i++) { 718 for (let i = 1; i <= (totalPage < 5 ? totalPage : 5); i++) {
725 pages.push({ 719 pages.push({
726 - url: handleFilterUrl(params, {page: i}), 720 + url: handleFilterUrl(params, { page: i }),
727 num: i, 721 num: i,
728 cur: currentPage === i 722 cur: currentPage === i
729 }); 723 });
@@ -731,7 +725,7 @@ exports.handlePagerData = (total, params) => { @@ -731,7 +725,7 @@ exports.handlePagerData = (total, params) => {
731 } else if (currentPage > totalPage - 2) { 725 } else if (currentPage > totalPage - 2) {
732 for (let i = totalPage; i >= totalPage - 4; i--) { 726 for (let i = totalPage; i >= totalPage - 4; i--) {
733 pages.push({ 727 pages.push({
734 - url: handleFilterUrl(params, {page: i}), 728 + url: handleFilterUrl(params, { page: i }),
735 num: i, 729 num: i,
736 cur: currentPage === i 730 cur: currentPage === i
737 }); 731 });
@@ -745,7 +739,7 @@ exports.handlePagerData = (total, params) => { @@ -745,7 +739,7 @@ exports.handlePagerData = (total, params) => {
745 if (_.size(pages) === 5) { 739 if (_.size(pages) === 5) {
746 if (currentPage > 4) { 740 if (currentPage > 4) {
747 prevPages.push({ 741 prevPages.push({
748 - url: handleFilterUrl(params, {page: 1}), 742 + url: handleFilterUrl(params, { page: 1 }),
749 num: 1 743 num: 1
750 }); 744 });
751 prevPages.push({ 745 prevPages.push({
@@ -757,7 +751,7 @@ exports.handlePagerData = (total, params) => { @@ -757,7 +751,7 @@ exports.handlePagerData = (total, params) => {
757 num: '...' 751 num: '...'
758 }); 752 });
759 nextPages.push({ 753 nextPages.push({
760 - url: handleFilterUrl(params, {page: totalPage}), 754 + url: handleFilterUrl(params, { page: totalPage }),
761 num: totalPage 755 num: totalPage
762 }); 756 });
763 } 757 }
@@ -159,7 +159,9 @@ exports.getSaleIndexData = (channel) => { @@ -159,7 +159,9 @@ exports.getSaleIndexData = (channel) => {
159 159
160 // 折扣专场活动处理 160 // 折扣专场活动处理
161 if (result[1].code === 200) { 161 if (result[1].code === 200) {
162 - finalResult.brandSale = saleHandler.handleSaleActivityData(result[1].data, channel); 162 + if (result[1].data.length > 0) {
  163 + finalResult.brandSale = saleHandler.handleSaleActivityData(result[1].data, channel);
  164 + }
163 } else { 165 } else {
164 logger.error('discount activities api code no 200'); 166 logger.error('discount activities api code no 200');
165 } 167 }
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <label class="time" data-limit="{{limit}}"></label> 5 <label class="time" data-limit="{{limit}}"></label>
6 </div> 6 </div>
7 <div class="special-name"> 7 <div class="special-name">
8 - <img src="{{image logo 100 40}}"> 8 + <img src="{{image logo 86 40}}">
9 {{special}} 9 {{special}}
10 <span><i>{{discount}}</i>{{discountText}}</span> 10 <span><i>{{discount}}</i>{{discountText}}</span>
11 </div> 11 </div>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="tpl-nav"> 4 <div class="tpl-nav">
5 <div class="tpl-keywords"> 5 <div class="tpl-keywords">
6 {{#each blocks}} 6 {{#each blocks}}
7 - <a class="keywords{{@index}}" title="{{title}}" href="{{url}}" target= "_blank"><img src="{{image img 185 75}}"/></a> 7 + <a class="keywords{{@index}}" title="{{title}}" href="{{url}}" target= "_blank"><img src="{{image img 185 76}}"/></a>
8 {{/each}} 8 {{/each}}
9 </div> 9 </div>
10 <div class="tpl-category clearfix"> 10 <div class="tpl-category clearfix">
@@ -15,13 +15,13 @@ @@ -15,13 +15,13 @@
15 </div> 15 </div>
16 <div class="tpl-brands imgopacity clearfix"> 16 <div class="tpl-brands imgopacity clearfix">
17 {{#each brands}} 17 {{#each brands}}
18 - <a title="{{title}}" href="{{url}}" target= "_blank"><img src="{{image img 375 505}}"/></a> 18 + <a title="{{title}}" href="{{url}}" target= "_blank"><img src="{{image img 377 504}}"/></a>
19 {{/each}} 19 {{/each}}
20 </div> 20 </div>
21 <div class="tpl-types imgopacity clearfix"> 21 <div class="tpl-types imgopacity clearfix">
22 <ul> 22 <ul>
23 {{#each types}} 23 {{#each types}}
24 - <li><a title="{{title}}" href="{{url}}" target= "_blank"><img src="{{image img 185 245}}"/></a></li> 24 + <li><a title="{{title}}" href="{{url}}" target= "_blank"><img src="{{image img 185 248}}"/></a></li>
25 {{/each}} 25 {{/each}}
26 </ul> 26 </ul>
27 </div> 27 </div>
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <div class="list-page"> 5 <div class="list-page">
6 {{# brands}} 6 {{# brands}}
7 <div class="brand-item"> 7 <div class="brand-item">
8 - <img class="lazy" data-original="{{image logo 112 77}}"> 8 + <img class="lazy" data-original="{{image logo 140 65}}">
9 </div> 9 </div>
10 {{/ brands}} 10 {{/ brands}}
11 </div> 11 </div>
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 </a> 22 </a>
23 <div class="item-info"> 23 <div class="item-info">
24 <a href="{{href}}" target="_blank"> 24 <a href="{{href}}" target="_blank">
25 - <img class="logo-img" src="{{image logo 155 65}}"> 25 + <img class="logo-img" src="{{image logo 140 65}}">
26 <p class="discount"><i>{{discount}}</i>{{discountText}}</p> 26 <p class="discount"><i>{{discount}}</i>{{discountText}}</p>
27 <p class="title">{{title}}</p> 27 <p class="title">{{title}}</p>
28 <label class="time" data-limit="{{limit}}" data-pre="仅剩"></label> 28 <label class="time" data-limit="{{limit}}" data-pre="仅剩"></label>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </a> 10 </a>
11 <div class="item-info"> 11 <div class="item-info">
12 <a href="{{href}}" target="_blank"> 12 <a href="{{href}}" target="_blank">
13 - <img src="{{image logo 150 50}}" class="brand-logo"> 13 + <img src="{{image logo 140 65}}" class="brand-logo">
14 </a> 14 </a>
15 <div class="activity-info"> 15 <div class="activity-info">
16 <p> 16 <p>
1 <div class="brand-sale"> 1 <div class="brand-sale">
2 - <div class="floor-title">  
3 - 折扣专场 SALE  
4 - </div>  
5 -  
6 - {{#brandSale}}  
7 - <div class="sale-group-big clearfix">  
8 - {{#big}}  
9 - <a class="item pull-left" href="{{link}}" target= "_blank">  
10 - <div class="pic">  
11 - <img src="{{image img 375 400}}">  
12 - <div class="time"><span class="time-span"><span class="iconfont">&#xe60a;</span>{{time}}</span></div>  
13 - </div>  
14 - <div class="detail">  
15 - <img class="brand pull-left" src="{{image brand 185 86}}">  
16 - <div class="text">  
17 - <div class="discount">  
18 - <span class="num">{{discount}}</span>  
19 - {{discountText}}  
20 - </div>  
21 - <div class="active-name">{{activityName}}</div>  
22 - <div class="title">  
23 - {{title}} 2 + {{#if brandSale}}
  3 + {{#brandSale}}
  4 + <div class="floor-title">
  5 + 折扣专场 SALE
  6 + </div>
  7 + <div class="sale-group-big clearfix">
  8 + {{#big}}
  9 + <a class="item pull-left" href="{{link}}" target= "_blank">
  10 + <div class="pic">
  11 + <img src="{{image img 375 375}}">
  12 + <div class="time"><span class="time-span"><span class="iconfont">&#xe60a;</span>{{time}}</span></div>
  13 + </div>
  14 + <div class="detail">
  15 + <img class="brand pull-left" src="{{image brand 185 86}}">
  16 + <div class="text">
  17 + <div class="discount">
  18 + <span class="num">{{discount}}</span>
  19 + {{discountText}}
  20 + </div>
  21 + <div class="active-name">{{activityName}}</div>
  22 + <div class="title">
  23 + {{title}}
  24 + </div>
24 </div> 25 </div>
25 </div> 26 </div>
26 - </div>  
27 - </a>  
28 - {{/big}}  
29 - </div>  
30 - <div class="sale-group clearfix">  
31 - {{#normal}}  
32 - <a class="item pull-left" href="{{link}}" target= "_blank">  
33 - <img class="pic" src="{{image img 350 360}}">  
34 - <div class="detail">  
35 - <div class="title">{{title}}{{discount}}{{discountText}}</div>  
36 - <div class="time">{{time}}</div>  
37 - </div>  
38 - </a>  
39 - {{/normal}}  
40 - </div>  
41 - {{/brandSale}} 27 + </a>
  28 + {{/big}}
  29 + </div>
  30 + <div class="sale-group clearfix">
  31 + {{#normal}}
  32 + <a class="item pull-left" href="{{link}}" target= "_blank">
  33 + <img class="pic" src="{{image img 350 350}}">
  34 + <div class="detail">
  35 + <div class="title">{{title}}{{discount}}{{discountText}}</div>
  36 + <div class="time">{{time}}</div>
  37 + </div>
  38 + </a>
  39 + {{/normal}}
  40 + </div>
  41 + {{/brandSale}}
  42 + {{/if}}
42 43
43 </div> 44 </div>
1 <div class="floor-header clearfix"> 1 <div class="floor-header clearfix">
2 - <h2 class="floor-title">{{name}}</h2> 2 + {{# name}}
  3 + <h2 class="floor-title">{{.}}</h2>
  4 + {{/ name}}
3 {{#if navs}} 5 {{#if navs}}
4 <ul class="header-navs"> 6 <ul class="header-navs">
5 {{# navs}} 7 {{# navs}}
This diff could not be displayed because it is too large.
@@ -575,8 +575,8 @@ @@ -575,8 +575,8 @@
575 } 575 }
576 576
577 .tpl-brands { 577 .tpl-brands {
578 - width: 378px;  
579 - height: 512px; 578 + width: 377px;
  579 + height: 504px;
580 580
581 li a { 581 li a {
582 height: 248px; 582 height: 248px;
@@ -56,8 +56,8 @@ @@ -56,8 +56,8 @@
56 } 56 }
57 57
58 .logo-img { 58 .logo-img {
59 - width: 79%;  
60 - height: 25%; 59 + width: 140px;
  60 + height: auto;
61 margin: 25px 0 40px; 61 margin: 25px 0 40px;
62 float: none; 62 float: none;
63 } 63 }
@@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
136 136
137 .brand-item img { 137 .brand-item img {
138 width: 90%; 138 width: 90%;
139 - margin-top: 6px; 139 + margin-top: 19px;
140 } 140 }
141 141
142 } 142 }
@@ -276,7 +276,8 @@ @@ -276,7 +276,8 @@
276 .brand-logo { 276 .brand-logo {
277 width: 120px; 277 width: 120px;
278 float: right; 278 float: right;
279 - margin-top: 20px; 279 + margin-top: 14px;
  280 + margin-right: 8px;
280 } 281 }
281 282
282 .activity-info { 283 .activity-info {
@@ -144,7 +144,7 @@ @@ -144,7 +144,7 @@
144 144
145 .pic { 145 .pic {
146 position: relative; 146 position: relative;
147 - height: 400px; 147 + height: 375px;
148 } 148 }
149 149
150 .time { 150 .time {