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

@@ -69,7 +69,7 @@ class ProductLogic extends  BaseLogic
             $info['icon'] = json_decode($info['icon']);
             $info['icon'] = json_decode($info['icon']);
             foreach ($info['icon'] as $k => $v){
             foreach ($info['icon'] as $k => $v){
                 $v = (array)$v;
                 $v = (array)$v;
-                $v['image_link'] = $this->getImageUrl($v['url']);
+                $v['image_link'] = $this->getImageUrl($v);
                 $info['icon'][$k] = $v;
                 $info['icon'][$k] = $v;
             }
             }
         }
         }