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

更新rank搜索



查看合并请求 !585

@@ -25,9 +25,6 @@ class ATemplateModuleController extends BaseController
      * @time   :2023/6/28 16:54
      * @time   :2023/6/28 16:54
      */
      */
     public function lists(ATemplateModuleLogic $ATemplateModuleLogic){
     public function lists(ATemplateModuleLogic $ATemplateModuleLogic){
-        if(isset($this->map['type']) && ($this->map['type'] == 99)){
-            $this->map['type'] = 99;
-        }
         $lists = $ATemplateModuleLogic->aTemplateModuleLists($this->map,$this->page,$this->row,$this->order);
         $lists = $ATemplateModuleLogic->aTemplateModuleLists($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }

@@ -8,6 +8,7 @@ use App\Http\Logic\Bside\BTemplate\BTemplateLogic;
 use App\Http\Requests\Bside\Template\TemplateRequest;
 use App\Http\Requests\Bside\Template\TemplateRequest;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;
+use App\Models\Template\Template;
 
 
 class BTemplateController extends BaseController
 class BTemplateController extends BaseController
 {
 {
@@ -159,15 +160,21 @@ class BTemplateController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @remark :获取source类型
-     * @name   :getSource
+     * @remark :选择内页模版
+     * @name   :setPublicTemplate
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2024/1/3 9:06
+     * @time   :2024/5/24 15:08
      */
      */
-    public function getSource(){
-        $bTemplateModel = new BTemplate();
-        $info = $bTemplateModel->sourceMap();
-        $this->response('success',Code::SUCCESS,$info);
+    public function setPublicTemplate(BTemplateLogic $BTemplateLogic){
+        $this->request->validate([
+            'id'=>'required',
+            'template_id'=>'required',
+        ],[
+            'id.required' => '当前数据id不能为空',
+            'template_id.required' => '模版id不能为空',
+        ]);
+        $BTemplateLogic->setCustomTemplate();
+        $this->response('保存成功');
     }
     }
 }
 }

@@ -42,7 +42,8 @@ class BTemplateLogController extends BaseController
             $userModel = new User();
             $userModel = new User();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 if(!empty($v['template_id'])){
                 if(!empty($v['template_id'])){
-                    $v['template_name'] = $templateModel->read(['id'=>$v['template_id']],['name'])['name'];
+                    $template_name = $templateModel->read(['id'=>$v['template_id']],['name']);
+                    $v['template_name'] = $template_name !== false ? $templateModel['name'] : '';
                 }
                 }
                 $v['operator_name'] = $userModel->getName($v['operator_id']);
                 $v['operator_name'] = $userModel->getName($v['operator_id']);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;

@@ -170,7 +170,7 @@ class CustomTemplateController extends BaseController
         ],[
         ],[
             'id.required' => 'ID不能为空',
             'id.required' => 'ID不能为空',
         ]);
         ]);
-        $logic->copyCustomTemplateInfo();
-        $this->response('success');
+        $data = $logic->copyCustomTemplateInfo();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -933,4 +933,24 @@ class BTemplateLogic extends BaseLogic
         }
         }
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :设置模版
+     * @name   :setCustomTemplate
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/24 15:55
+     */
+    public function setCustomTemplate(){
+        $templateModel = new Template();
+        $templateInfo = $templateModel->read(['id'=>$this->param['template_id']],['id','main_html','main_css']);
+        if($templateInfo === false){
+            $this->fail('未获取到模版数据');
+        }
+        if(empty($templateInfo['main_html']) || empty($templateInfo['main_css'])){
+            $this->fail('当前模版替换数据错误');
+        }
+        $this->model->edit(['html'=>$templateInfo['main_html'],'html_style'=>$templateInfo['main_css']],['id'=>$this->param['id']]);
+        return $this->success();
+    }
 }
 }

@@ -404,4 +404,33 @@ class CustomTemplateLogic extends BaseLogic
         }
         }
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :复制单页面
+     * @name   :copyCustomTemplateInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/24 14:47
+     */
+    public function copyCustomTemplateInfo(){
+        $info = $this->model->read(['id'=>$this->param['id']]);
+        if($info === false){
+            $this->fail('当前数据不存在');
+        }
+        $param = [
+            'name'=>$info['name'].'-copy',
+            'status'=>$info['status'],
+            'url'=>$info['url'].'-copy',
+            'html'=>$info['html'],
+            'html_style'=>$info['html_style'],
+            'project_id'=>$info['project_id'],
+            'is_visualization'=>$info['is_visualization'],
+            'six_read'=>$info['six_read'],
+            'is_upgrade'=>$info['is_upgrade'],
+        ];
+        $id = $this->model->addReturnId($param);
+        $route = RouteMap::setRoute($param['url'],RouteMap::SOURCE_PAGE,$id,$param['project_id']);
+        $this->model->edit(['url'=>$route],['id'=>$id]);
+        return $this->success(['id'=>$id]);
+    }
 }
 }

@@ -97,6 +97,7 @@ class RankDataLogic extends BaseLogic
             foreach($languageList as $lang){
             foreach($languageList as $lang){
                 $remain_day = $lang_data[$lang['lang']]['dabiao_day'] ?? 0;
                 $remain_day = $lang_data[$lang['lang']]['dabiao_day'] ?? 0;
                 $data['langs'][$lang['language'] ?? ''] = [
                 $data['langs'][$lang['language'] ?? ''] = [
+                    'lang'=>$lang['lang'],
                     'lang_text' => $lang['language'],
                     'lang_text' => $lang['language'],
                     'keyword_num' => $lang['keywords'] ?? 0,
                     'keyword_num' => $lang['keywords'] ?? 0,
                     'reach_day' => $lang_data[$lang['lang']]['dabiao_day'] ?? 0,
                     'reach_day' => $lang_data[$lang['lang']]['dabiao_day'] ?? 0,
@@ -247,7 +248,7 @@ class RankDataLogic extends BaseLogic
         $list = collect($list30)->merge($list30_0)->merge($list100)->merge($list0)->filter(function ($item) {
         $list = collect($list30)->merge($list30_0)->merge($list100)->merge($list0)->filter(function ($item) {
             //搜索
             //搜索
             if ($this->request['search']) {
             if ($this->request['search']) {
-                return strpos($item['keyword'], $this->request['search']) !== false;
+                return strpos(strtolower($item['keyword']), strtolower($this->request['search'])) !== false;
             }
             }
             //前几名
             //前几名
             if ($this->request['first']) {
             if ($this->request['first']) {

@@ -361,6 +361,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/savePublicTemplate', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'savePublicTemplate'])->name('template_savePublicTemplate');
         Route::any('/savePublicTemplate', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'savePublicTemplate'])->name('template_savePublicTemplate');
         Route::any('/getDetailInfo', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getDetailInfo'])->name('template_getDetailInfo');
         Route::any('/getDetailInfo', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getDetailInfo'])->name('template_getDetailInfo');
         Route::any('/saveDetail', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'saveDetail'])->name('template_saveDetail');
         Route::any('/saveDetail', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'saveDetail'])->name('template_saveDetail');
+        Route::any('/setPublicTemplate', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'setPublicTemplate'])->name('template_setPublicTemplate');
         // 模板
         // 模板
         Route::prefix('module')->group(function () {
         Route::prefix('module')->group(function () {
             //获取所有左侧模版
             //获取所有左侧模版