fe / yoho-blk · Commits

Go to a project

Authored by 姜枫
Commit 9dd9269e027a5c4f3d1a551e172f406ecf538cf8 1 parent a6ab2c30

处理清除筛选条件

Inline Side-by-side
Showing 8 changed files with 32 additions and 16 deletions
@@ -149,7 +149,8 @@ const list = { @@ -149,7 +149,8 @@ const list = {
149 colors: colors, 149 colors: colors,
150 size: sizeInfo, 150 size: sizeInfo,
151 priceRange: priceRange, 151 priceRange: priceRange,
152 - filters: filters 152 + filters: filters,
  153 + showFilters: filters.length > 0
153 }; 154 };
154 } 155 }
155 156
  1 +{{#if showFilters}}
1 <div class="filter-area"> 2 <div class="filter-area">
2 <label>已选条件：</label> 3 <label>已选条件：</label>
3 4
@@ -13,6 +14,7 @@ @@ -13,6 +14,7 @@
13 14
14 <label class="cancel">清空筛选条件</label> 15 <label class="cancel">清空筛选条件</label>
15 </div> 16 </div>
  17 +{{/if}}
16 18
17 <div class="order-area"> 19 <div class="order-area">
18 <div class="order selected">综合</div> 20 <div class="order selected">综合</div>
@@ -65,3 +67,4 @@ @@ -65,3 +67,4 @@
65 </div> 67 </div>
66 </div> 68 </div>
67 </div> 69 </div>
  70 +{{{ pagination paginationOpts }}}
No preview for this file type
@@ -2,15 +2,7 @@ @@ -2,15 +2,7 @@
2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > 2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
3 <svg xmlns="http://www.w3.org/2000/svg"> 3 <svg xmlns="http://www.w3.org/2000/svg">
4 <metadata> 4 <metadata>
5 -<<<<<<< HEAD  
6 -<<<<<<< HEAD  
7 -Created by FontForge 20120731 at Tue Jul 5 16:22:47 2016  
8 -=======  
9 -Created by FontForge 20120731 at Mon Jul 4 15:42:03 2016  
10 ->>>>>>> develop  
11 -=======  
12 -Created by FontForge 20120731 at Wed Jul 6 11:07:02 2016  
13 ->>>>>>> develop 5 +Created by FontForge 20120731 at Wed Jul 6 16:36:19 2016
14 By admin 6 By admin
15 </metadata> 7 </metadata>
16 <defs> 8 <defs>
@@ -27,7 +19,7 @@ Created by FontForge 20120731 at Wed Jul 6 11:07:02 2016 @@ -27,7 +19,7 @@ Created by FontForge 20120731 at Wed Jul 6 11:07:02 2016
27 bbox="0 -212 1303 896.303" 19 bbox="0 -212 1303 896.303"
28 underline-thickness="50" 20 underline-thickness="50"
29 underline-position="-100" 21 underline-position="-100"
30 - unicode-range="U+0078-E620" 22 + unicode-range="U+0078-E621"
31 /> 23 />
32 <missing-glyph horiz-adv-x="374" 24 <missing-glyph horiz-adv-x="374"
33 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" /> 25 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 @@ -119,15 +111,15 @@ d="M0 -128v1024h1024v-1024h-1024zM512 704q-133 0 -226.5 -93.5t-93.5 -226.5t93.5
119 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 111 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
120 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" /> 112 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" />
121 <glyph glyph-name="uniE61D" unicode="&#xe61d;" 113 <glyph glyph-name="uniE61D" unicode="&#xe61d;"
122 -<<<<<<< HEAD  
123 -d="M649 543l-137 -136l-137 136l-22 -22l136 -137l-136 -137l22 -22l137 136l137 -136l22 22l-136 137l136 137z" />  
124 -=======  
125 d="M783 526l-45 45l-226 -226l-226 226l-45 -45l226 -226l-226 -226l45 -46l226 227l226 -227l45 46l-226 226z" /> 114 d="M783 526l-45 45l-226 -226l-226 226l-45 -45l226 -226l-226 -226l45 -46l226 227l226 -227l45 46l-226 226z" />
126 ->>>>>>> develop  
127 <glyph glyph-name="uniE61E" unicode="&#xe61e;" 115 <glyph glyph-name="uniE61E" unicode="&#xe61e;"
128 d="M384 570l48 50l338 -335l-338 -335l-48 49l284 286z" /> 116 d="M384 570l48 50l338 -335l-338 -335l-48 49l284 286z" />
  117 + <glyph glyph-name="uniE61F" unicode="&#xe61f;" horiz-adv-x="1000"
  118 +d="M459 850h55h54v-120v-142v-120h191h191v-109h-191h-191v-191v-190h-109v190v191h-191h-190q-1 37 -1 109h191h191v382z" />
129 <glyph glyph-name="uniE620" unicode="&#xe620;" 119 <glyph glyph-name="uniE620" unicode="&#xe620;"
130 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 120 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
131 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" /> 121 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" />
  122 + <glyph glyph-name="uniE621" unicode="&#xe621;" horiz-adv-x="1000"
  123 +d="M77 468h873v-109h-873v109z" />
132 </font> 124 </font>
133 </defs></svg> 125 </defs></svg>
No preview for this file type
No preview for this file type
@@ -115,6 +115,26 @@ var YohoListPage = { @@ -115,6 +115,26 @@ var YohoListPage = {
115 $('.goods-wrapper').mouseleave(function(e) { 115 $('.goods-wrapper').mouseleave(function(e) {
116 YohoListPage.hideGoodsWrapper(e); 116 YohoListPage.hideGoodsWrapper(e);
117 }); 117 });
  118 +
  119 + $('.filter-area .filter-item').click(function() {
  120 + var key = $(this).data('key');
  121 + var data = {};
  122 +
  123 + data[key] = '';
  124 + YohoListPage.go(data);
  125 + });
  126 +
  127 + $('.filter-area .cancel').click(function() {
  128 + var data = {};
  129 +
  130 + $('.filter-area .filter-item').each(function() {
  131 + var key = $(this).data('key');
  132 +
  133 + data[key] = '';
  134 + });
  135 +
  136 + YohoListPage.go(data);
  137 + });
118 }, 138 },
119 openBrandMulitChoose: function() { 139 openBrandMulitChoose: function() {
120 $('.yoho-product-list .mulit-choose').hide(); 140 $('.yoho-product-list .mulit-choose').hide();
@@ -175,6 +175,7 @@ @@ -175,6 +175,7 @@
175 175
176 .filter-area { 176 .filter-area {
177 background-color: #eae9e9; 177 background-color: #eae9e9;
  178 + margin-bottom: 30px;
178 179
179 label { 180 label {
180 font-size: 14px; 181 font-size: 14px;
@@ -226,7 +227,6 @@ @@ -226,7 +227,6 @@
226 .order-area { 227 .order-area {
227 border-top: 1px solid #eee; 228 border-top: 1px solid #eee;
228 border-bottom: 1px solid #eee; 229 border-bottom: 1px solid #eee;
229 - margin-top: 30px;  
230 color: #878787; 230 color: #878787;
231 font-weight: 700; 231 font-weight: 700;
232 232