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

@@ -197,9 +197,7 @@ class ProductLogic extends  BaseLogic
      * @time   :2023/7/29 15:03
      * @time   :2023/7/29 15:03
      */
      */
     public function setCopyProduct(){
     public function setCopyProduct(){
-        $info = Product::withoutCasts()->find($this->param['id']);
-        var_dump($info);
-        die();
+        $info = $this->model->read(['id'=>$this->param['id']]);
         $param = $this->setProductParams($info);
         $param = $this->setProductParams($info);
         $save_id = $this->model->insertGetId($param);
         $save_id = $this->model->insertGetId($param);
         $route = RouteMap::setRoute($param['route'], RouteMap::SOURCE_PRODUCT, $save_id, $this->user['project_id']);
         $route = RouteMap::setRoute($param['route'], RouteMap::SOURCE_PRODUCT, $save_id, $this->user['project_id']);
@@ -288,14 +286,20 @@ class ProductLogic extends  BaseLogic
             'created_at'=>date('Y-m-d H:i:s'),
             'created_at'=>date('Y-m-d H:i:s'),
             'updated_at'=>date('Y-m-d H:i:s'),
             'updated_at'=>date('Y-m-d H:i:s'),
         ];
         ];
-        if(!empty($info['thumb'])){
-            $param['thumb']= Arr::a2s($info['thumb']);
+        if(isset($info['icon']) && !empty($info['icon'])){
+            foreach ($info['icon'] as $k1 => $v1){
+                $info['icon'][$k1] = str_replace_url($v1);
+            }
+            $param['icon'] = Arr::a2s($info['icon'] ?? '');
         }
         }
-        if(!empty($info['gallery'])){
-            $param['gallery']= Arr::a2s($info['gallery']);
+        //产品图
+        if(isset($info['gallery']) && !empty($info['gallery'])){
+            foreach ($info['gallery'] as $k => $v){
+                $v['url'] = str_replace_url($v['url']);
+                $info['gallery'][$k] = $v;
             }
             }
-        if(!empty($info['icon'])){
-            $param['icon']= Arr::a2s($info['icon']);
+            $param['thumb'] = Arr::a2s($info['gallery'][0] ?? '');
+            $param['gallery'] = Arr::a2s($info['gallery'] ?? '');
         }
         }
         return $param;
         return $param;
     }
     }