处理清除筛选条件

@@ -149,7 +149,8 @@ const list = {
                         colors: colors,
                         size: sizeInfo,
                         priceRange: priceRange,
-                        filters: filters
+                        filters: filters,
+                        showFilters: filters.length > 0
                     };
                 }
 

+{{#if showFilters}}
 <div class="filter-area">
     <label>已选条件：</label>
 
@@ -13,6 +14,7 @@
     
     <label class="cancel">清空筛选条件</label>
 </div>
+{{/if}}
 
 <div class="order-area">
     <div class="order selected">综合</div>
@@ -64,4 +66,5 @@
         <div class="goods-img-list">
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+{{{ pagination paginationOpts }}}
\ No newline at end of file

@@ -2,15 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
-<<<<<<< HEAD
-<<<<<<< HEAD
-Created by FontForge 20120731 at Tue Jul  5 16:22:47 2016
-=======
-Created by FontForge 20120731 at Mon Jul  4 15:42:03 2016
->>>>>>> develop
-=======
-Created by FontForge 20120731 at Wed Jul  6 11:07:02 2016
->>>>>>> develop
+Created by FontForge 20120731 at Wed Jul  6 16:36:19 2016
  By admin
 </metadata>
 <defs>
@@ -27,7 +19,7 @@ Created by FontForge 20120731 at Wed Jul  6 11:07:02 2016
     bbox="0 -212 1303 896.303"
     underline-thickness="50"
     underline-position="-100"
-    unicode-range="U+0078-E620"
+    unicode-range="U+0078-E621"
   />
 <missing-glyph horiz-adv-x="374" 
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -119,15 +111,15 @@ d="M0 -128v1024h1024v-1024h-1024zM512 704q-133 0 -226.5 -93.5t-93.5 -226.5t93.5
 d="M1092 225v171q0 101 -39.5 193.5t-106.5 159.5t-160 107t-194 40h-92q-101 0 -193.5 -40t-159.5 -107t-107 -159.5t-40 -193.5v-173v-317q0 -14 10 -24t24 -10h175q15 0 24.5 10t9.5 24v317q0 15 -9.5 24.5t-24.5 9.5h-128v116q0 88 34 168t92 137.5t138 92t168 34.5h67
 q87 0 167 -34.5t138 -92t92 -137.5t34 -168v-113h-129q-15 0 -24.5 -10t-9.5 -25v-317q0 -14 9.5 -24t24.5 -10h175q14 0 24 10t10 24z" />
     <glyph glyph-name="uniE61D" unicode="&#xe61d;" 
-<<<<<<< HEAD
-d="M649 543l-137 -136l-137 136l-22 -22l136 -137l-136 -137l22 -22l137 136l137 -136l22 22l-136 137l136 137z" />
-=======
 d="M783 526l-45 45l-226 -226l-226 226l-45 -45l226 -226l-226 -226l45 -46l226 227l226 -227l45 46l-226 226z" />
->>>>>>> develop
     <glyph glyph-name="uniE61E" unicode="&#xe61e;" 
 d="M384 570l48 50l338 -335l-338 -335l-48 49l284 286z" />
+    <glyph glyph-name="uniE61F" unicode="&#xe61f;" horiz-adv-x="1000" 
+d="M459 850h55h54v-120v-142v-120h191h191v-109h-191h-191v-191v-190h-109v190v191h-191h-190q-1 37 -1 109h191h191v382z" />
     <glyph glyph-name="uniE620" unicode="&#xe620;" 
 d="M512 886q-102 0 -195 -39.5t-160.5 -107t-107 -160.5t-39.5 -195t39.5 -195t107 -160.5t160.5 -107t195 -39.5t195 39.5t160.5 107t107 160.5t39.5 195t-39.5 195t-107 160.5t-160.5 107t-195 39.5zM512 -79q-94 0 -180 36.5t-148 98.5t-98.5 148t-36.5 180t36.5 180
 t98.5 148t148 98.5t180 36.5t180 -36.5t148 -98.5t98.5 -148t36.5 -180t-36.5 -180t-98.5 -148t-148 -98.5t-180 -36.5z" />
+    <glyph glyph-name="uniE621" unicode="&#xe621;" horiz-adv-x="1000" 
+d="M77 468h873v-109h-873v109z" />
   </font>
 </defs></svg>

@@ -115,6 +115,26 @@ var YohoListPage = {
         $('.goods-wrapper').mouseleave(function(e) {
             YohoListPage.hideGoodsWrapper(e);
         });
+
+        $('.filter-area .filter-item').click(function() {
+            var key = $(this).data('key');
+            var data = {};
+
+            data[key] = '';
+            YohoListPage.go(data);
+        });
+
+        $('.filter-area .cancel').click(function() {
+            var data = {};
+
+            $('.filter-area .filter-item').each(function() {
+                var key = $(this).data('key');
+
+                data[key] = '';
+            });
+
+            YohoListPage.go(data);
+        });
     },
     openBrandMulitChoose: function() {
         $('.yoho-product-list .mulit-choose').hide();

@@ -175,6 +175,7 @@
 
     .filter-area {
         background-color: #eae9e9;
+        margin-bottom: 30px;
 
         label {
             font-size: 14px;
@@ -226,7 +227,6 @@
     .order-area {
         border-top: 1px solid #eee;
         border-bottom: 1px solid #eee;
-        margin-top: 30px;
         color: #878787;
         font-weight: 700;