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

app/Admin/Controllers/ProductController.php

@@ -120,9 +120,6 @@ class ProductController extends AdminController
 				->options(ProductStatus::array())
 				->default(ProductStatus::ON_SALE)
 				->required();
-			$form->select('supplier_id', '供应商')
-				->options(Supplier::where('status', UserStatus::NORMAL)->pluck('name', 'id'))
-				->required();
 			$form->editor('know');
 			$form->editor('content');
         })->saving(function (Form $form) {

app/Admin/Controllers/SupplierController.php

@@ -152,7 +152,12 @@ class SupplierController extends AdminController
 				}
 			}
 
-        	//不允许编辑的字段
+			//抽成比例
+			if ($form->rate < 0 || $form->rate > 100) {
+				return $form->response()->error('抽成比例在 0 ~ 100 之间');
+			}
+
+			//不允许编辑的字段
 			if ($form->isEditing()) {
 				$form->ignore(['id', 'username', 'created_at', 'created_at', 'deleted_at', 'deleted_at']);
 			}

app/AdminSettled/Controllers/AgentController.php

@@ -99,11 +99,6 @@ class AgentController extends AdminController
 				return $form->response()->error($form->username . ' 的账号已经存在');
 			}
 
-        	//不允许编辑的字段
-        	if ($form->isEditing()) {
-				$form->ignore(['id', 'remember_token', 'username', 'rate', 'created_at', 'updated_at', 'deleted_at']);
-			}
-
         	//过滤null字段
         	foreach($form->input() as $k => $v) {
         		if (is_null($v)) {
@@ -111,13 +106,13 @@ class AgentController extends AdminController
 				}
 			}
 
+			//不允许编辑的字段
+			$form->ignore(['id', 'remember_token', 'username', 'rate', 'created_at', 'updated_at', 'deleted_at']);
+
         	//处理特殊字段
+			$form->hidden(['status', 'rate']);
 			$form->status = UserStatus::UNAUDITED;
-        	$form->rate = 0.05;
-//			$form->appid = $form->appid ?: '暂未填写';
-//			$form->appsecret = $form->appsecret ?: '暂未填写';
-//			$form->mchid = $form->appid ?: '暂未填写';
-//			$form->mchkey = $form->appid ?: '暂未填写';
+        	$form->rate = 5;
 			$form->type = in_array($form->type, AgentType::key()) ? $form->type : AgentType::OPERATOR;
 		})->saved(function (Form $form) {
 			return $form->response()->success('操作成功，请等待管理员审核')->refresh();

app/AdminSettled/Controllers/GuideController.php

@@ -73,11 +73,6 @@ class GuideController extends AdminController
 				return $form->response()->error($form->username . ' 的账号已经存在');
 			}
 
-			//不允许编辑的字段
-			if ($form->isEditing()) {
-				$form->ignore(['id', 'remember_token', 'username', 'rate', 'created_at', 'updated_at', 'deleted_at']);
-			}
-
 			//过滤null字段
 			foreach ($form->input() as $k => $v) {
 				if (is_null($v)) {
@@ -85,9 +80,13 @@ class GuideController extends AdminController
 				}
 			}
 
+			//不允许编辑的字段
+			$form->ignore(['id', 'remember_token', 'username', 'rate', 'created_at', 'updated_at', 'deleted_at']);
+
 			//处理特殊字段
+			$form->hidden(['status', 'rate']);
 			$form->status = UserStatus::UNAUDITED;
-			$form->rate = 0.05;
+			$form->rate = 5;
 		})->saved(function (Form $form) {
 			return $form->response()->success('操作成功，请等待管理员审核')->refresh();
 		})->deleting(function (Form $form) {

app/AdminSettled/Controllers/SupplierController.php

@@ -75,11 +75,6 @@ class SupplierController extends AdminController
 				return $form->response()->error($form->username . ' 的账号已经存在');
 			}
 
-        	//不允许编辑的字段
-			if ($form->isEditing()) {
-				$form->ignore(['id', 'remember_token', 'rate', 'created_at', 'created_at', 'deleted_at', 'deleted_at']);
-			}
-
 			//过滤null字段
 			foreach($form->input() as $k => $v) {
 				if (is_null($form->$k)) {
@@ -87,9 +82,13 @@ class SupplierController extends AdminController
 				}
 			}
 
+			//不允许编辑的字段
+			$form->ignore(['id', 'remember_token', 'rate', 'created_at', 'created_at', 'deleted_at', 'deleted_at']);
+
 			//处理特殊字段
+			$form->hidden(['status', 'rate']);
 			$form->status = UserStatus::UNAUDITED;
-			$form->rate = 0.1;
+			$form->rate = 5;
 		})->saved(function (Form $form) {
 			return $form->response()->success('操作成功，请等待管理员审核')->refresh();
 		})->deleting(function (Form $form) {

app/AdminSupplier/Controllers/ProductController.php

@@ -33,7 +33,7 @@ class ProductController extends AdminController
             $grid->column('id')->sortable();
 			$grid->column('type')->using(admin_trans('product.options.publish_type'));
             $grid->column('category.name', '产品分类');
-            $grid->column('title');
+            $grid->column('title')->limit(15);
 			$grid->column('picture')->image('', 60, 60);
             $grid->column('price');
             $grid->column('original_price');
@@ -76,22 +76,6 @@ class ProductController extends AdminController
             $show->field('know')->unescape()->as(fn($v) => preg_replace('/<script.*?>.*?<\/script>/is', '', $v));
             $show->field('content')->unescape()->as(fn($v) => preg_replace('/<script.*?>.*?<\/script>/is', '', $v));
 			$show->field('verify_mobile','核销员手机');
-			$show->field('extends', '附加信息')
-				->unescape()
-				->as(function ($v) {
-					$html = '';
-					$arr = [
-						'project' => '服务项目',
-						'date' => '时间',
-						'tags' => '包含项目',
-						'open_time' => '开放时间',
-						'package' => '包含套餐',
-					];
-					foreach ($v as $k => $item) {
-						$html .= new Card(Table::make([$arr[$k] ?? '项目'], $item));
-					}
-					return $html;
-				});
             $show->field('created_at');
             $show->field('updated_at');
         });