作者 lyh

gx

@@ -5,6 +5,7 @@ namespace App\Http\Logic\Bside\BTemplate; @@ -5,6 +5,7 @@ namespace App\Http\Logic\Bside\BTemplate;
5 use App\Http\Logic\Bside\BaseLogic; 5 use App\Http\Logic\Bside\BaseLogic;
6 use App\Models\Blog\Blog; 6 use App\Models\Blog\Blog;
7 use App\Models\Blog\BlogCategory; 7 use App\Models\Blog\BlogCategory;
  8 +use App\Models\CustomModule\CustomModule;
8 use App\Models\News\News; 9 use App\Models\News\News;
9 use App\Models\News\NewsCategory; 10 use App\Models\News\NewsCategory;
10 use App\Models\Product\Category; 11 use App\Models\Product\Category;
@@ -690,7 +691,11 @@ class BTemplateLogic extends BaseLogic @@ -690,7 +691,11 @@ class BTemplateLogic extends BaseLogic
690 if (!empty($blogCategory)){ 691 if (!empty($blogCategory)){
691 foreach ($blogCategory as $item){$data["blogs"]["category"][] =$item;} 692 foreach ($blogCategory as $item){$data["blogs"]["category"][] =$item;}
692 } 693 }
693 - //返回 694 + //获取模块
  695 + $data['module'] = ['默认','产品','新闻','博客'];
  696 + //获取当前项目的扩展模块
  697 + $moduleModel = new CustomModule();
  698 + $moduleModel->list(['status'=>0]);
694 return $this->success($data); 699 return $this->success($data);
695 } 700 }
696 701
@@ -54,7 +54,9 @@ class RouteMap extends Base @@ -54,7 +54,9 @@ class RouteMap extends Base
54 * @date 2023/4/17 54 * @date 2023/4/17
55 */ 55 */
56 public static function generateRoute($title, $source, $source_id, $project_id){ 56 public static function generateRoute($title, $source, $source_id, $project_id){
  57 + if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
57 $title = Translate::tran($title, 'en'); 58 $title = Translate::tran($title, 'en');
  59 + }
58 $i=1; 60 $i=1;
59 $sign = generateRoute($title); 61 $sign = generateRoute($title);
60 $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first(); 62 $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();
@@ -116,7 +118,7 @@ class RouteMap extends Base @@ -116,7 +118,7 @@ class RouteMap extends Base
116 public static function setRoute($title, $source, $source_id, $project_id = 0){ 118 public static function setRoute($title, $source, $source_id, $project_id = 0){
117 $route = self::generateRoute($title, $source, $source_id, $project_id); 119 $route = self::generateRoute($title, $source, $source_id, $project_id);
118 if(!$route){ 120 if(!$route){
119 - throw new \Exception('路由不能为空'); 121 + throw new \Exception('路由生成失败');
120 } 122 }
121 try { 123 try {
122 $route_map = self::where('project_id', $project_id)->where('source_id', $source_id)->where('source', $source)->first(); 124 $route_map = self::where('project_id', $project_id)->where('source_id', $source_id)->where('source', $source)->first();