修改

@@ -33,8 +33,15 @@
               <td :rowspan="item.returnedGoodsListBoArray.length">退货</td>
               <td :rowspan="item.returnedGoodsListBoArray.length">退货</td>
               <td :rowspan="item.returnedGoodsListBoArray.length">{{ shopStatus[item.shopStatus] || '无' }}</td>
               <td :rowspan="item.returnedGoodsListBoArray.length">{{ shopStatus[item.shopStatus] || '无' }}</td>
               <td :rowspan="item.returnedGoodsListBoArray.length">
               <td :rowspan="item.returnedGoodsListBoArray.length">
-                <i-button type="default" size="small" @click="goToDetail(item.id, item.orderCode)">查看订单</i-button>
-                <i-button type="primary" size="small" @click="goToHandle(item.id, item.orderCode)">处理</i-button>
+                <i-button type="default" @click="goToDetail(item.id, item.orderCode, item.shopStatus)">
+                  查看订单
+                </i-button>
+                <template v-if="item.shopStatus >= 24">
+                  <i-button type="default" @click="goToHandle(item.id, item.orderCode)">查看售后详情</i-button>
+                </template>
+                <template v-else>
+                  <i-button type="primary" @click="goToHandle(item.id, item.orderCode)">处理</i-button>
+                </template>
               </td>
               </td>
             </template>
             </template>
           </tr>
           </tr>
@@ -66,13 +73,14 @@ export default {
     };
     };
   },
   },
   methods: {
   methods: {
-    goToDetail(operateId, code) {
+    goToDetail(operateId, code, status) {
       this.$router.push({
       this.$router.push({
         name: 'order.returned.detail',
         name: 'order.returned.detail',
         params: {},
         params: {},
         query: {
         query: {
           id: operateId,
           id: operateId,
           orderCode: code,
           orderCode: code,
+          shopStatus: status,
         },
         },
       });
       });
     },
     },
@@ -116,6 +124,10 @@ table.order-table {
           margin-left: 10px;
           margin-left: 10px;
           margin-right: 20px;
           margin-right: 20px;
         }
         }
+        button {
+          margin: 2px;
+          padding: 5px 0 5px 5px;
+        }
       }
       }
       td:last-child {
       td:last-child {
         border-right: 1px solid #cccccc;
         border-right: 1px solid #cccccc;

@@ -4,9 +4,16 @@
       <div class="ivu-card-head">
       <div class="ivu-card-head">
         <p slot="title" style="height: 35px">
         <p slot="title" style="height: 35px">
           当前订单状态：{{ orderStatus[orderInfo.orderStatus] }}
           当前订单状态：{{ orderStatus[orderInfo.orderStatus] }}
-          <i-button size="large" type="success" style="margin-left: 50px;" @click="goToHandle(id, orderCode)">
-            去处理
-          </i-button>
+          <template v-if="shopStatus < 24">
+            <i-button size="large" type="primary" style="margin-left: 50px;" @click="goToHandle(id, orderCode)">
+              去处理
+            </i-button>
+          </template>
+          <template v-else>
+            <i-button size="large" type="default" style="margin-left: 50px;" @click="goToHandle(id, orderCode)">
+              查看售后详情
+            </i-button>
+          </template>
         </p>
         </p>
       </div>
       </div>
     </div>
     </div>
@@ -42,6 +49,7 @@ export default {
     return {
     return {
       orderCode: this.$route.query.orderCode,
       orderCode: this.$route.query.orderCode,
       id: this.$route.query.id,
       id: this.$route.query.id,
+      shopStatus: this.$route.query.shopStatus,
       orderStatus: OrderConfig.orderStatus,
       orderStatus: OrderConfig.orderStatus,
       feeSharingType: OrderConfig.feeSharingType,
       feeSharingType: OrderConfig.feeSharingType,
       orderInfo: [],
       orderInfo: [],

@@ -11,7 +11,7 @@
           <i-col span="4">退货状态：{{ returnedGoodsShopStatus[returnedInfo.shopStatus] }}</i-col>
           <i-col span="4">退货状态：{{ returnedGoodsShopStatus[returnedInfo.shopStatus] }}</i-col>
         </Row>
         </Row>
         <Row>
         <Row>
-          <i-col span="4">退款总金额：{{ returnedInfo.realReturnedAmount }}</i-col>
+          <i-col span="4">退款总金额：{{ returnTotalAmount }}</i-col>
           <i-col span="4">
           <i-col span="4">
             退款成功时间：<span v-if="returnedInfo.refundTime">{{ returnedInfo.refundTime | timeFormat }}</span>
             退款成功时间：<span v-if="returnedInfo.refundTime">{{ returnedInfo.refundTime | timeFormat }}</span>
           </i-col>
           </i-col>
@@ -24,7 +24,7 @@
     <returned-goods-info
     <returned-goods-info
       :table-data="returnGoods"
       :table-data="returnGoods"
       :returned-reason="returnedReasonArr"
       :returned-reason="returnedReasonArr"
-      :returned-amount="returnedInfo.realReturnedAmount"
+      :returned-amount="returnTotalAmount"
     >
     >
     </returned-goods-info>
     </returned-goods-info>
     <div class="ivu-card">
     <div class="ivu-card">
@@ -93,6 +93,7 @@ export default {
       expressName: '',
       expressName: '',
       expressId: 0,
       expressId: 0,
       returnedGoodsShopStatus: OrderConfig.returnedGoodsShopStatus,
       returnedGoodsShopStatus: OrderConfig.returnedGoodsShopStatus,
+      returnTotalAmount: 0,
     };
     };
   },
   },
   created() {
   created() {
@@ -110,6 +111,7 @@ export default {
     getReturnedInfo() {
     getReturnedInfo() {
       this.returnedService.getReturnedInfo({ id: +this.id }).then(ret => {
       this.returnedService.getReturnedInfo({ id: +this.id }).then(ret => {
         this.returnedInfo = _.get(ret, 'data', []);
         this.returnedInfo = _.get(ret, 'data', []);
+        this.returnTotalAmount = this.returnedInfo.realReturnedAmount + this.returnedInfo.returnShippingCost;
       });
       });
     },
     },
     //获取订单详情
     //获取订单详情