Showing
5 changed files
with
23 additions
and
12 deletions
@@ -623,6 +623,22 @@ handlebars.registerHelper('timestamp', function() { | @@ -623,6 +623,22 @@ handlebars.registerHelper('timestamp', function() { | ||
623 | return new Date().getTime(); | 623 | return new Date().getTime(); |
624 | }); | 624 | }); |
625 | /** | 625 | /** |
626 | + * 头像 | ||
627 | + * @param {[type]} v1 [description] | ||
628 | + * @param {[type]} options) { if (v1 [description] | ||
629 | + * @return {[type]} [description] | ||
630 | + */ | ||
631 | +handlebars.registerHelper('headerimg', function(headerimg) { | ||
632 | + | ||
633 | + if (headerimg === '') { | ||
634 | + return 'http://img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif' + | ||
635 | + '?imageView/2/w/100/h/100'; | ||
636 | + } else { | ||
637 | + return headerimg; | ||
638 | + } | ||
639 | + | ||
640 | +}); | ||
641 | +/** | ||
626 | * 判断等级为3的helper | 642 | * 判断等级为3的helper |
627 | * @param {[type]} v1 [description] | 643 | * @param {[type]} v1 [description] |
628 | * @param {[type]} options) { if (v1 [description] | 644 | * @param {[type]} options) { if (v1 [description] |
@@ -1542,7 +1558,7 @@ function actionGetBannerAndNotice() { | @@ -1542,7 +1558,7 @@ function actionGetBannerAndNotice() { | ||
1542 | if (url.indexOf('kids') !== -1) { | 1558 | if (url.indexOf('kids') !== -1) { |
1543 | code = bannerMap[INDEXKIDS]; | 1559 | code = bannerMap[INDEXKIDS]; |
1544 | } | 1560 | } |
1545 | - if (url.indexOf('woman') !== -1) { | 1561 | + if (url.indexOf('woman') !== -1 || url.indexOf('girls') !== -1) { |
1546 | code = bannerMap[INDEXWOMAN]; | 1562 | code = bannerMap[INDEXWOMAN]; |
1547 | } | 1563 | } |
1548 | if (url.indexOf('lifestyle') !== -1) { | 1564 | if (url.indexOf('lifestyle') !== -1) { |
@@ -1808,8 +1824,7 @@ function init() { | @@ -1808,8 +1824,7 @@ function init() { | ||
1808 | actionCover(); //初次登录弹框 | 1824 | actionCover(); //初次登录弹框 |
1809 | actionAddKeyWords(); //增加关键字 | 1825 | actionAddKeyWords(); //增加关键字 |
1810 | } | 1826 | } |
1811 | -init(); | ||
1812 | - | 1827 | +init(); |
1813 | }); | 1828 | }); |
1814 | define("js/simple-header", ["jquery"], function(require, exports, module){ | 1829 | define("js/simple-header", ["jquery"], function(require, exports, module){ |
1815 | var $ = require("jquery"); | 1830 | var $ = require("jquery"); |
@@ -2577,18 +2592,14 @@ $goodInfoMain.on('click', '.col-btn', function() { | @@ -2577,18 +2592,14 @@ $goodInfoMain.on('click', '.col-btn', function() { | ||
2577 | if (res.code === 200) { | 2592 | if (res.code === 200) { |
2578 | $this.toggleClass('coled'); | 2593 | $this.toggleClass('coled'); |
2579 | } else if (res.code === 403) { | 2594 | } else if (res.code === 403) { |
2580 | - location.href = '/signin.html?refer=' + encodeURIComponent(location.href); | 2595 | + location.href = 'http://www.yohobuy.com/signin.html?refer=' + encodeURIComponent(location.href); |
2581 | } | 2596 | } |
2582 | }); | 2597 | }); |
2583 | }); | 2598 | }); |
2584 | 2599 | ||
2585 | // 左侧导航 | 2600 | // 左侧导航 |
2586 | -$productListNav.click(function(event) { | ||
2587 | - var $this = $(this); | ||
2588 | - | ||
2589 | - if (!$this.hasClass('product-list-nav')) { | ||
2590 | - return; | ||
2591 | - } | 2601 | +$productListNav.find('h3').click(function(event) { |
2602 | + var $this = $(this).closest('.product-list-nav'); | ||
2592 | 2603 | ||
2593 | if ($this.hasClass('active')) { | 2604 | if ($this.hasClass('active')) { |
2594 | 2605 | ||
@@ -2746,7 +2757,7 @@ $('#brand-favor').on('click', function() { | @@ -2746,7 +2757,7 @@ $('#brand-favor').on('click', function() { | ||
2746 | $this.find('i').removeClass('coled'); | 2757 | $this.find('i').removeClass('coled'); |
2747 | } | 2758 | } |
2748 | } else if (res.code === 403) { | 2759 | } else if (res.code === 403) { |
2749 | - location.href = '/signin.html?refer=' + encodeURIComponent(location.href); | 2760 | + location.href = 'http://www.yohobuy.com/signin.html?refer=' + encodeURIComponent(location.href); |
2750 | } | 2761 | } |
2751 | }); | 2762 | }); |
2752 | }); | 2763 | }); |
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
@@ -32,4 +32,4 @@ routes.brandabout.type = "rewrite" | @@ -32,4 +32,4 @@ routes.brandabout.type = "rewrite" | ||
32 | routes.brandabout.match = "/about" | 32 | routes.brandabout.match = "/about" |
33 | routes.brandabout.route.module = Product | 33 | routes.brandabout.route.module = Product |
34 | routes.brandabout.route.controller = Index | 34 | routes.brandabout.route.controller = Index |
35 | -routes.brandabout.route.action = brandIntro | ||
35 | +routes.brandabout.route.action = about |
-
Please register or login to post a comment