fe / yohobuy-node · Commits

Go to a project

Authored by 郝肖肖
Commit 301e5cb104c38391b3d247e8066a9bfd2414c414 2 parents 7d03d6df 4a3daf6e

Merge branch 'hotfix/payCss' into feature/meal

Inline Side-by-side
Showing 5 changed files with 55 additions and 60 deletions
1 .shopping-cashondelivery-page { 1 .shopping-cashondelivery-page {
2 width: 860px; 2 width: 860px;
3 margin: 0 auto; 3 margin: 0 auto;
4 - font-family: arial,"Microsoft YaHei"; 4 + font-family: arial, "Microsoft YaHei";
5 font-size: 12px; 5 font-size: 12px;
6 text-align: left; 6 text-align: left;
7 line-height: 150%; 7 line-height: 150%;
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 color: #333; 16 color: #333;
17 text-align: center; 17 text-align: center;
18 font-size: 20px; 18 font-size: 20px;
19 - font-family: Arial,helvetica,sans-serif; 19 + font-family: Arial, helvetica, sans-serif;
20 } 20 }
21 } 21 }
22 22
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 .list-box { 31 .list-box {
32 border: 1px #dadada solid; 32 border: 1px #dadada solid;
33 border-top: 10px #000 solid; 33 border-top: 10px #000 solid;
34 - border-bottom: 0px; 34 + border-bottom: 0;
35 margin-bottom: 20px; 35 margin-bottom: 20px;
36 font-size: 14px; 36 font-size: 14px;
37 } 37 }
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 font-weight: bold; 62 font-weight: bold;
63 float: left; 63 float: left;
64 64
65 - a{ 65 + a {
66 text-decoration: none; 66 text-decoration: none;
67 color: #468fa2; 67 color: #468fa2;
68 outline: none; 68 outline: none;
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
83 float: left; 83 float: left;
84 } 84 }
85 85
86 - .li-4{ 86 + .li-4 {
87 width: 170px; 87 width: 170px;
88 height: 36px; 88 height: 36px;
89 border-right: 1px #dadada solid; 89 border-right: 1px #dadada solid;
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 padding: 20px; 126 padding: 20px;
127 line-height: 1.8; 127 line-height: 1.8;
128 margin-bottom: 20px; 128 margin-bottom: 20px;
129 - font-family: Arial,helvetica,sans-serif; 129 + font-family: Arial, helvetica, sans-serif;
130 130
131 a { 131 a {
132 text-decoration: none; 132 text-decoration: none;
@@ -135,11 +135,11 @@ @@ -135,11 +135,11 @@
135 } 135 }
136 136
137 b { 137 b {
138 - color:#c00; 138 + color: #c00;
139 } 139 }
140 } 140 }
141 141
142 - .pay-mode{ 142 + .pay-mode {
143 color: #666; 143 color: #666;
144 } 144 }
145 145
@@ -174,5 +174,4 @@ @@ -174,5 +174,4 @@
174 width: 97px; 174 width: 97px;
175 } 175 }
176 } 176 }
177 -  
178 } 177 }
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 width: 32px; 23 width: 32px;
24 height: 32px; 24 height: 32px;
25 margin-right: 20px; 25 margin-right: 20px;
26 - background: resolve('pay/pay-sure-icon.png'); 26 + background: resolve(pay/pay-sure-icon.png);
27 vertical-align: text-bottom; 27 vertical-align: text-bottom;
28 } 28 }
29 } 29 }
@@ -44,11 +44,11 @@ @@ -44,11 +44,11 @@
44 } 44 }
45 45
46 .back-yoho-coin:after { 46 .back-yoho-coin:after {
47 - content: ''; 47 + content: "";
48 display: inline-block; 48 display: inline-block;
49 width: 14px; 49 width: 14px;
50 height: 14px; 50 height: 14px;
51 - background: resolve('cart/yoho-coin.png'); 51 + background: resolve(cart/yoho-coin.png);
52 margin-left: 6px; 52 margin-left: 6px;
53 vertical-align: bottom; 53 vertical-align: bottom;
54 } 54 }
@@ -75,10 +75,10 @@ @@ -75,10 +75,10 @@
75 } 75 }
76 76
77 &:after { 77 &:after {
78 - content: ''; 78 + content: "";
79 width: 450px; 79 width: 450px;
80 height: 170px; 80 height: 170px;
81 - background: resolve('pay/qr-img.png'); 81 + background: resolve(pay/qr-img.png);
82 position: absolute; 82 position: absolute;
83 top: 30px; 83 top: 30px;
84 right: 0; 84 right: 0;
@@ -120,13 +120,13 @@ @@ -120,13 +120,13 @@
120 display: none; 120 display: none;
121 121
122 &:after { 122 &:after {
123 - content: ''; 123 + content: "";
124 width: 13px; 124 width: 13px;
125 height: 13px; 125 height: 13px;
126 margin-left: 8px; 126 margin-left: 8px;
127 display: inline-block; 127 display: inline-block;
128 vertical-align: middle; 128 vertical-align: middle;
129 - background: resolve('pay/change-icon.png'); 129 + background: resolve(pay/change-icon.png);
130 } 130 }
131 } 131 }
132 } 132 }
1 .shopping-pay-page { 1 .shopping-pay-page {
2 -  
3 margin: 25px auto; 2 margin: 25px auto;
4 3
5 .pay-page { 4 .pay-page {
@@ -24,7 +23,7 @@ @@ -24,7 +23,7 @@
24 background: resolve("pay/success.png") no-repeat center left; 23 background: resolve("pay/success.png") no-repeat center left;
25 } 24 }
26 25
27 - a{ 26 + a {
28 margin-top: 40px; 27 margin-top: 40px;
29 margin-left: 140px; 28 margin-left: 140px;
30 float: left; 29 float: left;
@@ -36,9 +35,9 @@ @@ -36,9 +35,9 @@
36 width: 980px; 35 width: 980px;
37 height: 52px; 36 height: 52px;
38 overflow: hidden; 37 overflow: hidden;
39 - padding: 20px 0px 0px 0px;  
40 - margin: 0px auto;  
41 - border-bottom: 2px solid #000000; 38 + padding: 20px 0 0;
  39 + margin: 0 auto;
  40 + border-bottom: 2px solid #000;
42 41
43 ul { 42 ul {
44 width: 446px; 43 width: 446px;
@@ -60,11 +59,10 @@ @@ -60,11 +59,10 @@
60 span { 59 span {
61 display: block; 60 display: block;
62 height: 15px; 61 height: 15px;
63 - padding: 15px 0px 0px 0px; 62 + padding: 15px 0 0;
64 line-height: 15px; 63 line-height: 15px;
65 font-size: 12px; 64 font-size: 12px;
66 } 65 }
67 -  
68 } 66 }
69 67
70 .end { 68 .end {
@@ -85,6 +83,7 @@ @@ -85,6 +83,7 @@
85 background-image: resolve("pay/pay-title.png"); 83 background-image: resolve("pay/pay-title.png");
86 float: left; 84 float: left;
87 } 85 }
  86 +
88 .step5 { 87 .step5 {
89 height: 31px; 88 height: 31px;
90 width: 117px; 89 width: 117px;
@@ -92,6 +91,7 @@ @@ -92,6 +91,7 @@
92 background-image: resolve("pay/bc.png"); 91 background-image: resolve("pay/bc.png");
93 float: left; 92 float: left;
94 } 93 }
  94 +
95 .cart-pay { 95 .cart-pay {
96 width: 980px; 96 width: 980px;
97 margin: 25px auto; 97 margin: 25px auto;
@@ -99,13 +99,13 @@ @@ -99,13 +99,13 @@
99 h2 { 99 h2 {
100 width: 950px; 100 width: 950px;
101 height: 40px; 101 height: 40px;
102 - height: 40px;  
103 - padding: 0px 0px 0px 30px; 102 + padding: 0 0 0 30px;
104 line-height: 40px; 103 line-height: 40px;
105 color: #000; 104 color: #000;
106 font-size: 20px; 105 font-size: 20px;
107 - font-family: Arial,helvetica,sans-serif;  
108 - background: resolve("pay/cat-pay.png") no-repeat 0px 11px; 106 + font-family: Arial, helvetica, sans-serif;
  107 + background: resolve("pay/cat-pay.png") no-repeat;
  108 + background-position: 0 11px;
109 font-weight: normal; 109 font-weight: normal;
110 } 110 }
111 111
@@ -117,8 +117,8 @@ @@ -117,8 +117,8 @@
117 font-size: 12px; 117 font-size: 12px;
118 margin: 0; 118 margin: 0;
119 119
120 - strong {  
121 - color: #E8044F; 120 + strong {
  121 + color: #e8044f;
122 font-size: 14px; 122 font-size: 14px;
123 font-weight: bold; 123 font-weight: bold;
124 } 124 }
@@ -145,10 +145,10 @@ @@ -145,10 +145,10 @@
145 .pay-way { 145 .pay-way {
146 width: 980px; 146 width: 980px;
147 height: 32px; 147 height: 32px;
148 - margin-bottom: 27px;  
149 overflow: hidden; 148 overflow: hidden;
150 - margin: 30 auto; 149 + margin: 30px auto;
151 } 150 }
  151 +
152 .word { 152 .word {
153 display: block; 153 display: block;
154 float: left; 154 float: left;
@@ -156,6 +156,7 @@ @@ -156,6 +156,7 @@
156 font-size: 16px; 156 font-size: 16px;
157 margin-right: 10px; 157 margin-right: 10px;
158 } 158 }
  159 +
159 .pay-type-img { 160 .pay-type-img {
160 height: 30px; 161 height: 30px;
161 float: left; 162 float: left;
@@ -174,7 +175,7 @@ @@ -174,7 +175,7 @@
174 .tabs { 175 .tabs {
175 height: 40px; 176 height: 40px;
176 padding-left: 20px; 177 padding-left: 20px;
177 - background: #ffffff; 178 + background: #fff;
178 border-bottom: 1px solid #d9d9d9; 179 border-bottom: 1px solid #d9d9d9;
179 180
180 li { 181 li {
@@ -192,10 +193,9 @@ @@ -192,10 +193,9 @@
192 cursor: pointer; 193 cursor: pointer;
193 194
194 &.active { 195 &.active {
195 - background: #ffffff;  
196 - border-bottom: 1px solid #ffffff; 196 + background: #fff;
197 border: 1px solid #d9d9d9; 197 border: 1px solid #d9d9d9;
198 - border-bottom:none; 198 + border-bottom: none;
199 } 199 }
200 200
201 a { 201 a {
@@ -214,7 +214,7 @@ @@ -214,7 +214,7 @@
214 overflow: hidden; 214 overflow: hidden;
215 } 215 }
216 216
217 - .none{ 217 + .none {
218 display: none; 218 display: none;
219 } 219 }
220 220
@@ -231,7 +231,7 @@ @@ -231,7 +231,7 @@
231 line-height: 44px; 231 line-height: 44px;
232 cursor: pointer; 232 cursor: pointer;
233 233
234 - img{ 234 + img {
235 vertical-align: middle; 235 vertical-align: middle;
236 outline: none; 236 outline: none;
237 } 237 }
@@ -274,7 +274,7 @@ @@ -274,7 +274,7 @@
274 font-size: 16px; 274 font-size: 16px;
275 border: none; 275 border: none;
276 font-weight: bold; 276 font-weight: bold;
277 - font-family: arial,"Microsoft YaHei" ! important; 277 + font-family: arial, "Microsoft YaHei" !important;
278 cursor: pointer; 278 cursor: pointer;
279 } 279 }
280 280
@@ -293,8 +293,8 @@ @@ -293,8 +293,8 @@
293 width: 100%; 293 width: 100%;
294 height: 1000px; 294 height: 1000px;
295 background: #000; 295 background: #000;
296 - filter: Alpha(Opacity=50);  
297 - opacity: 0.50; 296 + filter: alpha(Opacity=50);
  297 + opacity: 0.5;
298 overflow: hidden; 298 overflow: hidden;
299 position: absolute; 299 position: absolute;
300 top: 0; 300 top: 0;
@@ -305,7 +305,7 @@ @@ -305,7 +305,7 @@
305 margin-left: -203px; 305 margin-left: -203px;
306 margin-top: -124px; 306 margin-top: -124px;
307 padding: 50px 40px; 307 padding: 50px 40px;
308 - background-color: #FFFFFF; 308 + background-color: #fff;
309 position: absolute; 309 position: absolute;
310 top: 50%; 310 top: 50%;
311 left: 50%; 311 left: 50%;
@@ -323,14 +323,15 @@ @@ -323,14 +323,15 @@
323 width: 134px; 323 width: 134px;
324 height: 38px; 324 height: 38px;
325 line-height: 38px; 325 line-height: 38px;
326 - color: #FFFFFF; 326 + color: #fff;
327 font-size: 14px; 327 font-size: 14px;
328 margin: 0 14px; 328 margin: 0 14px;
329 display: inline-block; 329 display: inline-block;
330 text-align: center; 330 text-align: center;
331 text-decoration: none; 331 text-decoration: none;
332 - }  
333 - .change { 332 + }
  333 +
  334 + .change {
334 background: #bdbdbd; 335 background: #bdbdbd;
335 } 336 }
336 337
@@ -2,14 +2,14 @@ @@ -2,14 +2,14 @@
2 width: 990px; 2 width: 990px;
3 margin: 0 auto; 3 margin: 0 auto;
4 font-size: 12px; 4 font-size: 12px;
5 - font-family: Arial,helvetica,sans-serif; 5 + font-family: Arial, helvetica, sans-serif;
6 6
7 .pay-title { 7 .pay-title {
8 height: 65px; 8 height: 65px;
9 overflow: hidden; 9 overflow: hidden;
10 - padding: 20px 0px 0px 0px;  
11 - margin: 0px auto;  
12 - border-bottom: 2px solid #000000; 10 + padding: 20px 0 0;
  11 + margin: 0 auto;
  12 + border-bottom: 2px solid #000;
13 13
14 ul { 14 ul {
15 width: 446px; 15 width: 446px;
@@ -31,10 +31,9 @@ @@ -31,10 +31,9 @@
31 span { 31 span {
32 display: block; 32 display: block;
33 height: 15px; 33 height: 15px;
34 - padding: 15px 0px 0px 0px; 34 + padding: 15px 0 0;
35 line-height: 15px; 35 line-height: 15px;
36 } 36 }
37 -  
38 } 37 }
39 38
40 .end { 39 .end {
@@ -2,14 +2,14 @@ @@ -2,14 +2,14 @@
2 width: 990px; 2 width: 990px;
3 margin: 0 auto; 3 margin: 0 auto;
4 font-size: 12px; 4 font-size: 12px;
5 - font-family:arial, "Microsoft YaHei"; 5 + font-family: arial, "Microsoft YaHei";
6 6
7 .pay-title { 7 .pay-title {
8 height: 52px; 8 height: 52px;
9 overflow: hidden; 9 overflow: hidden;
10 - padding: 20px 0px 0px 0px;  
11 - margin: 0px auto;  
12 - border-bottom: 2px solid #000000; 10 + padding: 20px 0 0;
  11 + margin: 0 auto;
  12 + border-bottom: 2px solid #000;
13 13
14 ul { 14 ul {
15 width: 446px; 15 width: 446px;
@@ -31,10 +31,9 @@ @@ -31,10 +31,9 @@
31 span { 31 span {
32 display: block; 32 display: block;
33 height: 15px; 33 height: 15px;
34 - padding: 15px 0px 0px 0px; 34 + padding: 15px 0 0;
35 line-height: 15px; 35 line-height: 15px;
36 } 36 }
37 -  
38 } 37 }
39 38
40 .end { 39 .end {
@@ -83,7 +82,6 @@ @@ -83,7 +82,6 @@
83 color: red; 82 color: red;
84 } 83 }
85 } 84 }
86 -  
87 } 85 }
88 86
89 .w-right { 87 .w-right {
@@ -127,7 +125,7 @@ @@ -127,7 +125,7 @@
127 } 125 }
128 } 126 }
129 127
130 - .up { 128 + .up {
131 float: right; 129 float: right;
132 border-width: 4px 3px 0; 130 border-width: 4px 3px 0;
133 border-style: solid dashed dashed; 131 border-style: solid dashed dashed;
@@ -141,8 +139,6 @@ @@ -141,8 +139,6 @@
141 border-color: transparent transparent #2ea7e7; 139 border-color: transparent transparent #2ea7e7;
142 } 140 }
143 141
144 -  
145 -  
146 .w-addrinfo { 142 .w-addrinfo {
147 padding: 12px 0; 143 padding: 12px 0;
148 color: #9b9b9b; 144 color: #9b9b9b;