From 618a356406578e641dd5b3bef57dd10a4891db5c Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Wed, 31 Aug 2022 11:47:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beike/admin/views/components/header.blade.php |  2 +-
 .../beike/admin/views/pages/login/login.blade.php | 12 ++++++------
 .../beike/admin/views/pages/rmas/info.blade.php   |  2 +-
 resources/lang/en/admin/login.php                 | 15 +++++++++++++++
 resources/lang/en/common.php                      |  1 +
 resources/lang/zh_cn/admin/login.php              | 15 +++++++++++++++
 resources/lang/zh_cn/common.php                   |  1 +
 7 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 resources/lang/en/admin/login.php
 create mode 100644 resources/lang/zh_cn/admin/login.php

diff --git a/resources/beike/admin/views/components/header.blade.php b/resources/beike/admin/views/components/header.blade.php
index 16791b2f..9eeac4c7 100644
--- a/resources/beike/admin/views/components/header.blade.php
+++ b/resources/beike/admin/views/components/header.blade.php
@@ -34,7 +34,7 @@
           </a>
 
           <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="dropdownMenuLink">
-            <li><a href="{{ admin_route('logout.index') }}" class="dropdown-item"><i class="bi bi-box-arrow-left"></i> 退出登录</a></li>
+            <li><a href="{{ admin_route('logout.index') }}" class="dropdown-item"><i class="bi bi-box-arrow-left"></i> {{ __('common.sign_out') }}</a></li>
           </ul>
         </div>
       </li>
diff --git a/resources/beike/admin/views/pages/login/login.blade.php b/resources/beike/admin/views/pages/login/login.blade.php
index 243c60dc..0acee9c3 100644
--- a/resources/beike/admin/views/pages/login/login.blade.php
+++ b/resources/beike/admin/views/pages/login/login.blade.php
@@ -14,8 +14,8 @@
       <div class="card">
         <div class="w-480">
           <div class="card-header mt-3 mb-4">
-            <h4 class="fw-bold">登录到 beikeshop 后台</h4>
-            <div class="text-muted fw-normal">登录到 beikeshop 后台</div>
+            <h4 class="fw-bold">{{ __('admin/login.plugins_index') }}</h4>
+            <div class="text-muted fw-normal">{{ __('admin/login.plugins_index') }}</div>
           </div>
 
           <div class="card-body">
@@ -24,15 +24,15 @@
 
               <div class="form-floating mb-4">
                 <input type="text" name="email" class="form-control" id="email-input" value="{{ old('email') }}" placeholder="邮箱地址">
-                <label for="email-input">邮箱地址</label>
+                <label for="email-input">{{ __('common.email') }}</label>
                 @error('email')
                   <x-admin::form.error :message="$message" />
                 @enderror
               </div>
 
               <div class="form-floating mb-5">
-                <input type="password" name="password" class="form-control" id="password-input" placeholder="密码">
-                <label for="password-input">密码</label>
+                <input type="password" name="password" class="form-control" id="password-input" placeholder="{{ __('shop/login.password') }}">
+                <label for="password-input">{{ __('shop/login.password') }}</label>
                 @error('password')
                   <x-admin::form.error :message="$message" />
                 @enderror
@@ -44,7 +44,7 @@
                 </div>
               @endif
 
-              <div class="d-grid mb-4"><button type="submit" class="btn btn-lg btn-primary">登录</button></div>
+              <div class="d-grid mb-4"><button type="submit" class="btn btn-lg btn-primary">{{ __('admin/login.log_in') }}</button></div>
               {{-- <a href="{{ admin_route('forgotten.index') }}" class="text-muted"><i class="bi bi-question-circle"></i> 忘记密码</a> --}}
             </form>
           </div>
diff --git a/resources/beike/admin/views/pages/rmas/info.blade.php b/resources/beike/admin/views/pages/rmas/info.blade.php
index ddf38549..e769ff60 100644
--- a/resources/beike/admin/views/pages/rmas/info.blade.php
+++ b/resources/beike/admin/views/pages/rmas/info.blade.php
@@ -56,7 +56,7 @@
     <div class="card-body" id="app">
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="{{ __('admin/rma.current_state') }}">
-          待支付
+          {{ $rma->status }}
         </el-form-item>
         <el-form-item label="{{ __('admin/rma.modify_status') }}" prop="status">
           <el-select size="small" v-model="form.status" placeholder="{{ __('common.please_choose') }}">
diff --git a/resources/lang/en/admin/login.php b/resources/lang/en/admin/login.php
new file mode 100644
index 00000000..9b902ae2
--- /dev/null
+++ b/resources/lang/en/admin/login.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * order.php
+ *
+ * @copyright  2022 opencart.cn - All Rights Reserved
+ * @link       http://www.guangdawangluo.com
+ * @author     Edward Yang <yangjin@opencart.cn>
+ * @created    2022-08-02 14:22:41
+ * @modified   2022-08-02 14:22:41
+ */
+
+return [
+    'plugins_index' => 'Login to beikeshop backend',
+    'log_in' => 'Log In',
+];
diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index f03d7893..2c8537a5 100644
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -63,6 +63,7 @@ return [
     'return' => 'Return',
     'language' => 'Language',
     'select_all' => 'Select All',
+    'sign_out' => 'Sign Out',
 
     'id' => 'ID',
     'created_at' => 'Created At',
diff --git a/resources/lang/zh_cn/admin/login.php b/resources/lang/zh_cn/admin/login.php
new file mode 100644
index 00000000..b4484431
--- /dev/null
+++ b/resources/lang/zh_cn/admin/login.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * order.php
+ *
+ * @copyright  2022 opencart.cn - All Rights Reserved
+ * @link       http://www.guangdawangluo.com
+ * @author     Edward Yang <yangjin@opencart.cn>
+ * @created    2022-08-02 14:22:41
+ * @modified   2022-08-02 14:22:41
+ */
+
+return [
+    'plugins_index' => '登录到 beikeshop 后台',
+    'log_in' => '登录',
+];
diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php
index bed2bf2e..a2b21ab4 100644
--- a/resources/lang/zh_cn/common.php
+++ b/resources/lang/zh_cn/common.php
@@ -62,6 +62,7 @@ return [
     'return' => '返回',
     'language' => '语言',
     'select_all' => '全选',
+    'sign_out' => '退出登录',
 
     'id' => 'ID',
     'created_at' => '创建时间',