瀏覽代碼

name不再必填

durong 5 年之前
父節點
當前提交
6ba8cce05a

+ 0 - 2
app/Http/Controllers/CmsContentTemplateSetController.php

@@ -103,7 +103,6 @@ class CmsContentTemplateSetController extends BaseController
     {
     {
         $validator = Validator::make($request->all(), [
         $validator = Validator::make($request->all(), [
             'rule' => 'required|array',
             'rule' => 'required|array',
-            'name' => 'required|string',
             'tpl_id' => 'required|integer',
             'tpl_id' => 'required|integer',
             'area_type' => ['required', Rule::in(0,1,2,3,4,5)],
             'area_type' => ['required', Rule::in(0,1,2,3,4,5)],
         ]);
         ]);
@@ -120,7 +119,6 @@ class CmsContentTemplateSetController extends BaseController
     {
     {
         $validator = Validator::make($request->all(), [
         $validator = Validator::make($request->all(), [
             'rule' => 'required|array',
             'rule' => 'required|array',
-            'name' => 'required|string',
             'tpl_id' => 'required|integer',
             'tpl_id' => 'required|integer',
             'area_type' => ['required', Rule::in(0,1,2,3,4,5)],
             'area_type' => ['required', Rule::in(0,1,2,3,4,5)],
         ]);
         ]);

+ 1 - 1
app/Repositories/CmsContentTemplateSetRepository.php

@@ -576,7 +576,7 @@ class CmsContentTemplateSetRepository
 //            if (count(json_decode($v['rule'])) > 0) {
 //            if (count(json_decode($v['rule'])) > 0) {
             $new_rule[$k]['area_type'] = $v['area_type'];
             $new_rule[$k]['area_type'] = $v['area_type'];
             $new_rule[$k]['rule']['id'] = $v['id'];
             $new_rule[$k]['rule']['id'] = $v['id'];
-            $new_rule[$k]['rule']['name'] = $v['name'];
+//            $new_rule[$k]['rule']['name'] = $v['name'];
             $new_rule[$k]['rule']['floor_img'] = $v['floor_img'];
             $new_rule[$k]['rule']['floor_img'] = $v['floor_img'];
             $new_rule[$k]['rule']['rule'] = json_decode($v['rule'], true);
             $new_rule[$k]['rule']['rule'] = json_decode($v['rule'], true);
 //            }
 //            }