From 00790c1d6c6b3a45adc378a5e26c9c6e1d608241 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Tue, 16 Aug 2022 19:03:45 +0800
Subject: [PATCH] wip

---
 themes/default/account/account.blade.php   |  5 +----
 themes/default/account/rmas/form.blade.php | 16 ++++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/themes/default/account/account.blade.php b/themes/default/account/account.blade.php
index 29afd3e4..5e195e5a 100644
--- a/themes/default/account/account.blade.php
+++ b/themes/default/account/account.blade.php
@@ -72,10 +72,7 @@
                       <tr class="align-middle">
                         <td>
                           <div class="img me-3 border wh-60">
-                            {{-- @foreach ($order->orderProducts as $product)
-                            <img src="{{ $product->image }}" class="img-fluid">
-                            @endforeach --}}
-                            <img src="{{ $order->orderProducts[0]->image }}" class="img-fluid">
+                            <img src="{{ $order->orderProducts[0]->image ?? '' }}" class="img-fluid">
                           </div>
                         </td>
                         <td>
diff --git a/themes/default/account/rmas/form.blade.php b/themes/default/account/rmas/form.blade.php
index 60429028..36d095d6 100644
--- a/themes/default/account/rmas/form.blade.php
+++ b/themes/default/account/rmas/form.blade.php
@@ -48,6 +48,14 @@
               <input type="hidden" name="order_product_id" value="{{ $orderProduct->id }}">
 
               <div class="row">
+                <div class="col-sm-6 mb-4">
+                  <label class="form-label">服务类型</label>
+                  <select class="form-select" name="type">
+                    @foreach ($types as $key => $item)
+                      <option value="{{ $key }}" {{ $key == old('type', '') ? 'selected': '' }}>{{ $item }}</option>
+                    @endforeach
+                  </select>
+                </div>
                 <div class="col-sm-6 mb-4">
                   <label class="form-label">退换数量</label>
                   <input class="form-control" type="text" value="{{ old('quantity', $orderProduct->quantity ?? '1') }}">
@@ -69,14 +77,6 @@
                     <option value="1">是</option>
                   </select>
                 </div>
-                <div class="col-sm-6 mb-4">
-                  <label class="form-label">服务类型</label>
-                  <select class="form-select" name="type">
-                    @foreach ($statuses as $key => $item)
-                      <option value="{{ $key }}" {{ $key == old('type', '') ? 'selected': '' }}>{{ $item }}</option>
-                    @endforeach
-                  </select>
-                </div>
 
                 <div class="col-12 "></div>