merge code

@@ -182,18 +182,22 @@ class Images
 		$result = json_decode(file_get_contents('http://upload.static.yohobuy.com', false, $context), true);
 		$result = json_decode(file_get_contents('http://upload.static.yohobuy.com', false, $context), true);
 		if(!empty($result['data']['imagesList']))
 		if(!empty($result['data']['imagesList']))
 		{
 		{
+			$imgList = array('imgList'=>array());
 			if(count($file) == 1 || !is_array($file))
 			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
 			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
 		else
 		{
 		{

@@ -26,4 +26,5 @@ dist
 coverage
 coverage
 css/
 css/
 .sass-cache/
 .sass-cache/
-script/nginx/logs/
+script/nginx/logs/
+*.DS_Store

@@ -13,9 +13,8 @@ var $nav = $('.category-nav'),
     $subLevelItem = $categoryContainer.find('.sub-level li'),
     $subLevelItem = $categoryContainer.find('.sub-level li'),
     $primaryItem = $categoryContainer.find('.primary-level li');
     $primaryItem = $categoryContainer.find('.primary-level li');
 
 
-var $curContent = $contents.not('.hide');
-
-var navHammer;
+var $curContent = $contents.not('.hide'),
+    navHammer;
 
 
 //初始化container高度
 //初始化container高度
 (function() {
 (function() {

@@ -28,7 +28,7 @@
         a.async=1;
         a.async=1;
         a.src=j;
         a.src=j;
         m.parentNode.insertBefore(a,m);
         m.parentNode.insertBefore(a,m);
-    })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13/yas.js','_yas');
+    })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13/yas-debug.js','_yas');
 </script>
 </script>
 {{> layout/use}}
 {{> layout/use}}
 {{> layout/analysis}} 
 {{> layout/analysis}}