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

app/AdminAgent/Controllers/AgentProductController.php

@@ -318,13 +318,21 @@ class AgentProductController extends AdminController
 			if (array_key_exists('guide_id', $form->input())) {
 				$form->guide_id = $form->guide_id ?? 0;
 			}
+
+			//订金
 			if ($form->earnest <= 0 || $form->earnest_timeout <= 0) {
 				$form->earnest = 0;
 				$form->earnest_timeout = 0;
+			} else if ($form->earnest > $form->price) {
+				return $form->response()->error('订金不能大于商品价');
 			}
+
+			//定金
 			if ($form->deposit <= 0 || $form->deposit_timeout <= 0) {
 				$form->deposit = 0;
 				$form->deposit_timeout = 0;
+			} else if ($form->earnest > $form->price) {
+				return $form->response()->error('定金不能大于商品价');
 			}
 
 			//不允许编辑的字段

app/AdminSettled/Controllers/AgentController.php

@@ -73,7 +73,7 @@ class AgentController extends AdminController
             $form->text('address')->required();
             $form->image('license_pic')->required()->removable(false)->uniqueName();
             $form->text('director')->required();
-            $form->text('contact_phone')->required();
+            $form->text('contact_phone')->required()->maxLength(13);
         })->saving(function (Form $form) {
 			if ($form->isEditing()) {
 				return $form->response()->error('服务器出错了~~');

app/AdminSettled/Controllers/GuideController.php

@@ -61,7 +61,7 @@ class GuideController extends AdminController
             $form->text('name')->required();
             $form->image('photo')->required()->removable(false)->uniqueName();
             $form->image('license_pic')->required()->removable(false)->uniqueName();
-            $form->text('contact_phone')->required();
+            $form->text('contact_phone')->required()->maxLength(13);
         })->saving(function (Form $form) {
         	//判断账号是否唯一
 			if ($form->isEditing()) {

app/AdminSettled/Controllers/SupplierController.php

@@ -64,7 +64,7 @@ class SupplierController extends AdminController
             $form->text('address')->required();
             $form->image('license_pic')->required()->removable(false)->uniqueName();
             $form->text('director')->required();
-            $form->text('contact_phone')->required();
+            $form->text('contact_phone')->required()->maxLength(13);
         })->saving(function (Form $form) {
 			if ($form->isEditing()) {
 				return $form->response()->error('服务器出错了~~');