fe / YOHOBUYWAP · Commits

Go to a project

Authored by hf
Commit f98cb0a5a3fcf10ae57864424f11f7e1d3e262b7 1 parent 8a191280

code review by hf: merge zhaobiao order logistic

Inline Side-by-side
Showing 9 changed files with 40 additions and 142 deletions
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 display: inline-block; 23 display: inline-block;
24 max-width: pxToRem(380px); 24 max-width: pxToRem(380px);
25 overflow: hidden; 25 overflow: hidden;
26 - text-overflow: ellipsis; 26 + text-overflow: ellipsis;
27 white-space: nowrap; 27 white-space: nowrap;
28 } 28 }
29 29
@@ -37,10 +37,10 @@ @@ -37,10 +37,10 @@
37 } 37 }
38 38
39 .action { 39 .action {
40 - font-size: pxToRem(32px); 40 + font-size: pxToRem(40px);
41 line-height: pxToRem(60px); 41 line-height: pxToRem(60px);
42 text-align: right; 42 text-align: right;
43 - 43 +
44 .edit, 44 .edit,
45 .del { 45 .del {
46 display: inline-block; 46 display: inline-block;
@@ -48,10 +48,6 @@ @@ -48,10 +48,6 @@
48 width: pxToRem(60px); 48 width: pxToRem(60px);
49 height: pxToRem(60px); 49 height: pxToRem(60px);
50 color: #999; 50 color: #999;
51 -  
52 - &:hover {  
53 - color: #666;  
54 - }  
55 } 51 }
56 52
57 .edit { 53 .edit {
@@ -216,7 +212,7 @@ @@ -216,7 +212,7 @@
216 float: right; 212 float: right;
217 color: #d0d0d0; 213 color: #d0d0d0;
218 } 214 }
219 - 215 +
220 &.highlight { 216 &.highlight {
221 background: #eee; 217 background: #eee;
222 } 218 }
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 } 23 }
24 } 24 }
25 } 25 }
26 -#employ{ 26 +.employ-list{
27 width:100%; 27 width:100%;
28 height: auto; 28 height: auto;
29 overflow:hidden; 29 overflow:hidden;
@@ -32,9 +32,7 @@ @@ -32,9 +32,7 @@
32 height: 180rem / $pxConvertRem; 32 height: 180rem / $pxConvertRem;
33 overflow: hidden; 33 overflow: hidden;
34 margin: 20rem / $pxConvertRem auto; 34 margin: 20rem / $pxConvertRem auto;
35 - background-image: image-url('me/employ/employ.jpg');  
36 - background-position: top center;  
37 - background-repeat:no-repeat; 35 + background: image-url('me/employ/employ.jpg') top center no-repeat;
38 background-size: 100% 100%; 36 background-size: 100% 100%;
39 color: #fff; 37 color: #fff;
40 position: relative; 38 position: relative;
@@ -44,21 +42,16 @@ @@ -44,21 +42,16 @@
44 float: left; 42 float: left;
45 text-align: center; 43 text-align: center;
46 line-height: 180rem / $pxConvertRem; 44 line-height: 180rem / $pxConvertRem;
47 - font-size: 50px; 45 + font-size: 180em / $pxConvertRem;
48 } 46 }
49 p{ 47 p{
50 width: 55.517241%; 48 width: 55.517241%;
51 height: auto; 49 height: auto;
52 - padding: 0 5% 18em / $pxConvertRem; 50 + padding: 0 5% 18em / $pxConvertRem;;
53 float: left; 51 float: left;
54 &:first-of-type{ 52 &:first-of-type{
55 - padding-top: 0.75rem;  
56 - font-size: 18px;  
57 - height: 76rem / $pxConvertRem;  
58 - display: -webkit-box;  
59 - -webkit-line-clamp: 2;  
60 - -webkit-box-orient: vertical;  
61 - overflow: hidden; 53 + padding-top:30em / $pxConvertRem;
  54 + font-size: 60em / $pxConvertRem;
62 } 55 }
63 } 56 }
64 i{ 57 i{
@@ -126,7 +126,6 @@ @@ -126,7 +126,6 @@
126 126
127 .price-underline { 127 .price-underline {
128 text-decoration: line-through; 128 text-decoration: line-through;
129 - margin-left: pxToRem(15px);  
130 } 129 }
131 } 130 }
132 131
@@ -171,14 +170,17 @@ @@ -171,14 +170,17 @@
171 } 170 }
172 171
173 &.del-fav { 172 &.del-fav {
174 - width: 2rem;  
175 - height: 1.5rem;  
176 - line-height: 1.5rem; 173 + $width: pxToRem(image_width(sprite-file($fav, fav-del)));
  174 + $height: pxToRem(image_height(sprite-file($fav, fav-del)));
  175 +
  176 + @include rem-sprite($fav, fav-del);
  177 + width: $width;
  178 + height: $height;
  179 +
177 position: absolute; 180 position: absolute;
178 top: 50%; 181 top: 50%;
179 - margin-top: -0.75rem;  
180 - right: 0;  
181 - color: #666; 182 + right: pxToRem(30px);
  183 + margin-top: -$height / 2;
182 } 184 }
183 } 185 }
184 } 186 }
@@ -186,24 +188,6 @@ @@ -186,24 +188,6 @@
186 } 188 }
187 //品牌收藏 189 //品牌收藏
188 .fav-brand-swiper { 190 .fav-brand-swiper {
189 - border-top: 1px solid #e0e0e0;  
190 - border-bottom: pxToRem(28px) solid #f0f0f0;  
191 - position: relative;  
192 -  
193 - &:nth-of-type(1) {  
194 - border-top: 0;  
195 - }  
196 -  
197 - &:after {  
198 - content: '';  
199 - position: absolute;  
200 - left: 0;  
201 - bottom: -2px;  
202 - border-top: 1px solid #e0e0e0;  
203 - display: block;  
204 - width: 100%;  
205 - height: 1px;  
206 - }  
207 191
208 .swiper-header { 192 .swiper-header {
209 height: pxToRem(100px); 193 height: pxToRem(100px);
@@ -255,30 +239,21 @@ @@ -255,30 +239,21 @@
255 } 239 }
256 } 240 }
257 .fav-more { 241 .fav-more {
258 - width: 2.5rem;  
259 - height: 2.5rem; 242 + $width: pxToRem(image_width(sprite-file($fav, fav-more)));
  243 + $height: pxToRem(image_height(sprite-file($fav, fav-more)));
  244 +
  245 + @include rem-sprite($fav, fav-more);
  246 + width: $width;
  247 + height: $height;
  248 +
260 position: absolute; 249 position: absolute;
261 - top: 0;  
262 - right: 0;  
263 -  
264 - &:after {  
265 - $width: pxToRem(image_width(sprite-file($fav, fav-more)));  
266 - $height: pxToRem(image_height(sprite-file($fav, fav-more)));  
267 -  
268 - @include rem-sprite($fav, fav-more);  
269 - width: $width;  
270 - height: $height;  
271 -  
272 - position: absolute;  
273 - top: 50%;  
274 - right: pxToRem(30px);  
275 - margin-top: -$height / 2;  
276 - content: '';  
277 - } 250 + top: 50%;
  251 + right: pxToRem(30px);
  252 + margin-top: -$height / 2;
278 } 253 }
279 } 254 }
280 .swiper-container { 255 .swiper-container {
281 - height: pxToRem(365px); 256 + height: pxToRem(300px);
282 margin: 0 pxToRem(30px); 257 margin: 0 pxToRem(30px);
283 258
284 .swiper-slide { 259 .swiper-slide {
@@ -295,28 +270,9 @@ @@ -295,28 +270,9 @@
295 img { 270 img {
296 display: block; 271 display: block;
297 width: 100%; 272 width: 100%;
298 - height: pxToRem(300px); 273 + height: 100%;
299 overflow: hidden; 274 overflow: hidden;
300 } 275 }
301 - .brand-product {  
302 - height: pxToRem(65px);  
303 - line-height: pxToRem(65px);  
304 - text-align: center;  
305 - font-size: pxToRem(22px);  
306 - color: #fff;  
307 -  
308 - .price-discount {  
309 - span {  
310 - color: #d1021c  
311 - }  
312 - b {  
313 - color: #b0b0b0;  
314 - text-decoration: line-through;  
315 - font-weight: normal;  
316 - margin-left: pxToRem(13px);  
317 - }  
318 - }  
319 - }  
320 } 276 }
321 } 277 }
322 } 278 }
@@ -140,7 +140,6 @@ @@ -140,7 +140,6 @@
140 border-top: 1px solid #e0e0e0; 140 border-top: 1px solid #e0e0e0;
141 141
142 .type-item { 142 .type-item {
143 - position: relative;  
144 float: left; 143 float: left;
145 color: #444; 144 color: #444;
146 font-size: pxToRem(28px); 145 font-size: pxToRem(28px);
@@ -150,20 +149,6 @@ @@ -150,20 +149,6 @@
150 &.highlight { 149 &.highlight {
151 background: #eee; 150 background: #eee;
152 } 151 }
153 -  
154 - .num {  
155 - position: absolute;  
156 - padding: 0 pxToRem(8px);  
157 - top: 0;  
158 - right: pxToRem(40px);  
159 - min-width: pxToRem(16px);  
160 - font-size: pxToRem(24px);  
161 - line-height: pxToRem(32px);  
162 - color: #fff;  
163 - background: #F03D35;  
164 - text-align: center;  
165 - border-radius: pxToRem(20px);  
166 - }  
167 } 152 }
168 153
169 .iconfont { 154 .iconfont {
1 $vip: sprite-map("me/vip/*.png", $spacing: 10px); 1 $vip: sprite-map("me/vip/*.png", $spacing: 10px);
2 $fav: sprite-map("me/fav/*.png", $spacing: 5px); 2 $fav: sprite-map("me/fav/*.png", $spacing: 5px);
3 3
4 -@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service", "my-guang", "ihelp", "browse-record"; 4 +@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service", "my-guang", "ihelp", "logistic";
5 5
@@ -171,4 +171,4 @@ @@ -171,4 +171,4 @@
171 @extend %qa; 171 @extend %qa;
172 } 172 }
173 } 173 }
174 -} 174 +}
@@ -35,9 +35,6 @@ @@ -35,9 +35,6 @@
35 font-size: 48em / $pxConvertRem; 35 font-size: 48em / $pxConvertRem;
36 margin-right: 8%; 36 margin-right: 8%;
37 float: left; 37 float: left;
38 - text-overflow:ellipsis;  
39 - white-space:nowrap;  
40 - overflow:hidden;  
41 .head-portrait{ 38 .head-portrait{
42 width:90rem / $pxConvertRem; 39 width:90rem / $pxConvertRem;
43 height: 90rem / $pxConvertRem; 40 height: 90rem / $pxConvertRem;
@@ -31,23 +31,18 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -31,23 +31,18 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
31 31
32 //意见反馈主体 32 //意见反馈主体
33 .suggest-content { 33 .suggest-content {
34 - border-top: 1px solid #e0e0e0; 34 + border-top: pxToRem(30px) solid #fff;
35 35
36 .suggest-item { 36 .suggest-item {
37 width: 100%; 37 width: 100%;
38 color: #444; 38 color: #444;
39 border-top: 1px solid #e0e0e0; 39 border-top: 1px solid #e0e0e0;
40 border-bottom: pxToRem(30px) solid #f0f0f0; 40 border-bottom: pxToRem(30px) solid #f0f0f0;
41 - overflow: hidden;  
42 41
43 - .suggest-item-img {  
44 - width: 100%; 42 + > img {
  43 + display: block;
45 overflow: hidden; 44 overflow: hidden;
46 - > img {  
47 - margin: 0 auto;  
48 - display: block;  
49 - max-width: 100%;  
50 - } 45 + width: 100%;
51 } 46 }
52 47
53 > h2 { 48 > h2 {
@@ -76,7 +71,6 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -76,7 +71,6 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
76 &.suggest-active { 71 &.suggest-active {
77 > div { 72 > div {
78 width: 50%; 73 width: 50%;
79 - height: 100%;  
80 float: left; 74 float: left;
81 text-align: left; 75 text-align: left;
82 padding-left: pxToRem(128px); 76 padding-left: pxToRem(128px);
@@ -136,29 +130,8 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -136,29 +130,8 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
136 line-height: pxToRem(88px); 130 line-height: pxToRem(88px);
137 text-align: center; 131 text-align: center;
138 font-size: pxToRem(30px); 132 font-size: pxToRem(30px);
139 - //border-top: 1px solid #e0e0e0;  
140 - //border-bottom: 1px solid #e0e0e0;  
141 - border-top: pxToRem(30px) solid #f0f0f0;  
142 - border-bottom: pxToRem(30px) solid #f0f0f0;  
143 - position: relative;  
144 - &:after {  
145 - content: '';  
146 - width: 100%;  
147 - height: 1px;  
148 - border-top: 1px solid #e0e0e0;  
149 - position: absolute;  
150 - left: 0;  
151 - top: 0;  
152 - }  
153 - &:before {  
154 - content: '';  
155 - width: 100%;  
156 - height: 1px;  
157 - border-bottom: 1px solid #e0e0e0;  
158 - position: absolute;  
159 - left: 0;  
160 - bottom: 0;  
161 - } 133 + border-top: 1px solid #e0e0e0;
  134 + border-bottom: 1px solid #e0e0e0;
162 135
163 a { 136 a {
164 color: #444; 137 color: #444;
@@ -203,8 +176,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -203,8 +176,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
203 176
204 .img-form { 177 .img-form {
205 padding: 0 pxToRem(30px); 178 padding: 0 pxToRem(30px);
206 - padding-top: pxToRem(40px);  
207 - overflow: hidden; 179 + float: left;
208 180
209 .upload-img-list { 181 .upload-img-list {
210 float: left; 182 float: left;
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 16
17 .user-name { 17 .user-name {
18 font-size: 25rem / $pxConvertRem; 18 font-size: 25rem / $pxConvertRem;
19 - margin-right: 0.5rem;  
20 } 19 }
21 20
22 .vip-icon { 21 .vip-icon {