From 9d35dee8deb06026d242ad73d6f3f5be83a1fb5b Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 1 Sep 2022 14:04:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Repositories/SettingRepo.php                       | 2 +-
 plugins/FlatShipping/columns.php                         | 8 ++++----
 resources/beike/admin/views/pages/plugins/form.blade.php | 2 +-
 resources/lang/en/common.php                             | 1 +
 resources/lang/zh_cn/common.php                          | 1 +
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/beike/Repositories/SettingRepo.php b/beike/Repositories/SettingRepo.php
index 05eebf03..4f910a5e 100644
--- a/beike/Repositories/SettingRepo.php
+++ b/beike/Repositories/SettingRepo.php
@@ -52,7 +52,7 @@ class SettingRepo
     {
         return [
             'name' => 'status',
-            'label' => '是否开启',
+            'label' => trans('common.whether_open'),
             'type' => 'bool',
             'required' => true,
         ];
diff --git a/plugins/FlatShipping/columns.php b/plugins/FlatShipping/columns.php
index a700ce2c..6f742f97 100644
--- a/plugins/FlatShipping/columns.php
+++ b/plugins/FlatShipping/columns.php
@@ -12,17 +12,17 @@
 return [
     [
         'name' => 'type',
-        'label' => trans('FlatShipping::common.flat_shipping'),
+        'label_key' => 'common.flat_shipping',
         'type' => 'select',
         'options' => [
-            ['value' => 'fixed', 'label' => '固定运费'],
-            ['value' => 'percent', 'label' => '百分比']
+            ['value' => 'fixed', 'label_key' => 'common.flat_shipping'],
+            ['value' => 'percent', 'label_key' => 'common.percentage']
         ],
         'required' => true,
     ],
     [
         'name' => 'value',
-        'label' => '运费值',
+        'label_key' => 'common.shipping_value',
         'type' => 'string',
         'required' => true,
     ]
diff --git a/resources/beike/admin/views/pages/plugins/form.blade.php b/resources/beike/admin/views/pages/plugins/form.blade.php
index 694f903d..f3418d75 100644
--- a/resources/beike/admin/views/pages/plugins/form.blade.php
+++ b/resources/beike/admin/views/pages/plugins/form.blade.php
@@ -62,7 +62,7 @@
         @endforeach
 
         <x-admin::form.row title="">
-          <button type="submit" class="btn btn-primary btn-lg mt-4">提交</button>
+          <button type="submit" class="btn btn-primary btn-lg mt-4">{{ __('common.submit') }}</button>
         </x-admin::form.row>
       </form>
     </div>
diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index f4c9b607..746678d9 100644
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -65,6 +65,7 @@ return [
     'select_all' => 'Select All',
     'sign_out' => 'Sign Out',
     'menu' => 'Menu',
+    'whether_open' => 'Whether to open',
 
     'id' => 'ID',
     'created_at' => 'Created At',
diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php
index 780332e2..02f96852 100644
--- a/resources/lang/zh_cn/common.php
+++ b/resources/lang/zh_cn/common.php
@@ -64,6 +64,7 @@ return [
     'select_all' => '全选',
     'sign_out' => '退出登录',
     'menu' => '菜单',
+    'whether_open' => '是否开启',
 
     'id' => 'ID',
     'created_at' => '创建时间',