Authored by 沈志敏

fix bug

@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div class="filter" :class="{ 'filter-open': isVisible}"> 3 <div class="filter" :class="{ 'filter-open': isVisible}">
4 <div class="filter-actions"> 4 <div class="filter-actions">
5 <button class="button-ghost filter-action" @click="clearVals">清空</button> 5 <button class="button-ghost filter-action" @click="clearVals">清空</button>
6 - <button class="button button-small filter-action" @click="okAction">确定</button> 6 + <button class="button button-small button-ok filter-action" @click="okAction">确定</button>
7 </div> 7 </div>
8 <div class="filter-params"> 8 <div class="filter-params">
9 <ul class="filter-cates"> 9 <ul class="filter-cates">
@@ -196,7 +196,7 @@ @@ -196,7 +196,7 @@
196 196
197 .filter-actions, 197 .filter-actions,
198 .filter-cate { 198 .filter-cate {
199 - border-bottom: 1px solid $grey; 199 + border-bottom: 1px solid #eee;
200 } 200 }
201 201
202 .filter-cates { 202 .filter-cates {
@@ -206,7 +206,7 @@ @@ -206,7 +206,7 @@
206 } 206 }
207 207
208 .filter-cate .icon-right { 208 .filter-cate .icon-right {
209 - margin-left: 24px; 209 + margin-left: 20px;
210 } 210 }
211 211
212 .filter-cate, 212 .filter-cate,
@@ -228,6 +228,7 @@ @@ -228,6 +228,7 @@
228 white-space: nowrap; 228 white-space: nowrap;
229 text-overflow: ellipsis; 229 text-overflow: ellipsis;
230 overflow: hidden; 230 overflow: hidden;
  231 + font-family: "BrownStd-Bold", "黑体", Helvetica, Roboto, "Heiti SC", "\9ED1\4F53", Arial;
231 } 232 }
232 233
233 .filter-cate-val, 234 .filter-cate-val,
@@ -239,4 +240,8 @@ @@ -239,4 +240,8 @@
239 position: absolute; 240 position: absolute;
240 } 241 }
241 242
  243 + .button-ok {
  244 + min-width: 138px !important;
  245 + }
  246 +
242 </style> 247 </style>
@@ -38,6 +38,10 @@ @@ -38,6 +38,10 @@
38 <style> 38 <style>
39 @import "../../../../scss/common/_color.css"; 39 @import "../../../../scss/common/_color.css";
40 40
  41 +.blk-header {
  42 + padding-left: 26px;
  43 +}
  44 +
41 .filter-sub { 45 .filter-sub {
42 position: fixed; 46 position: fixed;
43 top: 0; 47 top: 0;
@@ -65,7 +69,7 @@ @@ -65,7 +69,7 @@
65 .index { 69 .index {
66 margin-left: $w; 70 margin-left: $w;
67 margin-right: $w; 71 margin-right: $w;
68 - border-bottom: 1px solid $division; 72 + border-bottom: 1px solid #eee;
69 } 73 }
70 .index { 74 .index {
71 font-size: 32px; 75 font-size: 32px;
@@ -69,6 +69,8 @@ @@ -69,6 +69,8 @@
69 } 69 }
70 70
71 .card-large { 71 .card-large {
  72 + background-color: #fff;
  73 +
72 .card { 74 .card {
73 float: left; 75 float: left;
74 width: 374px; 76 width: 374px;
@@ -95,13 +97,14 @@ @@ -95,13 +97,14 @@
95 min-height: 180px; 97 min-height: 180px;
96 margin-left: 30px; 98 margin-left: 30px;
97 margin-right: 30px; 99 margin-right: 30px;
98 - padding-top: 25px; 100 + padding-top: 26px;
99 text-align: center; 101 text-align: center;
100 - font-size: 24px; 102 + font-size: 0;
  103 +
101 } 104 }
102 105
103 .card-label { 106 .card-label {
104 - margin: 0 0 10px; 107 + margin: 0 0 14px;
105 font-size: 24px; 108 font-size: 24px;
106 line-height: 1.4; 109 line-height: 1.4;
107 height: 67.1999999999px; 110 height: 67.1999999999px;
@@ -111,7 +114,8 @@ @@ -111,7 +114,8 @@
111 114
112 .good-price { 115 .good-price {
113 color: #b0b0b0; 116 color: #b0b0b0;
114 - margin-right: 10px; 117 + margin-right: 14px;
  118 + font-size: 24px;
115 &:last-of-type { 119 &:last-of-type {
116 margin-right: 0; 120 margin-right: 0;
117 } 121 }
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
9 </ul> 9 </ul>
10 </template> 10 </template>
11 <script> 11 <script>
12 -const $ = require('jquery');  
13 const bus = require('common/vue-bus'); 12 const bus = require('common/vue-bus');
14 const simple = require('./order/simple.vue'); 13 const simple = require('./order/simple.vue');
15 const updown = require('./order/updown.vue'); 14 const updown = require('./order/updown.vue');
@@ -52,6 +51,7 @@ module.exports = { @@ -52,6 +51,7 @@ module.exports = {
52 padding: 25px 0; 51 padding: 25px 0;
53 color: $grey; 52 color: $grey;
54 background-color: #fff; 53 background-color: #fff;
  54 + border-bottom: 1px solid #eee;
55 } 55 }
56 56
57 .order-item { 57 .order-item {