From 33baf71bb6cdea1cb7fbb02c2e224d3c3f97f790 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Wed, 27 Oct 2021 11:41:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B->=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/ProductController.php                 | 2 +-
 app/Admin/Controllers/SupplierController.php                | 2 +-
 app/AdminSupplier/Controllers/DemandProductController.php   | 4 ++--
 app/AdminSupplier/Controllers/IndustryProductController.php | 2 +-
 app/AdminSupplier/Controllers/ProductController.php         | 2 +-
 resources/lang/zh_CN/industry-product.php                   | 2 +-
 resources/lang/zh_CN/product.php                            | 1 +
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/Admin/Controllers/ProductController.php b/app/Admin/Controllers/ProductController.php
index 54cc54c..f05a262 100644
--- a/app/Admin/Controllers/ProductController.php
+++ b/app/Admin/Controllers/ProductController.php
@@ -157,7 +157,7 @@ class ProductController extends AdminController
 			$form->editor('content');
 			$form->display('verify_mobile')->required();
 
-			$form->radio('type', '产品类型')
+			$form->radio('type')
 				->options(admin_trans('product.options.publish_type'))->disable($form->isEditing())
 				->default(current(admin_trans('product.options.publish_type')))
 				->when(0, function (Form $form) { //旅游线路
diff --git a/app/Admin/Controllers/SupplierController.php b/app/Admin/Controllers/SupplierController.php
index 27b65b8..457ce45 100644
--- a/app/Admin/Controllers/SupplierController.php
+++ b/app/Admin/Controllers/SupplierController.php
@@ -153,7 +153,7 @@ class SupplierController extends AdminController
 			$form->checkbox('publish_type')
 				->options(admin_trans('product.options.publish_type'))
 				->default(0)
-				->help('供应商可发布的产品类型');
+				->help('供应商可发布的产品模板');
         })->saving(function (Form $form) {
 			//判断账号是否唯一
 			if ($form->isCreating()) {
diff --git a/app/AdminSupplier/Controllers/DemandProductController.php b/app/AdminSupplier/Controllers/DemandProductController.php
index 619feaa..ba0fa34 100755
--- a/app/AdminSupplier/Controllers/DemandProductController.php
+++ b/app/AdminSupplier/Controllers/DemandProductController.php
@@ -106,7 +106,7 @@ class DemandProductController extends AdminController
 				array_flip(Admin::user()->publish_type)
 			);
 
-			$form->radio('type', '产品类型')
+			$form->radio('type')
 				->options($publish_type)
 				->default(current(Admin::user()->publish_type))
 				->when(0, function (Form $form) { //旅游线路
@@ -166,7 +166,7 @@ class DemandProductController extends AdminController
 				});
 
 			if ($form->isEditing()) {
-				$form->confirm('提示', '修改标题、价格、产品图片、旅游须知、产品详情、产品类型及信息需要重新审核，同时<span class="btn-danger">下架所有</span>关联的代理商产品，是否继续？');
+				$form->confirm('提示', '修改标题、价格、产品图片、旅游须知、产品详情等信息需要重新审核，同时<span class="btn-danger">下架所有</span>关联的代理商产品，是否继续？');
 			}
 		})->saving(function (Form $form) {
 			//不允许编辑非自己数据
diff --git a/app/AdminSupplier/Controllers/IndustryProductController.php b/app/AdminSupplier/Controllers/IndustryProductController.php
index a722a48..968a1ed 100644
--- a/app/AdminSupplier/Controllers/IndustryProductController.php
+++ b/app/AdminSupplier/Controllers/IndustryProductController.php
@@ -163,7 +163,7 @@ class IndustryProductController extends AdminController
 			);
 
 			//0:旅游线路、1:酒店、2:景区、3:餐厅、4:车队、5:单项
-			$form->radio('type', '产品类型')
+			$form->radio('type')
 				->options($publish_type)->disable($form->isEditing())
 				->default(current(Admin::user()->publish_type))
 				->when(0, function (Form $form) { //旅游线路
diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php
index 36bacf9..799391a 100644
--- a/app/AdminSupplier/Controllers/ProductController.php
+++ b/app/AdminSupplier/Controllers/ProductController.php
@@ -193,7 +193,7 @@ class ProductController extends AdminController
 			);
 
 			//0:旅游线路、1:酒店、2:景区、3:餐厅、4:车队、5:单项
-			$form->radio('type', '产品类型')
+			$form->radio('type')
 				->options($publish_type)->disable($form->isEditing())
 				->default(current(Admin::user()->publish_type))
 				->when(0, function (Form $form) { //旅游线路
diff --git a/resources/lang/zh_CN/industry-product.php b/resources/lang/zh_CN/industry-product.php
index 20b9017..9d0a114 100644
--- a/resources/lang/zh_CN/industry-product.php
+++ b/resources/lang/zh_CN/industry-product.php
@@ -7,7 +7,7 @@ return [
     ],
     'fields' => [
         'supplier_id' => '供应商ID',
-        'type' => '产品类型',
+        'type' => '产品模板',
         'category_id' => '分类ID',
         'title' => '标题',
         'pictures' => '产品图片',
diff --git a/resources/lang/zh_CN/product.php b/resources/lang/zh_CN/product.php
index 9f5a84f..e0e0c61 100644
--- a/resources/lang/zh_CN/product.php
+++ b/resources/lang/zh_CN/product.php
@@ -22,6 +22,7 @@ return [
         'verify_mobile' => '核销手机号',
         'spec' => '产品规格',
         'date' => '日期',
+        'type' => '产品模板',
 		'supplier' => trans('supplier.fields'),
     ],
     'options' => [