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

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