From 270623a9adb9f24044981b2e5a75ac681e61b0f8 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 22 Aug 2023 16:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/pages/logistics/form/form.blade.php | 40 ++++++++++---------
 resources/lang/en/admin/logistics.php         |  1 +
 resources/lang/zh_cn/admin/logistics.php      |  1 +
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/resources/beike/admin/views/pages/logistics/form/form.blade.php b/resources/beike/admin/views/pages/logistics/form/form.blade.php
index e97fd5c0..cae8fd36 100644
--- a/resources/beike/admin/views/pages/logistics/form/form.blade.php
+++ b/resources/beike/admin/views/pages/logistics/form/form.blade.php
@@ -144,33 +144,37 @@
             </x-admin::form.row>
             <span v-if="form.type !== 'free'">
               <span v-if="form.type === 'weight'">
-            <x-admin-form-input name="first_weight" type="number" :title="__('admin/logistics.first_weight')"
-                                :value="old('first_weight', $logistics->first_weight ?? '')" step="any" required/>
+                <x-admin-form-input name="first_weight" type="number" :title="__('admin/logistics.first_weight')" :value="old('first_weight', $logistics->first_weight ?? '')" step="any" required>
+                  {{ __('admin/logistics.unit',['unit'=>__('product.g')]) }}
+                </x-admin-form-input>
             <x-admin-form-input name="first_weight_fee" type="number" :title="__('admin/logistics.first_weight_fee')"
                                 :value="old('first_weight_fee', $logistics->first_weight_fee ?? '')" step="any"
-                                required/>
+                                required> {{ __('admin/logistics.unit',['unit'=>'USD']) }}</x-admin-form-input>
             <x-admin-form-input name="add_weight" type="number" :title="__('admin/logistics.add_weight')"
-                                :value="old('add_weight', $logistics->add_weight ?? '')" step="any" required/>
+                                :value="old('add_weight', $logistics->add_weight ?? '')" step="any" required>
+                     {{ __('admin/logistics.unit',['unit'=>__('product.g')]) }}
+            </x-admin-form-input>
             <x-admin-form-input name="continuation_weight_fee" type="number"
                                 :title="__('admin/logistics.continuation_weight_fee')"
                                 :value="old('continuation_weight_fee', $logistics->continuation_weight_fee ?? '')"
-                                step="any" required/>
+                                step="any" required>
+                        {{ __('admin/logistics.unit',['unit'=>'USD']) }}
+            </x-admin-form-input>
             <x-admin-form-input name="throwing_ratio" type="number" :title="__('admin/logistics.throwing_ratio')"
-                                :value="old('throwing_ratio', $logistics->throwing_ratio ?? '')" step="any" required/>
+                                :value="old('throwing_ratio', $logistics->throwing_ratio ?? '')" step="any" required>
+            </x-admin-form-input>
 {{--            <x-admin-form-input name="continuation_weight_max" type="number" :title="__('admin/logistics.continuation_weight_max')" :value="old('continuation_weight_max', $logistics->continuation_weight_max ?? '')" step="any" required />--}}
-</span>
+              </span>
               <span v-if="form.type === 'num'">
-            <x-admin-form-input name="first_weight" type="number" :title="__('admin/logistics.first_num')"
-                                :value="old('first_weight', $logistics->first_weight ?? '')" step="any" required/>
-            <x-admin-form-input name="first_weight_fee" type="number" :title="__('admin/logistics.first_num_fee')"
-                                :value="old('first_weight_fee', $logistics->first_weight_fee ?? '')" step="any"
-                                required/>
-            <x-admin-form-input name="add_weight" type="number" :title="__('admin/logistics.add_num')"
-                                :value="old('add_weight', $logistics->add_weight ?? '')" step="any" required/>
-            <x-admin-form-input name="continuation_weight_fee" type="number"
-                                :title="__('admin/logistics.continuation_num_fee')"
-                                :value="old('continuation_weight_fee', $logistics->continuation_weight_fee ?? '')"
-                                step="any" required/>
+                <x-admin-form-input name="first_weight" type="number" :title="__('admin/logistics.first_num')" :value="old('first_weight', $logistics->first_weight ?? '')" step="any" required></x-admin-form-input>
+                <x-admin-form-input name="first_weight_fee" type="number" :title="__('admin/logistics.first_num_fee')" :value="old('first_weight_fee', $logistics->first_weight_fee ?? '')" step="any" required>
+                  {{ __('admin/logistics.unit',['unit'=>'USD']) }}
+                </x-admin-form-input>
+                <x-admin-form-input name="add_weight" type="number" :title="__('admin/logistics.add_num')" :value="old('add_weight', $logistics->add_weight ?? '')" step="any" required/>
+                <x-admin-form-input name="continuation_weight_fee" type="number" :title="__('admin/logistics.continuation_num_fee')" :value="old('continuation_weight_fee', $logistics->continuation_weight_fee ?? '')" step="any" required>
+                  {{ __('admin/logistics.unit',['unit'=>'USD']) }}
+                </x-admin-form-input>
+
 {{--            <x-admin-form-input name="num_fee" type="number" :title="__('admin/logistics.num_fee')" :value="old('num_fee', $logistics->continuation_weight_fee ?? '')" step="any" required />--}}
             </span>
               </span>
diff --git a/resources/lang/en/admin/logistics.php b/resources/lang/en/admin/logistics.php
index 8dc7027f..7952dcc2 100644
--- a/resources/lang/en/admin/logistics.php
+++ b/resources/lang/en/admin/logistics.php
@@ -78,4 +78,5 @@ return [
     'continuation_num_fee'=>'Continuation num fee',
     'freight_calculation_method'=>'Freight calculation method',
     'logistics_duration'         => 'Delivery within :day working days after shipment',
+    'unit'         => 'unit：:unit',
 ];
diff --git a/resources/lang/zh_cn/admin/logistics.php b/resources/lang/zh_cn/admin/logistics.php
index dde7232c..76b72aad 100644
--- a/resources/lang/zh_cn/admin/logistics.php
+++ b/resources/lang/zh_cn/admin/logistics.php
@@ -77,4 +77,5 @@ return [
     'continuation_num_fee'       => '续件运费',
     'freight_calculation_method' => '运费计算方式',
     'logistics_duration'         => '发货后:day个工作日内交货',
+    'unit'         => '单位：:unit',
 ];