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

@@ -68,7 +68,9 @@ class ProductLogic extends  BaseLogic
         if(!empty($info['icon'])){
         if(!empty($info['icon'])){
             $info['icon'] = json_decode($info['icon']);
             $info['icon'] = json_decode($info['icon']);
             foreach ($info['icon'] as $k => $v){
             foreach ($info['icon'] as $k => $v){
-                $info['icon'][$k]['image_link'] = $this->getImageUrl($v);
+                var_dump($v);
+                die();
+                $info[] = $this->getImageUrl($v);
             }
             }
         }
         }
         return $info;
         return $info;