合并分支 'develop' 到 'master'

Develop合并



查看合并请求 !372

@@ -123,6 +123,7 @@ class NavLogic extends  BaseLogic
             'remark'=>$param['remark'] ?? '',
             'remark'=>$param['remark'] ?? '',
             'group_id'=>$param['group_id'],
             'group_id'=>$param['group_id'],
             'show'=>$param['show'] ?? 0,
             'show'=>$param['show'] ?? 0,
+            'class'=>$param['class'] ?? ''
         ];
         ];
         return $this->success($data);
         return $this->success($data);
     }
     }

@@ -263,6 +263,58 @@ class TranslateLogic extends BaseLogic
 //        }catch (\Exception $e){
 //        }catch (\Exception $e){
 //            $this->fail('系统错误请联系管理员');
 //            $this->fail('系统错误请联系管理员');
 //        }
 //        }
+        $this->handleRoute($this->param['url']);
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :处理路由
+     * @name   :handleRoute
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/18 17:25
+     */
+    public function handleRoute($url){
+        $lang = $languageInfo = $this->getLanguage($this->param['language_id'])['short'];
+        $url = str_replace_url($url);
+        $arr = explode('/',trim($url,'/'));
+        $num = count($arr);
+        $page = 0;
+        if($num == 1){
+            $route = $arr[0];
+        }
+        if($num == 2){
+            if(ctype_digit($arr[1])){//是数字的情况
+                $page = $arr[1];
+                $route = $arr[0];
+            }else{
+                $route = $arr[1];
+            }
+        }
+        if($num == 3){
+            if(ctype_digit($arr[2])){//是数字的情况
+                $page = $arr[2];
+                $route = $arr[0];
+            }else{
+                if($arr[2] == 'page'){
+                    $route = $arr[1];
+                }else{
+                    $route = $arr[0];
+                }
+            }
+        }
+        if($num == 4){
+            if(ctype_digit($arr[3])){//是数字的情况
+                $page = $arr[3];
+                $route = $arr[1];
+            }
+        }
+        if($page != 0){
+            $data['page'] = $page;
+        }
+        $data['new_route'] = $route;
+        $data['lang'] = $lang;
+        $data['project_id']= $this->user['project_id'];
+        $this->curlDelRoute($data);
+    }
 }
 }