Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -32,10 +32,10 @@ class CustomRequest extends FormRequest
     {
     {
         $rule = [
         $rule = [
             'name'   =>  ['required','max:100'],
             'name'   =>  ['required','max:100'],
-//            'title'   =>  ['required','max:200'],
-//            'keywords'   =>  ['required','max:200'],
-//            'description'   =>  ['required','max:250'],
-//            'html'   =>  ['required'],
+            'title'   =>  [],//'required','max:200'
+            'keywords'   =>  [],//'required','max:200'
+            'description'   =>  [],//'required','max:250'
+            'html'   =>  ['required'],
             'url'   =>  ['required','max:200','url'],
             'url'   =>  ['required','max:200','url'],
             'status'   =>  ['required','in:0,1'],
             'status'   =>  ['required','in:0,1'],
         ];
         ];
@@ -44,6 +44,10 @@ class CustomRequest extends FormRequest
         if($this->is('b/custom/update')){
         if($this->is('b/custom/update')){
             $rule['id'] = ['required','integer'];
             $rule['id'] = ['required','integer'];
         }
         }
+        // 新增
+        if($this->is('b/custom/create')){
+            unset($rule['html']);
+        }
 
 
         // 删除
         // 删除
         if($this->is('b/custom/delete')){
         if($this->is('b/custom/delete')){
@@ -61,12 +65,12 @@ class CustomRequest extends FormRequest
 
 
             'name.required'  =>  '名称必须',
             'name.required'  =>  '名称必须',
             'name.max'  =>  '名称不能超过100个字符',
             'name.max'  =>  '名称不能超过100个字符',
-//            'title.required'  =>  '网页标题必须',
-//            'title.max'  =>  '网页标题不能超过200个字符',
-//            'keywords.required'  =>  '网页关键字必须',
-//            'keywords.max'  =>  '网页关键字不能超过200个字符',
-//            'description.required'  =>  '网页描述必须',
-//            'description.max'  =>  '网页描述不能超过250个字符',
+            'title.required'  =>  '网页标题必须',
+            'title.max'  =>  '网页标题不能超过200个字符',
+            'keywords.required'  =>  '网页关键字必须',
+            'keywords.max'  =>  '网页关键字不能超过200个字符',
+            'description.required'  =>  '网页描述必须',
+            'description.max'  =>  '网页描述不能超过250个字符',
 
 
             'url.required'  =>  '链接必须',
             'url.required'  =>  '链接必须',
             'url.max'  =>  '链接不能超过200个字符',
             'url.max'  =>  '链接不能超过200个字符',