diff --git a/MySQL_change.sql b/MySQL_change.sql index 41cd751..effd4cc 100644 --- a/MySQL_change.sql +++ b/MySQL_change.sql @@ -267,3 +267,8 @@ ROW_FORMAT=DYNAMIC # 12:47 ‎2021/‎10/‎15 ALTER TABLE `industry_orders` ADD COLUMN `industry_product_spec_id` BIGINT UNSIGNED NOT NULL COMMENT '行业产品规格ID' AFTER `industry_product_id`; + +# 16:43 ‎2021/‎10/‎15 +ALTER TABLE `products` + ADD COLUMN `single_deposit` DECIMAL(20,2) NOT NULL DEFAULT '0.00' COMMENT '交易金单价' AFTER `content`, + DROP COLUMN `service_persons`; diff --git a/app/AdminAgent/Controllers/IndustryProductController.php b/app/AdminAgent/Controllers/IndustryProductController.php index e12b73a..4654036 100644 --- a/app/AdminAgent/Controllers/IndustryProductController.php +++ b/app/AdminAgent/Controllers/IndustryProductController.php @@ -35,7 +35,6 @@ class IndustryProductController extends AdminController $grid->column('original_price'); $grid->column('stock'); $grid->column('sale'); - $grid->column('service_persons'); $grid->column('min_sale'); $grid->column('created_at'); $grid->column('op', '操作') @@ -79,7 +78,6 @@ class IndustryProductController extends AdminController $show->field('status')->using(ProductStatus::array()); $show->field('know')->unescape()->as(fn($v) => preg_replace('/.*?<\/script>/is', '', $v)); $show->field('content')->unescape()->as(fn($v) => preg_replace('/.*?<\/script>/is', '', $v)); - $show->field('service_persons'); $show->field('min_sale'); $show->field('verify_mobile'); $show->field('created_at'); diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php index 713df63..4d6bbbb 100644 --- a/app/AdminSupplier/Controllers/ProductController.php +++ b/app/AdminSupplier/Controllers/ProductController.php @@ -8,14 +8,12 @@ use App\Models\AgentProduct; use App\Models\AgentProductItem; use App\Models\Category; use App\Models\DiyForm; -use App\Models\Special; use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Form\NestedForm; use Dcat\Admin\Grid; use Dcat\Admin\Show; use Dcat\Admin\Http\Controllers\AdminController; -use Illuminate\Support\Facades\DB; class ProductController extends AdminController { @@ -88,7 +86,7 @@ class ProductController extends AdminController $show->field('pictures')->image('', 80, 80); $show->field('stock'); $show->field('sale'); - $show->field('service_persons'); + $show->field('single_deposit'); $show->field('status'); $show->field('know')->unescape()->as(fn($v) => preg_replace('/.*?<\/script>/is', '', $v)); $show->field('content')->unescape()->as(fn($v) => preg_replace('/.*?<\/script>/is', '', $v)); @@ -289,11 +287,6 @@ class ProductController extends AdminController $form->original_price = min(array_column($spec, 'original_price')); $form->price = min(array_column($spec, 'price')); - //单库存服务用户数必须大于1 - if ($form->service_persons < 1) { - return $form->response()->error('单库存服务用户数不能小于1'); - } - //特殊字段处理 if ($form->isCreating()) { $form->hidden(['status', 'supplier_id']); //表单没有的字段,必须加上这句才能重置值 diff --git a/resources/lang/zh_CN/product.php b/resources/lang/zh_CN/product.php index b0b7af3..eb044db 100644 --- a/resources/lang/zh_CN/product.php +++ b/resources/lang/zh_CN/product.php @@ -14,7 +14,7 @@ return [ 'price' => '销售价', 'cost_price' => '成本价', 'sale' => '销量', - 'service_persons' => '单库存服务用户数', + 'single_deposit' => '交易金单价', 'status' => '状态', 'stock' => '库存', 'supplier_id' => '供应商ID',