From ffe91e5bdc9608da11a0002caee4e15fb890d3fa Mon Sep 17 00:00:00 2001
From: sl <2436637291@qq.com>
Date: Thu, 18 Aug 2022 19:09:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/lang/zh_cn/shop/account.php       | 25 +++++++++++++++++++++
 resources/lang/zh_cn/shop/common.php        |  2 ++
 themes/default/account/rmas/form.blade.php  | 25 ++++++++++++---------
 themes/default/account/rmas/index.blade.php | 25 ++++++++++++---------
 themes/default/account/rmas/info.blade.php  |  4 +++-
 5 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php
index 82cf2161..046bd1ae 100644
--- a/resources/lang/zh_cn/shop/account.php
+++ b/resources/lang/zh_cn/shop/account.php
@@ -46,6 +46,7 @@ return [
 
     'order' => [
         'index' => '订单列表',
+        'show' => '订单详情',
         'order_completed' => '已确认收货',
         'order_details' => '订单详情',
         'amount' => '金额',
@@ -103,4 +104,28 @@ return [
         'confirm_delete' => '确定要删除地址吗？',
         'hint' => '提示',
     ],
+
+    'rma' => [
+        'index' => '我的售后',
+        'commodity' => '商品',
+        'quantity' => '数量',
+        'service_type' => '服务类型',
+        'return_reason' => '退换原因',
+        'creation_time' => '创建时间',
+        'operate' => '操作',
+        'check' => '查看',
+
+        'rma_info' => [
+            'index' => '售后详情', 
+        ],
+
+        'rma_form' => [
+            'index' => '提交售后信息', 
+            'service_type' => '服务类型', 
+            'return_quantity' => '退换数量', 
+            'unpacked' => '已打开包装', 
+            'return_reason' => '退换原因', 
+            'remark' => '备注', 
+        ]
+    ]
 ];
diff --git a/resources/lang/zh_cn/shop/common.php b/resources/lang/zh_cn/shop/common.php
index 218fd6e7..3962bc38 100644
--- a/resources/lang/zh_cn/shop/common.php
+++ b/resources/lang/zh_cn/shop/common.php
@@ -14,4 +14,6 @@ return [
     'submit' => '提交',
     'cancel' => '取消',
     'confirm' => '确定',
+    'no' => '否',
+    'yes' => '是',
 ];
diff --git a/themes/default/account/rmas/form.blade.php b/themes/default/account/rmas/form.blade.php
index 8f6a2579..64b6340e 100644
--- a/themes/default/account/rmas/form.blade.php
+++ b/themes/default/account/rmas/form.blade.php
@@ -8,12 +8,15 @@
 
 @section('content')
   <div class="container" id="address-app">
-    <nav aria-label="breadcrumb">
+
+    <x-shop-breadcrumb type="static" value="account.rma.index" /> 
+
+    {{-- <nav aria-label="breadcrumb">
       <ol class="breadcrumb">
         <li class="breadcrumb-item"><a href="#">Home</a></li>
         <li class="breadcrumb-item active" aria-current="page">Library</li>
       </ol>
-    </nav>
+    </nav> --}}
 
     <div class="row">
       <x-shop-sidebar/>
@@ -21,7 +24,7 @@
       <div class="col-12 col-md-9">
         <div class="card h-min-600">
           <div class="card-header d-flex justify-content-between align-items-center">
-            <h5 class="card-title">提交售后信息</h5>
+            <h5 class="card-title">{{ __('shop/account.rma.rma_form.index') }}</h5>
           </div>
           <div class="card-body h-min-600">
             <div class="bg-light rounded-3 p-3 mb-4" style="background: #f6f9fc;">
@@ -48,7 +51,7 @@
 
               <div class="row">
                 <div class="col-sm-6 mb-4">
-                  <label class="form-label">服务类型</label>
+                  <label class="form-label">{{ __('shop/account.rma.rma_form.service_type') }}</label>
                   <select class="form-select" name="type">
                     @foreach ($types as $key => $item)
                       <option value="{{ $key }}" {{ $key == old('type', '') ? 'selected': '' }}>{{ $item }}</option>
@@ -57,7 +60,7 @@
                 </div>
 
                 <div class="col-sm-6 mb-4">
-                  <label class="form-label">退换数量</label>
+                  <label class="form-label">{{ __('shop/account.rma.rma_form.return_quantity') }}</label>
                   <input class="form-control {{ $errors->has('quantity') ? 'is-invalid' : '' }}" type="text" name="quantity" value="{{ old('quantity', $orderProduct->quantity ?? '1') }}">
                   @if ($errors->has('quantity'))
                     <span class="invalid-feedback" role="alert">{{ $errors->first('quantity') }}</span>
@@ -65,15 +68,15 @@
                 </div>
 
                 <div class="col-sm-6 mb-4">
-                  <label class="form-label">已打开包装</label>
+                  <label class="form-label">{{ __('shop/account.rma.rma_form.unpacked') }}</label>
                   <select class="form-select" name="opened">
-                    <option selected value="0">否</option>
-                    <option value="1">是</option>
+                    <option selected value="0">{{ __('shop/common.no') }}</option>
+                    <option value="1">{{ __('shop/common.yes') }}</option>
                   </select>
                 </div>
 
                 <div class="col-sm-6 mb-4">
-                  <label class="form-label">退换原因</label>
+                  <label class="form-label">{{ __('shop/account.rma.rma_form.return_reason') }}</label>
                   <select class="form-select {{ $errors->has('rma_reason_id') ? 'is-invalid' : '' }}" name="rma_reason_id">
                     @foreach ($reasons as $item)
                       <option value="{{ $item['id'] }}" {{ $item['id'] == old('opened', '') ? 'selected': '' }}>{{ $item['name'] }}</option>
@@ -88,12 +91,12 @@
                 <div class="col-12 "></div>
 
                 <div class="col-sm-6 mb-4">
-                  <label class="form-label">备注</label>
+                  <label class="form-label">{{ __('shop/account.rma.rma_form.remark') }}</label>
                   <textarea rows="4" type="text" name="comment" class="form-control">{{ old('comment', '') }}</textarea>
                 </div>
 
                 <div class="col-12 mt-4">
-                  <button class="btn btn-primary mt-sm-0" type="submit">提交</button>
+                  <button class="btn btn-primary mt-sm-0" type="submit">{{ __('shop/common.submit') }}</button>
                 </div>
               </div>
             </form>
diff --git a/themes/default/account/rmas/index.blade.php b/themes/default/account/rmas/index.blade.php
index 5c5d77f9..7b906881 100644
--- a/themes/default/account/rmas/index.blade.php
+++ b/themes/default/account/rmas/index.blade.php
@@ -3,13 +3,16 @@
 @section('body-class', 'page-account-rmas')
 
 @section('content')
-  <div class="container">
-    <nav aria-label="breadcrumb">
+  <div class="container"> 
+
+    <x-shop-breadcrumb type="static" value="account.rma.index" /> 
+
+    {{-- <nav aria-label="breadcrumb">
       <ol class="breadcrumb">
         <li class="breadcrumb-item"><a href="#">Home</a></li>
         <li class="breadcrumb-item active" aria-current="page">Library</li>
       </ol>
-    </nav>
+    </nav> --}}
 
 
     <div class="row">
@@ -17,19 +20,19 @@
       <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">
-            <h5 class="card-title">我的售后</h5>
+            <h5 class="card-title">{{ __('shop/account.rma.index') }}</h5>
           </div>
           <div class="card-body">
             <table class="table ">
               <thead>
                 <tr>
-                  <th>商品</th>
-                  <th>数量</th>
-                  <th>服务类型</th>
-                  <th>退换原因</th>
-                  <th>创建时间</th>
+                  <th>{{ __('shop/account.rma.commodity') }}</th>
+                  <th>{{ __('shop/account.rma.quantity') }}</th>
+                  <th>{{ __('shop/account.rma.service_type') }}</th>
+                  <th>{{ __('shop/account.rma.return_reason') }}</th>
+                  <th>{{ __('shop/account.rma.creation_time') }}</th>
                   {{-- <th>状态</th> --}}
-                  <th class="text-end">操作</th>
+                  <th class="text-end">{{ __('shop/account.rma.operate') }}</th>
                 </tr>
               </thead>
               <tbody>
@@ -41,7 +44,7 @@
                     <td>{{ $rma['reason'] }}</td>
                     <td>{{ $rma['created_at'] }}</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>
+                    <td class="text-end"><a href="{{ shop_route('account.rma.show', [$rma['id']]) }}" class="btn btn-outline-secondary btn-sm">{{ __('shop/account.rma.check') }}</a> </td>
                   </tr>
                 @endforeach
               </tbody>
diff --git a/themes/default/account/rmas/info.blade.php b/themes/default/account/rmas/info.blade.php
index 48353465..a605dcef 100644
--- a/themes/default/account/rmas/info.blade.php
+++ b/themes/default/account/rmas/info.blade.php
@@ -8,6 +8,8 @@
 
 @section('content')
   <div class="container" id="address-app">
+
+    
     <nav aria-label="breadcrumb">
       <ol class="breadcrumb">
         <li class="breadcrumb-item"><a href="#">Home</a></li>
@@ -21,7 +23,7 @@
       <div class="col-12 col-md-9">
         <div class="card h-min-600">
           <div class="card-header d-flex justify-content-between align-items-center">
-            <h5 class="card-title">售后详情</h5>
+            <h5 class="card-title">{{ __('shop/account.rma.rma_info.index') }}</h5>
           </div>
           <div class="card-body h-600">
             {{-- {{ dd($rma) }} --}}