Merge branch 'develop' into beta

@@ -273,9 +273,8 @@ class HelperSearch
 
     public static function groupSort($sort)
     {
-
         $options = self::$options;
-        if (isset($options['controller']) && $options['controller'] != 'Search') {
+        if (isset($options['controller']) && $options['controller'] == 'Search') {
             return array();
         }
         //设置导航
@@ -319,7 +318,7 @@ class HelperSearch
             }
         }
         $result['list'] = $sortList;
-
+        
         return $result;
     }
 
@@ -327,7 +326,7 @@ class HelperSearch
     {
         $result = array();
         $options = self::$options;
-        if (!isset($options['controller']) || $options['controller'] != 'Search') {
+        if (!isset($options['controller']) || $options['controller'] == 'Search') {
             return $result;
         }
         $params = self::$params;

@@ -88,7 +88,6 @@ $invoice.on('touchend', '.checkbox', function() {
     if ($this.hasClass('icon-checkbox')) {
         $invoice.removeClass('focus');
     }
-    return false;
 });
 
 function orderCompute() {
@@ -243,10 +242,10 @@ $('.coin').on('touchend', function() {
     orderCompute();
 });
 
-$invoice.on('touchend', function(e) {
+$invoice.on('touchend', '.checkbox', function(e) {
     var $this = $(this);
 
-    orderInfo('invoice', $this.find('.checkbox').hasClass('icon-cb-checked'));
+    orderInfo('invoice', $this.hasClass('icon-cb-checked'));
     e.preventDefault();
     e.stopPropagation();
 });

@@ -34,6 +34,20 @@
         </div>
     {{/if}}
 
+    {{#if gender}}
+        <div class="channel section">
+            <span class="title">性别：</span>
+
+            <div class="attr-content clearfix">
+                {{#each channel}}
+                    <a class="attr {{#if checked}}checked{{/if}}" href="{{href}}">
+                        {{name}}
+                    </a>
+                {{/each}}
+            </div>
+        </div>
+    {{/if}}
+
     {{#if sort}}
         <div class="sort section">
             <span class="title">分类：</span>

@@ -135,7 +135,6 @@ exports.init = function(num) {
 
             // 鼠标悬浮获取到商品信息后显示第一张图片
             if (data[0] && data[0].src) {
-                $(event.target).find('.good-thumb img').attr('src', data[0].src);
                 $goodInfoMain.find('.good-thumb img').attr('src', data[0].src);
             }
 

@@ -82,6 +82,7 @@
             width: 14px;
             border: 1px solid #fff;
             margin-bottom: -3px;
+            background-size: 100% !important;
         }
 
         .clear-checked {
@@ -283,6 +284,7 @@
         border: 1px solid #ccc;
         margin-bottom: -6px;
         margin-right: 5px;
+        background-size: 100% !important;
     }
 
     .senior {

@@ -125,9 +125,20 @@
         }
     }
 
+    @keyframes slideRight {
+        from {
+            width: 0;
+        }
+        to {
+            width: 50px;
+        }
+    }
+
     .good-select-color {
         float: left;
         margin-top: 22px;
+        overflow: hidden;
+        animation: slideRight 200ms 1;
 
         ul {
             display: block;
@@ -175,4 +186,4 @@
     }
 
 
-}
\ No newline at end of file
+}

@@ -71,7 +71,7 @@ class Bootstrap extends Bootstrap_Abstract
         $controller = 'Index';
         $action = 'Index';
         // 二级域名
-        if (2 === $level) {
+        if (3 === $level) {
             $subDomain = strval($hostParts[0]);
             switch (strtolower($subDomain)) {
                 case 'www':  // 主站

@@ -5,11 +5,29 @@ class ListController extends WebAction
 {
     public function indexAction()
     {
-
+        
     }
 
+    /**
+     * list列表new(模板new-sale)
+     */
     public function newAction(){
-
+        $condition = array(
+            'order' => 's_t_desc'
+        );
+        $options = array(
+            'specialsale_id' => 'Y',
+            'needDay' => 'Y'
+        );
+        
+        $newData = Product\NewModel::getNewSearchData($condition, $options);
+        $data = array(
+            'productListPage' => true,
+            'newSale' => $newData
+        );
+        $this->setWebNavHeader();
+        //渲染模板
+        $this->_view->display('new-sale', $data);
     }
 
     /**

-<?php
-
-use Action\WebAction;
-
-/**
- * new页
- *
- */
-class NewController extends WebAction 
-{
-
-    public function indexAction() 
-    {
-        $condition = array(
-            'order' => 's_t_desc'
-        );
-        $options = array(
-            'specialsale_id' => 'Y',
-            'needDay' => 'Y'
-        );
-        
-        $newData = Product\NewModel::getNewSearchData($condition, $options);
-        $data = array(
-            'productListPage' => true,
-            'newSale' => $newData
-        );
-        $this->setWebNavHeader();
-        //渲染模板
-        $this->_view->display('new-sale', $data);
-    }
-
-}