Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list

@@ -396,8 +396,10 @@ class HelperSearch
             $sortList[$key]['active'] = isset(self::$params['msort']) && self::$params['msort'] == $val['sort_id'] ? true : false;
             $sortList[$key]['active'] = isset(self::$params['msort']) && self::$params['msort'] == $val['sort_id'] ? true : false;
             $sortList[$key]['childList'][] = array(
             $sortList[$key]['childList'][] = array(
                 'name' => '全部'.$val['sort_name'],
                 'name' => '全部'.$val['sort_name'],
-                'href' => self::buildUrl(array_merge($gender, array('msort'=>$val['sort_id'])))
+                'href' => self::buildUrl(array_merge($gender, array('msort'=>$val['sort_id']))),
+                'childActive' => isset(self::$params['msort']) && !isset(self::$params['misort']) && self::$params['msort'] == $val['sort_id'] ? true : false
             );
             );
+            
             if (isset($val['sub']) && !empty($val['sub'])) {
             if (isset($val['sub']) && !empty($val['sub'])) {
                 foreach ($val['sub'] as $k => $v) {
                 foreach ($val['sub'] as $k => $v) {
                     $sortList[$key]['childList'][$k+1]['name'] = $v['sort_name'];
                     $sortList[$key]['childList'][$k+1]['name'] = $v['sort_name'];
@@ -993,7 +995,7 @@ class HelperSearch
             $url = self::buildUrl(array_merge($params, array(
             $url = self::buildUrl(array_merge($params, array(
                 'order' => 'p_d_desc'
                 'order' => 'p_d_desc'
             )));
             )));
-            $desc = true;
+            $desc = false;
             $active = true;
             $active = true;
         }
         }
         else {
         else {

@@ -38,6 +38,11 @@
     </div>
     </div>
     <div class="good-detail-text">
     <div class="good-detail-text">
         <a href="{{url}}" target="_blank">{{{name}}}</a>
         <a href="{{url}}" target="_blank">{{{name}}}</a>
+        {{#brand}}
+        <p class="brand">
+            <a href="{{url}}">{{name}}</a>
+        </p>
+        {{/brand}}
         <p class="price">
         <p class="price">
             {{# marketPrice}}
             {{# marketPrice}}
                 <span class="market-price">¥{{.}}</span>
                 <span class="market-price">¥{{.}}</span>
@@ -47,4 +52,4 @@
             </span>
             </span>
         </p>
         </p>
     </div>
     </div>
-</div>
+</div>

@@ -840,7 +840,7 @@ function closeCover() {
  * @return {[type]} [description]
  * @return {[type]} [description]
  */
  */
 function actionCover() {
 function actionCover() {
-    var gender = cookieMap._Gender;
+    var gender = window.cookie('_Gender');
     var newMask = '';
     var newMask = '';
     var windowheight = '';
     var windowheight = '';
     var selfheight = '';
     var selfheight = '';
@@ -1477,6 +1477,7 @@ function init() {
     actionNav(); //处理导航
     actionNav(); //处理导航
     actionTipPic(); //鼠标移入后查询
     actionTipPic(); //鼠标移入后查询
     actionExeTemplate(); //处理模板
     actionExeTemplate(); //处理模板
+    actionCover(); //初次登录弹框
     actionInitCookie(); //初始化cookie
     actionInitCookie(); //初始化cookie
     actionExeCookieMap(); //格式化cookie
     actionExeCookieMap(); //格式化cookie
     actionGoodsCart(); //初始化购物车插件
     actionGoodsCart(); //初始化购物车插件
@@ -1494,7 +1495,6 @@ function init() {
     actionListenDelCarGoods(); //监听购物车删除
     actionListenDelCarGoods(); //监听购物车删除
     actionListenCartMore(); //
     actionListenCartMore(); //
     actionLoginInfo(); //获取登录信息
     actionLoginInfo(); //获取登录信息
-    actionCover(); //初次登录弹框
     actionAddKeyWords(); //增加关键字
     actionAddKeyWords(); //增加关键字
 }
 }
 init();
 init();

@@ -50,7 +50,14 @@
         }
         }
 
 
         > .price {
         > .price {
-            margin-top: 10px;
+            margin-top: 5px;
+        }
+
+        .brand {
+            a {
+                color: #666;
+                line-height: 1.5;
+            }
         }
         }
 
 
         .market-price {
         .market-price {

@@ -23,7 +23,7 @@ class IndexModel
         $urlList['product'] = SearchData::getProductUrl($searchCondition['condition']);
         $urlList['product'] = SearchData::getProductUrl($searchCondition['condition']);
         
         
         // 组合搜索分类url
         // 组合搜索分类url
-        $urlList['sort'] = SearchData::getClassesUrl($searchCondition['sortCondition']);
+        $urlList['sort'] = SearchData::getClassesUrl();
         
         
         //批量调接口获取数据
         //批量调接口获取数据
         $result = Yohobuy::getMulti($urlList);
         $result = Yohobuy::getMulti($urlList);

@@ -158,7 +158,6 @@ class SearchModel
         // 组合搜索商品url
         // 组合搜索商品url
         $urlList['product'] = SearchData::getProductUrl($searchCondition['condition']);
         $urlList['product'] = SearchData::getProductUrl($searchCondition['condition']);
         // 组合搜索分类url
         // 组合搜索分类url
-        //$urlList['sort'] = SearchData::getClassesUrl($searchCondition['sortCondition']);
         $urlList['sort'] = SearchData::getClassesUrl();
         $urlList['sort'] = SearchData::getClassesUrl();
         // 组合搜索折扣区间url
         // 组合搜索折扣区间url
         $urlList['discount'] = SearchData::getDiscountUrl();
         $urlList['discount'] = SearchData::getDiscountUrl();

@@ -70,4 +70,4 @@ class SearchController extends WebAction
         $this->setWebNavHeader();
         $this->setWebNavHeader();
         $this->_view->display('search', $data);
         $this->_view->display('search', $data);
     }
     }
-}
+}