Merge remote-tracking branch 'origin/master'

@@ -65,7 +65,7 @@ class Helpers
      */
     public static function getImageUrl($url, $width, $height, $mode = 2)
     {
-        return strtr($url, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode, 'http://' => '//'));
+        return strtr($url, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode, 'http://' => '//')) . '/q/70';
     }
 
     /**

@@ -71,7 +71,7 @@ class Images
         if (stripos($fileName, 'http://') !== 0) {
             $fileName = self::template($fileName, $bucket, $mode);
         }
-        return strtr($fileName, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode, 'http://' => '//'));
+        return strtr($fileName, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode, 'http://' => '//')) . '/q/70';
     }
 
     /**

@@ -192,7 +192,7 @@ module.exports = function(specificGender) {
                     'PRD_ID': PRDID.join(','),
                     'PRD_NUM': $(data).closest('.good-info').length,
                     'ACTION_ID': 0,
-                    'page_num': page + 1
+                    'page_num': RECPOSE === 110009 ? 1 : page
                 });
                 //为您优选埋点 end
             },

@@ -23,7 +23,7 @@ $.get('/product/recommend-for-you/cart').then(function(html) {
     });
 
     window.givePoint({
-        'REC_POSE': 10003,
+        'REC_POSE': 110003,
         'PRD_ID': PRDID.join(','),
         'PRD_NUM': $('.recommend-for-you .good-info').length,
         'ACTION_ID': 0,
@@ -34,7 +34,7 @@ $.get('/product/recommend-for-you/cart').then(function(html) {
         var index = $(this).closest('.good-info').index() + 1;
 
         window.givePoint({
-            'REC_POSE': 10003,
+            'REC_POSE': 110003,
             'PRD_ID': $(this).closest('.good-info').data('id'),
             'PRD_NUM': index,
             'ACTION_ID': 1,

@@ -31,6 +31,8 @@ class BoysController extends AbstractAction
         $uid = $this->getUid(true);
         $content = Index\HomeModel::getBoysFloor($uid);
 
+        $this->setCookie('_Channel', 'boys');
+
         // 渲染模板并输出
         $this->_view->display('index', array(
             'boysHomePage' => true,

@@ -24,6 +24,9 @@ class GirlsController extends AbstractAction
         // 显示底部TAB
         $this->setNavFooterTab();
         $uid = $this->getUid(true);
+
+        $this->setCookie('_Channel', 'girls');
+
         // 渲染模板并输出
         $this->_view->display('index', array(
             'grilsHomePage' => true,

@@ -24,6 +24,9 @@ class KidsController extends AbstractAction
         // 显示底部TAB
         $this->setNavFooterTab();
         $uid = $this->getUid(true);
+
+        $this->setCookie('_Channel', 'kids');
+
         // 渲染模板并输出
         $this->_view->display('index', array(
             'kidsHomePage' => true,

@@ -24,6 +24,9 @@ class LifestyleController extends AbstractAction
         // 显示底部TAB
         $this->setNavFooterTab();
         $uid = $this->getUid(true);
+
+        $this->setCookie('_Channel', 'lifestyle');
+
         // 渲染模板并输出
         $this->_view->display('index', array(
             'lifestyleHomePage' => true,

@@ -108,12 +108,14 @@ class BrandModel
                     $list['url'] = Helpers::url('', null, $row['brand_domain']);
                     $build['list'][] = $list;
                 }
-                $result['brandList'][] = $build;
+                if ($char !== '0~9') {
+                    $result['brandList'][] = $build;
+                } else {
+                    $lastBrand = $build;
+                }
             }
-            //第一个元素放到最后
-            $lastBrand = $result['brandList'][0];
-            unset($result['brandList'][0]);
             $result['brandList'][] = $lastBrand;
+            //第一个元素放到最后
             $result['brandList'] = array_values($result['brandList']);
         }
         //新入驻品牌