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

@@ -62,7 +62,7 @@ class ProductLogic extends  BaseLogic
                 $info['gallery'][$k] = $v;
                 $info['gallery'][$k] = $v;
             }
             }
         }
         }
-        $info['icon_link'] = $this->getImageUrl($info['icon']);
+//        $info['icon_link'] = $this->getImageUrl($info['icon']);
         return $info;
         return $info;
     }
     }