gx

@@ -5,6 +5,7 @@ namespace App\Http\Logic\Bside\BTemplate;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Blog\Blog;
 use App\Models\Blog\Blog;
 use App\Models\Blog\BlogCategory;
 use App\Models\Blog\BlogCategory;
+use App\Models\CustomModule\CustomModule;
 use App\Models\News\News;
 use App\Models\News\News;
 use App\Models\News\NewsCategory;
 use App\Models\News\NewsCategory;
 use App\Models\Product\Category;
 use App\Models\Product\Category;
@@ -690,7 +691,11 @@ class BTemplateLogic extends BaseLogic
         if (!empty($blogCategory)){
         if (!empty($blogCategory)){
             foreach ($blogCategory as $item){$data["blogs"]["category"][] =$item;}
             foreach ($blogCategory as $item){$data["blogs"]["category"][] =$item;}
         }
         }
-        //返回
+        //获取模块
+        $data['module'] = ['默认','产品','新闻','博客'];
+        //获取当前项目的扩展模块
+        $moduleModel = new CustomModule();
+        $moduleModel->list(['status'=>0]);
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 

@@ -54,7 +54,9 @@ class RouteMap extends Base
      * @date 2023/4/17
      * @date 2023/4/17
      */
      */
     public static function generateRoute($title, $source, $source_id, $project_id){
     public static function generateRoute($title, $source, $source_id, $project_id){
-        $title = Translate::tran($title, 'en');
+        if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
+            $title = Translate::tran($title, 'en');
+        }
         $i=1;
         $i=1;
         $sign = generateRoute($title);
         $sign = generateRoute($title);
         $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();
         $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();
@@ -116,7 +118,7 @@ class RouteMap extends Base
     public static function setRoute($title, $source, $source_id, $project_id = 0){
     public static function setRoute($title, $source, $source_id, $project_id = 0){
         $route = self::generateRoute($title, $source, $source_id, $project_id);
         $route = self::generateRoute($title, $source, $source_id, $project_id);
         if(!$route){
         if(!$route){
-            throw new \Exception('路由不能为空');
+            throw new \Exception('路由生成失败');
         }
         }
         try {
         try {
             $route_map = self::where('project_id', $project_id)->where('source_id', $source_id)->where('source', $source)->first();
             $route_map = self::where('project_id', $project_id)->where('source_id', $source_id)->where('source', $source)->first();