From 6f731804c6d7198b52aaefc0a450b0cb1f7e5199 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Mon, 29 Aug 2022 21:21:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E8=AF=8D=E6=9D=A1=E7=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Installer/Views/finished.blade.php      |   2 +-
 public/install/image/install-enter.jpg        | Bin 0 -> 1129 bytes
 .../views/pages/products/form/form.blade.php  |  97 +++++++++---------
 .../views/pages/products/index.blade.php      |   7 +-
 resources/lang/en/admin/brand.php             |   2 +
 resources/lang/en/admin/category.php          |   2 +
 resources/lang/en/admin/product.php           |  15 +++
 resources/lang/en/admin/tax_class.php         |   1 +
 resources/lang/en/common.php                  |   4 +
 resources/lang/zh_cn/admin/brand.php          |   2 +
 resources/lang/zh_cn/admin/category.php       |   2 +
 resources/lang/zh_cn/admin/product.php        |  15 +++
 resources/lang/zh_cn/admin/tax_class.php      |   1 +
 resources/lang/zh_cn/common.php               |   4 +
 14 files changed, 102 insertions(+), 52 deletions(-)
 create mode 100644 public/install/image/install-enter.jpg

diff --git a/beike/Installer/Views/finished.blade.php b/beike/Installer/Views/finished.blade.php
index ca73050e..0edfc893 100644
--- a/beike/Installer/Views/finished.blade.php
+++ b/beike/Installer/Views/finished.blade.php
@@ -15,7 +15,7 @@
 
 		<div class="d-flex justify-content-center flex-column align-items-center">
 
-			<div class="welcome-img mb-5" style="max-width: 260px;"><img src="{{ asset('/install/image/install-2.png') }}" class="img-fluid"></div>
+			<div class="welcome-img mb-5" style="max-width: 260px;"><img src="http://beikeshop.test/install/install-2.png?version=1.0&build_date=20220829" class="img-fluid"></div>
 
 			<h5 class="text-center mb-5">{{ __('installer::installer_messages.final.finished') }}</h5>
 
diff --git a/public/install/image/install-enter.jpg b/public/install/image/install-enter.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ada5c296412976428991bfc77f2767def6711e6b
GIT binary patch
literal 1129
zcma)5T~FIE6m`~8x;8+gf>Z(0tnji;YZ9k}l86jJL$yxIgt|)GYnm7umBdk!u7TI>
zU+rN$>__b5iT7#y37M0%g$+9G%8~4od(OSKkCV^I6{sD>&ItgW&SOvn*O7b&oIbLK
z=YRou3hx1sT;<RpihNZRy-+Z1(#L{DTroC%5ebqA_V#1nw1zl>eSGS88vpadM;<!1
z#=qV+B*Smvf%E(#z^^V|_N<GcrP%!bGq@M4vFp1yGGXkVd7&C>d?v2ac?yd>%u=GE
z#vi0r;Tz)^wn%_sQ$Te~k|fwv1Z<mfzj0z(PoONxNJMlr>!_*94HYSH5<D#!*e7aN
zZ%@k6mBvr@H6D+JaYG=%sfZLs5hYoa<vPu%hv!~o#&s{;nkwixv;xPE9OA)L(d?5^
zr17-b-@9=Ane3g%btBO*{+;T&=^13QVbsOf{oW}Y_Rf7Qc5z5XfrV-MR!a8OR)Ecj
z1U*8|rU!XEAQ1@%#D{W2K=7eqT8@_@k1~p3s2wkiOwYm{UE`^U;5fFbw4WX#xvijf
z3n6r*AIj2UtGTNm>`2=?lHQtfbz+TN>_t<qea$_X%S{d8`n0l+1LrNa+W~Q5wrkay
z-%E3@-h^w<?`3x`SES8|>D}JA>nTJHlul>nrHh&Uu}3{0P;)0gz;b3;U|-Tl#3bLq
zdr-*d^9%XH!b0JGfqvy;p-?QdrBb<6Vk>MG6?S>0va-xptE;Qk>gLAA#^!@rFpG<e
zOYBmuQmL)4ack?dAOAZ^E&*4h@0!Um9Jt3ZIgUv_ffp3{Gm6aL2&mjbxLZi_6|gym
O3g<Ym4|?yCFTVgRfF@-C

literal 0
HcmV?d00001

diff --git a/resources/beike/admin/views/pages/products/form/form.blade.php b/resources/beike/admin/views/pages/products/form/form.blade.php
index 6d7ab9b4..e3905d59 100644
--- a/resources/beike/admin/views/pages/products/form/form.blade.php
+++ b/resources/beike/admin/views/pages/products/form/form.blade.php
@@ -1,6 +1,6 @@
 @extends('admin::layouts.master')
 
-@section('title', '商品详情')
+@section('title', __('admin/product.products_show'))
 
 @section('body-class', 'page-product-form')
 
@@ -23,10 +23,10 @@
 
   <ul class="nav nav-tabs nav-bordered mb-3" role="tablist">
     <li class="nav-item" role="presentation">
-      <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#tab-basic" type="button" >基础信息</button>
+      <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#tab-basic" type="button" >{{ __('admin/product.basic_information') }}</button>
     </li>
     <li class="nav-item" role="presentation">
-      <button class="nav-link" data-bs-toggle="tab" data-bs-target="#tab-descriptions" type="button">商品详情</button>
+      <button class="nav-link" data-bs-toggle="tab" data-bs-target="#tab-descriptions" type="button">{{ __('admin/product.product_details') }}</button>
     </li>
   </ul>
 
@@ -41,9 +41,9 @@
 
         <div class="tab-content">
           <div class="tab-pane fade show active" id="tab-basic">
-            <h6 class="border-bottom pb-3 mb-4">数据</h6>
-            <x-admin-form-input-locale :width="600" name="descriptions.*.name" title="名称" :value="$descriptions" :required="true" />
-            <x-admin::form.row title="图片">
+            <h6 class="border-bottom pb-3 mb-4">{{ __('common.data') }}</h6>
+            <x-admin-form-input-locale :width="600" name="descriptions.*.name" title="{{ __('common.name') }}" :value="$descriptions" :required="true" />
+            <x-admin::form.row title="{{ __('common.image') }}">
               <draggable
                 element="div"
                 ghost-class="dragabble-ghost"
@@ -60,21 +60,20 @@
                 </div>
                 <div class="set-product-img wh-80" @click="addProductImages"><i class="bi bi-plus fs-1 text-muted"></i></div>
               </draggable>
-              <div class="help-text mb-1 mt-2">第一张图片将作为商品主图,支持同时上传多张图片,多张图片之间可随意调整位置；</div>
-              <div class="help-text">开启多规格并且多规格配置了图片时，这里的图片将作为多规格的公用图片，展示在其后面</div>
+              <div class="help-text mb-1 mt-2">{{ __('admin/product.image_help') }}</div>
             </x-admin::form.row>
             {{-- <x-admin-form-input name="video" title="视频" :value="old('video', $product->video ?? '')" /> --}}
-            <x-admin-form-input name="position" title="排序" :value="old('position', $product->position ?? '0')" />
+            <x-admin-form-input name="position" :title="__('common.sort_order')" :value="old('position', $product->position ?? '0')" />
 
-            <x-admin::form.row title="品牌">
+            <x-admin::form.row :title="__('admin/brand.index')">
               <input type="text" value="{{ $product->brand->name ?? '' }}" id="brand-autocomplete" class="form-control wp-400 " />
               <input type="hidden" name="brand_id" value="{{ old('brand_id', $product->brand_id ?? '') }}" />
             </x-admin::form.row>
 
-            <x-admin-form-select title="税类" name="tax_class_id" :value="old('tax_class_id', $product->tax_class_id ?? '')" :options="$tax_classes" key="id" label="title" />
-            <x-admin-form-switch name="active" title="状态" :value="old('active', $product->active ?? 1)" />
+            <x-admin-form-select :title="__('admin/tax_class.index')" name="tax_class_id" :value="old('tax_class_id', $product->tax_class_id ?? '')" :options="$tax_classes" key="id" label="title" />
+            <x-admin-form-switch name="active" :title="__('common.status')" :value="old('active', $product->active ?? 1)" />
 
-            <x-admin::form.row title="分类">
+            <x-admin::form.row :title="__('admin/category.index')">
               <div class="wp-400 form-control" style="max-height: 240px;overflow-y: auto">
                 @foreach ($source['categories'] as $_category)
                 <div class="form-check">
@@ -89,9 +88,9 @@
             </x-admin::form.row>
 
             <div>
-              <h5 class="border-bottom pb-3 mb-4">商品库存</h5>
+              <h5 class="border-bottom pb-3 mb-4">{{ __('admin/product.stocks') }}</h5>
 
-              <x-admin::form.row title="启用多规格">
+              <x-admin::form.row :title="__('admin/product.enable_multi_spec')">
                 <el-switch v-model="editing.isVariable" class="mt-2"></el-switch>
               </x-admin::form.row>
 
@@ -107,12 +106,12 @@
                           <div class="title">
                             <div>
                               <b>@{{ variant.name[current_language_code] }}</b>
-                              <el-link type="primary" @click="modalVariantOpenButtonClicked(variantIndex, null)">编辑</el-link>
-                              <el-link type="danger" class="ms-2" @click="removeSourceVariant(variantIndex)">移除</el-link>
+                              <el-link type="primary" @click="modalVariantOpenButtonClicked(variantIndex, null)">{{ __('admin/product.edit') }}</el-link>
+                              <el-link type="danger" class="ms-2" @click="removeSourceVariant(variantIndex)">{{ __('admin/product.delete') }}</el-link>
                             </div>
                             <div>
-                              <el-checkbox v-model="variant.isImage" border size="mini" class="me-2 bg-white">添加规格图片</el-checkbox>
-                              <el-button type="primary" plain size="mini" @click="modalVariantOpenButtonClicked(variantIndex, -1)">添加规格值</el-button>
+                              <el-checkbox v-model="variant.isImage" border size="mini" class="me-2 bg-white">{{ __('admin/product.add_variable_image') }}</el-checkbox>
+                              <el-button type="primary" plain size="mini" @click="modalVariantOpenButtonClicked(variantIndex, -1)">{{ __('admin/product.add_variable_value') }}</el-button>
                             </div>
                           </div>
                            <draggable
@@ -147,12 +146,12 @@
                              </div>
                           </draggable>
                           <div v-else>
-                            <div class="p-2" @click="modalVariantOpenButtonClicked(variantIndex, -1)">请添加规格值</div>
+                            <div class="p-2" @click="modalVariantOpenButtonClicked(variantIndex, -1)">{{ __('admin/product.add_variable_value') }}</div>
                           </div>
                         </div>
                       </draggable>
 
-                      <el-button type="primary" plain size="small" @click="modalVariantOpenButtonClicked(-1, null)" class="btn btn-xs mr-1 mb-1">添加规格</el-button>
+                      <el-button type="primary" plain size="small" @click="modalVariantOpenButtonClicked(-1, null)" class="btn btn-xs mr-1 mb-1">{{ __('admin/product.add_variable') }}</el-button>
                     </div>
 
                     <div v-if="form.skus.length && form.variables.length" class="mt-3">
@@ -161,13 +160,13 @@
                           <th v-for="(variant, index) in form.variables" :key="'pv-header-' + index">
                             @{{ variant.name[current_language_code] || 'No name' }}
                           </th>
-                          <th width="106px">图片</th>
-                          <th>型号</th>
+                          <th width="106px">{{ __('common.image') }}</th>
+                          <th>{{ __('admin/product.model') }}</th>
                           <th>sku</th>
-                          <th>价格</th>
-                          <th>原价</th>
-                          <th>成本价</th>
-                          <th>数量</th>
+                          <th>{{ __('admin/product.price') }}</th>
+                          <th>{{ __('admin/product.origin_price') }}</th>
+                          <th>{{ __('admin/product.cost_price') }}</th>
+                          <th>{{ __('admin/product.quantity') }}</th>
                         </thead>
                         <tbody>
                           <tr v-for="(sku, skuIndex) in form.skus" :key="skuIndex">
@@ -194,42 +193,42 @@
                                 :name="'skus[' + skuIndex + '][variants][' + j + ']'" :value="variantValueIndex">
                             </td>
                             <td><input type="text" class="form-control" v-model="sku.model" :name="'skus[' + skuIndex + '][model]'"
-                                placeholder="型号"></td>
+                                placeholder="{{ __('admin/product.model') }}"></td>
                             <td>
                               <input type="text" class="form-control" v-model="sku.sku" :name="'skus[' + skuIndex + '][sku]'" placeholder="sku" :style="sku.is_default ? 'margin-top: 19px;' : ''" required>
-                              <span role="alert" class="invalid-feedback">请填写sku</span>
-                              <span v-if="sku.is_default" class="text-success">默认主商品</span>
+                              <span role="alert" class="invalid-feedback">{{ __('common.error_required', ['name' => 'sku']) }}</span>
+                              <span v-if="sku.is_default" class="text-success">{{ __('admin/product.default_main_product') }}</span>
                             </td>
                             <td>
                               <input type="text" class="form-control" v-model="sku.price" :name="'skus[' + skuIndex + '][price]'"
-                                placeholder="价格" required>
-                              <span role="alert" class="invalid-feedback">请填写价格</span>
+                                placeholder="{{ __('admin/product.price') }}" required>
+                              <span role="alert" class="invalid-feedback">{{ __('common.error_required', ['name' => __('admin/product.price')]) }}</span>
                             </td>
                             <td><input type="text" class="form-control" v-model="sku.origin_price" :name="'skus[' + skuIndex + '][origin_price]'"
-                                placeholder="原价"></td>
+                                placeholder="{{ __('admin/product.origin_price') }}"></td>
                             <td><input type="text" class="form-control" v-model="sku.cost_price" :name="'skus[' + skuIndex + '][cost_price]'"
-                                placeholder="成本价">
+                                placeholder="{{ __('admin/product.cost_price') }}">
                             </td>
                             <td><input type="text" class="form-control" v-model="sku.quantity" :name="'skus[' + skuIndex + '][quantity]'"
-                                placeholder="数量"></td>
+                                placeholder="{{ __('admin/product.quantity') }}"></td>
                           </tr>
                         </tbody>
                       </table>
                     </div>
                   </div>
                   <input class="form-control d-none" :value="form.skus[0]?.variants?.length || ''" required>
-                  <div class="invalid-feedback" style="font-size: 16px"><i class="bi bi-exclamation-circle-fill"></i> 请添加规格</div>
+                  <div class="invalid-feedback" style="font-size: 16px"><i class="bi bi-exclamation-circle-fill"></i> {{ __('admin/product.add_variable') }}</div>
                 </div>
               </div>
 
               <template v-if="!editing.isVariable">
                 <input type="hidden" value="{{ old('skus.0.image', $product->skus[0]->image ?? '') }}" name="skus[0][image]">
-                <x-admin-form-input name="skus[0][model]" title="型号" :value="old('skus.0.model', $product->skus[0]->model ?? '')" />
+                <x-admin-form-input name="skus[0][model]" :title="__('admin/product.model')" :value="old('skus.0.model', $product->skus[0]->model ?? '')" />
                 <x-admin-form-input name="skus[0][sku]" title="sku" :value="old('skus.0.sku', $product->skus[0]->sku ?? '')" required />
-                <x-admin-form-input name="skus[0][price]" title="价格" :value="old('skus.0.price', $product->skus[0]->price ?? '')" required />
-                <x-admin-form-input name="skus[0][origin_price]" title="原价" :value="old('skus.0.origin_price', $product->skus[0]->origin_price ?? '')" />
-                <x-admin-form-input name="skus[0][cost_price]" title="成本价" :value="old('skus.0.cost_price', $product->skus[0]->cost_price ?? '')" />
-                <x-admin-form-input name="skus[0][quantity]" title="数量" :value="old('skus.0.quantity', $product->skus[0]->quantity ?? '')" />
+                <x-admin-form-input name="skus[0][price]" :title="__('admin/product.price')" :value="old('skus.0.price', $product->skus[0]->price ?? '')" required />
+                <x-admin-form-input name="skus[0][origin_price]" :title="__('admin/product.origin_price')" :value="old('skus.0.origin_price', $product->skus[0]->origin_price ?? '')" />
+                <x-admin-form-input name="skus[0][cost_price]" :title="__('admin/product.cost_price')" :value="old('skus.0.cost_price', $product->skus[0]->cost_price ?? '')" />
+                <x-admin-form-input name="skus[0][quantity]" :title="__('admin/product.quantity')" :value="old('skus.0.quantity', $product->skus[0]->quantity ?? '')" />
                 <input type="hidden" name="skus[0][variants]" placeholder="variants" value="">
                 <input type="hidden" name="skus[0][position]" placeholder="position" value="0">
                 <input type="hidden" name="skus[0][is_default]" placeholder="is_default" value="1">
@@ -237,8 +236,8 @@
             </div>
           </div>
           <div class="tab-pane fade" id="tab-descriptions">
-            <h6 class="border-bottom pb-3 mb-4">商品详情</h6>
-            <x-admin::form.row title="商品详情">
+            <h6 class="border-bottom pb-3 mb-4">{{ __('admin/product.product_details') }}</h6>
+            <x-admin::form.row :title="__('admin/product.product_details')">
 
               <ul class="nav nav-tabs mb-3" role="tablist">
                 @foreach ($languages as $language)
@@ -263,21 +262,21 @@
 
 
         <x-admin::form.row title="">
-          <button type="submit" class="btn btn-primary mt-3 btn-lg">保存</button>
+          <button type="submit" class="btn btn-primary mt-3 btn-lg">{{ __('common.save') }}</button>
         </x-admin::form.row>
 
         <el-dialog
-          title="编辑"
+          title="{{ __('common.edit') }}"
           :visible.sync="dialogVariables.show"
           width="400"
           @close="closedialogVariablesFormDialog('form')"
           :close-on-click-modal="false"
           >
           <el-form ref="form" :rules="rules" :model="dialogVariables.form" label-width="100px">
-            <el-form-item label="名称" required class="language-inputs">
+            <el-form-item label="{{ __('common.name') }}" required class="language-inputs">
               <el-form-item  :prop="'name.' + lang.code" :inline-message="true"  v-for="lang, lang_i in source.languages" :key="lang_i"
                 :rules="[
-                  { required: true, message: '输入框不能为空', trigger: 'blur' },
+                  { required: true, message: '{{ __('common.error_input_required') }}', trigger: 'blur' },
                 ]"
               >
                 <el-input size="mini" v-model="dialogVariables.form.name[lang.code]" placeholder="请填写名称"><template slot="prepend">@{{lang.name}}</template></el-input>
@@ -285,8 +284,8 @@
             </el-form-item>
 
             <el-form-item>
-              <el-button type="primary" @click="dialogVariablesFormSubmit('form')">保存</el-button>
-              <el-button @click="closedialogVariablesFormDialog('form')">取消</el-button>
+              <el-button type="primary" @click="dialogVariablesFormSubmit('form')">{{ __('common.save') }}</el-button>
+              <el-button @click="closedialogVariablesFormDialog('form')">{{ __('common.cancel') }}</el-button>
             </el-form-item>
           </el-form>
         </el-dialog>
diff --git a/resources/beike/admin/views/pages/products/index.blade.php b/resources/beike/admin/views/pages/products/index.blade.php
index bea3aa88..e0c71b8f 100644
--- a/resources/beike/admin/views/pages/products/index.blade.php
+++ b/resources/beike/admin/views/pages/products/index.blade.php
@@ -122,13 +122,16 @@
                   <div class="wh-60"><img :src="item.images[0] || 'image/placeholder.png'" class="img-fluid"></div>
                 </td>
                 <td>
-                  <a :href="item.url" target="_blank" class="text-dark">@{{ item.name || '无名称' }}</a>
+                  <a :href="item.url" target="_blank" :title="item.name" class="text-dark">@{{ stringLengthInte(item.name, 90) }}</a>
                 </td>
                 <td>@{{ item.price_formatted }}</td>
                 <td>@{{ item.created_at }}</td>
                 <td>@{{ item.position }}</td>
                 @if ($type != 'trashed')
-                  <td>@{{ item.active ? '上架' : '下架' }}</td>
+                  <td>
+                    <span v-if="item.active" class="text-success">{{ __('common.enable') }}</span>
+                    <span v-else class="text-secondary">{{ __('common.disable') }}</span>
+                  </td>
                 @endif
                 <td width="140" class="text-end">
                   <template v-if="item.deleted_at == ''">
diff --git a/resources/lang/en/admin/brand.php b/resources/lang/en/admin/brand.php
index 6172c009..d168a502 100644
--- a/resources/lang/en/admin/brand.php
+++ b/resources/lang/en/admin/brand.php
@@ -10,6 +10,8 @@
  */
 
 return [
+    'index' => 'Brand',
+
     'brands_index' => 'Index',
     'brands_create' => 'Create',
     'brands_show' => 'Detail',
diff --git a/resources/lang/en/admin/category.php b/resources/lang/en/admin/category.php
index a5043deb..69d63b1b 100644
--- a/resources/lang/en/admin/category.php
+++ b/resources/lang/en/admin/category.php
@@ -10,6 +10,8 @@
  */
 
 return [
+    'index' => 'Category',
+
     'categories_index' => 'Index',
     'categories_create' => 'Create',
     'categories_show' => 'Detail',
diff --git a/resources/lang/en/admin/product.php b/resources/lang/en/admin/product.php
index 3a19f1be..0166478e 100644
--- a/resources/lang/en/admin/product.php
+++ b/resources/lang/en/admin/product.php
@@ -22,4 +22,19 @@ return [
     'batch_delete' => 'Batch Delete',
     'batch_active' => 'Batch Active',
     'batch_inactive' => 'Batch Inactive',
+
+    'basic_information' => 'basic information',
+     'product_details' => 'Product details',
+     'stocks' => 'goods inventory',
+     'model' => 'model',
+     'price' => 'price',
+     'origin_price' => 'original price',
+     'cost_price' => 'cost price',
+     'quantity' => 'quantity',
+     'enable_multi_spec' => 'Enable multi-spec',
+     'image_help' => 'The first picture will be used as the main picture of the product, and multiple pictures can be uploaded at the same time, and the position of multiple pictures can be adjusted at will',
+     'add_variable' => 'Add Specs',
+     'add_variable_value' => 'Add Specification Value',
+     'add_variable_image' => 'Add Spec Image',
+     'default_main_product' => 'Default main product',
 ];
diff --git a/resources/lang/en/admin/tax_class.php b/resources/lang/en/admin/tax_class.php
index afd8ebc9..f44ba35f 100644
--- a/resources/lang/en/admin/tax_class.php
+++ b/resources/lang/en/admin/tax_class.php
@@ -10,6 +10,7 @@
  */
 
 return [
+    'index' => 'Tax',
     'rule' => 'Rule',
     'based_on' => 'Based',
     'priority' => 'Priority',
diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index 0a776b67..4e923b6a 100644
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -13,6 +13,7 @@ return [
     'error_required' => 'Please fill out the :name', // 这个有用别删了，:name 是一个变量
     'error_required_name' => 'Please fill in your name',
     'error_required_email' => 'Please enter your email',
+    'error_input_required' => 'Input box cannot be empty',
     'unauthenticated' => 'Please login first',
     'success' => 'Success',
     'no_data' => 'No data～',
@@ -53,6 +54,9 @@ return [
     'confirm_delete' => 'You sure you want to delete it?',
     'text_hint' => 'Hint',
     'restore' => 'Restore',
+    'name' => 'Name',
+    'image' => 'Image',
+    'data' => 'Data',
 
     'id' => 'ID',
     'created_at' => 'Created At',
diff --git a/resources/lang/zh_cn/admin/brand.php b/resources/lang/zh_cn/admin/brand.php
index e7818330..2e5b3b5d 100644
--- a/resources/lang/zh_cn/admin/brand.php
+++ b/resources/lang/zh_cn/admin/brand.php
@@ -10,6 +10,8 @@
  */
 
 return [
+    'index' => '品牌',
+
     'brands_index' => '品牌列表',
     'brands_create' => '创建品牌',
     'brands_show' => '品牌详情',
diff --git a/resources/lang/zh_cn/admin/category.php b/resources/lang/zh_cn/admin/category.php
index 376ca4ed..d4280c53 100644
--- a/resources/lang/zh_cn/admin/category.php
+++ b/resources/lang/zh_cn/admin/category.php
@@ -10,6 +10,8 @@
  */
 
 return [
+    'index' => '分类',
+
     'categories_index' => '分类列表',
     'categories_create' => '创建分类',
     'categories_show' => '分类详情',
diff --git a/resources/lang/zh_cn/admin/product.php b/resources/lang/zh_cn/admin/product.php
index fe95da14..839d15d8 100644
--- a/resources/lang/zh_cn/admin/product.php
+++ b/resources/lang/zh_cn/admin/product.php
@@ -23,4 +23,19 @@ return [
     'batch_delete' => '批量删除',
     'batch_active' => '批量上架',
     'batch_inactive' => '批量下架',
+
+    'basic_information' => '基础信息',
+    'product_details' => '商品详情',
+    'stocks' => '商品库存',
+    'model' => '型号',
+    'price' => '价格',
+    'origin_price' => '原价',
+    'cost_price' => '成本价',
+    'quantity' => '数量',
+    'enable_multi_spec' => '启用多规格',
+    'image_help' => '第一张图片将作为商品主图,支持同时上传多张图片,多张图片之间可随意调整位置',
+    'add_variable' => '添加规格',
+    'add_variable_value' => '添加规格值',
+    'add_variable_image' => '添加规格图片',
+    'default_main_product' => '默认主商品',
 ];
diff --git a/resources/lang/zh_cn/admin/tax_class.php b/resources/lang/zh_cn/admin/tax_class.php
index 56801adf..f24caa5b 100644
--- a/resources/lang/zh_cn/admin/tax_class.php
+++ b/resources/lang/zh_cn/admin/tax_class.php
@@ -10,6 +10,7 @@
  */
 
 return [
+    'index' => '税类',
     'rule' => '规则',
     'based_on' => '基于',
     'priority' => '优先级',
diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php
index 1c99909b..4320a86a 100644
--- a/resources/lang/zh_cn/common.php
+++ b/resources/lang/zh_cn/common.php
@@ -12,6 +12,7 @@ return [
     'error_required' => '请填写 :name', // 这个有用别删了，:name 是一个变量
     'error_required_name' => '请填写姓名',
     'error_required_email' => '请填写邮箱',
+    'error_input_required' => '输入框不能为空',
     'unauthenticated' => '请先登录',
     'success' => '成功',
     'no_data' => '暂无数据～',
@@ -52,6 +53,9 @@ return [
     'confirm_delete' => '确定要删除吗?',
     'text_hint' => '提示',
     'restore' => '恢复',
+    'name' => '名称',
+    'image' => '图片',
+    'data' => '数据',
 
     'id' => 'ID',
     'created_at' => '创建时间',