Merge branch 'develop' into release/1.0

@@ -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) {

@@ -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;

@@ -71,8 +71,8 @@
     .card-large {
         .card {
             float: left;
-            width: 372px;
-            margin-right: 6px;
+            width: 374px;
+            margin-right: 2px;
 
             &:nth-child(2n) {
                 margin-right: 0;
@@ -103,6 +103,7 @@
         .card-label {
             margin: 0 0 10px;
             font-size: 24px;
+            line-height: 28px;
             height: 65px;
             font-weight: normal;
         }

@@ -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);
                 }
             }
         },

@@ -57,7 +57,7 @@
                     </div>
                     <div class="exchange-reason">
                         <p v-if="goods.newColorName || goods.newSizeName">换货颜色尺码: {{goods.newColorName}} {{goods.newSizeName}}</p>
-                        <p v-if="goods.reasonName">换货原因: {{goods.reasonName}}</p>
+                        <p v-if="goods.reasonName">原因: {{goods.reasonName}}</p>
                         <blockquote v-if="goods.remark">{{goods.remark}}</blockquote>
                         <ul v-if="goods.evidenceImages.length > 0" class="exchange-img">
                             <li v-for="image in goods.evidenceImages">
@@ -71,7 +71,9 @@
         <div class="exchange-express" v-if="type ==='refund'">
             <div class="exchange-address" v-if="detail.returnAmount">
                 <p>退款金额: &yen;{{detail.returnAmount}}</p>
-                <p>(现金:&yen;{{detail.returnAmountTotal}} - YOHO币:{{detail.returnYohoCoin}} - 优惠券:{{detail.returnCouponAmount}})</p>
+                <p class="info">现金:&yen;{{detail.returnAmountTotal}}</p>
+                <p v-if="detail.returnYohoCoin" class="info">YOHO币:{{detail.returnYohoCoin}}</p>
+                <p v-if="detail.returnCouponAmount" class="info">优惠券:{{detail.returnCouponAmount}}</p>
             </div>
             <div class="exchange-type">
                 <span href="" class="primary">退款方式<span class="right">{{detail.returnAmountModeName}}</span>
@@ -89,7 +91,7 @@
          <div class="exchange-express" v-else>
             <div class="exchange-address">
                 <p><span>{{detail.consigneeName}}</span><span>{{detail.mobile}}</span></p>
-                <p>{{detail.province}}&nbsp;{{detail.city}}&nbsp;{{detail.county}} <br>{{detail.address}}</p>
+                <p class="info">{{detail.province}}&nbsp;{{detail.city}}&nbsp;{{detail.county}} <br>{{detail.address}}</p>
             </div>
             <div class="exchange-type">
                 <span class="primary">换货方式<span class="right">{{detail.deliveryTpyeName}}</span></span>

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