fe / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 9c487ae90432539f9d0791b4b2085b5575e48386 2 parents 8f627090 9293bfba

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

Inline Side-by-side
Showing 16 changed files with 64 additions and 42 deletions
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'), 8 + Hammer = require('yoho.hammer'),
9 Swiper = require('yoho.iswiper'), 9 Swiper = require('yoho.iswiper'),
10 lazyLoad = require('yoho.lazyload'); 10 lazyLoad = require('yoho.lazyload');
11 11
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'); 8 + Hammer = require('yoho.hammer');
9 9
10 var $nav = $('.category-nav'), 10 var $nav = $('.category-nav'),
11 $categoryContainer = $('.category-container'), 11 $categoryContainer = $('.category-container'),
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'), 8 + Hammer = require('yoho.hammer'),
9 Swiper = require('yoho.iswiper'); 9 Swiper = require('yoho.iswiper');
10 10
11 var info = require('./info'), 11 var info = require('./info'),
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'), 8 + Hammer = require('yoho.hammer'),
9 ellipsis = require('mlellipsis'), 9 ellipsis = require('mlellipsis'),
10 lazyLoad = require('yoho.lazyload'); 10 lazyLoad = require('yoho.lazyload');
11 11
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'), 8 + Hammer = require('yoho.hammer'),
9 ellipsis = require('mlellipsis'), 9 ellipsis = require('mlellipsis'),
10 lazyLoad = require('yoho.lazyload'); 10 lazyLoad = require('yoho.lazyload');
11 11
@@ -85,7 +85,9 @@ likeHammer.on('tap', function(e) { @@ -85,7 +85,9 @@ likeHammer.on('tap', function(e) {
85 success: function(data) { 85 success: function(data) {
86 if (data.code === 200) { 86 if (data.code === 200) {
87 $this.toggleClass('like'); 87 $this.toggleClass('like');
88 - } else if (data.code === 400) { 88 + } else if (data.code === 400 || data.code === 412) {
  89 +
  90 + //code:412 用户ID不正确，即未登录
89 tip.show('未登录'); 91 tip.show('未登录');
90 } else { 92 } else {
91 tip.show(data.message); 93 tip.show(data.message);
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'), 8 + Hammer = require('yoho.hammer'),
9 lazyLoad = require('yoho.lazyload'), 9 lazyLoad = require('yoho.lazyload'),
10 Swiper = require('yoho.iswiper'); 10 Swiper = require('yoho.iswiper');
11 11
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 * @date: 2015/10/12 4 * @date: 2015/10/12
5 */ 5 */
6 var $ = require('jquery'), 6 var $ = require('jquery'),
7 - Hammer = require('hammer'), 7 + Hammer = require('yoho.hammer'),
8 Swiper = require('yoho.iswiper'), 8 Swiper = require('yoho.iswiper'),
9 lazyLoad = require('yoho.lazyload'), 9 lazyLoad = require('yoho.lazyload'),
10 $mobileWrap = $('.mobile-wrap'), 10 $mobileWrap = $('.mobile-wrap'),
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'), 8 + Hammer = require('yoho.hammer'),
9 tip = require('../plugin/tip'), 9 tip = require('../plugin/tip'),
10 lazyLoad = require('yoho.lazyload'); 10 lazyLoad = require('yoho.lazyload');
11 11
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'); 8 + Hammer = require('yoho.hammer');
9 9
10 var floatLayerCloseHammer, floatLayerBtnHammer; 10 var floatLayerCloseHammer, floatLayerBtnHammer;
11 11
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'); 8 + Hammer = require('yoho.hammer');
9 9
10 var $input = $('#search-input input'); 10 var $input = $('#search-input input');
11 11
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 */ 6 */
7 7
8 var $ = require('jquery'), 8 var $ = require('jquery'),
9 - Hammer = require('hammer'); 9 + Hammer = require('yoho.hammer');
10 10
11 var $filter; 11 var $filter;
12 12
@@ -17,13 +17,6 @@ var missStatus; //是否忽略选中状态 @@ -17,13 +17,6 @@ var missStatus; //是否忽略选中状态
17 //隐藏筛选界面 17 //隐藏筛选界面
18 function hideFilter() { 18 function hideFilter() {
19 $filter.addClass('hide'); 19 $filter.addClass('hide');
20 -  
21 - if (missStatus) {  
22 -  
23 - //重置一级筛选项选中状态  
24 - $filter.find('.classify-item.active').removeClass('active');  
25 - $filter.find('.classify-item:first-child').addClass('active');  
26 - }  
27 } 20 }
28 21
29 //显示筛选界面 22 //显示筛选界面
@@ -31,6 +24,7 @@ function showFilter() { @@ -31,6 +24,7 @@ function showFilter() {
31 $filter.removeClass('hide'); 24 $filter.removeClass('hide');
32 } 25 }
33 26
  27 +//主筛选项Tap事件句柄
34 function classifyTapEvt($this) { 28 function classifyTapEvt($this) {
35 if ($this.hasClass('active')) { 29 if ($this.hasClass('active')) {
36 return; 30 return;
@@ -41,9 +35,8 @@ function classifyTapEvt($this) { @@ -41,9 +35,8 @@ function classifyTapEvt($this) {
41 $this.addClass('active'); 35 $this.addClass('active');
42 } 36 }
43 37
44 -function subClassifyTapEvt($this) {  
45 - var id = $this.data('id');  
46 - 38 +//子筛选项选中处理
  39 +function setSubClassify($this) {
47 var $sub = $this.closest('.sub-classify'); 40 var $sub = $this.closest('.sub-classify');
48 41
49 var $shower = $sub.siblings('.shower'); 42 var $shower = $sub.siblings('.shower');
@@ -72,6 +65,17 @@ function subClassifyTapEvt($this) { @@ -72,6 +65,17 @@ function subClassifyTapEvt($this) {
72 $shower.removeClass('default'); 65 $shower.removeClass('default');
73 } 66 }
74 67
  68 + return $sub;
  69 +}
  70 +
  71 +//子筛选项Tap句柄
  72 +function subClassifyTapEvt($this) {
  73 + var id = $this.data('id');
  74 +
  75 + var $sub;
  76 +
  77 + $sub = setSubClassify($this);
  78 +
75 if (fCbFn) { 79 if (fCbFn) {
76 fCbFn({ 80 fCbFn({
77 type: $sub.data('type'), 81 type: $sub.data('type'),
@@ -80,12 +84,6 @@ function subClassifyTapEvt($this) { @@ -80,12 +84,6 @@ function subClassifyTapEvt($this) {
80 } 84 }
81 85
82 hideFilter(); 86 hideFilter();
83 -  
84 - //重置选中状态  
85 - if (missStatus) {  
86 - $this.removeClass('chosed');  
87 - $sub.children(':first-child').addClass('chosed');  
88 - }  
89 } 87 }
90 88
91 //初始化筛选 89 //初始化筛选
@@ -133,8 +131,25 @@ function initFilter(opt) { @@ -133,8 +131,25 @@ function initFilter(opt) {
133 }); 131 });
134 } 132 }
135 133
  134 +//重置筛选面板
  135 +function resetFilter() {
  136 + if (typeof $filter === 'undefined') {
  137 + return;
  138 + }
  139 +
  140 + //重置子筛选项
  141 + $('.sub-classify').each(function() {
  142 + setSubClassify($(this).children(':first-child'));
  143 + });
  144 +
  145 + //重置主筛选项
  146 + classifyTapEvt($('.classify > :first-child'));
  147 +}
  148 +
136 exports.initFilter = initFilter; 149 exports.initFilter = initFilter;
137 150
138 exports.showFilter = showFilter; 151 exports.showFilter = showFilter;
139 152
140 -exports.hideFilter = hideFilter;  
  153 +exports.hideFilter = hideFilter;
  154 +
  155 +exports.resetFilter = resetFilter;
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'), 8 + Hammer = require('yoho.hammer'),
9 lazyLoad = require('yoho.lazyload'); 9 lazyLoad = require('yoho.lazyload');
10 10
11 //品牌页参数 11 //品牌页参数
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 Swiper = require('yoho.iswiper'), 8 Swiper = require('yoho.iswiper'),
9 - Hammer = require('hammer'), 9 + Hammer = require('yoho.hammer'),
10 lazyLoad = require('yoho.lazyload'); 10 lazyLoad = require('yoho.lazyload');
11 11
12 var swiper; 12 var swiper;
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 Swiper = require('yoho.iswiper'), 8 Swiper = require('yoho.iswiper'),
9 - Hammer = require('hammer'), 9 + Hammer = require('yoho.hammer'),
10 lazyLoad = require('yoho.lazyload'); 10 lazyLoad = require('yoho.lazyload');
11 11
12 var swiper, 12 var swiper,
@@ -41,6 +41,8 @@ var defaultOpt = { @@ -41,6 +41,8 @@ var defaultOpt = {
41 dayLimit: 1 41 dayLimit: 1
42 }; 42 };
43 43
  44 +var storeOpt = $.extend({}, defaultOpt); //存储默认筛选条件以便重置
  45 +
44 var now = new Date(), 46 var now = new Date(),
45 month = now.getMonth() + 1, 47 month = now.getMonth() + 1,
46 date = now.getDate(); 48 date = now.getDate();
@@ -267,8 +269,7 @@ $.ajax({ @@ -267,8 +269,7 @@ $.ajax({
267 //切换active状态到$pre上 269 //切换active状态到$pre上
268 $pre.addClass('active'); 270 $pre.addClass('active');
269 $pre.siblings('.filter').removeClass('active'); 271 $pre.siblings('.filter').removeClass('active');
270 - },  
271 - missStatus: true 272 + }
272 }); 273 });
273 } 274 }
274 }); 275 });
@@ -343,6 +344,10 @@ navHammer.on('tap', function(e) { @@ -343,6 +344,10 @@ navHammer.on('tap', function(e) {
343 $dgc.removeClass('hide'); 344 $dgc.removeClass('hide');
344 break; 345 break;
345 } 346 }
  347 +
  348 + //重置筛选项
  349 + filter.resetFilter();
  350 + defaultOpt = $.extend({}, storeOpt);
346 } 351 }
347 352
348 $active.removeClass('active'); 353 $active.removeClass('active');
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 "import-style": "1.0.0", 23 "import-style": "1.0.0",
24 "yoho.lazyload": "1.1.0", 24 "yoho.lazyload": "1.1.0",
25 "yoho.handlebars": "3.0.3", 25 "yoho.handlebars": "3.0.3",
26 - "hammer": "2.0.4" 26 + "yoho.hammer": "2.0.4"
27 }, 27 },
28 "devDependencies": { 28 "devDependencies": {
29 "expect.js": "0.3.1" 29 "expect.js": "0.3.1"
@@ -91,20 +91,20 @@ @@ -91,20 +91,20 @@
91 padding-top: 50%; 91 padding-top: 50%;
92 width: 100%; 92 width: 100%;
93 position: absolute; 93 position: absolute;
94 - top: -230rem / $pxConvertRem; 94 + top: -180rem / $pxConvertRem;
95 95
96 .list-item { 96 .list-item {
97 display: block; 97 display: block;
98 position: relative; 98 position: relative;
99 - margin: 0 auto 50rem / $pxConvertRem;  
100 - width: 444rem / $pxConvertRem;  
101 - height: 110rem / $pxConvertRem; 99 + margin: 0 auto 40rem / $pxConvertRem;
  100 + width: 216px;
  101 + height: 52px;
102 text-align: center; 102 text-align: center;
103 - font-size: 30rem / $pxConvertRem;  
104 - line-height: 110rem / $pxConvertRem; 103 + font-size: 16px;
  104 + line-height: 52px;
105 color: #fff; 105 color: #fff;
106 background: #000; 106 background: #000;
107 - border: 5rem / $pxConvertRem solid #fff; 107 + border: 4px solid #fff;
108 font-weight: bold; 108 font-weight: bold;
109 } 109 }
110 .lighter { 110 .lighter {