fe / yohoblk-wap · Commits

Go to a project

Authored by 李奇
Commit 4a362d7acb074f35860b5f02872e1c1afb382010 2 parents 6219a9cf 241f152c

Merge branch 'release/4.0' into gray

Inline Side-by-side
Showing 3 changed files with 27 additions and 7 deletions
@@ -15,8 +15,11 @@ @@ -15,8 +15,11 @@
15 <div class="top-filter clearfix"> 15 <div class="top-filter clearfix">
16 <div class="filter-content"> 16 <div class="filter-content">
17 <ul class="filter-type"> 17 <ul class="filter-type">
18 - <li class="type-item">新品<i class="icon down icon-sort-down"></i></li>  
19 - <li class="type-item">筛选<i class="icon down icon-sort-down"></i></li> 18 + <li
  19 + class="type-item"><span class="sort-label">新品<i class="icon down icon-sort-down"></i></span></li>
  20 + <li
  21 + class="type-item"><span class="sort-label">筛选
  22 + <i class="icon down icon-sort-down"></i></span></li>
20 </ul> 23 </ul>
21 </div> 24 </div>
22 </div> 25 </div>
@@ -39,7 +39,6 @@ @@ -39,7 +39,6 @@
39 <style> 39 <style>
40 .cate-page { 40 .cate-page {
41 font-size: 36px; 41 font-size: 36px;
42 - font-family: helvetica, Arial, "黑体";  
43 42
44 .cate-container { 43 .cate-container {
45 } 44 }
@@ -3,8 +3,12 @@ @@ -3,8 +3,12 @@
3 <div class="filter-overlay" v-show="layFlag" @click="close"></div> 3 <div class="filter-overlay" v-show="layFlag" @click="close"></div>
4 <div class="filter-content"> 4 <div class="filter-content">
5 <ul class="filter-type"> 5 <ul class="filter-type">
6 - <li class="type-item" @click="toggleRec">{{activeSort.text}}<i class="icon" :class="recClass"></i></li>  
7 - <li class="type-item" @click="toggleFilter">筛选<i class="icon" :class="filterClass"></i></li> 6 + <li class="type-item" @click="toggleRec">
  7 + <span class="sort-label">{{activeSort.text}}<i class="icon" :class="recClass"></i></span>
  8 + </li>
  9 + <li class="type-item" @click="toggleFilter">
  10 + <span class="sort-label">筛选<i class="icon" :class="filterClass"></i></span>
  11 + </li>
8 </ul> 12 </ul>
9 <div class="rec-detail" v-show="!recDown"> 13 <div class="rec-detail" v-show="!recDown">
10 <ul class="re-items"> 14 <ul class="re-items">
@@ -144,6 +148,16 @@ export default { @@ -144,6 +148,16 @@ export default {
144 text: '推荐', 148 text: '推荐',
145 val: '', 149 val: '',
146 type: 0 150 type: 0
  151 + },
  152 + s_p_desc: {
  153 + text: '价格从高到低',
  154 + val: 's_p_desc',
  155 + type: 3
  156 + },
  157 + s_p_asc: {
  158 + text: '价格从低到高',
  159 + val: 's_p_asc',
  160 + type: 3
147 } 161 }
148 }; 162 };
149 163
@@ -385,10 +399,14 @@ export default { @@ -385,10 +399,14 @@ export default {
385 } 399 }
386 } 400 }
387 401
388 - .icon { 402 + .sort-label {
389 position: relative; 403 position: relative;
  404 + }
  405 +
  406 + .icon {
  407 + position: absolute;
390 top: 14px; 408 top: 14px;
391 - left: 20px; 409 + right: -46px;
392 font-size: 40px; 410 font-size: 40px;
393 font-weight: bold; 411 font-weight: bold;
394 412