moshaorui 4 months ago
parent
commit
2d4f93c8ec

+ 2 - 2
app/Admin/Controllers/BaseProductCategoryController.php

@@ -42,7 +42,7 @@ class BaseProductCategoryController extends AdminController
                 return $prefix . ' ' . html_entity_decode($name); // 拼接加号和名称
             });;
             $grid->column('parent_id');
-            $grid->column('baseProductParameter.name',admin_trans_label('parameter_name'));
+            $grid->column('baseProductParameter.name',admin_trans_label('attribute_name'));
             $grid->column('order');
             $grid->column('enabled')->switch();
             $grid->column('created_at');
@@ -81,7 +81,7 @@ class BaseProductCategoryController extends AdminController
                     return (int) $v;
                 });
             $form->text('name')->required();
-            $form->select('parameter_id', admin_trans_field('parameter_name'))->options(BaseProductParameter::selectOptions())->required();
+            $form->select('parameter_id', admin_trans_field('attribute_name'))->options(BaseProductParameter::selectOptions())->required();
             $form->number('order')
                 ->default(0)
                 ->rules('numeric');

+ 1 - 1
app/Admin/Controllers/BaseProductController.php

@@ -134,7 +134,7 @@ class BaseProductController extends AdminController
             $form->text('title')->required();
             $form->text('sku')->required();
             $form->date('issuance_date');
-            $form->table('parameters',admin_trans_label('parameter_name'), function (Form\NestedForm $table) {
+            $form->table('parameters',admin_trans_label('attribute_name'), function (Form\NestedForm $table) {
                 $table->text('key')->required();
                 $table->text('value')->required();
             });

+ 1 - 1
app/Admin/Controllers/BaseProductParameterController.php

@@ -15,7 +15,7 @@ class BaseProductParameterController extends AdminController
     public function index(Content $content)
     {
         return $content
-            ->header(admin_trans( 'admin.product_parameter'))
+            ->header(admin_trans( 'admin.product_attribute'))
             ->description('')
             ->breadcrumb(['text'=>'list','url'=>''])
             ->body($this->grid());

+ 1 - 1
app/Distributor/Controllers/DistProductController.php

@@ -159,7 +159,7 @@ class DistProductController extends AdminDistController
             $form->text('title')->required();
             $form->text('sku')->required();
             $form->date('issuance_date');
-            $form->table('parameters',admin_trans_label('parameter_name'), function (Form\NestedForm $table) {
+            $form->table('parameters',admin_trans_label('attribute_name'), function (Form\NestedForm $table) {
                 $table->text('key',admin_trans_field('key'))->required();
                 $table->text('value',admin_trans_field('value'))->required();
             });

+ 1 - 1
app/Distributor/Controllers/ImportProductController.php

@@ -115,7 +115,7 @@ class ImportProductController extends AdminDistController
             $show->field('keywords');
             $show->field('description');
             $show->field('issuance_date');
-            $show->field('parameters')->as(function ($items) {
+            $show->field('parameters',admin_trans_label('attribute'))->as(function ($items) {
                 if (is_array($items)) {
                     // 创建表格的表头
                     $table = '<table class="table table-bordered table-condensed">';

+ 1 - 1
lang/en/admin.php

@@ -229,7 +229,7 @@ return [
    'language' => 'language',
     'products_list'=>'Products List',
     'proudct_category'=>'Product Category',
-    'product_parameter'=>'Product Parameter',
+    'product_attribute'=>'Product Attribute',
     'video_category'=>'Video Category',
     'video_list'=>'Video List',
     'import'=>'Import Products',

+ 4 - 3
lang/en/global.php

@@ -39,11 +39,11 @@ return [
         'products_list'         => 'Product List',
         'images'                => 'Images',
         'parent'                => 'Parent',
-        'key'                   => 'Parameter Name',
-        'value'                 => 'Parameter Value',
+        'key'                   => 'Attribute Name',
+        'value'                 => 'Attribute Value',
         'cover_image'           => 'Cover Image',
         'category_name'         => 'Category Name',
-        'parameter_name'        => 'Parameter Name',
+        'attribute_name'        => 'Attribute Name',
         'video_url'             => 'Video URL',
         'contact_number'        => 'Contact Number',
         'service_hotline'       => 'Service Hotline',
@@ -185,6 +185,7 @@ return [
         'username_tips'=>'Login name',
         'name_tips'=>'Nickname',
         'distributor_create_success' => 'Create successfully, please configure the distributor site!',
+        'attribute_name'        => 'Attribute Name',
     ],
     'options' => [
         //

+ 1 - 1
lang/zh_CN/admin.php

@@ -231,7 +231,7 @@ return [
     'language'          => '语言',
     'products_list'=>'产品列表',
     'proudct_category'=>'产品分类',
-    'product_parameter'=>'产品参数',
+    'product_attribute'=>'产品属性',
     'video_category'=>'视频分类',
     'video_list'=>'视频列表',
     'product'  => '产品',

+ 7 - 6
lang/zh_CN/global.php

@@ -31,19 +31,19 @@ return [
         'issuance_date'         => '发布日期',
         'enabled'               => '是否启用',
         'content'               => '内容',
-        'parameters'            => '产品参数',
+        'parameters'            => '产品属性',
         'is_pinned'             => '置顶',
         'parent_id'             => '上级ID',
         'remark'                => '备注',
-        'parameter_id'          => '参数',
+        'parameter_id'          => '属性',
         'products_list'         => '产品列表',
         'images'                => '图片',
         'parent'                => '上级',
-        'key'                   => '参数名',
-        'value'                 => '参数值',
+        'key'                   => '属性名',
+        'value'                 => '属性值',
         'cover_image'           => '封面图片',
         'category_name'         => '分类名称',
-        'parameter_name'        => '参数名称',
+        'attribute_name'        => '属性名称',
         'video_url'             => '视频URL地址',
         'contact_number'        => '联系电话',
         'service_hotline'       => '服务热线',
@@ -127,7 +127,7 @@ return [
         'company_address' => '公司地址',
         'import_tmpl'  => '导入模板',
         'category_name'         => '分类名称',
-        'parameter_name'        => '参数名称',
+        'parameter_name'        => '属性名称',
         'assignment'            => '分配',
         'images'                => '图片',
         'process'               => '处理',
@@ -192,6 +192,7 @@ return [
         'username_tips'=>'登录名',
         'name_tips'=>'昵称',
         'distributor_create_success' => '创建成功,请配置分销商站点!',
+        'attribute_name'        => '属性名称',
     ],
     'options' => [
         //