Showing
7 changed files
with
32 additions
and
25 deletions
No preview for this file type
This diff could not be displayed because it is too large.
No preview for this file type
No preview for this file type
@@ -86,6 +86,24 @@ | @@ -86,6 +86,24 @@ | ||
86 | .icon-up:before { | 86 | .icon-up:before { |
87 | content: "\e617"; | 87 | content: "\e617"; |
88 | } | 88 | } |
89 | +.icon-plus:before { | ||
90 | + content: "\e900"; | ||
91 | +} | ||
92 | +.icon-back:before { | ||
93 | + content: "\e901"; | ||
94 | +} | ||
95 | +.icon-choose:before { | ||
96 | + content: "\e902"; | ||
97 | +} | ||
98 | +.icon-minus:before { | ||
99 | + content: "\e903"; | ||
100 | +} | ||
101 | +.icon-brand:before { | ||
102 | + content: "\e904"; | ||
103 | +} | ||
104 | +.icon-shopping-bag:before { | ||
105 | + content: "\e905"; | ||
106 | +} | ||
89 | .icon-time-o:before { | 107 | .icon-time-o:before { |
90 | content: "\e906"; | 108 | content: "\e906"; |
91 | } | 109 | } |
@@ -191,9 +209,6 @@ | @@ -191,9 +209,6 @@ | ||
191 | .icon-noselect:before { | 209 | .icon-noselect:before { |
192 | content: "\e928"; | 210 | content: "\e928"; |
193 | } | 211 | } |
194 | -.icon-add:before { | ||
195 | - content: "\e929"; | ||
196 | -} | ||
197 | .icon-message:before { | 212 | .icon-message:before { |
198 | content: "\e92a"; | 213 | content: "\e92a"; |
199 | } | 214 | } |
@@ -278,23 +293,10 @@ | @@ -278,23 +293,10 @@ | ||
278 | .icon-see:before { | 293 | .icon-see:before { |
279 | content: "\e945"; | 294 | content: "\e945"; |
280 | } | 295 | } |
281 | -.icon-plus:before { | ||
282 | - content: "\e900"; | ||
283 | -} | ||
284 | -.icon-back:before { | ||
285 | - content: "\e901"; | ||
286 | -} | ||
287 | -.icon-choose:before { | ||
288 | - content: "\e902"; | ||
289 | -} | ||
290 | -.icon-minus:before { | ||
291 | - content: "\e903"; | 296 | +.icon-reduce:before { |
297 | + content: "\e946"; | ||
292 | } | 298 | } |
293 | -.icon-brand:before { | ||
294 | - content: "\e904"; | ||
295 | -} | ||
296 | -.icon-shopping-bag:before { | ||
297 | - content: "\e905"; | ||
298 | - color: #969595; | 299 | +.icon-add:before { |
300 | + content: "\e947"; | ||
299 | } | 301 | } |
300 | 302 |
@@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
9 | </div> | 9 | </div> |
10 | </dd> | 10 | </dd> |
11 | </dl> | 11 | </dl> |
12 | - <index-list class="filter-index-list" :index-list="indexData"></index-list> | 12 | + <index-list class="filter-index-list" :index-list="indexData" :class="{'fix-ios-top': needFix}"></index-list> |
13 | </div> | 13 | </div> |
14 | </template> | 14 | </template> |
15 | <script> | 15 | <script> |
@@ -21,6 +21,7 @@ | @@ -21,6 +21,7 @@ | ||
21 | * } | 21 | * } |
22 | */ | 22 | */ |
23 | import $ from 'jquery'; | 23 | import $ from 'jquery'; |
24 | + import yoho from 'yoho'; | ||
24 | import indexList from 'component/tool/index-list.vue'; | 25 | import indexList from 'component/tool/index-list.vue'; |
25 | 26 | ||
26 | export default { | 27 | export default { |
@@ -42,7 +43,8 @@ | @@ -42,7 +43,8 @@ | ||
42 | return { | 43 | return { |
43 | indexData: [], | 44 | indexData: [], |
44 | currentData: [], | 45 | currentData: [], |
45 | - currentValue: this.value | 46 | + currentValue: this.value, |
47 | + needFix: yoho.isiOS | ||
46 | }; | 48 | }; |
47 | }, | 49 | }, |
48 | watch: { | 50 | watch: { |
@@ -100,7 +102,11 @@ | @@ -100,7 +102,11 @@ | ||
100 | </script> | 102 | </script> |
101 | <style> | 103 | <style> |
102 | .filter-index-list { | 104 | .filter-index-list { |
103 | - top: calc(70 + 20 * 2 + 1)px; | 105 | + top: calc(70 + 20 * 2 + 1)px!important; |
106 | +} | ||
107 | + | ||
108 | +.fix-ios-top { | ||
109 | + margin-top: 20px; | ||
104 | } | 110 | } |
105 | 111 | ||
106 | </style> | 112 | </style> |
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | <div class="ft-item"> | 2 | <div class="ft-item"> |
3 | <div class="title" @click="toggleExpand(name)"> | 3 | <div class="title" @click="toggleExpand(name)"> |
4 | <span class="t-text">{{name}}</span> | 4 | <span class="t-text">{{name}}</span> |
5 | - <i class="t-icon icon" :class="{'icon-add': !show, 'icon-minus': show}"></i> | 5 | + <i class="t-icon icon" :class="{'icon-add': !show, 'icon-reduce': show}"></i> |
6 | <span class="t-val ellipsis">{{chosenVal}}</span> | 6 | <span class="t-val ellipsis">{{chosenVal}}</span> |
7 | </div> | 7 | </div> |
8 | <div class="choices" v-show="show"> | 8 | <div class="choices" v-show="show"> |
@@ -266,7 +266,6 @@ export default { | @@ -266,7 +266,6 @@ export default { | ||
266 | float: right; | 266 | float: right; |
267 | margin-top: 30px; | 267 | margin-top: 30px; |
268 | font-size: 24px; | 268 | font-size: 24px; |
269 | - font-weight: bold; | ||
270 | 269 | ||
271 | &.icon-minus { | 270 | &.icon-minus { |
272 | margin-right: -10px; | 271 | margin-right: -10px; |
-
Please register or login to post a comment