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

@@ -56,11 +56,12 @@ class ProductLogic extends  BaseLogic
         $info['created_uid_text'] = (new UserLogic())->getCacheInfo($info['created_uid'])['name'] ?? '';
         $info['created_uid_text'] = (new UserLogic())->getCacheInfo($info['created_uid'])['name'] ?? '';
         $info['url'] = $this->getProjectDomain() . $info['route'] ;
         $info['url'] = $this->getProjectDomain() . $info['route'] ;
         //统一图片链接
         //统一图片链接
-//        if(!empty($info['gallery'])){
-//            foreach ($info['gallery'] as $k => $v){
-//                $info['gallery'][$k]['image_link'] = $v['url'];
-//            }
-//        }
+        if(!empty($info['gallery'])){
+            $info['gallery'] = json_decode($info['gallery']);
+            foreach ($info['gallery'] as $k => $v){
+                $info['gallery'][$k]['image_link'] = $v['url'];
+            }
+        }
         return $info;
         return $info;
     }
     }