合并分支 'develop' 到 'master'

Develop



查看合并请求 !264

@@ -460,7 +460,6 @@ if (!function_exists('getImageUrl')) {
             foreach ($path as $v){
             foreach ($path as $v){
                 $url[] = getImageUrl($v);
                 $url[] = getImageUrl($v);
             }
             }
-            $url = array_filter($url);
         }else{
         }else{
             if(empty($path)){
             if(empty($path)){
                 return '';
                 return '';

@@ -174,8 +174,6 @@ class ProjectLogic extends BaseLogic
                 }
                 }
             }
             }
             $param['notice_file'] = Arr::a2s($param['notice_file']);
             $param['notice_file'] = Arr::a2s($param['notice_file']);
-        }else{
-            unset($param['notice_file']);
         }
         }
         if(isset($param['confirm_file']) && !empty($param['confirm_file'])){
         if(isset($param['confirm_file']) && !empty($param['confirm_file'])){
             foreach ($param['confirm_file'] as &$v2) {
             foreach ($param['confirm_file'] as &$v2) {
@@ -184,11 +182,8 @@ class ProjectLogic extends BaseLogic
                 }
                 }
             }
             }
             $param['confirm_file'] = Arr::a2s($param['confirm_file']);
             $param['confirm_file'] = Arr::a2s($param['confirm_file']);
-        }else{
-            unset($param['confirm_file']);
         }
         }
         unset($param['payment'],$param['deploy_build'],$param['deploy_optimize'],$param['online_check'],$param['project_after']);
         unset($param['payment'],$param['deploy_build'],$param['deploy_optimize'],$param['online_check'],$param['project_after']);
-
         //文件上传默认值
         //文件上传默认值
         if($param['is_upload_manage']){
         if($param['is_upload_manage']){
             $param['upload_config'] = [
             $param['upload_config'] = [

@@ -99,6 +99,7 @@ class CategoryLogic extends  BaseLogic
         $info = $this->model->read(['id'=>$id]);
         $info = $this->model->read(['id'=>$id]);
         $info['url'] = $info['route'];
         $info['url'] = $info['route'];
         $info['image_link'] = getImageUrl($info['image']);
         $info['image_link'] = getImageUrl($info['image']);
+        $info['describe_image'] = !empty($info['describe_image']) ? getImageUrl(json_decode($info['describe_image'])) : [];
         return $this->success($info);
         return $this->success($info);
     }
     }
 
 
@@ -112,12 +113,12 @@ class CategoryLogic extends  BaseLogic
     public function categorySave(){
     public function categorySave(){
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
+            $this->param = $this->saveHandleParam($this->param);
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $this->param['id'], $this->user['project_id']);
                 $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $this->param['id'], $this->user['project_id']);
                 $route = $this->param['route'];
                 $route = $this->param['route'];
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
             }else{
             }else{
-                $this->param['project_id'] = $this->user['project_id'];
                 $id = $this->model->addReturnId($this->param);
                 $id = $this->model->addReturnId($this->param);
                 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $id, $this->user['project_id']);
                 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $id, $this->user['project_id']);
                 $this->edit(['route'=>$route],['id'=>$id]);
                 $this->edit(['route'=>$route],['id'=>$id]);
@@ -135,6 +136,25 @@ class CategoryLogic extends  BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :保存时处理数据
+     * @name   :saveHandleParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/22 17:28
+     */
+    public function saveHandleParam($param){
+        if(isset($this->param['describe_image']) && !empty($this->param['describe_image'])){
+            foreach ($this->param['describe_image'] as $k => $v){
+                $v = str_replace_url($v);
+                $this->param['describe_image'][$k] = $v;
+            }
+            $this->param['describe_image'] = json_encode($this->param['describe_image']);
+        }
+        $this->param['project_id'] = $this->user['project_id'];
+        return $this->success($param);
+    }
+
+    /**
      * @remark :删除
      * @remark :删除
      * @name   :delete
      * @name   :delete
      * @author :lyh
      * @author :lyh

@@ -355,7 +355,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/read', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'read'])->name('custom_read');
         Route::any('/read', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'read'])->name('custom_read');
         Route::any('/save', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'save'])->name('custom_save');
         Route::any('/save', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'save'])->name('custom_save');
         Route::any('/saveHtml', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'saveHtml'])->name('custom_saveHtml');
         Route::any('/saveHtml', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'saveHtml'])->name('custom_saveHtml');
-        Route::any('/statusNum', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'statusNumber'])->name('product_statusNum');
+        Route::any('/statusNum', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'statusNumber'])->name('custom_statusNum');
         Route::any('/del', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'del'])->name('custom_del');
         Route::any('/del', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'del'])->name('custom_del');
     });
     });
     // 菜单组
     // 菜单组