合并分支 'master-lyh-edit' 到 'master'

Master lyh edit



查看合并请求 !550

@@ -8,6 +8,7 @@ use App\Http\Logic\Aside\Template\ATemplateLogic;
 use App\Http\Requests\Aside\Template\ATemplateRequest;
 use App\Http\Requests\Aside\Template\ATemplateRequest;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;
 use App\Models\Template\Template;
 use App\Models\Template\Template;
+use App\Models\Template\TemplateLabel;
 
 
 /**
 /**
  * @remark :A端主题模板管理
  * @remark :A端主题模板管理
@@ -24,11 +25,12 @@ class ATemplateController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/6/28 16:34
      * @time   :2023/6/28 16:34
      */
      */
-    public function lists(ATemplateLogic $aTemplateLogic){
+    public function lists(ATemplateLogic $aTemplateLogic,TemplateLabel $templateLabel){
         $filed = ['id','name','image','url','status','sort','deleted_status','test_model','created_at','project_id'];
         $filed = ['id','name','image','url','status','sort','deleted_status','test_model','created_at','project_id'];
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
+                $v['label'] = $templateLabel->list(['template_id'=>$v['id']],'id',['id','name'],'desc',5);
                 $v['image_link'] = getImageUrl($v['image']);
                 $v['image_link'] = getImageUrl($v['image']);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }

@@ -25,7 +25,7 @@ class ATemplateTypeController extends BaseController
      */
      */
     public function getType(ATemplateTypeLogic $ATemplateTypeLogic){
     public function getType(ATemplateTypeLogic $ATemplateTypeLogic){
         if(!isset($this->map['type'])){
         if(!isset($this->map['type'])){
-            $this->map['type'] == 1;
+            $this->map['type'] = 1;
         }
         }
         $list = $ATemplateTypeLogic->ModuleType($this->map);
         $list = $ATemplateTypeLogic->ModuleType($this->map);
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);

+<?php
+/**
+ * @remark :
+ * @name   :TemplateLabelController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/16 9:51
+ */
+
+namespace App\Http\Controllers\Aside\Template;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Http\Logic\Aside\Template\TemplateLabelLogic;
+use App\Models\Template\Template;
+use App\Models\Template\TemplateLabel;
+
+/**
+ * @remark :
+ * @name   :TemplateLabelController
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/16 9:51
+ */
+class TemplateLabelController extends BaseController
+{
+    /**
+     * @remark :获取左侧模版的标签
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/16 10:15
+     */
+    public function getUserLists(TemplateLabel $templateLabel){
+        $this->request->validate([
+            'template_id'=>'required',
+        ],[
+            'template_id.required' => '模版id不能为空',
+        ]);
+        $data = $templateLabel->list($this->map);
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :保存标签
+     * @name   :save
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/16 9:53
+     */
+   public function save(TemplateLabelLogic $labelLogic){
+       $this->request->validate([
+           'name'=>'required | max:200',
+           'type'=>'required',
+           'template_id'=>'required',
+       ],[
+           'name.required' => '标签名称不能为空',
+           'type.required' => '模版类型不能为空不能为空',
+           'template_id.required' => '模版ID不能为空不能为空',
+       ]);
+       $data = $labelLogic->saveLabel();
+       $this->response('success',Code::SUCCESS,$data);
+   }
+
+    /**
+     * @remark :删除数据
+     * @name   :del
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/16 10:08
+     */
+   public function del(TemplateLabelLogic $labelLogic){
+       $this->request->validate([
+           'id'=>'required',
+       ],[
+           'id.required' => '主键不能为空',
+       ]);
+       $data = $labelLogic->delLabel();
+       $this->response('success',Code::SUCCESS,$data);
+   }
+}

+<?php
+/**
+ * @remark :
+ * @name   :TemplateLabelLogic.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/16 9:54
+ */
+
+namespace App\Http\Logic\Aside\Template;
+
+use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Template\TemplateLabel;
+
+/**
+ * @remark :模版标签
+ * @name   :TemplateLabelLogic
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/16 9:54
+ */
+class TemplateLabelLogic extends BaseLogic
+{
+    /**
+     * 初始化数据
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new TemplateLabel();
+        $this->param = $this->requestAll;
+    }
+
+
+    /**
+     * @remark :保存标签
+     * @name   :saveLabel
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/16 9:55
+     */
+    public function saveLabel(){
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $id = $this->param['id'];
+            $info = $this->model->read(['name'=>$this->param['name'],['template_id'=>$this->param['template_id']],'id'=>['!=',$id]],['id']);
+            if($info === false){
+                $this->model->edit($this->param,['id'=>$id]);
+            }
+        }else{
+            $info = $this->model->read(['name'=>$this->param['name'],['template_id'=>$this->param['template_id']]],['id']);
+            if($info === false){
+                $this->param['manager_id'] = $this->manager['id'];
+                $id = $this->model->addReturnId($this->param);
+            }else{
+                $id = $info['id'];
+            }
+        }
+        return $this->success(['id'=>$id]);
+    }
+
+    /**
+     * @remark :删除标签
+     * @name   :delLabel
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/16 10:03
+     */
+    public function delLabel(){
+        $rs = $this->model->del($this->param);
+        if($rs === false){
+            $this->fail('删除失败，请联系管理员');
+        }
+        return $this->success();
+    }
+}

@@ -103,6 +103,7 @@ class RankDataLogic extends BaseLogic
                     'home_cnt' => $lang_data[$lang['lang']]['home_cnt'] ?? 0,
                     'home_cnt' => $lang_data[$lang['lang']]['home_cnt'] ?? 0,
                     'remain_day' => ($lang['type']??0) == 1 ? $data['project']['remain_day'] : $lang['service_day'] - $remain_day,
                     'remain_day' => ($lang['type']??0) == 1 ? $data['project']['remain_day'] : $lang['service_day'] - $remain_day,
                     'type' => $lang['type'] ?? 0, //1 项目关键词 项目天数  2 保证首页关键词 项目达标天数
                     'type' => $lang['type'] ?? 0, //1 项目关键词 项目天数  2 保证首页关键词 项目达标天数
+                    'dabiao_day'=>$remain_day,
                     'service_day' => $lang['service_day'] ?? 0, //1 项目关键词 项目天数  2 保证首页关键词 项目达标天数
                     'service_day' => $lang['service_day'] ?? 0, //1 项目关键词 项目天数  2 保证首页关键词 项目达标天数
                 ];
                 ];
             }
             }

+<?php
+/**
+ * @remark :
+ * @name   :TemplateLabel.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/16 9:49
+ */
+
+namespace App\Models\Template;
+
+use App\Models\Base;
+
+/**
+ * @remark :模版标签
+ * @name   :TemplateLabel
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/16 9:49
+ */
+class TemplateLabel extends Base
+{
+    protected $table = 'gl_public_template_label';
+}

@@ -375,6 +375,12 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::any('/sort', [Aside\Template\ATemplateTypeController::class, 'sort'])->name('admin.ATemplateType_sort');
             Route::any('/sort', [Aside\Template\ATemplateTypeController::class, 'sort'])->name('admin.ATemplateType_sort');
             Route::any('/del', [Aside\Template\ATemplateTypeController::class, 'del'])->name('admin.ATemplateType_del');
             Route::any('/del', [Aside\Template\ATemplateTypeController::class, 'del'])->name('admin.ATemplateType_del');
         });
         });
+        //设置标签
+        Route::prefix('label')->group(function () {
+            Route::any('/getUserLists', [Aside\Template\TemplateLabelController::class, 'getUserLists'])->name('admin.ATemplateType_label_getUserLists');
+            Route::any('/save', [Aside\Template\TemplateLabelController::class, 'save'])->name('admin.ATemplateType_label_save');
+            Route::any('/del', [Aside\Template\TemplateLabelController::class, 'del'])->name('admin.ATemplateType_label_del');
+        });
     });
     });
     //可视化数据替换
     //可视化数据替换
     Route::prefix('replace')->group(function () {
     Route::prefix('replace')->group(function () {