Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/hainan

app/AdminSupplier/Controllers/IndustryProductController.php

@@ -5,7 +5,6 @@ namespace App\AdminSupplier\Controllers;
 use App\AdminSupplier\Repositories\IndustryProduct;
 use App\Common\ProductStatus;
 use App\Models\Category;
-use App\Models\Order;
 use App\Models\Supplier;
 use App\Models\SystemSetting;
 use Dcat\Admin\Admin;
@@ -117,8 +116,8 @@ class IndustryProductController extends AdminController
             $form->text('title')->required();
             $form->currency('price')->required();
             $form->currency('original_price')->required();
-			$form->number('service_persons')->min(0)->required()->help('所需交易金 = 单库存服务用户数 x 库存 x ' . SystemSetting::val('single', 'price'));
-            $form->number('stock')->required()->help('所需交易金 = 单库存服务用户数 x 库存 x ' . SystemSetting::val('single', 'price'));
+			$form->number('service_persons')->min(0)->required();
+            $form->number('stock')->required();
 			$form->number('min_sale')->min(1)->required();
 			if ($form->isEditing() && in_array($form->model()->status, [ProductStatus::SOLD_OUT, ProductStatus::ON_SALE])) {
 				$form->radio('status')->options([1 => '上架', -2 => '下架'])->default(1);