Merge remote-tracking branch 'origin/develop' into develop

app/AdminSettled/Controllers/AgentController.php

@@ -118,9 +118,9 @@ class AgentController extends AdminController
 //			$form->appsecret = $form->appsecret ?: '暂未填写';
 //			$form->mchid = $form->appid ?: '暂未填写';
 //			$form->mchkey = $form->appid ?: '暂未填写';
-			$form->type = in_array($form->type, UserStatus::array()) ? $form->type : AgentType::OPERATOR;
+			$form->type = in_array($form->type, AgentType::key()) ? $form->type : AgentType::OPERATOR;
 		})->saved(function (Form $form) {
-			return $form->response()->success('操作成功，请等待管理员审核');
+			return $form->response()->success('操作成功，请等待管理员审核')->refresh();
 		})->deleting(function (Form $form) {
 			return $form->response()->error('服务器出错了~~');
 		});

app/AdminSettled/Controllers/GuideController.php

@@ -89,7 +89,7 @@ class GuideController extends AdminController
 			$form->status = UserStatus::UNAUDITED;
 			$form->rate = 0.05;
 		})->saved(function (Form $form) {
-			return $form->response()->success('操作成功，请等待管理员审核');
+			return $form->response()->success('操作成功，请等待管理员审核')->refresh();
 		})->deleting(function (Form $form) {
 			return $form->response()->error('服务器出错了~~');
 		});

app/AdminSettled/Controllers/SupplierController.php

@@ -91,7 +91,7 @@ class SupplierController extends AdminController
 			$form->status = UserStatus::UNAUDITED;
 			$form->rate = 0.1;
 		})->saved(function (Form $form) {
-			return $form->response()->success('操作成功，请等待管理员审核');
+			return $form->response()->success('操作成功，请等待管理员审核')->refresh();
 		})->deleting(function (Form $form) {
 			return $form->response()->error('服务器出错了~~');
 		});

app/Common/AgentType.php

@@ -26,4 +26,13 @@ class AgentType
 			self::CLUSTER => '组团版旅行社',
 		];
 	}
+
+	public static function key(): array
+	{
+		return [
+			self::OPERATOR,
+			self::SUPPLIER,
+			self::CLUSTER,
+		];
+	}
 }