fe / yohoblk-wap · Commits

Go to a project

Authored by 陈轩
Commit 48ef117249969ac55a206285f19f6c07ea7d52f5 2 parents b7be538d faa8b873

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 6 changed files with 18 additions and 36 deletions
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 } 26 }
27 27
28 .icon-bag:before { 28 .icon-bag:before {
29 - content: "\e601"; 29 + content: "\e910";
30 } 30 }
31 31
32 .icon-down:before { 32 .icon-down:before {
@@ -40,14 +40,14 @@ @@ -40,14 +40,14 @@
40 height: 100%; 40 height: 100%;
41 display: inline-block; 41 display: inline-block;
42 text-align: center; 42 text-align: center;
43 - color: #4a90e2; 43 + color: #b0b0b0;
44 font-size: 30px; 44 font-size: 30px;
45 line-height: 88px; 45 line-height: 88px;
46 font-weight: bold; 46 font-weight: bold;
47 } 47 }
48 48
49 - a.modal-button:first-of-type {  
50 - color: #b0b0b0; 49 + a.modal-button:last-of-type {
  50 + color: #4a90e2;
51 } 51 }
52 52
53 :not(:first-child) { 53 :not(:first-child) {
@@ -33,14 +33,12 @@ body { @@ -33,14 +33,12 @@ body {
33 } 33 }
34 34
35 .order-code { 35 .order-code {
36 - padding: 20px 30px; 36 + padding: 22px 30px;
37 margin-bottom: 20px; 37 margin-bottom: 20px;
38 - border-top: 1px solid #eee;  
39 - border-bottom: 1px solid #eee;  
40 38
41 p:first-of-type { 39 p:first-of-type {
42 font-size: 34px; 40 font-size: 34px;
43 - font-weight: 700; 41 + font-weight: 600;
44 } 42 }
45 43
46 p:last-of-type { 44 p:last-of-type {
@@ -53,12 +51,11 @@ body { @@ -53,12 +51,11 @@ body {
53 position: relative; 51 position: relative;
54 padding: 20px 30px 27px; 52 padding: 20px 30px 27px;
55 margin-bottom: 20px; 53 margin-bottom: 20px;
56 - border-top: 1px solid #eee;  
57 word-wrap: break-word; 54 word-wrap: break-word;
58 55
59 p:first-of-type { 56 p:first-of-type {
60 font-size: 32px; 57 font-size: 32px;
61 - font-weight: 700; 58 + font-weight: 600;
62 59
63 span { 60 span {
64 margin-right: 40px; 61 margin-right: 40px;
@@ -84,7 +81,6 @@ body { @@ -84,7 +81,6 @@ body {
84 81
85 .order-goods { 82 .order-goods {
86 padding-top: 20px; 83 padding-top: 20px;
87 - border-top: 1px solid #eee;  
88 border-bottom: 1px solid #eee; 84 border-bottom: 1px solid #eee;
89 85
90 .goods-info { 86 .goods-info {
@@ -178,7 +174,7 @@ body { @@ -178,7 +174,7 @@ body {
178 } 174 }
179 175
180 .order-amount { 176 .order-amount {
181 - padding: 30px 20px; 177 + padding: 26px 30px;
182 margin-bottom: 20px; 178 margin-bottom: 20px;
183 border-bottom: 1px solid #eee; 179 border-bottom: 1px solid #eee;
184 text-align: right; 180 text-align: right;
@@ -224,6 +220,7 @@ body { @@ -224,6 +220,7 @@ body {
224 text-align: right; 220 text-align: right;
225 221
226 a { 222 a {
  223 + display: inline-block;
227 padding: 0 20px; 224 padding: 0 20px;
228 height: 68px; 225 height: 68px;
229 line-height: 68px; 226 line-height: 68px;
@@ -234,6 +231,7 @@ body { @@ -234,6 +231,7 @@ body {
234 background: $white; 231 background: $white;
235 font-size: 28px; 232 font-size: 28px;
236 margin-right: 10px; 233 margin-right: 10px;
  234 + width: 192px;
237 } 235 }
238 236
239 button { 237 button {
@@ -260,7 +258,7 @@ body { @@ -260,7 +258,7 @@ body {
260 } 258 }
261 259
262 &.normal { 260 &.normal {
263 - width: 188px; 261 + width: 192px;
264 padding: 0; 262 padding: 0;
265 border: 1px solid $black; 263 border: 1px solid $black;
266 color: $black; 264 color: $black;
@@ -21,8 +21,6 @@ @@ -21,8 +21,6 @@
21 } 21 }
22 22
23 .exchange-progress { 23 .exchange-progress {
24 - border-bottom: 1px solid #eee;  
25 -  
26 li { 24 li {
27 position: relative; 25 position: relative;
28 padding-left: 55px; 26 padding-left: 55px;
@@ -132,7 +130,6 @@ @@ -132,7 +130,6 @@
132 130
133 .exchange-details { 131 .exchange-details {
134 margin-top: 20px; 132 margin-top: 20px;
135 - border-top: 1px solid #eee;  
136 133
137 h2 { 134 h2 {
138 height: 88px; 135 height: 88px;
@@ -149,6 +146,10 @@ @@ -149,6 +146,10 @@
149 } 146 }
150 } 147 }
151 148
  149 + .exchange-product-wrapper {
  150 + border-top: 1px solid #eee;
  151 + }
  152 +
152 .exchange-product { 153 .exchange-product {
153 border-bottom: 1px solid #eee; 154 border-bottom: 1px solid #eee;
154 155
@@ -336,24 +337,7 @@ @@ -336,24 +337,7 @@
336 border: 1px solid #444; 337 border: 1px solid #444;
337 background: white; 338 background: white;
338 font-size: 28px; 339 font-size: 28px;
339 -  
340 - &.black {  
341 width: 192px; 340 width: 192px;
342 - color: white;  
343 - background: black;  
344 - }  
345 -  
346 - &.countdown {  
347 - color: white;  
348 - background: black;  
349 - }  
350 -  
351 - &.normal {  
352 - width: 188px;  
353 - padding: 0;  
354 - border: 1px solid black;  
355 - color: black;  
356 - }  
357 341
358 &:focus { 342 &:focus {
359 outline: none; 343 outline: none;
@@ -219,7 +219,7 @@ @@ -219,7 +219,7 @@
219 } 219 }
220 220
221 if (isSpecialReason && !(goods.remark && goods.evidence_images && goods.evidence_images.length)) { 221 if (isSpecialReason && !(goods.remark && goods.evidence_images && goods.evidence_images.length)) {
222 - msg = '换货原因 请填写完整'; 222 + msg = '换货原因请填写完整';
223 return true; 223 return true;
224 } 224 }
225 225
@@ -253,7 +253,7 @@ @@ -253,7 +253,7 @@
253 self.processing = false; 253 self.processing = false;
254 }); 254 });
255 } else { 255 } else {
256 - Modal.alert(msg); 256 + Modal.alert('', msg);
257 } 257 }
258 } 258 }
259 }, 259 },
@@ -156,7 +156,7 @@ @@ -156,7 +156,7 @@
156 const self = this; 156 const self = this;
157 157
158 if (!this.checkSubmitData()) { 158 if (!this.checkSubmitData()) {
159 - modal.alert('请填写完整退货信息'); 159 + modal.alert('', '请填写完整退货信息');
160 } 160 }
161 $.ajax({ 161 $.ajax({
162 method: 'POST', 162 method: 'POST',