Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -182,18 +182,22 @@ class Images
 		$result = json_decode(file_get_contents('http://upload.static.yohobuy.com', false, $context), true);
 		if(!empty($result['data']['imagesList']))
 		{
+			$imgList = array('imgList'=>array());
 			if(count($file) == 1 || !is_array($file))
 			{
-				return self::getSourceUrl(current($result['data']['imagesList']), 'suggest');
+				$imgList['imgList'][] = array('imgUrl' => self::getSourceUrl(current($result['data']['imagesList']), 'suggest'));
 			}
 			else
 			{
-				foreach ($result['data']['imagesList'] as &$val) {
-					$val = self::getSourceUrl($val, 'suggest');
+				$img = array();
+				foreach ($result['data']['imagesList'] as $val) {
+					$img = array();
+					$img['imgUrl'] = self::getSourceUrl($val, 'suggest');
+					$imgList['imgList'][] = $img;
 				}
-
-				return $result['data']['imagesList'];
 			}
+
+			return $imgList;
 		}
 		else
 		{

@@ -15,13 +15,8 @@ var $nav = $('.category-nav'),
 
 var $curContent = $contents.not('.hide');
 
-<<<<<<< HEAD
-// $curClickSubLevel;
 
-var navHammer, ccHammer;
-=======
 var navHammer;
->>>>>>> master
 
 //初始化container高度
 (function() {