Merge remote-tracking branch 'origin/master' into akun

@@ -33,7 +33,7 @@ class UpgradeProjectCount extends Command
     protected $description = '升级项目统计';
     protected $description = '升级项目统计';
 
 
     public function handle(){
     public function handle(){
-        $project_id = 555;
+        $project_id = 439;
         ProjectServer::useProject($project_id);
         ProjectServer::useProject($project_id);
         $this->count($project_id);
         $this->count($project_id);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');

@@ -43,8 +43,10 @@ class DomainInfo extends Command
         foreach ($list as $v){
         foreach ($list as $v){
             if(empty($v['private_key']) || empty($v['private_cert'])){
             if(empty($v['private_key']) || empty($v['private_cert'])){
                 //域名结束时间<2天时，重新生成
                 //域名结束时间<2天时，重新生成
-                if(!empty($v['certificate_end_time']) && ($v['certificate_end_time'] > date('Y-m-d H:i:s',time() + 24*3600))){
-                    $this->updatePrivate($v);
+                if(!empty($v['certificate_end_time'])){
+                    if(($v['certificate_end_time'] > date('Y-m-d H:i:s',time() + 24*3600)) || ($v['certificate_end_time'] < date('Y-m-d H:i:s',time()))){
+                        $this->updatePrivate($v);
+                    }
                 }
                 }
             }
             }
             $ssl = $this->updateDomainSsl($v['domain']);
             $ssl = $this->updateDomainSsl($v['domain']);
@@ -77,7 +79,6 @@ class DomainInfo extends Command
     public function updatePrivate($param)
     public function updatePrivate($param)
     {
     {
         $url = 'https://' . $param['domain']. '/api/applySsl/';
         $url = 'https://' . $param['domain']. '/api/applySsl/';
-        $extend_config = json_decode($param['extend_config'], true);
         $top_domain = $this->getTopDomain($param['domain']);
         $top_domain = $this->getTopDomain($param['domain']);
         if ((empty($extend_config) || empty($extend_config[0]['origin'])) && $param['id'] != 3) {
         if ((empty($extend_config) || empty($extend_config[0]['origin'])) && $param['id'] != 3) {
             $extend_config = [
             $extend_config = [
@@ -89,13 +90,14 @@ class DomainInfo extends Command
             'type' => 1,
             'type' => 1,
             'route' => 1,
             'route' => 1,
             "domain" =>$param['domain'],
             "domain" =>$param['domain'],
-            "rewrite"=> $extend_config,
+            "rewrite"=> $extend_config ?? [],
             'other_domain' => [$top_domain, '*.' . $top_domain],
             'other_domain' => [$top_domain, '*.' . $top_domain],
             'private_key' => '',
             'private_key' => '',
             'cert' => ''
             'cert' => ''
         ];
         ];
         $result = $this->curlRequest($url, $param);
         $result = $this->curlRequest($url, $param);
-        Log::info('domain id: ' . $param['id'] . ', domain: ' . $param['domain'] . ', result: ' . var_export($result, true));
+        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($result, true) . PHP_EOL, FILE_APPEND);
+        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($param['domain'], true) . PHP_EOL, FILE_APPEND);
     }
     }
 
 
     public static function getTopDomain ($url) {
     public static function getTopDomain ($url) {

@@ -35,8 +35,8 @@ class UpgradeProjectCount extends Command
     protected $description = '升级项目统计';
     protected $description = '升级项目统计';
 
 
     public function handle(){
     public function handle(){
-        $project_id = 555;
-        $url = 'www.sincoherenaesthetics.com';
+        $project_id = 439;
+        $url = 'www.cnzyl.com';
         ProjectServer::useProject($project_id);
         ProjectServer::useProject($project_id);
         $this->count($project_id,$url);
         $this->count($project_id,$url);
 
 
@@ -67,6 +67,14 @@ class UpgradeProjectCount extends Command
             $arr['month_total'] = 0;
             $arr['month_total'] = 0;
             if(isset($res['data']['count'])){
             if(isset($res['data']['count'])){
                 $arr['month_total'] = $res['data']['count'];
                 $arr['month_total'] = $res['data']['count'];
+                //获取上一个的count
+                $previousMonth = date('Y-m', strtotime($v['month'] . ' -1 month'));
+                $previousInfo = $monthCountModel->read(['month'=>$previousMonth,'project_id'=>$project_id]);
+                if($previousInfo === false){
+                    $arr['total'] = $arr['month_total'];
+                }else{
+                    $arr['total'] = $res['data']['count'] + ($previousInfo['total'] ?? 0);
+                }
             }
             }
             if(isset($res['data']['data'])){
             if(isset($res['data']['data'])){
                 $arr['country'] = json_encode($res['data']['data']);
                 $arr['country'] = json_encode($res['data']['data']);

@@ -10,11 +10,14 @@
 namespace App\Console\Commands;
 namespace App\Console\Commands;
 
 
 use App\Helper\Arr;
 use App\Helper\Arr;
+use App\Models\CustomModule\CustomModuleCategory;
+use App\Models\CustomModule\CustomModuleContent;
 use App\Models\Product\CategoryRelated;
 use App\Models\Product\CategoryRelated;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
+use App\Models\Template\BTemplate;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -51,20 +54,37 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>51]);
+        $list = $projectModel->list(['id'=>99]);
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
 //            $this->getProduct();
 //            $this->getProduct();
-            $this->setProductKeyword();
+//            $this->setProductKeyword();
 //            $this->getRouteMap();
 //            $this->getRouteMap();
 //            $this->getProductCategory();
 //            $this->getProductCategory();
 //            $this->delRouteMap();
 //            $this->delRouteMap();
+            $this->setCustomRoute($v['id']);
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
     }
 
 
+    public function setCustomRoute($project_id){
+//        $customModel = new CustomModuleContent();
+//        $list = $customModel->list();
+//        foreach ($list as $v){
+//                $route = RouteMap::setRoute($v['name'], RouteMap::SOURCE_MODULE, $v['id'], $project_id);
+//                $customModel->edit(['route'=>$route],['id'=>$v['id']]);
+//        }
+        $cateModel = new CustomModuleCategory();
+        $lists = $cateModel->list();
+        foreach ($lists as $v1){
+                $route = RouteMap::setRoute($v1['name'], RouteMap::SOURCE_MODULE_CATE, $v1['id'], $project_id);
+                $cateModel->edit(['route'=>$route],['id'=>$v1['id']]);
+
+        }
+    }
+
     /**
     /**
      * @remark :写入
      * @remark :写入
      * @name   :getProductKeyword
      * @name   :getProductKeyword

@@ -34,8 +34,10 @@ class PrivateController extends BaseController
         $result = Project::select($field)->leftJoin('gl_project_deploy_optimize as b', 'gl_project.id', '=', 'b.project_id')
         $result = Project::select($field)->leftJoin('gl_project_deploy_optimize as b', 'gl_project.id', '=', 'b.project_id')
             ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id')
             ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id')
             ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id')
             ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id')
-            ->where('c.qa_status', '=', OnlineCheck::STATUS_ONLINE_TRUE)
             ->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR])
             ->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR])
+            ->where(function ($subQuery) {
+                $subQuery->orwhere('c.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE);
+            })
             ->paginate($page_size)
             ->paginate($page_size)
             ->toArray();
             ->toArray();
         return $this->success($result);
         return $this->success($result);

@@ -65,6 +65,7 @@ class OnlineController extends BaseController
             'gl_project.channel AS channel',
             'gl_project.channel AS channel',
             'gl_project.type AS type',
             'gl_project.type AS type',
             'gl_project.created_at AS created_at',
             'gl_project.created_at AS created_at',
+            'gl_project.is_upgrade AS is_upgrade',
             'gl_project_online_check.id AS online_check_id',
             'gl_project_online_check.id AS online_check_id',
             'gl_project_online_check.question AS question',
             'gl_project_online_check.question AS question',
             'gl_project_online_check.optimist_status AS optimist_status',
             'gl_project_online_check.optimist_status AS optimist_status',
@@ -145,6 +146,9 @@ class OnlineController extends BaseController
         if(isset($this->map['all_status'])){
         if(isset($this->map['all_status'])){
             $query->where('gl_project_online_check.qa_status',$this->map['all_status']);
             $query->where('gl_project_online_check.qa_status',$this->map['all_status']);
         }
         }
+        if(isset($this->map['is_upgrade'])){
+            $query->where('gl_project.is_upgrade',$this->map['is_upgrade']);
+        }
         if(isset($this->map['optimist_status'])){
         if(isset($this->map['optimist_status'])){
             $query->where('gl_project_online_check.optimist_status',$this->map['optimist_status']);
             $query->where('gl_project_online_check.optimist_status',$this->map['optimist_status']);
         }
         }

@@ -133,6 +133,7 @@ class OptimizeController extends BaseController
             'gl_project.robots AS robots',
             'gl_project.robots AS robots',
             'gl_project.is_translate AS is_translate',
             'gl_project.is_translate AS is_translate',
             'gl_project.is_translate_tag AS is_translate_tag',
             'gl_project.is_translate_tag AS is_translate_tag',
+            'gl_project.is_upgrade AS is_upgrade',
             'gl_project_online_check.id AS online_check_id',
             'gl_project_online_check.id AS online_check_id',
             'gl_project_online_check.question AS question',
             'gl_project_online_check.question AS question',
             'gl_project_online_check.go_question AS go_question',
             'gl_project_online_check.go_question AS go_question',
@@ -191,6 +192,9 @@ class OptimizeController extends BaseController
         if(isset($this->map['optimize_manager_mid']) && !empty($this->map['optimize_manager_mid'])){
         if(isset($this->map['optimize_manager_mid']) && !empty($this->map['optimize_manager_mid'])){
             $query = $query->where('gl_project_deploy_optimize.manager_mid','like','%'.$this->map['optimize_manager_mid'].'%');
             $query = $query->where('gl_project_deploy_optimize.manager_mid','like','%'.$this->map['optimize_manager_mid'].'%');
         }
         }
+        if(isset($this->map['is_upgrade']) && !empty($this->map['is_upgrade'])){
+            $query = $query->where('gl_project.is_upgrade',$this->map['is_upgrade']);
+        }
         if(isset($this->map['optimize_tech_mid']) && !empty($this->map['optimize_tech_mid'])){
         if(isset($this->map['optimize_tech_mid']) && !empty($this->map['optimize_tech_mid'])){
             $query = $query->where('gl_project_deploy_optimize.tech_mid','like','%'.$this->map['optimize_tech_mid'].'%');
             $query = $query->where('gl_project_deploy_optimize.tech_mid','like','%'.$this->map['optimize_tech_mid'].'%');
         }
         }

@@ -70,7 +70,7 @@ class AyrReleaseController extends BaseController
         //参数处理
         //参数处理
         $this->param['mediaUrls'] = $ayrReleaseLogic->image_file_param($data);
         $this->param['mediaUrls'] = $ayrReleaseLogic->image_file_param($data);
         //时间处理
         //时间处理
-        $datetime = new \DateTime($this->param['schedule_date']);
+        $datetime = new \DateTime($this->param['schedule_date'] ?? date('Y-m-d H:i:s'));
         $formattedTime = $datetime->format("Y-m-d\TH:i:s\Z");
         $formattedTime = $datetime->format("Y-m-d\TH:i:s\Z");
         //统一生成发布
         //统一生成发布
         $param = [
         $param = [

@@ -275,4 +275,16 @@ class BlogController extends BaseController
         $logic->setSort();
         $logic->setSort();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :批量排序
+     * @name   :allSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/11 9:46
+     */
+    public function allSort(BlogLogic $logic){
+        $logic->setAllSort();
+        $this->response('success');
+    }
 }
 }

@@ -262,4 +262,16 @@ class NewsController extends BaseController
         $newsLogic->setSort();
         $newsLogic->setSort();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :批量排序
+     * @name   :allSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/11 9:47
+     */
+    public function allSort(NewsLogic $newsLogic){
+        $newsLogic->setAllSort();
+        $this->response('success');
+    }
 }
 }

@@ -238,9 +238,13 @@ class ProductController extends BaseController
             }
             }
             $v['keyword_id_text'] = trim($v['keyword_id_text'],',');
             $v['keyword_id_text'] = trim($v['keyword_id_text'],',');
         }
         }
-        $v['status_text'] = Product::statusMap()[$v['status']] ?? '';
+        if(!empty($v['status'])){
+            $v['status_text'] = Product::statusMap()[$v['status']] ?? '';
+        }else{
+            $v['status_text'] = '';
+        }
         //获取当前用户选择的模版
         //获取当前用户选择的模版
-        $v['video'] = json_decode($v['video']);
+        $v['video'] = json_decode($v['video'] ?? '');
         $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);
         $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);
         $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id']);
         $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id']);
         $v['url'] = $this->user['domain'].$v['route'];
         $v['url'] = $this->user['domain'].$v['route'];
@@ -421,4 +425,16 @@ class ProductController extends BaseController
         $logic->setSort();
         $logic->setSort();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :批量更新排序
+     * @name   :allSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/10 15:34
+     */
+    public function allSort(ProductLogic $logic){
+        $logic->setAllSort();
+        $this->response('success');
+    }
 }
 }

@@ -66,43 +66,118 @@ class BTemplateLogic extends BaseLogic
     public function getTemplateHtml(){
     public function getTemplateHtml(){
         $is_custom = $this->param['is_custom'] ?? 0;//是否为扩展模块
         $is_custom = $this->param['is_custom'] ?? 0;//是否为扩展模块
         $is_list = $this->param['is_list'] ?? 0;//是否为列表页
         $is_list = $this->param['is_list'] ?? 0;//是否为列表页
-        $template_id = $this->getSettingTemplate($this->param['source'],$is_list);//设置的模版id
-        $templateInfo = $this->model->read([
-            'template_id'=>$template_id, 'source'=>$this->param['source'],
-            'project_id'=>$this->user['project_id'], 'source_id'=>$this->param['source_id'],
-            'is_custom'=>$is_custom, 'is_list'=>$is_list
-        ]);
+        $template_id = $this->getSettingTemplate($this->param['source'],$is_list,$is_custom);//设置的模版id
+        $templateInfo = $this->webTemplateInfo($this->param['source'],$this->param['source_id'],$template_id,$is_custom,$is_list);
         if($templateInfo === false){
         if($templateInfo === false){
             if($this->user['is_customized'] == BTemplate::IS_VISUALIZATION){//处理定制页面初始数据
             if($this->user['is_customized'] == BTemplate::IS_VISUALIZATION){//处理定制页面初始数据
-                $html = $this->isCustomizedPage($this->param['source'],$is_list);//获取定制页面的html
-                if(!empty($html)){
-                    return $this->success(['html'=>$html,'template_id'=>$template_id]);
+                $html = $this->customizedReturnHtml($this->param['source'],$template_id,$is_custom,$is_list);
+                if($html !== false){
+                    return $this->success($html);
                 }
                 }
             }
             }
+            //非定制初始中间部分
             $mainInfo = $this->getMAinHtml($this->param['source'],$is_custom,$is_list);//获取中间部分代码
             $mainInfo = $this->getMAinHtml($this->param['source'],$is_custom,$is_list);//获取中间部分代码
         }else{
         }else{
             if($templateInfo['type'] == BTemplate::ALL_HTML){//返回整个html代码
             if($templateInfo['type'] == BTemplate::ALL_HTML){//返回整个html代码
-                $type = $this->getCustomizedType($this->param['source'],$is_list);
-                $commonInfo = $this->getCustomizedCommonHtml($type);//获取定制头部
-                $html = $this->handleAllHtml($commonInfo,$templateInfo['html']);
-                return $this->success(['html'=>$html,'template_id'=>$template_id,'id'=>$templateInfo['id'],'updated_at'=>$templateInfo['updated_at']]);
+                return $this->getCustomizeAllHtml($templateInfo,$template_id,$is_custom,$is_list);
             }
             }
             $mainInfo = ['main_html'=>$templateInfo['main_html'], 'main_css'=>$templateInfo['main_css']];
             $mainInfo = ['main_html'=>$templateInfo['main_html'], 'main_css'=>$templateInfo['main_css']];
         }
         }
-        $commonInfo = $this->getCommonHtml($this->param['source'],$is_list,$template_id,$is_custom);//获取定制头部
-        $html = $commonInfo['head_css'].$mainInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other'].
-            $commonInfo['head_html'].$mainInfo['main_html'].$commonInfo['footer_html'];
+        $commonInfo = $this->getCommonHtml($this->param['source'],$is_list,$template_id,$is_custom);//获取非定制头部
+        $html = $commonInfo['head_css'].$mainInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other']. $commonInfo['head_html'].$mainInfo['main_html'].$commonInfo['footer_html'];
         $html = $this->getHeadFooter($html);
         $html = $this->getHeadFooter($html);
         $result = ['html'=>$html,'template_id'=>$template_id];
         $result = ['html'=>$html,'template_id'=>$template_id];
-        if($templateInfo !== false)
-        {
-            $result['id'] = $templateInfo['id'];
-            $result['updated_at'] = $templateInfo['updated_at'];
-        }
+        if($templateInfo !== false) {$result['id'] = $templateInfo['id'];$result['updated_at'] = $templateInfo['updated_at'];}
         return $this->success($result);
         return $this->success($result);
     }
     }
 
 
     /**
     /**
+     * @remark :获取整个html代码
+     * @name   :getCustomizeAllHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/10 14:15
+     */
+    public function getCustomizeAllHtml($templateInfo,$template_id,$is_custom,$is_list){
+        if($is_custom == BTemplate::IS_CUSTOM){
+            $commonInfo = $this->getCustomizedCommonHtml($this->param['source'],$is_custom,$is_list);//获取定制头部
+            $html = $this->handleAllHtml($commonInfo,$templateInfo['html']);
+        }else{
+            $type = $this->getCustomizedType($this->param['source'],$is_list);
+            $commonInfo = $this->getCustomizedCommonHtml($type,$is_custom,$is_list);//获取定制头部
+            $html = $this->handleAllHtml($commonInfo,$templateInfo['html']);
+        }
+        return $this->success(['html'=>$html,'template_id'=>$template_id,'id'=>$templateInfo['id'],'updated_at'=>$templateInfo['updated_at']]);
+    }
+
+    /**
+     * @remark :获取装修详情
+     * @name   :webTemplateInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/10 13:43
+     */
+    public function webTemplateInfo($source,$source_id,$template_id,$is_custom,$is_list){
+        $templateInfo = $this->model->read([
+            'template_id'=>$template_id, 'source'=>$source,
+            'project_id'=>$this->user['project_id'], 'source_id'=>$source_id,
+            'is_custom'=>$is_custom, 'is_list'=>$is_list
+        ]);
+        return $this->success($templateInfo);
+    }
+
+    /**
+     * @remark :定制页面获取html
+     * @name   :customizedReturnHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/10 13:46
+     */
+    public function customizedReturnHtml($source,$template_id,$is_custom,$is_list){
+        //TODO::扩展模块定制单独处理
+        if($is_custom == BTemplate::IS_CUSTOM){
+            $customModuleModel = new CustomModule();
+            $info = $customModuleModel->read(['id'=>$source]);
+            if($info === false){
+                $this->fail('当前扩展模块不存在或已被删除');
+            }
+            //扩展模块定制
+            if($info['list_customized'] == BTemplate::IS_VISUALIZATION || $info['detail_customized'] == BTemplate::IS_VISUALIZATION){
+                $html = $this->customModuleCustomizeHtml($source,$is_list,$is_custom);
+                return $this->success(['html'=>$html,'template_id'=>$template_id]);
+            }
+            return false;
+        }
+        //TODO::默认模块定制
+        $html = $this->isCustomizedPage($source,$is_list);//获取定制页面的html
+        if(!empty($html)){
+            return $this->success(['html'=>$html,'template_id'=>$template_id]);
+        }
+        return false;
+    }
+
+    /**
+     * @remark :扩展模块定制html
+     * @name   :customModuleInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/10 9:20
+     */
+    public function customModuleCustomizeHtml($source,$is_list,$is_custom){
+        $bTemplateMainModel = new BTemplateMain();
+        //TODO::获取初始代码
+        $customHtmlInfo = $bTemplateMainModel->read(['type'=>$source,'is_list'=>$is_list,'is_custom'=>$is_custom]);
+        if($customHtmlInfo === false){
+            $this->fail('定制页面，请先上传代码块');
+        }
+        $commonInfo = $this->getCustomizedCommonHtml($source,$is_custom,$is_list);//获取定制头部
+        if($commonInfo !== false){
+            $customHtmlInfo['main_html'] = $this->handleAllHtml($commonInfo,$customHtmlInfo['main_html']);
+        }
+        return $customHtmlInfo['main_html'];
+    }
+
+    /**
      * @remark :获取中间部分的html
      * @remark :获取中间部分的html
      * @name   :getMAinHtml
      * @name   :getMAinHtml
      * @author :lyh
      * @author :lyh
@@ -163,7 +238,7 @@ class BTemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/12/13 10:55
      * @time   :2023/12/13 10:55
      */
      */
-    public function isCustomizedPage($source,$is_list)
+    public function isCustomizedPage($source,$is_list,$is_custom)
     {
     {
         $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
         $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
         //查看当前页面是否定制，是否开启可视化
         //查看当前页面是否定制，是否开启可视化
@@ -171,17 +246,17 @@ class BTemplateLogic extends BaseLogic
         if (in_array($type, $page_array)) {//是定制界面
         if (in_array($type, $page_array)) {//是定制界面
             //TODO::获取初始代码
             //TODO::获取初始代码
             $bTemplateMainModel = new BTemplateMain();
             $bTemplateMainModel = new BTemplateMain();
-            $customHtmlInfo = $bTemplateMainModel->read(['type'=>$source,'is_list'=>$is_list]);
+            $customHtmlInfo = $bTemplateMainModel->read(['type'=>$source,'is_custom'=>$is_custom,'is_list'=>$is_list]);
             if($customHtmlInfo === false){
             if($customHtmlInfo === false){
                 $this->fail('定制页面，请先上传代码块');
                 $this->fail('定制页面，请先上传代码块');
             }
             }
-            $commonInfo = $this->getCustomizedCommonHtml($type);//获取定制头部
+            $commonInfo = $this->getCustomizedCommonHtml($type,$is_custom,$is_list);//获取定制头部
             if($commonInfo !== false){
             if($commonInfo !== false){
                 $customHtmlInfo['main_html'] = $this->handleAllHtml($commonInfo,$customHtmlInfo['main_html']);
                 $customHtmlInfo['main_html'] = $this->handleAllHtml($commonInfo,$customHtmlInfo['main_html']);
             }
             }
             return $customHtmlInfo['main_html'];
             return $customHtmlInfo['main_html'];
         }
         }
-        return [];
+        return false;
     }
     }
 
 
     /**
     /**
@@ -191,11 +266,13 @@ class BTemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/12/29 13:13
      * @time   :2023/12/29 13:13
      */
      */
-    public function getCustomizedCommonHtml($type){
+    public function getCustomizedCommonHtml($type,$is_custom = 0,$is_list = 0){
         $data = [
         $data = [
             'template_id' => 0,
             'template_id' => 0,
             'project_id' => $this->user['project_id'],
             'project_id' => $this->user['project_id'],
-            'type'=>$type
+            'type'=>$type,
+            'is_custom'=>$is_custom,
+            'is_list'=>$is_list
         ];
         ];
         $commonTemplateModel = new BTemplateCommon();
         $commonTemplateModel = new BTemplateCommon();
         return $commonTemplateModel->read($data);
         return $commonTemplateModel->read($data);
@@ -241,14 +318,25 @@ class BTemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/12/13 10:48
      * @time   :2023/12/13 10:48
      */
      */
-    public function getSettingTemplate($source,$is_list){
+    public function getSettingTemplate($source,$is_list,$is_custom){
         $template_id = 0;
         $template_id = 0;
         if($this->user['is_customized'] == BTemplate::IS_VISUALIZATION) {//定制项目
         if($this->user['is_customized'] == BTemplate::IS_VISUALIZATION) {//定制项目
-            $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
-            //查看当前页面是否定制，是否开启可视化
-            $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
-            if (in_array($type, $page_array)) {//是定制界面
-                return $this->success($template_id);
+            if($is_custom == BTemplate::IS_CUSTOM){
+                $customModuleModel = new CustomModule();
+                $info = $customModuleModel->read(['id'=>$source]);
+                if($info === false){
+                    $this->fail('当前扩展模块不存在或已被删除');
+                }
+                if($info['list_customized'] == BTemplate::IS_VISUALIZATION || $info['detail_customized'] == BTemplate::IS_VISUALIZATION){
+                    return $this->success($template_id);
+                }
+            }else{
+                $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
+                //查看当前页面是否定制，是否开启可视化
+                $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
+                if (in_array($type, $page_array)) {//是定制界面
+                    return $this->success($template_id);
+                }
             }
             }
         }
         }
         $bSettingModel = new Setting();
         $bSettingModel = new Setting();
@@ -272,7 +360,8 @@ class BTemplateLogic extends BaseLogic
         $data = [
         $data = [
             'template_id' => $template_id,
             'template_id' => $template_id,
             'project_id' => $this->user['project_id'],
             'project_id' => $this->user['project_id'],
-            'type'=>$type
+            'type'=>$type,
+            'is_custom'=>$is_custom,
         ];
         ];
         $commonTemplateModel = new BTemplateCommon();
         $commonTemplateModel = new BTemplateCommon();
         $commonInfo = $commonTemplateModel->read($data);
         $commonInfo = $commonTemplateModel->read($data);
@@ -294,16 +383,10 @@ class BTemplateLogic extends BaseLogic
      * @time   :2023/6/29 11:05
      * @time   :2023/6/29 11:05
      */
      */
     public function templateSave(){
     public function templateSave(){
-        //演示项目不允许修改
+        //TODO::演示项目不允许修改
         $this->showProjectNoEdit($this->param['source']);
         $this->showProjectNoEdit($this->param['source']);
         $this->param = $this->handleDefaultString($this->param);//设置默认数据
         $this->param = $this->handleDefaultString($this->param);//设置默认数据
-        $templateInfo = $this->model->read([
-            'template_id'=>$this->param['template_id'],
-            'source'=>$this->param['source'],
-            'source_id'=>$this->param['source_id'],
-            'is_custom'=>$this->param['is_custom'],
-            'is_list'=>$this->param['is_list']
-        ]);
+        $templateInfo = $this->webTemplateInfo($this->param['source'],$this->param['source_id'],$this->param['template_id'],$this->param['is_custom'],$this->param['is_list']);
         if($templateInfo === false){//执行新增
         if($templateInfo === false){//执行新增
             $data = [
             $data = [
                 'source'=>$this->param['source'], 'source_id'=>$this->param['source_id'],'type'=>BTemplate::PAGE_HTML,
                 'source'=>$this->param['source'], 'source_id'=>$this->param['source_id'],'type'=>BTemplate::PAGE_HTML,
@@ -311,7 +394,7 @@ class BTemplateLogic extends BaseLogic
                 'section_list_id'=>$this->param['section_list_id'],'is_custom'=>$this->param['is_custom'],
                 'section_list_id'=>$this->param['section_list_id'],'is_custom'=>$this->param['is_custom'],
                 'is_list'=>$this->param['is_list']
                 'is_list'=>$this->param['is_list']
             ];
             ];
-            $data = $this->handleVisualizationParam($this->param['html'],$this->param['source'],$this->param['is_list'],$data);
+            $data = $this->handleVisualizationParam($this->param['html'],$this->param['source'],$this->param['is_list'],$this->param['is_custom'],$data);
             $this->model->add($data);
             $this->model->add($data);
         }else{//执行编辑
         }else{//执行编辑
             $condition = [
             $condition = [
@@ -322,7 +405,7 @@ class BTemplateLogic extends BaseLogic
             $data = [
             $data = [
                 'section_list_id'=>$this->param['section_list_id']
                 'section_list_id'=>$this->param['section_list_id']
             ];
             ];
-            $data = $this->handleVisualizationParam($this->param['html'],$this->param['source'],$this->param['is_list'],$data);
+            $data = $this->handleVisualizationParam($this->param['html'],$this->param['source'],$this->param['is_list'],$this->param['is_custom'],$data);
             $this->model->edit($data,$condition);
             $this->model->edit($data,$condition);
         }
         }
         //更新头部信息
         //更新头部信息
@@ -355,7 +438,7 @@ class BTemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/12/15 10:59
      * @time   :2023/12/15 10:59
      */
      */
-    public function handleVisualizationParam($html,$source, $is_list,$data){
+    public function handleVisualizationParam($html,$source, $is_list,$is_custom,$data){
         if($this->user['is_customized'] == BTemplate::IS_VISUALIZATION){//定制项目
         if($this->user['is_customized'] == BTemplate::IS_VISUALIZATION){//定制项目
             $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
             $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
             //查看当前页面是否定制，是否开启可视化
             //查看当前页面是否定制，是否开启可视化
@@ -364,6 +447,19 @@ class BTemplateLogic extends BaseLogic
                 $data['html'] = $html;
                 $data['html'] = $html;
                 $data['type'] = BTemplate::ALL_HTML;
                 $data['type'] = BTemplate::ALL_HTML;
             }else{
             }else{
+                //TODO::扩展模块定制单独处理
+                if($is_custom == BTemplate::IS_CUSTOM){
+                    $customModuleModel = new CustomModule();
+                    $info = $customModuleModel->read(['id'=>$source]);
+                    if($info === false){
+                        $this->fail('当前扩展模块不存在或已被删除');
+                    }
+                    //todo::扩展模块（列表页/详情页）定制
+                    if($info['list_customized'] == BTemplate::IS_VISUALIZATION || $info['detail_customized'] == BTemplate::IS_VISUALIZATION) {
+                        $data['html'] = $html;
+                        $data['type'] = BTemplate::ALL_HTML;
+                    }
+                }
                 $mainInfo = $this->handleTemplateHtml($html);
                 $mainInfo = $this->handleTemplateHtml($html);
                 $data['main_html'] = $mainInfo['main_html'];
                 $data['main_html'] = $mainInfo['main_html'];
                 $data['main_css'] = $mainInfo['main_css'];
                 $data['main_css'] = $mainInfo['main_css'];
@@ -376,7 +472,6 @@ class BTemplateLogic extends BaseLogic
         return $data;
         return $data;
     }
     }
 
 
-
     /**
     /**
      * @remark :保存公共头部底部
      * @remark :保存公共头部底部
      * @name   :saveCommonHtml
      * @name   :saveCommonHtml
@@ -385,12 +480,20 @@ class BTemplateLogic extends BaseLogic
      * @time   :2023/12/13 17:05
      * @time   :2023/12/13 17:05
      */
      */
     public function saveCommonHtml($html,$source,$is_list,$template_id,$is_custom){
     public function saveCommonHtml($html,$source,$is_list,$template_id,$is_custom){
+        //TODO::定制扩展模块单独处理
+        if($is_custom == BTemplate::IS_CUSTOM){
+            $code = $this->saveCustomModuleCommonHtml($html,$source,$is_custom,$is_list,$template_id);
+            if($code === false){
+                return $this->success();
+            }
+        }
+        //其他情况
         $type = $this->getType($source,$is_list,$is_custom);//获取头部类型1-9（首页到自定义页面）
         $type = $this->getType($source,$is_list,$is_custom);//获取头部类型1-9（首页到自定义页面）
         if($template_id == 0){//定制页面默认为独立头部
         if($template_id == 0){//定制页面默认为独立头部
             $type = $this->getCustomizedType($source,$is_list);//定制默认独立头部
             $type = $this->getCustomizedType($source,$is_list);//定制默认独立头部
         }
         }
         $templateCommonModel = new BTemplateCommon();
         $templateCommonModel = new BTemplateCommon();
-        $commonInfo = $templateCommonModel->read(['template_id'=>$template_id,'project_id'=>$this->user['project_id'],'type'=>$type]);//查看当前头部是否存在
+        $commonInfo = $templateCommonModel->read(['template_id'=>$template_id,'project_id'=>$this->user['project_id'],'type'=>$type,'is_custom'=>0]);//查看当前头部是否存在
         $handleInfo = $this->handleCommonParam($html);
         $handleInfo = $this->handleCommonParam($html);
         if($commonInfo === false){
         if($commonInfo === false){
             $data = [
             $data = [
@@ -411,6 +514,45 @@ class BTemplateLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :扩展模块定制保存头部处理
+     * @name   :saveCustomModuleCommonHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/10 11:33
+     */
+    public function saveCustomModuleCommonHtml($html,$source,$is_custom,$is_list,$template_id){
+        $customModuleModel = new CustomModule();
+        $info = $customModuleModel->read(['id'=>$source]);
+        if($info === false){
+            $this->fail('当前扩展模块不存在或已被删除');
+        }
+        //todo::扩展模块（列表页/详情页）定制
+        if($info['list_customized'] == BTemplate::IS_VISUALIZATION || $info['detail_customized'] == BTemplate::IS_VISUALIZATION) {
+            $data = ['type'=>$source,'is_custom'=>$is_custom,'is_list'=>$is_list,'template_id'=>$template_id];
+            $templateCommonModel = new BTemplateCommon();
+            $commonInfo = $templateCommonModel->read($data);//查看当前头部是否存在
+            $handleInfo = $this->handleCommonParam($html);
+            if($commonInfo === false){
+                $data = [
+                    'head_html'=>$handleInfo['head_html'], 'head_css'=>$handleInfo['head_css'],'other'=>$handleInfo['other'],
+                    'footer_html'=>$handleInfo['footer_html'], 'footer_css'=>$handleInfo['footer_css'],
+                    'type'=>$source,'template_id'=>$template_id, 'project_id'=>$this->user['project_id'],
+                    'is_custom'=>$is_custom,'is_list'=>$is_list,
+                ];
+                $templateCommonModel->add($data);
+            }else{
+                $data = [
+                    'head_html'=>$handleInfo['head_html'], 'head_css'=>$handleInfo['head_css'],'other'=>$handleInfo['other'],
+                    'footer_html'=>$handleInfo['footer_html'], 'footer_css'=>$handleInfo['footer_css'],
+                ];
+                $templateCommonModel->edit($data,['id'=>$commonInfo['id']]);
+            }
+            return false;
+        }
+        return true;
+    }
+
+    /**
      * @remark :演示项目不允许修改首页
      * @remark :演示项目不允许修改首页
      * @name   :showProject
      * @name   :showProject
      * @author :lyh
      * @author :lyh
@@ -457,7 +599,7 @@ class BTemplateLogic extends BaseLogic
         return $this->success($param);
         return $this->success($param);
     }
     }
     /**
     /**
-     * @remark :保存时获取获取设置的类型
+     * @remark :（非定制）保存时获取获取设置的类型
      * @name   :getType
      * @name   :getType
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post

@@ -234,6 +234,20 @@ class BlogLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :
+     * @name   :setAllSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/10 15:40
+     */
+    public function setAllSort(){
+        foreach ($this->param['data'] as $k => $v){
+            $this->model->edit(['sort'=>$v['sort']],['id'=>$v['id']]);
+        }
+        return $this->success();
+    }
+
+    /**
      * 博客导入
      * 博客导入
      * @param $project_id
      * @param $project_id
      * @param $user_id
      * @param $user_id

@@ -250,6 +250,21 @@ class NewsLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :
+     * @name   :setAllSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/10 15:40
+     */
+    public function setAllSort(){
+        foreach ($this->param['data'] as $k => $v){
+            $this->model->edit(['sort'=>$v['sort']],['id'=>$v['id']]);
+        }
+        return $this->success();
+    }
+
+
+    /**
      * @remark :删除路由
      * @remark :删除路由
      * @name   :delRoute
      * @name   :delRoute
      * @author :lyh
      * @author :lyh

@@ -599,6 +599,20 @@ class ProductLogic extends  BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :
+     * @name   :setAllSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/10 15:40
+     */
+    public function setAllSort(){
+        foreach ($this->param['data'] as $k => $v){
+            $this->model->edit(['sort'=>$v['sort']],['id'=>$v['id']]);
+        }
+        return $this->success();
+    }
+
+    /**
      * 产品导入
      * 产品导入
      * @param $project_id
      * @param $project_id
      * @param $user_id
      * @param $user_id
@@ -722,13 +736,11 @@ class ProductLogic extends  BaseLogic
             if($data[10]??''){
             if($data[10]??''){
                 $seo_description = substr(strip_tags($data[10]),0,200);
                 $seo_description = substr(strip_tags($data[10]),0,200);
             }
             }
-
             $seo_mate = [
             $seo_mate = [
                 'title' => $seo_title,
                 'title' => $seo_title,
                 'keyword' => $seo_keywords,
                 'keyword' => $seo_keywords,
                 'description' => $seo_description
                 'description' => $seo_description
             ];
             ];
-
             //处理参数
             //处理参数
             $attrs = [];
             $attrs = [];
             if($data[4]??''){
             if($data[4]??''){
@@ -746,10 +758,8 @@ class ProductLogic extends  BaseLogic
                     }
                     }
                 }
                 }
             }
             }
-
             //处理描述切换栏
             //处理描述切换栏
             $describe = [];
             $describe = [];
-
             for ($i=11;$i<=20;$i+=2){
             for ($i=11;$i<=20;$i+=2){
                 if(($data[$i]??'') && ($data[$i+1]??'')){
                 if(($data[$i]??'') && ($data[$i+1]??'')){
                     preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[$i+1], $result_desc);
                     preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[$i+1], $result_desc);
@@ -759,7 +769,6 @@ class ProductLogic extends  BaseLogic
                             $new_vdesc_img && $data[$i+1] = str_replace($vdesc_img,$new_vdesc_img,$data[$i+1]);
                             $new_vdesc_img && $data[$i+1] = str_replace($vdesc_img,$new_vdesc_img,$data[$i+1]);
                         }
                         }
                     }
                     }
-
                     preg_match_all('/<source\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[$i+1], $result_desc_video);
                     preg_match_all('/<source\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[$i+1], $result_desc_video);
                     if($result_desc_video[2]??[]){
                     if($result_desc_video[2]??[]){
                         foreach ($result_desc_video[2] as $vdesc_video){
                         foreach ($result_desc_video[2] as $vdesc_video){
@@ -776,7 +785,6 @@ class ProductLogic extends  BaseLogic
                     break;
                     break;
                 }
                 }
             }
             }
-
             $id = $this->model->addReturnId(
             $id = $this->model->addReturnId(
                 [
                 [
                     'project_id' => $project_id,
                     'project_id' => $project_id,
@@ -794,7 +802,6 @@ class ProductLogic extends  BaseLogic
                     'status' => Product::STATUS_ON
                     'status' => Product::STATUS_ON
                 ]
                 ]
             );
             );
-
             //更新路由
             //更新路由
             if($route){
             if($route){
                 $route_map = RouteMap::where('project_id', $project_id)->where('source', RouteMap::SOURCE_PRODUCT)->where('source_id', $id)->first();
                 $route_map = RouteMap::where('project_id', $project_id)->where('source', RouteMap::SOURCE_PRODUCT)->where('source_id', $id)->first();
@@ -810,17 +817,13 @@ class ProductLogic extends  BaseLogic
             }else{
             }else{
                 $route = RouteMap::setRoute($data[0], RouteMap::SOURCE_PRODUCT, $id, $project_id);
                 $route = RouteMap::setRoute($data[0], RouteMap::SOURCE_PRODUCT, $id, $project_id);
             }
             }
-
             $this->edit(['route' => $route], ['id' => $id]);
             $this->edit(['route' => $route], ['id' => $id]);
-
             //关联分类
             //关联分类
             if($category_arr){
             if($category_arr){
                 CategoryRelated::saveRelated($id, $category_arr);
                 CategoryRelated::saveRelated($id, $category_arr);
             }
             }
-
             return true;
             return true;
         }
         }
-
         return false;
         return false;
     }
     }
 }
 }

@@ -27,6 +27,7 @@ class AyrReleaseRequest extends FormRequest
             'content'=>'required',
             'content'=>'required',
             'share_id'=>'required',
             'share_id'=>'required',
             'platforms'=>'required|array',
             'platforms'=>'required|array',
+            'schedule_date'=>'required'
         ];
         ];
     }
     }
 
 

@@ -30,6 +30,10 @@ class Project extends Base
 
 
     const TYPE_SEVEN = 7;//错误单
     const TYPE_SEVEN = 7;//错误单
     const MYSQL_ID = 2;//默认数据库id
     const MYSQL_ID = 2;//默认数据库id
+
+    const IS_UPGRADE_FALSE = 0;
+    const IS_UPGRADE_TRUE = 1;
+
     /**
     /**
      * 星级客户
      * 星级客户
      * @return string[]
      * @return string[]
@@ -81,6 +85,7 @@ class Project extends Base
             9 => '星链网站（2年版）',
             9 => '星链网站（2年版）',
             11 => '俄语标准版',
             11 => '俄语标准版',
             12 => '俄语商务版',
             12 => '俄语商务版',
+            13 => '体验版'
         ];
         ];
     }
     }
 
 

@@ -74,6 +74,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/del', [\App\Http\Controllers\Bside\News\NewsController::class, 'del'])->name('news_del');
         Route::any('/del', [\App\Http\Controllers\Bside\News\NewsController::class, 'del'])->name('news_del');
         Route::any('/status', [\App\Http\Controllers\Bside\News\NewsController::class, 'status'])->name('news_status');
         Route::any('/status', [\App\Http\Controllers\Bside\News\NewsController::class, 'status'])->name('news_status');
         Route::any('/sort', [\App\Http\Controllers\Bside\News\NewsController::class, 'sort'])->name('news_sort');
         Route::any('/sort', [\App\Http\Controllers\Bside\News\NewsController::class, 'sort'])->name('news_sort');
+        Route::any('/allSort', [\App\Http\Controllers\Bside\News\NewsController::class, 'allSort'])->name('news_allSort');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\News\NewsController::class, 'getStatusNumber'])->name('news_statusNum');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\News\NewsController::class, 'getStatusNumber'])->name('news_statusNum');
     });
     });
 
 
@@ -89,6 +90,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/del', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'del'])->name('blog_del');
         Route::any('/del', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'del'])->name('blog_del');
         Route::any('/status', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'status'])->name('blog_status');
         Route::any('/status', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'status'])->name('blog_status');
         Route::any('/sort', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'sort'])->name('blog_sort');
         Route::any('/sort', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'sort'])->name('blog_sort');
+        Route::any('/allSort', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'allSort'])->name('blog_allSort');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'getStatusNumber'])->name('blog_statusNum');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'getStatusNumber'])->name('blog_statusNum');
         //分类
         //分类
         Route::any('/category/', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'lists'])->name('blog_category_lists');
         Route::any('/category/', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'lists'])->name('blog_category_lists');
@@ -204,6 +206,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::post('/save', [\App\Http\Controllers\Bside\Product\ProductController::class, 'save'])->name('product_save');
         Route::post('/save', [\App\Http\Controllers\Bside\Product\ProductController::class, 'save'])->name('product_save');
         Route::post('/editList', [\App\Http\Controllers\Bside\Product\ProductController::class, 'editList'])->name('product_editList');
         Route::post('/editList', [\App\Http\Controllers\Bside\Product\ProductController::class, 'editList'])->name('product_editList');
         Route::post('/sort', [\App\Http\Controllers\Bside\Product\ProductController::class, 'sort'])->name('product_sort');
         Route::post('/sort', [\App\Http\Controllers\Bside\Product\ProductController::class, 'sort'])->name('product_sort');
+        Route::post('/allSort', [\App\Http\Controllers\Bside\Product\ProductController::class, 'allSort'])->name('product_allSort');
         Route::any('/delete', [\App\Http\Controllers\Bside\Product\ProductController::class, 'delete'])->name('product_delete');
         Route::any('/delete', [\App\Http\Controllers\Bside\Product\ProductController::class, 'delete'])->name('product_delete');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\Product\ProductController::class, 'getStatusNumber'])->name('product_statusNum');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\Product\ProductController::class, 'getStatusNumber'])->name('product_statusNum');
         Route::any('/copyProduct', [\App\Http\Controllers\Bside\Product\ProductController::class, 'copyProduct'])->name('product_copyProduct');
         Route::any('/copyProduct', [\App\Http\Controllers\Bside\Product\ProductController::class, 'copyProduct'])->name('product_copyProduct');