'填写物流按钮样式'

@@ -9,6 +9,7 @@ const headerModel = require('../../../doraemon/models/header'); // 头部model
 const refundModel = require('../models/refund');
 const notLoginCode = 400;
 const notLoginTip = '抱歉，您暂未登录！';
+const helpers = global.yoho.helpers;
 
 const refund = {
     refund(req, res) {
@@ -97,6 +98,7 @@ const refund = {
 
         let headerData = headerModel.setNav({
             navTitle: '退货状态',
+            backUrl: helpers.urlFormat('/home/return'),
             navBtn: false
         });
 
@@ -113,6 +115,7 @@ const refund = {
 
         let headerData = headerModel.setNav({
             navTitle: '换货状态',
+            backUrl: helpers.urlFormat('/home/return'),
             navBtn: false
         });
 

@@ -26,15 +26,16 @@
                     </a>
                 </template>
             </div>
-            <div v-else class="progress-todo">
+            <div v-else-if="detail.notice.title" class="progress-todo">
                 <template v-if="detail.notice">
                     <p>{{detail.notice.title}}</p>
-                    <p class="phone">{{detail.notice.remark}}</p>
+                    <p :class="{'status-notice': true, phone: (detail.delivery_tpye === '10' || type ==='refund') && detail.status == 10 }">{{detail.notice.remark}}</p>
                 </template>
             </div>
-            <div v-if="(detail.delivery_tpye === '10' || type ==='refund') && detail.status == 10"
-                 class="logistics">
-                 <a :href="`/home/return/logistics?applyid=${applyid}&type=${type}`">填写商品寄回的快递信息</a>
+            <div v-if="(detail.delivery_tpye === '10' || type ==='refund') && detail.status == 10" class="padding-b-20">
+                <div class="logistics">
+                    <a :href="`/home/return/logistics?applyid=${applyid}&type=${type}`">填写商品寄回的快递信息</a>
+                </div>
             </div>
         </div>
         <div class="exchange-details">
@@ -297,13 +298,21 @@
                 color: #444;
                 border-top: 1px solid #e0e0e0;
 
-                .phone {
+                .status-notice {
                     color: #b0b0b0;
-                    background-color: #f0f0f0;
+                    font-size: 20px;
+                }
+
+                .phone {
                     padding: 15px;
+                    background-color: #f0f0f0;
                 }
             }
 
+            .padding-b-20 {
+                padding-bottom: 20px;
+            }
+
             .logistics-detail {
                 padding: 20px 30px;
                 border-top: 1px solid #e0e0e0;

@@ -5,6 +5,7 @@
         <div v-if="refundData.return_amount_info" class="return-amount-info">
             {{refundData.return_amount_info}}
         </div>
+        <div v-else class="return-info-hide-margtin-30"></div>
 
         <div class="return-amount">
             <!-- TODO:退货信息优化为组件 -->
@@ -228,6 +229,10 @@
             color: #b0b0b0;
         }
 
+        .return-info-hide-margtin-30 {
+            margin-top: 30px;
+        }
+
         .return-amount-item {
             p {
                 border-top: 1px solid #e0e0e0;

@@ -14,7 +14,7 @@
             </div>
             <div class="image-list clearfix">
                 <div class="image-item" v-for="(image, index) in imageListForShow" :key="index">
-                    <span @click="deleteImage(image.index)" class="icon icon-close"></span>
+                    <span @click="deleteImage(image.index)" class="icon iconfont icon-close">&#xe623</span>
                     <img :src="image.path | resize(100, 130)">
                 </div>
                 <upload v-show="imageListForShow.length < 4" class="image-item" :image-list="product.imageList" :bucket="bucket"></upload>
@@ -112,7 +112,6 @@
 
         .remark {
             background: #fff;
-            padding: 20px 30px 0;
             position: relative;
 
             &:before {
@@ -130,7 +129,7 @@
                 resize: none;
                 border: 1px solid #f1f1f1;
                 border-radius: 5px;
-                padding: 10px;
+                padding: 15px 20px;
             }
         }
 
@@ -155,11 +154,14 @@
                     position: absolute;
                     right: -20px;
                     top: -20px;
-                    font-size: 40px;
                     color: #fff;
-                    background: #b0b0b0;
+                    background-color: red;
                     border-radius: 100%;
                     z-index: 2;
+                    width: 40px;
+                    height: 40px;
+                    font-size: 30px;
+                    text-align: center;
                 }
 
                 img {