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

@@ -26,7 +26,7 @@
 }
 
 .icon-bag:before {
-    content: "\e601";
+    content: "\e910";
 }
 
 .icon-down:before {

@@ -40,14 +40,14 @@
             height: 100%;
             display: inline-block;
             text-align: center;
-            color: #4a90e2;
+            color: #b0b0b0;
             font-size: 30px;
             line-height: 88px;
             font-weight: bold;
         }
 
-        a.modal-button:first-of-type {
-            color: #b0b0b0;
+        a.modal-button:last-of-type {
+            color: #4a90e2;
         }
 
         :not(:first-child) {

@@ -33,14 +33,12 @@ body {
     }
 
     .order-code {
-        padding: 20px 30px;
+        padding: 22px 30px;
         margin-bottom: 20px;
-        border-top: 1px solid #eee;
-        border-bottom: 1px solid #eee;
 
         p:first-of-type {
             font-size: 34px;
-            font-weight: 700;
+            font-weight: 600;
         }
 
         p:last-of-type {
@@ -53,12 +51,11 @@ body {
         position: relative;
         padding: 20px 30px 27px;
         margin-bottom: 20px;
-        border-top: 1px solid #eee;
         word-wrap: break-word;
 
         p:first-of-type {
             font-size: 32px;
-            font-weight: 700;
+            font-weight: 600;
 
             span {
                 margin-right: 40px;
@@ -84,7 +81,6 @@ body {
 
     .order-goods {
         padding-top: 20px;
-        border-top: 1px solid #eee;
         border-bottom: 1px solid #eee;
 
         .goods-info {
@@ -178,7 +174,7 @@ body {
     }
 
     .order-amount {
-        padding: 30px 20px;
+        padding: 26px 30px;
         margin-bottom: 20px;
         border-bottom: 1px solid #eee;
         text-align: right;
@@ -224,6 +220,7 @@ body {
         text-align: right;
 
         a {
+            display: inline-block;
             padding: 0 20px;
             height: 68px;
             line-height: 68px;
@@ -234,6 +231,7 @@ body {
             background: $white;
             font-size: 28px;
             margin-right: 10px;
+            width: 192px;
         }
 
         button {
@@ -260,7 +258,7 @@ body {
             }
 
             &.normal {
-                width: 188px;
+                width: 192px;
                 padding: 0;
                 border: 1px solid $black;
                 color: $black;

@@ -21,8 +21,6 @@
     }
 
     .exchange-progress {
-        border-bottom: 1px solid #eee;
-
         li {
             position: relative;
             padding-left: 55px;
@@ -132,7 +130,6 @@
 
     .exchange-details {
         margin-top: 20px;
-        border-top: 1px solid #eee;
 
         h2 {
             height: 88px;
@@ -149,6 +146,10 @@
         }
     }
 
+    .exchange-product-wrapper {
+        border-top: 1px solid #eee;
+    }
+
     .exchange-product {
         border-bottom: 1px solid #eee;
 
@@ -336,24 +337,7 @@
             border: 1px solid #444;
             background: white;
             font-size: 28px;
-
-            &.black {
-                width: 192px;
-                color: white;
-                background: black;
-            }
-
-            &.countdown {
-                color: white;
-                background: black;
-            }
-
-            &.normal {
-                width: 188px;
-                padding: 0;
-                border: 1px solid black;
-                color: black;
-            }
+            width: 192px;
 
             &:focus {
                 outline: none;

@@ -219,7 +219,7 @@
                     }
 
                     if (isSpecialReason && !(goods.remark && goods.evidence_images && goods.evidence_images.length)) {
-                        msg = '换货原因 请填写完整';
+                        msg = '换货原因请填写完整';
                         return true;
                     }
 
@@ -253,7 +253,7 @@
                         self.processing = false;
                     });
                 } else {
-                    Modal.alert(msg);
+                    Modal.alert('', msg);
                 }
             }
         },

@@ -156,7 +156,7 @@
                 const self = this;
 
                 if (!this.checkSubmitData()) {
-                    modal.alert('请填写完整退货信息');
+                    modal.alert('', '请填写完整退货信息');
                 }
                 $.ajax({
                     method: 'POST',