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

@@ -509,16 +509,17 @@ if (!function_exists('str_replace_url')) {
      */
      */
     function str_replace_url($url)
     function str_replace_url($url)
     {
     {
+        if(!empty($url)){
             // 使用 parse_url 函数来解析 URL
             // 使用 parse_url 函数来解析 URL
             $urlParts = parse_url($url);
             $urlParts = parse_url($url);
             // 检查是否存在 host（域名）部分
             // 检查是否存在 host（域名）部分
             if (isset($urlParts['path'])) {
             if (isset($urlParts['path'])) {
                 $urlWithoutDomain = $urlParts['path'];
                 $urlWithoutDomain = $urlParts['path'];
                 return $urlWithoutDomain;
                 return $urlWithoutDomain;
-        } else {
-            return $url;
             }
             }
         }
         }
+        return $url;
+    }
 }
 }
 
 
 if(!function_exists('curlGet')){
 if(!function_exists('curlGet')){

@@ -36,9 +36,8 @@ class NavLogic extends  BaseLogic
     {
     {
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
-            if(isset($this->param['image']) && !empty($this->param['image'])){
-                $this->param['image'] = str_replace_url($this->param['image']);
-            }
+            $this->param['image'] = str_replace_url(isset($this->param['image']) ?? '');
+            $this->param['remark_image'] = str_replace_url(isset($this->param['remark_image']) ?? '');
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $this->handleEditParam();//验证是否可编辑分类
                 $this->handleEditParam();//验证是否可编辑分类
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
                 $this->model->edit($this->param,['id'=>$this->param['id']]);