gx

@@ -31,6 +31,36 @@ class BTemplateLogLogic extends BaseLogic
      */
      */
     public function saveRollbackVersion(){
     public function saveRollbackVersion(){
         //获取当前数据详情
         //获取当前数据详情
-        $this->model->read(['id']);
+        $info = $this->model->read(['id'=>$this->param['id']]);
+        if($info === false){
+            $this->fail('error');
+        }
+        $data = $this->setParam($info);
+        $BTemplateModel = new BTemplate();
+        $rs = $BTemplateModel->edit($data,['template_id'=>$info['template_id'],'source'=>$info['source'],'source_id'=>$info['source_id']]);
+        if($rs === false){
+            $this->fail('error');
+        }
+        return $this->success();
+    }
+
+    /**
+     * @remark :设置回滚参数
+     * @name   :setParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/23 14:18
+     */
+    public function setParam($info){
+        $data = [
+            'html'=>$info['html'],
+            'head_html'=>$info['head_html'],
+            'head_css'=>$info['head_css'],
+            'main_html'=>$info['main_html'],
+            'main_css'=>$info['main_css'],
+            'footer_html'=>$info['footer_html'],
+            'footer_css'=>$info['footer_css'],
+        ];
+        return  $this->success($data);
     }
     }
 }
 }

@@ -174,8 +174,8 @@ class BTemplateLogic extends BaseLogic
      */
      */
     public function templateSave(){
     public function templateSave(){
         //查询当前模版是否已保存
         //查询当前模版是否已保存
-//        DB::beginTransaction();
-//        try {
+        DB::beginTransaction();
+        try {
             $info = $this->webTemplateInfo($this->param['template_id'],$this->param['source'],$this->param['source_id']);
             $info = $this->webTemplateInfo($this->param['template_id'],$this->param['source'],$this->param['source_id']);
             //字符串截取
             //字符串截取
             $this->param = $this->stringProcessing($this->param);
             $this->param = $this->stringProcessing($this->param);
@@ -186,11 +186,11 @@ class BTemplateLogic extends BaseLogic
                 $this->model->edit($this->param,['id'=>$info['id']]);
                 $this->model->edit($this->param,['id'=>$info['id']]);
             }
             }
             $this->setTemplateLog($this->param);
             $this->setTemplateLog($this->param);
-//            DB::commit();
-//        }catch (\Exception $e){
-//            DB::rollBack();
-//            $this->fail('error');
-//        }
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('error');
+        }
         //通知更新
         //通知更新
         $this->homeOrProduct($this->param['source'],$this->param['source_id']);
         $this->homeOrProduct($this->param['source'],$this->param['source_id']);
         return $this->success();
         return $this->success();
@@ -209,6 +209,14 @@ class BTemplateLogic extends BaseLogic
             'project_id'=>$this->user['project_id'],
             'project_id'=>$this->user['project_id'],
             'operator_id'=>$this->user['id'],
             'operator_id'=>$this->user['id'],
             'text'=>$param['html'],
             'text'=>$param['html'],
+            'source'=>$param['source'],
+            'source_id'=>$param['source_id'],
+            'head_html'=>$param['head_html'],
+            'head_css'=>$param['head_css'],
+            'main_html'=>$param['main_html'],
+            'main_css'=>$param['main_css'],
+            'footer_html'=>$param['footer_html'],
+            'footer_css'=>$param['footer_css'],
         ];
         ];
         $bTemplateLogModel = new BTemplateLog();
         $bTemplateLogModel = new BTemplateLog();
         return $bTemplateLogModel->add($data);
         return $bTemplateLogModel->add($data);

@@ -275,6 +275,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::prefix('log')->group(function () {
         Route::prefix('log')->group(function () {
             //获取所有左侧模版
             //获取所有左侧模版
             Route::any('/', [\App\Http\Controllers\Bside\Template\BTemplateLogController::class, 'lists'])->name('template_log_lists');
             Route::any('/', [\App\Http\Controllers\Bside\Template\BTemplateLogController::class, 'lists'])->name('template_log_lists');
+            Route::any('/rollbackVersion', [\App\Http\Controllers\Bside\Template\BTemplateLogController::class, 'rollbackVersion'])->name('template_log_rollbackVersion');
         });
         });
     });
     });
     // 自定义页面，专题页
     // 自定义页面，专题页