From 5b503d9038236288cf0a73e7cdb55c2f1df05276 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Wed, 17 Aug 2022 11:11:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=94=AE=E5=90=8E=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Shop/Http/Resources/RmaDetail.php             | 5 ++++-
 themes/default/account/account.blade.php            | 2 +-
 themes/default/account/rmas/index.blade.php         | 7 ++++---
 themes/default/account/rmas/info.blade.php          | 2 +-
 themes/default/components/account/sidebar.blade.php | 2 ++
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/beike/Shop/Http/Resources/RmaDetail.php b/beike/Shop/Http/Resources/RmaDetail.php
index 52eb182d..ada5c4ae 100644
--- a/beike/Shop/Http/Resources/RmaDetail.php
+++ b/beike/Shop/Http/Resources/RmaDetail.php
@@ -11,18 +11,21 @@
 
 namespace Beike\Shop\Http\Resources;
 
+use Beike\Repositories\RmaRepo;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class RmaDetail extends JsonResource
 {
     public function toArray($request): array
     {
+        $types = RmaRepo::getTypes();
+
         return [
             'id' => $this->id,
             'order_product_id' => $this->order_product_id,
             'quantity' => $this->quantity,
             'opened' => $this->opened,
-            'type' => $this->type,
+            'type' => $types[$this->type],
             'comment' => $this->comment,
             'status' => $this->status,
             'created_at' => time_format($this->created_at),
diff --git a/themes/default/account/account.blade.php b/themes/default/account/account.blade.php
index 5e195e5a..93d80a8f 100644
--- a/themes/default/account/account.blade.php
+++ b/themes/default/account/account.blade.php
@@ -54,7 +54,7 @@
                   class="text-muted">待发货</span></a>
               <a href="{{ shop_route('account.order.index', ['status' => 'shipped']) }}" class="d-flex flex-column align-items-center"><i class="iconfont">&#xf131;</i><span
                   class="text-muted">待收货</span></a>
-              <a href="http://" class="d-flex flex-column align-items-center"><i class="iconfont">&#xf132;</i><span
+              <a href="{{ shop_route('account.rma.index') }}" class="d-flex flex-column align-items-center"><i class="iconfont">&#xf132;</i><span
                   class="text-muted">售后</span></a>
             </div>
             <div class="order-wrap">
diff --git a/themes/default/account/rmas/index.blade.php b/themes/default/account/rmas/index.blade.php
index c667a2ad..5c5d77f9 100644
--- a/themes/default/account/rmas/index.blade.php
+++ b/themes/default/account/rmas/index.blade.php
@@ -14,7 +14,6 @@
 
     <div class="row">
       <x-shop-sidebar/>
-
       <div class="col-12 col-md-9">
         <div class="card mb-4 account-card order-wrap h-min-600">
           <div class="card-header d-flex justify-content-between align-items-center">
@@ -27,8 +26,9 @@
                   <th>商品</th>
                   <th>数量</th>
                   <th>服务类型</th>
+                  <th>退换原因</th>
                   <th>创建时间</th>
-                  <th>状态</th>
+                  {{-- <th>状态</th> --}}
                   <th class="text-end">操作</th>
                 </tr>
               </thead>
@@ -38,8 +38,9 @@
                     <td>{{ sub_string($rma['product_name'], 80) }}</td>
                     <td>{{ $rma['quantity'] }}</td>
                     <td>{{ $rma['type'] }}</td>
+                    <td>{{ $rma['reason'] }}</td>
                     <td>{{ $rma['created_at'] }}</td>
-                    <td>{{ $rma['status'] }}</td>
+                    {{-- <td>{{ $rma['status'] }}</td> --}}
                     <td class="text-end"><a href="{{ shop_route('account.rma.show', [$rma['id']]) }}" class="btn btn-outline-secondary btn-sm">查看</a> </td>
                   </tr>
                 @endforeach
diff --git a/themes/default/account/rmas/info.blade.php b/themes/default/account/rmas/info.blade.php
index b8a9d600..48353465 100644
--- a/themes/default/account/rmas/info.blade.php
+++ b/themes/default/account/rmas/info.blade.php
@@ -24,7 +24,7 @@
             <h5 class="card-title">售后详情</h5>
           </div>
           <div class="card-body h-600">
-
+            {{-- {{ dd($rma) }} --}}
           </div>
         </div>
       </div>
diff --git a/themes/default/components/account/sidebar.blade.php b/themes/default/components/account/sidebar.blade.php
index f5bed0a5..bf29da75 100644
--- a/themes/default/components/account/sidebar.blade.php
+++ b/themes/default/components/account/sidebar.blade.php
@@ -16,6 +16,8 @@
         <span>我的地址</span></a>
       <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('account.wishlist.index') }}">
         <span>我的收藏</span></a>
+      <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('account.rma.index') }}">
+        <span>我的售后</span></a>
       <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('logout') }}">
         <span>退出登录</span></a>
     </nav>