bbbbb

@@ -146,12 +146,33 @@ class TemplateController extends BaseController
         $data['data_source']    =   $data['source'];
         $data['data_source']    =   $data['source'];
         $data['data_source_id']    =   $data['source_id'];
         $data['data_source_id']    =   $data['source_id'];
 
 
+        // 不需要数据id
+        if(in_array($data['data_source'],['index'])){
+            $data['data_source_id'] = 0;
+        }
+
         unset($data['source']);
         unset($data['source']);
         unset($data['source_id']);
         unset($data['source_id']);
 
 
-        TemplateLogic::instance()->save($data);
+        $id = TemplateLogic::instance()->save($data);
+
+        if($id){
+            $info = TemplateLogic::instance()->getInfo($id['id']);
+            $info['source'] = $info['data_source'];
+            $info['source_id'] = $info['data_source_id'];
+            unset($info['data_source']);
+            unset($info['data_source_id']);
+            unset($info['template_id']);
+            unset($info['created_at']);
+            unset($info['updated_at']);
+            unset($info['css']);
+            unset($info['script']);
+            unset($info['data_ext']);
+
+            return $this->success($info,Code::SUCCESS,'保存成功');
+        }
 
 
-        return $this->response('保存成功');
+        return $this->response('保存失败',Code::SYSTEM_ERROR);
 
 
     }
     }
 
 

@@ -37,9 +37,11 @@ class TemplateLogic extends  BaseLogic
         $data = $this->first($param['data_source'],$param['data_source_id']);
         $data = $this->first($param['data_source'],$param['data_source_id']);
         if($data){
         if($data){
             $param['id'] = $data['id'];
             $param['id'] = $data['id'];
+        }else{
+            $param['template_id'] = BSetting::_get($this->user['project_id'])['template_id'];
         }
         }
 
 
-        parent::save($param);
+        return parent::save($param);
 
 
     }
     }
 
 
@@ -83,7 +85,7 @@ class TemplateLogic extends  BaseLogic
             'project_id'=>$this->user['project_id'],
             'project_id'=>$this->user['project_id'],
             'data_source'  =>  $source,
             'data_source'  =>  $source,
             'data_source_id'  =>  $source_id,
             'data_source_id'  =>  $source_id,
-            'template_id'   => BSetting::_get($this->user['project_id'])
+            'template_id'   => BSetting::_get($this->user['project_id'])['template_id']
         ])->first();
         ])->first();
     }
     }
 
 

@@ -43,7 +43,7 @@ class TemplateRequest extends FormRequest
 
 
 
 
         // 删除
         // 删除
-        if(!$this->is('b/template/status')){
+        if($this->is('b/template/status')){
             unset($rule['css']);
             unset($rule['css']);
             unset($rule['script']);
             unset($rule['script']);
             unset($rule['html']);
             unset($rule['html']);

@@ -233,7 +233,7 @@ Route::middleware(['bloginauth','accesstoken'])->group(function () {
 //        Route::get('/custom-chunk', [\App\Http\Controllers\Bside\TemplateController::class, 'customChunk'])->name('bside_template_custom_chunk');
 //        Route::get('/custom-chunk', [\App\Http\Controllers\Bside\TemplateController::class, 'customChunk'])->name('bside_template_custom_chunk');
         Route::get('/get_type', [\App\Http\Controllers\Bside\TemplateController::class, 'get_type'])->name('bside_template_type');
         Route::get('/get_type', [\App\Http\Controllers\Bside\TemplateController::class, 'get_type'])->name('bside_template_type');
         Route::get('/get_html', [\App\Http\Controllers\Bside\TemplateController::class, 'get_html'])->name('bside_template_get_html');
         Route::get('/get_html', [\App\Http\Controllers\Bside\TemplateController::class, 'get_html'])->name('bside_template_get_html');
-        Route::get('/save_html', [\App\Http\Controllers\Bside\TemplateController::class, 'save_html'])->name('bside_template_save_html');
+        Route::post('/save_html', [\App\Http\Controllers\Bside\TemplateController::class, 'save_html'])->name('bside_template_save_html');
         Route::get('/status', [\App\Http\Controllers\Bside\TemplateController::class, 'status'])->name('bside_template_status');
         Route::get('/status', [\App\Http\Controllers\Bside\TemplateController::class, 'status'])->name('bside_template_status');