Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -433,8 +433,8 @@ class ProductController extends BaseController
      * @time   :2023/7/29 14:59
      * @time   :2023/7/29 14:59
      */
      */
     public function copyProduct(ProductLogic $logic){
     public function copyProduct(ProductLogic $logic){
-        $rs = $logic->setCopyProduct();
-        $this->response('success',Code::SUCCESS,$rs);
+        $data = $logic->setCopyProduct();
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**

@@ -50,7 +50,7 @@ class BlogLogic extends BaseLogic
             DB::commit();
             DB::commit();
         }catch (\Exception $e){
         }catch (\Exception $e){
             DB::rollBack();
             DB::rollBack();
-            $this->fail('error');
+            $this->fail('系统错误，请联系管理员');
         }
         }
         $this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route);
         $this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route);
         $this->curlDelRoute(['new_route'=>$route]);
         $this->curlDelRoute(['new_route'=>$route]);

@@ -47,7 +47,6 @@ class ProductLogic extends  BaseLogic
         $this->param = $this->handleSaveParam($this->param);
         $this->param = $this->handleSaveParam($this->param);
         try {
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
-
                 $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
                 $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
                 $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
                 $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
                 if($is_upgrade == 0 || $six_read == 1){
                 if($is_upgrade == 0 || $six_read == 1){
@@ -442,7 +441,7 @@ class ProductLogic extends  BaseLogic
         $this->model->edit(['route'=>$route],['id'=>$save_id]);
         $this->model->edit(['route'=>$route],['id'=>$save_id]);
         //同步可视化装修数据
         //同步可视化装修数据
         $this->copyTemplate($this->param['id'],$info['project_id'],$save_id);
         $this->copyTemplate($this->param['id'],$info['project_id'],$save_id);
-        return $this->success();
+        return $this->success(['id'=>$save_id]);
     }
     }
 
 
     /**
     /**