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

@@ -57,7 +57,8 @@ class ProductLogic extends  BaseLogic
         $info['url'] = $this->getProjectDomain() . $info['route'] ;
         //统一图片链接
         if(!empty($info['gallery'])){
-            $info['gallery'] = json_decode($info['gallery']);
+            var_dump($info['gallery']);
+            die();
             foreach ($info['gallery'] as $k => $v){
                 $info['gallery'][$k]['image_link'] = $v['url'];
             }