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

@@ -60,7 +60,8 @@ class TemplateController extends BaseController
 
 
         $data = TemplateLogic::instance()->getInfo($res['id']);
         $data = TemplateLogic::instance()->getInfo($res['id']);
 
 
-        return $this->success($data);
+        return $this->response('',Code::SUCCESS,$data);
+
     }
     }
 
 
 
 
@@ -131,7 +132,7 @@ class TemplateController extends BaseController
                 'id'    =>  ['required','integer'],
                 'id'    =>  ['required','integer'],
 //                'template_id'    =>  ['required','integer'],
 //                'template_id'    =>  ['required','integer'],
                 'name'    =>  ['required'],
                 'name'    =>  ['required'],
-                'type'    =>  ['required',Rule::in(ATemplateHtml::$typeMap)],
+                'type'    =>  ['required',Rule::in(array_keys(ATemplateHtml::$typeMap))],
                 'css'    =>  [],
                 'css'    =>  [],
                 'script'    =>  [],
                 'script'    =>  [],
                 'html'    =>  ['required'],
                 'html'    =>  ['required'],
@@ -166,7 +167,7 @@ class TemplateController extends BaseController
             return $this->response('保存失败',Code::SYSTEM_ERROR);
             return $this->response('保存失败',Code::SYSTEM_ERROR);
         }
         }
 
 
-        return $this->success(ATemplateHtml::_find($id));
+        return $this->response('保存成功',Code::SUCCESS,ATemplateHtml::_find($id));
     }
     }
 
 
 
 
@@ -194,7 +195,7 @@ class TemplateController extends BaseController
      * @time 2023/5/11 10:29
      * @time 2023/5/11 10:29
      */
      */
     public function html_type(){
     public function html_type(){
-        return $this->success(ATemplateHtml::$typeMap);
+        return $this->response('',Code::SUCCESS,ATemplateHtml::$typeMap);
     }
     }
 
 
 
 
@@ -209,7 +210,7 @@ class TemplateController extends BaseController
      */
      */
     public function chunk_lists(){
     public function chunk_lists(){
         $lists = TemplateChunkLogic::instance()->getList()->toArray();
         $lists = TemplateChunkLogic::instance()->getList()->toArray();
-        return $this->success($lists);
+        return $this->response('',Code::SUCCESS,$lists);
     }
     }
 
 
 
 

@@ -103,7 +103,8 @@ class ATemplateHtml extends \App\Models\Base{
 
 
 
 
     public static function _find($id){
     public static function _find($id){
-        return static::where('id',$id)->first();
+        $data = static::where('id',$id)->first();
+        return $data ? $data->toArray() : [];
     }
     }
 
 
     /**
     /**
@@ -122,11 +123,11 @@ class ATemplateHtml extends \App\Models\Base{
         $model->template_id = $template_id;
         $model->template_id = $template_id;
 
 
         $model->name = $data['name'];
         $model->name = $data['name'];
-        $model->status = $data['status'];
-        $model->is_default = $data['is_default'];
-        $model->sort = $data['sort'];
-        $model->thumb = $data['thumb'];
-        $model->url = $data['url'];
+        $model->type = $data['type'];
+        $model->css = $data['css'];
+        $model->script = $data['script'];
+        $model->html = $data['html'];
+
 
 
         $model->save();
         $model->save();