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

@@ -142,7 +142,7 @@ function actionGoodsCart() {
                 return false;
                 return false;
             }
             }
             key = encodeURI(key);
             key = encodeURI(key);
-            $.get(searchDomain + '?callback=?&query=' + key, function(htmlData) {
+            $.get(searchDomain + '?query=' + key, function(htmlData) {
                 $('.search-list').html(htmlData.data);
                 $('.search-list').html(htmlData.data);
                 queryNum = $('.search-list').children('li').length;
                 queryNum = $('.search-list').children('li').length;
                 listIndex = -1;
                 listIndex = -1;
@@ -156,7 +156,7 @@ function actionGoodsCart() {
                 }, function() {
                 }, function() {
                     $(this).css('background-color', '#fff');
                     $(this).css('background-color', '#fff');
                 });
                 });
-            }, 'jsonp');
+            }, 'json');
         }
         }
 
 
         function getText(obj) {
         function getText(obj) {
@@ -525,7 +525,7 @@ function createNewArray(obj) {
         var $that = $(this);
         var $that = $(this);
         var $alink = $that.find('a');
         var $alink = $that.find('a');
         var _href = $alink.attr('href');
         var _href = $alink.attr('href');
-        var hottag = $alink.attr('hot') === 'true' ? true : false;
+        var hottag = $alink.attr('hot') === 'hot' ? true : false;
         var objt = {};
         var objt = {};
 
 
         if ($that.hasClass('category-title')) {
         if ($that.hasClass('category-title')) {
@@ -721,7 +721,6 @@ function actionNav() {
 }
 }
 
 
 
 
-
 /**
 /**
  * 查询跳转后保留关键字
  * 查询跳转后保留关键字
  * @return {[type]} [description]
  * @return {[type]} [description]
@@ -1172,7 +1171,7 @@ function actionExeTemplate() {
  * @return {[type]} [description]
  * @return {[type]} [description]
  */
  */
 function actionSearch() {
 function actionSearch() {
-    var searchDomain = 'http://search.yohobuy.com/api/suggest';
+    var searchDomain = 'http://search.yohobuy.com/product/search/suggest';
 
 
     $('#query_key').search(searchDomain);
     $('#query_key').search(searchDomain);
 }
 }

@@ -14,9 +14,11 @@ var $cr = $('#country-code-hide'),
     emailReg = /^[.\-_a-zA-Z0-9]+@[\-_a-zA-Z0-9]+\.[a-zA-Z0-9]/,
     emailReg = /^[.\-_a-zA-Z0-9]+@[\-_a-zA-Z0-9]+\.[a-zA-Z0-9]/,
     acAccount = [
     acAccount = [
         ['qq.com', '163.com', '126.com', 'sina.com', 'gmail.com',
         ['qq.com', '163.com', '126.com', 'sina.com', 'gmail.com',
-        'sohu.com', 'hotmail.com', '139.com', '189.com'], //数字顺序
+            'sohu.com', 'hotmail.com', '139.com', '189.com'
+        ], //数字顺序
         ['gmail.com', 'qq.com', '163.com', '126.com', 'sina.com',
         ['gmail.com', 'qq.com', '163.com', '126.com', 'sina.com',
-        'sohu.com', 'hotmail.com', '139.com', '189.com'] //组合顺序
+            'sohu.com', 'hotmail.com', '139.com', '189.com'
+        ] //组合顺序
     ],
     ],
     $ccList = $('#country-code-list'),
     $ccList = $('#country-code-list'),
     $cc = $('#country-code'),
     $cc = $('#country-code'),
@@ -44,6 +46,7 @@ function imgcode() {
     var time = new Date(),
     var time = new Date(),
         $captchaImg = $('#captcha-img'),
         $captchaImg = $('#captcha-img'),
         captchaImgSrc = $captchaImg.attr('src').split('?')[0];
         captchaImgSrc = $captchaImg.attr('src').split('?')[0];
+
     $('#captcha-img').attr('src', captchaImgSrc + '?t=' + time.getTime());
     $('#captcha-img').attr('src', captchaImgSrc + '?t=' + time.getTime());
 
 
     //getSource('yoho_family_web', '换一张', 'homepage_man');
     //getSource('yoho_family_web', '换一张', 'homepage_man');

@@ -85,6 +85,8 @@ class CommonController extends WebAction
         $content_code = $this->get('content_code', '');
         $content_code = $this->get('content_code', '');
         $client_type = $this->get('client_type', 'web');
         $client_type = $this->get('client_type', 'web');
         $callback = $this->get('callback', '');
         $callback = $this->get('callback', '');
+        $width = $this->get('width', '');
+        $height = $this->get('height', '');
         $params = array(
         $params = array(
                 'content_code' => $content_code, 
                 'content_code' => $content_code, 
                 'client_type' => $client_type
                 'client_type' => $client_type
@@ -100,9 +102,12 @@ class CommonController extends WebAction
             if(isset($data['data'][0]['data']))
             if(isset($data['data'][0]['data']))
             {
             {
                 $banner = current($data['data'][0]['data']);
                 $banner = current($data['data'][0]['data']);
-        		
                 if(!empty($banner)) {
                 if(!empty($banner)) {
-        		   $banner['src'] = Images::getImageUrl($banner['src'], 2600, 60 ,2);
+                    if(empty($width) || empty($height) ) {
+                          $width = 2600;//通栏广告
+                          $height = 60;
+                    }
+                    $banner['src'] = Images::getImageUrl($banner['src'], $width, $height ,2);
                    //str_replace('?imageView/{mode}/w/{width}/h/{height}', '', $banner['src']);
                    //str_replace('?imageView/{mode}/w/{width}/h/{height}', '', $banner['src']);
                 }
                 }
             }
             }

@@ -75,7 +75,8 @@ class HomeModel
                         'link' => $val['sort_url'],
                         'link' => $val['sort_url'],
                         'icon' => $val['sort_ico'],
                         'icon' => $val['sort_ico'],
                         'classname' => str_replace(' ', '', strtolower($val['sort_name_en'])) == $channel ? $channel : '',
                         'classname' => str_replace(' ', '', strtolower($val['sort_name_en'])) == $channel ? $channel : '',
-        				'index_main' => $index_main++,
+                        'index_main' => $index_main ++,
+                        'content_code' => $val['content_code'],
                         'is_hot' => $val['is_hot'] == 'Y' ? true : false,
                         'is_hot' => $val['is_hot'] == 'Y' ? true : false,
                         'is_new' => $val['is_new'] == 'Y' ? true : false,
                         'is_new' => $val['is_new'] == 'Y' ? true : false,
                         //  'subnav' => array()
                         //  'subnav' => array()
@@ -88,6 +89,7 @@ class HomeModel
                             'link' => $sub['sort_url'],
                             'link' => $sub['sort_url'],
                             'is_hot' => $sub['is_hot'] == 'Y' ? true : false,
                             'is_hot' => $sub['is_hot'] == 'Y' ? true : false,
                             'is_new' => $sub['is_new'] == 'Y' ? true : false,
                             'is_new' => $sub['is_new'] == 'Y' ? true : false,
+                            'content_code' => $sub['content_code'],
                             //    'thirdnav' => array(),
                             //    'thirdnav' => array(),
                             'index_sub' => $index_sub ++
                             'index_sub' => $index_sub ++
                     );
                     );
@@ -97,6 +99,7 @@ class HomeModel
                                     'title' => $thirdsub['sort_name'],
                                     'title' => $thirdsub['sort_name'],
                                     'name_en' => $thirdsub['sort_name_en'],
                                     'name_en' => $thirdsub['sort_name_en'],
                                     'link' => $thirdsub['sort_url'],
                                     'link' => $thirdsub['sort_url'],
+                                    'content_code' => $thirdsub['content_code'],
                                     //       'branditems' => array()
                                     //       'branditems' => array()
                             );
                             );
                             if (isset($thirdsub['sub'])) {
                             if (isset($thirdsub['sub'])) {