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

@@ -449,6 +449,7 @@
                     },
                     },
                     ...
                     ...
                 ],
                 ],
+                hideMore: true, //隐藏更多和多选
                 //索引：index为索引键值（字母转化为小写）
                 //索引：index为索引键值（字母转化为小写）
                 brandIndex: [
                 brandIndex: [
                     {
                     {

@@ -46,7 +46,7 @@ class LoginData extends \LibModels\Wap\Passport\LoginData
 
 
         $param['client_secret'] = Sign::getSign($param);
         $param['client_secret'] = Sign::getSign($param);
 
 
-        return Yohobuy::get(Yohobuy::API_URL2, $param);
+        return Yohobuy::get(Yohobuy::API_URL, $param);
     }
     }
 
 
 }
 }

@@ -181,10 +181,10 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
         hasChooseColor = false;
         hasChooseColor = false;
 
 
         //当前尺码行隐藏
         //当前尺码行隐藏
-        $sizeRowList.eq(curSizeIndex).removeClass('show').addClass('hide');
+        $sizeRowList.eq(curSizeIndex).addClass('hide');
 
 
         //目标尺码行显示
         //目标尺码行显示
-        $sizeRowList.eq(0).removeClass('hide').addClass('show');
+        $sizeRowList.eq(0).removeClass('hide');
 
 
         curSizeIndex = 0;
         curSizeIndex = 0;
 
 
@@ -202,10 +202,10 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
         displayGoodNum(curGoodNum);
         displayGoodNum(curGoodNum);
 
 
         // 尺码行当前行隐藏
         // 尺码行当前行隐藏
-        $sizeRowList.eq(curSizeIndex).removeClass('show').addClass('hide');
+        $sizeRowList.eq(curSizeIndex).addClass('hide');
 
 
         //尺码对应行显示
         //尺码对应行显示
-        $sizeRowList.eq(index + 1).removeClass('hide').addClass('show');
+        $sizeRowList.eq(index + 1).removeClass('hide');
 
 
         curSizeIndex = index + 1;
         curSizeIndex = index + 1;
         $curColorBlock = $this;
         $curColorBlock = $this;

@@ -19,17 +19,10 @@
             <div class="chose-items">
             <div class="chose-items">
                 <div class="color-list block-list">
                 <div class="color-list block-list">
                     <span>颜色</span>
                     <span>颜色</span>
-                    <!--<ul class="clearfix" data-type="color">
-                        {{# colors}}
-                        <li class="block {{#if chosed}}chosed{{/if}} {{#unless colorNum}}zero-stock{{/unless}}" data-num="{{colorNum}}" data-id="{{id}}" data-numstr="{{sizeNumStr}}" data-skcid="{{skcId}}">
-                            {{name}}
-                        </li>
-                        {{/ colors}}
-                    </ul>-->
                     {{# colors}}
                     {{# colors}}
                     <ul class="size-row clearfix  {{#unless @first}}hide{{/if}}">
                     <ul class="size-row clearfix  {{#unless @first}}hide{{/if}}">
                         {{# color}}
                         {{# color}}
-                        <li class="block {{#if chosed}}chosed{{/if}} {{#unless colorNum}}zero-stock{{/unless}}" data-num="{{colorNum}}" data-id="{{id}}" data-numstr="{{sizeNumStr}}" data-skcid="{{skcId}}">
+                        <li class="block {{#if chosed}}chosed{{/if}} {{#unless colorNum}}zero-stock{{/unless}}" data-num="{{colorNum}}">
                             {{name}}
                             {{name}}
                         </li>
                         </li>
                         {{/ color}}
                         {{/ color}}
@@ -41,20 +34,12 @@
                     {{# sizes}}
                     {{# sizes}}
                     <ul class="size-row clearfix  {{#unless @first}}hide{{/if}}">
                     <ul class="size-row clearfix  {{#unless @first}}hide{{/if}}">
                         {{# size}}
                         {{# size}}
-                        <li class="block {{#if chosed}}chosed{{/if}} {{#unless sizeNum}}zero-stock{{/unless}}" data-id="{{id}}" data-colorid="{{colorId}}" data-num="{{sizeNum}}" data-numstr="{{colorNumStr}}" data-skuid="{{skuId}}" data-goodid="{{goodsId}}">
+                        <li class="block {{#if chosed}}chosed{{/if}} {{#unless sizeNum}}zero-stock{{/unless}}" data-num="{{sizeNum}}" data-skuid="{{skuId}}">
                             {{name}}
                             {{name}}
                         </li>
                         </li>
                         {{/ size}}
                         {{/ size}}
                     </ul>
                     </ul>
                     {{/ sizes}}
                     {{/ sizes}}
-
-                    <!--{{#if defaultSizes}}
-                        <ul class="size-row clearfix default-size">
-                            {{#each defaultSizes}}
-                                <li class="block {{#if numZero}}zero-stock{{/if}}" data-numstr="{{numStr}}">{{name}}</li>
-                            {{/each}}
-                        </ul>
-                    {{/if}}-->
                 </div>
                 </div>
                 <p>
                 <p>
                 <div class="num">
                 <div class="num">

@@ -2,9 +2,14 @@
 <div class="new-sale-page product-page yoho-page">
 <div class="new-sale-page product-page yoho-page">
     {{# saleList}}
     {{# saleList}}
         {{# saleBanner}}
         {{# saleBanner}}
-            <div class="banner-img" style="height: {{bannerHeight}}px;background:url({{img}}) no-repeat top center;"></div>
+        <div class="sale-list-banner" style="height: {{bannerHeight}}px;">
+            <ul style="height: {{bannerHeight}}px;">
+                {{# list}}
+                <li class="banner-img" style="background:url({{img}}) no-repeat top center;"></li>
+                {{/ list}}
+            </ul>
+        </div>
         {{/ saleBanner}}
         {{/ saleBanner}}
-
         <div class="center-content clearfix">
         <div class="center-content clearfix">
             {{# saleTitle}}
             {{# saleTitle}}
                 <div class="header-title">
                 <div class="header-title">

@@ -144,7 +144,7 @@
 {{!-- sale列表 --}}
 {{!-- sale列表 --}}
 {{#if saleListPage}}
 {{#if saleListPage}}
 <script>
 <script>
-    seajs.use(['js/product/list', 'js/product/product'], function (list, product) {
+    seajs.use(['js/product/list', 'js/product/product', 'js/product/banner'], function (list, product) {
 
 
         product.init(4);
         product.init(4);
         window.onresize = function () {
         window.onresize = function () {

@@ -39,7 +39,7 @@
             <span class="title">性别：</span>
             <span class="title">性别：</span>
 
 
             <div class="attr-content clearfix">
             <div class="attr-content clearfix">
-                {{#each channel}}
+                {{#each gender}}
                     <a class="attr {{#if checked}}checked{{/if}}" href="{{href}}">
                     <a class="attr {{#if checked}}checked{{/if}}" href="{{href}}">
                         {{name}}
                         {{name}}
                     </a>
                     </a>
@@ -55,7 +55,7 @@
             <div class="attr-content">
             <div class="attr-content">
                 <ul class="sort-pre clearfix">
                 <ul class="sort-pre clearfix">
                     {{#each sort}}
                     {{#each sort}}
-                        <li>
+                        <li data-id="{{id}}">
                             <span class="attr {{#if checked}}checked{{/if}}">
                             <span class="attr {{#if checked}}checked{{/if}}">
                                 {{name}}
                                 {{name}}
                                 <div class="sort-up-icon"></div>
                                 <div class="sort-up-icon"></div>
@@ -92,6 +92,7 @@
                     {{/ default}}
                     {{/ default}}
                 </ul>
                 </ul>
 
 
+                {{#unless hideMore}}
                     <div class="brand-opt">
                     <div class="brand-opt">
                         <span id="brand-more" class="brand-more">
                         <span id="brand-more" class="brand-more">
                             <em>更多</em>
                             <em>更多</em>
@@ -100,6 +101,7 @@
 
 
                         <span id="brand-multi" class="multi-select">多选 +</span>
                         <span id="brand-multi" class="multi-select">多选 +</span>
                     </div>
                     </div>
+                {{/unless}}
 
 
                 <div class="brand-panel hide">
                 <div class="brand-panel hide">
                     <div class="panel-head clearfix">
                     <div class="panel-head clearfix">
@@ -177,8 +179,7 @@
         </div>
         </div>
     {{/if}}
     {{/if}}
 
 
-    {{#if size}}
-        <div class="size section">
+    <div class="size section hide">
         <span class="title">尺码：</span>
         <span class="title">尺码：</span>
 
 
         <div class="attr-content clearfix">
         <div class="attr-content clearfix">
@@ -187,7 +188,6 @@
             {{/ size}}
             {{/ size}}
         </div>
         </div>
     </div>
     </div>
-    {{/if}}
 
 
     {{#if seniorChose}}
     {{#if seniorChose}}
         <div class="senior section">
         <div class="senior section">

@@ -25,7 +25,7 @@
         {{/ tags}}
         {{/ tags}}
     </div>
     </div>
     <div class="good-detail-img">
     <div class="good-detail-img">
-        <a class="good-thumb" href="{{url}}">
+        <a class="good-thumb" href="{{url}}" target="_blank">
             <img class="lazy" data-original="{{thumb}}">
             <img class="lazy" data-original="{{thumb}}">
         </a>
         </a>
         {{# isFew}}
         {{# isFew}}
@@ -37,7 +37,7 @@
         {{/if}}
         {{/if}}
     </div>
     </div>
     <div class="good-detail-text">
     <div class="good-detail-text">
-        <a href="{{url}}">{{name}}</a>
+        <a href="{{url}}" target="_blank">{{name}}</a>
         <p class="price">
         <p class="price">
             {{# marketPrice}}
             {{# marketPrice}}
                 <span class="market-price">¥{{.}}</span>
                 <span class="market-price">¥{{.}}</span>

@@ -211,13 +211,17 @@ $account.on('keyup', function() {
 //密码
 //密码
 $password.on('blur', function() {
 $password.on('blur', function() {
     validatePassword();
     validatePassword();
+
+    if ($capsLock.hasClass('hide')) {
+        return;
+    }
+
+    $capsLock.addClass('hide');
 }).on('keypress', function(e) {
 }).on('keypress', function(e) {
-    var code = e.which,
-        isShift = e.shiftKey || (code === 16) || false;
+    var code = e.which;
 
 
     //CapsLock检测
     //CapsLock检测
-    if ((!isShift && (code >= 65 && code <= 90)) ||
-        (isShift && (code >= 97 && code <= 122))) {
+    if (code >= 65 && code <= 90) {
         $capsLock.removeClass('hide');
         $capsLock.removeClass('hide');
         return;
         return;
     }
     }
@@ -276,7 +280,7 @@ $('#login-btn').on('click', function() {
                     if (data.data) {
                     if (data.data) {
 
 
                         //防止data.data为undefined时下行语句执行出错而导致脚本不能走到complete去处理authing
                         //防止data.data为undefined时下行语句执行出错而导致脚本不能走到complete去处理authing
-                        location.href = data.data.href;
+                        location.href = data.data.session;
                     }
                     }
                 } else {
                 } else {
                     $passwordTip.removeClass('hide').children('em').text(data.message);
                     $passwordTip.removeClass('hide').children('em').text(data.message);

@@ -417,6 +417,18 @@ function pwdFn($obj) {
 // Tips: 不可以在获得焦点的时候验证，获得焦点和失去焦点的间隔太小，如果中间存在ajax校验的话会出现问题
 // Tips: 不可以在获得焦点的时候验证，获得焦点和失去焦点的间隔太小，如果中间存在ajax校验的话会出现问题
 // ( ▼-▼ )注册页和信息完善页面接口不同
 // ( ▼-▼ )注册页和信息完善页面接口不同
 exports.init = function(page) {
 exports.init = function(page) {
+
+    $('#agree-terms').click(function() {
+        if ($(this).attr('notchecked')) {
+            console.log(1);
+            $(this).removeAttr('notchecked');
+        } else {
+            console.log(2);
+            $(this).attr('notchecked', 'true');
+        }
+
+    });
+
     $registerPage.find('.va').keyup(function() {
     $registerPage.find('.va').keyup(function() {
 
 
         var j,
         var j,
@@ -438,7 +450,7 @@ exports.init = function(page) {
 
 
             }
             }
 
 
-            if (statusLen === 4 && $('#agree-terms').is(':checked')) {
+            if (statusLen === 4 && !$('#agree-terms').attr('notchecked')) {
                 $registerBtn.removeClass('disable').removeAttr('disabled');
                 $registerBtn.removeClass('disable').removeAttr('disabled');
             } else {
             } else {
                 $registerBtn.addClass('disable').attr('disabled', 'true');
                 $registerBtn.addClass('disable').attr('disabled', 'true');
@@ -515,18 +527,6 @@ exports.init = function(page) {
     });
     });
 
 
     // 防止粘贴密码
     // 防止粘贴密码
-    /*$('#pwd, #repwd').keydown(function (event) {
-
-        console.log(event.ctrlKey);
-        console.log(isPwd);
-        console.log(event.keyCode);
-
-        if (event.ctrlKey && isPwd && event.keyCode === 86) {
-            $(this).val(pwdVal);
-        }
-
-    });*/
-
     $pwd[0].onpaste = function() {
     $pwd[0].onpaste = function() {
         return false;
         return false;
     };
     };

+/*
+ * author: chenglong
+ */
+
+var Slide = require('../common/yohoui/YH.slide');
+var $ = require('yoho.jquery');
+
+var $contain = $('.sale-list-banner');
+var $item = $contain.find('li');
+var index = 0;
+var pagationStr = '';
+var pagationBoxStr = '';
+var i;
+var current = true;
+var slide;
+
+for (i = 0; i < $item.length; i++) {
+
+    if (i === 0) {
+        pagationStr += '<span class="active"></span>';
+    } else {
+        pagationStr += '<span></span>';
+    }
+}
+
+pagationBoxStr = '<div class="sale-list-pagation"><div>' + pagationStr + '</div></div>';
+
+$contain.append($(pagationBoxStr));
+
+slide = new Slide({
+    length: $item.length,
+    loop: true,
+    auto: true,
+    timeout: 2,
+    index: 0
+});
+
+
+slide.on('change', function(data) {
+    if (current) {
+        current = false;
+    } else {
+        return;
+    }
+    index++;
+
+
+    $('.sale-list-pagation').find('span').removeClass('active');
+    $item.eq(data.from).animate({
+        opacity: 0
+    }, 300);
+    $item.eq(data.to).css({
+        zIndex: index
+    }).animate({
+        opacity: 1
+    }, 300, function() {
+        current = true;
+    });
+
+    $('.sale-list-pagation').find('span').eq(data.to).addClass('active');
+
+});
+
+$contain.hover(function() {
+    if (current) {
+        slide.pause();
+    }
+
+}, function() {
+    slide.resume();
+});
+
+$('.sale-list-pagation span').click(function() {
+
+    var index = $(this).index();
+
+    if (current) {
+        slide.go(index);
+    }
+});
+
+slide.init();

@@ -4,7 +4,8 @@
  * @date: 2015/12/4
  * @date: 2015/12/4
  */
  */
 
 
-var $ = require('yoho.jquery');
+var $ = require('yoho.jquery'),
+    Handlebars = require('yoho.handlebars');
 
 
 var checkUnicode = {
 var checkUnicode = {
     unchecked: '',
     unchecked: '',
@@ -38,6 +39,13 @@ var $seniorSubWrap = $('.senior-sub-wrap'),
 
 
 var seniorHoverTime, hoveredIndex;
 var seniorHoverTime, hoveredIndex;
 
 
+// 尺寸 handlebars 模板
+var sizeTmpl = '{{# size}}<a class="attr {{#if checked}}checked{{/if}}" href="{{href}}">{{name}}</a>{{/ size}}',
+    sizeCache = {}, // 缓存一下尺寸信息
+    $sizeWrap = $('.filter-box .size');
+
+sizeTmpl = Handlebars.compile(sizeTmpl);
+
 //清除checkbox选中状态
 //清除checkbox选中状态
 function clearChecked($checkbox) {
 function clearChecked($checkbox) {
     $checkbox.removeClass('checked').html(checkUnicode.unchecked);
     $checkbox.removeClass('checked').html(checkUnicode.unchecked);
@@ -85,13 +93,45 @@ $('.filter-box').on('selectstart', '.attr, .brands-index span', function() {
 //【分类】
 //【分类】
 $('.sort-pre').on('click', 'li', function() {
 $('.sort-pre').on('click', 'li', function() {
     var $this = $(this),
     var $this = $(this),
-        index = $this.index();
+        index = $this.index(),
+        id = $this.data('id');
+
+    if ($this.hasClass('active')) {
+
+        // 选中时，再次点击取消选中
+        $this.removeClass('active');
+        $sortSub.children(':eq(' + index + ')').addClass('hide');
+        $sizeWrap.addClass('hide');
+        return;
+    }
 
 
     $this.siblings('.active').removeClass('active');
     $this.siblings('.active').removeClass('active');
     $this.addClass('active');
     $this.addClass('active');
 
 
     $sortSub.children(':not(.hide)').addClass('hide');
     $sortSub.children(':not(.hide)').addClass('hide');
     $sortSub.children(':eq(' + index + ')').removeClass('hide');
     $sortSub.children(':eq(' + index + ')').removeClass('hide');
+
+    if (sizeCache[id]) {
+        $sizeWrap.find('.attr-content').html(sizeCache[id]);
+        $sizeWrap.removeClass('hide');
+    } else {
+        $.ajax({
+            url: '/product/search/sortSize',
+            data: {
+                msort: id
+            }
+        }).then(function(res) {
+            if ($.type(res) === 'array' && res.length) {
+                sizeCache[id] = sizeTmpl({
+                    size: res
+                });
+                $sizeWrap.find('.attr-content').html(sizeCache[id]);
+                $sizeWrap.removeClass('hide');
+            } else {
+                $sizeWrap.addClass('hide');
+            }
+        });
+    }
 });
 });
 
 
 //【品牌】
 //【品牌】
@@ -132,10 +172,17 @@ $brandMore.click(function() {
 });
 });
 
 
 //【品牌】索引
 //【品牌】索引
-$('.brands-index').on('click', 'span', function() {
+$('.brands-index').on('mouseenter', 'span', function() {
     var $this = $(this),
     var $this = $(this),
         index = $this.data('index');
         index = $this.data('index');
 
 
+    if ($this.hasClass('hover')) {
+        return;
+    }
+
+    $this.siblings('span.hover').removeClass('hover');
+    $this.addClass('hover');
+
     if ($this.index() === 0) {
     if ($this.index() === 0) {
 
 
         //全部
         //全部

@@ -121,4 +121,17 @@ $third: sprite-map("passport/third/*.png");
             background: sprite($third, renren) no-repeat;
             background: sprite($third, renren) no-repeat;
         }
         }
     }
     }
+
+    .caps-lock {
+        position: absolute;
+        color: #666;
+        border: #ffe57d;
+        background: #fff6d2;
+        white-space: nowrap;
+        top: 8px;
+        left: 278px;
+        padding: 0 20px;
+        height: 27px;
+        line-height: 30px;
+    }
 }
 }

@@ -46,6 +46,9 @@
                     width: 209px;
                     width: 209px;
                     display: block;
                     display: block;
                     float: left;
                     float: left;
+                    position: absolute;
+                    top: 0;
+                    right: 0;
                 }
                 }
 
 
                 &.captcha, &.msg-captcha{
                 &.captcha, &.msg-captcha{

@@ -170,15 +170,19 @@
             float: left;
             float: left;
             line-height: 30px;
             line-height: 30px;
             margin-right: 5px;
             margin-right: 5px;
+            cursor: pointer;
 
 
             span {
             span {
                 margin: 0 3px;
                 margin: 0 3px;
-                cursor: pointer;
                 -moz-user-select: none;
                 -moz-user-select: none;
 
 
                 &:first-child {
                 &:first-child {
                     margin-left: 10px;
                     margin-left: 10px;
                 }
                 }
+
+                &.hover {
+                    color: #f00;
+                }
             }
             }
         }
         }
 
 
@@ -314,12 +318,13 @@
     .senior-sub {
     .senior-sub {
         box-sizing: border-box;
         box-sizing: border-box;
         position: absolute;
         position: absolute;
-        padding: 15px 0;
-        left: 0;
-        right: 0;
+        padding: 15px 0 15px 91px;
+        left: -91px;
+        right: -1px;
         top: 39px;
         top: 39px;
         background: #fff;
         background: #fff;
-        border: 1px solid #eaeceb;
+        border: 1px solid #dfdfdf;
+        border-top-color: #eaeceb;
         z-index: 2;
         z-index: 2;
 
 
         ul {
         ul {

 .new-sale-page {
 .new-sale-page {
+
+    /*Modify by chenglong.wang at 2016/1/18
+     *sale列表页面轮播图
+     */
+    .sale-list-banner {
+        width: 100%;
+        position: relative;
+
+        ul {
+            overflow: hidden;
+            width: 100%;
+            position: relative;
+            z-index: 1;
+
+            li {
+                width: 100%;
+                height: 100%;
+                display: block;
+                float: left;
+                position: absolute;
+                top: 0;
+                left: 0;
+            }
+        }
+
+        .sale-list-pagation {
+            z-index: 2;
+            position: absolute;
+            left: 0;
+            bottom: 50px;
+            width: 100%;
+            height: 20px;
+            text-align: center;
+
+            div {
+                display: inline-block;
+            }
+
+            span {
+                display: block;
+                width: 20px;
+                height: 20px;
+                background: image_url('product/default-normal.png');
+                float: left;
+                margin: 0 10px;
+                cursor: pointer;
+
+                &.active {
+                    background: image_url('product/default-active.png');
+                }
+            }
+        }
+    }
+
     .header-title {
     .header-title {
         position: relative;
         position: relative;
         width: 100%;
         width: 100%;

@@ -339,35 +339,34 @@ class HomeModel
         }
         }
 
 
         $data = IndexData::channelData();
         $data = IndexData::channelData();
-        
         if (!empty($data['data']['list'])) {
         if (!empty($data['data']['list'])) {
             $build = array();
             $build = array();
             foreach ($data['data']['list'] as $value) {
             foreach ($data['data']['list'] as $value) {
                 $build = array();
                 $build = array();
                 switch (intval($value['channel_id'])) {
                 switch (intval($value['channel_id'])) {
                     case 1:
                     case 1:
-                        $build['href'] = '/boys';
+                        $build['href'] = Helpers::getFilterUrl($value['url']);
                         $build['title'] = '男生';
                         $build['title'] = '男生';
                         $build['entitle'] = 'BOYS';
                         $build['entitle'] = 'BOYS';
                         break;
                         break;
                     case 2:
                     case 2:
-                        $build['href'] = '/girls';
+                        $build['href'] = Helpers::getFilterUrl($value['url']);
                         $build['title'] = '女生';
                         $build['title'] = '女生';
                         $build['entitle'] = 'GIRLS';
                         $build['entitle'] = 'GIRLS';
                         break;
                         break;
                     case 3:
                     case 3:
-                        $build['href'] = '/kids';
+                        $build['href'] = Helpers::getFilterUrl($value['url']);
                         $build['title'] = '潮童';
                         $build['title'] = '潮童';
                         $build['entitle'] = 'KIDS';
                         $build['entitle'] = 'KIDS';
                         break;
                         break;
                     case 4:
                     case 4:
-                        $build['href'] = '/lifestyle';
+                        $build['href'] = Helpers::getFilterUrl($value['url']);
                         $build['title'] = '创意生活';
                         $build['title'] = '创意生活';
                         $build['entitle'] = 'LIFESTYLE';
                         $build['entitle'] = 'LIFESTYLE';
                         break;
                         break;
                     case 5:
                     case 5:
                         $result['showYohood'] = true;
                         $result['showYohood'] = true;
-                        $result['yohoodHref'] = 'http://yohood.cn';
+                        $result['yohoodHref'] = Helpers::getFilterUrl($value['url']);
                         break;
                         break;
                     default:
                     default:
                         continue;
                         continue;

@@ -238,6 +238,7 @@ class DetailModel
                     $colorArr['colorNum'] = isset($colorStorageGroup[ $colorArr['skcId'] ][$sizeName]) ? $colorStorageGroup[ $colorArr['skcId'] ][$sizeName] : 0;
                     $colorArr['colorNum'] = isset($colorStorageGroup[ $colorArr['skcId'] ][$sizeName]) ? $colorStorageGroup[ $colorArr['skcId'] ][$sizeName] : 0;
                     $colorGroup[$i]['color'][] = $colorArr;
                     $colorGroup[$i]['color'][] = $colorArr;
                 }
                 }
+                $colorGroup[$i]['sizeName'] = $sizeName;
                 
                 
                 ++ $i;
                 ++ $i;
             }
             }
@@ -246,6 +247,7 @@ class DetailModel
             foreach ($colorList as $value) {
             foreach ($colorList as $value) {
                 // 各个尺码的颜色，每行显示一个颜色的对应尺码
                 // 各个尺码的颜色，每行显示一个颜色的对应尺码
                 $sizeGroup[$i]['size'] = $sizeList[ $value['skcId'] ];
                 $sizeGroup[$i]['size'] = $sizeList[ $value['skcId'] ];
+                $sizeGroup[$i]['colorId'] = $value['skcId'];
                 // 默认颜色
                 // 默认颜色
                 $colorGroup[0]['color'][] = $value;
                 $colorGroup[0]['color'][] = $value;
                 
                 

@@ -38,20 +38,14 @@ class BrandsController extends WebAction
      */
      */
     public function brandinfoAction()
     public function brandinfoAction()
     {
     {
-        $result = array();
-
         do {
         do {
             /* 判断是不是AJAX请求 */
             /* 判断是不是AJAX请求 */
             if (!$this->isAjax()) {
             if (!$this->isAjax()) {
                 break;
                 break;
             }
             }
-            $brandId = $this->get('brandId',0);
-            $uid=$this->getUid(false);
-            $brandId=144;
-            BrandsModel::getBrandInfo($brandId, $uid);
-           
-            
-            
+            $brandId = $this->get('brandId', 0);
+            $uid = $this->getUid(false);
+            $data = BrandsModel::getBrandInfo($brandId, $uid);
             $result = array(
             $result = array(
                 'code' => 200,
                 'code' => 200,
                 'brand' => $data
                 'brand' => $data
@@ -62,9 +56,10 @@ class BrandsController extends WebAction
         $this->echoJson($result);
         $this->echoJson($result);
     }
     }
 
 
-    /**
-     * 品牌一览
+    /*
+     * 品牌list
      */
      */
+
     public function indexAction()
     public function indexAction()
     {
     {
         $headerdata = array(
         $headerdata = array(

@@ -7,6 +7,7 @@ use Plugin\HelperSearch;
 use LibModels\Web\Product\BrandData;
 use LibModels\Web\Product\BrandData;
 use Index\HomeModel;
 use Index\HomeModel;
 use Product\SearchModel;
 use Product\SearchModel;
+use Plugin\Helpers;
 
 
 /**
 /**
  * 品牌首页模板数据模型
  * 品牌首页模板数据模型
@@ -80,7 +81,7 @@ class BrandsModel
         $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']);
         $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']);
 
 
         // 组合搜索分类url
         // 组合搜索分类url
-        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']);
+        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['sortCondition']);
 
 
         //组合搜索品牌url
         //组合搜索品牌url
         $urlList['brand'] = HelperSearch::getBrandUrl($customOptions);
         $urlList['brand'] = HelperSearch::getBrandUrl($customOptions);
@@ -108,32 +109,41 @@ class BrandsModel
     {
     {
         $switchParams = self::switchBrandParams($channel);
         $switchParams = self::switchBrandParams($channel);
         $brandTop = array();
         $brandTop = array();
-        /*
-         * $item1 = array(
-          'name' => '所有品牌',
-          'src' => $imgsrc,
-          'url' => ''
-          );
-         */
         $brandAds = array();
         $brandAds = array();
         $brandList = array();
         $brandList = array();
         $res = BrandData::getTopBanner($switchParams['brandCode'], $switchParams['channelType']);
         $res = BrandData::getTopBanner($switchParams['brandCode'], $switchParams['channelType']);
+        //头部10个品牌图块
+        if (isset($res['brandTop'][1]['data']['list']) && $res['brandTop'][1]['data']['list']) {
+            foreach ($res['brandTop'][1]['data']['list'] as $tbk => $tbv) {
+                $imgUrlTmp = explode("?", $tbv['src']);
+                $urlTmp = explode("?", $tbv['url']);
+                $topBrandTmp = array(
+                    'name' => $tbv['name'],
+                    'src' => Helpers::getImageUrl($imgUrlTmp[0], 80, 50, 3),
+                    'url' => str_replace('m.', '', $urlTmp[0]),
+                );
+                $brandAds[$tbk] = $topBrandTmp;
+            }
+        }
+        //头部品牌图块
         if (isset($res['brandTop'][0]['data']) && $res['brandTop'][0]['data']) {
         if (isset($res['brandTop'][0]['data']) && $res['brandTop'][0]['data']) {
             foreach ($res['brandTop'][0]['data'] as $tk => $tv) {
             foreach ($res['brandTop'][0]['data'] as $tk => $tv) {
-                $imgUrl = explode("?", $tv['src']);
+                $imgUrlTmp = explode("?", $tv['src']);
+                $urlTmp = explode("?", $tv['url']);
                 $topTmp = array(
                 $topTmp = array(
                     'name' => $tv['title'],
                     'name' => $tv['title'],
-                    'src' => $imgUrl[0],
-                    'url' => $tv['url'],
-                    'items' => array()
+                    'src' => $imgUrlTmp[0],
+                    'url' => $urlTmp[0],
+                    'items' => $brandAds
                 );
                 );
                 $brandTop[$tk] = $topTmp;
                 $brandTop[$tk] = $topTmp;
             }
             }
         }
         }
+        //品牌list
         if (isset($res['brandList']['brands']) && $res['brandList']['brands']) {
         if (isset($res['brandList']['brands']) && $res['brandList']['brands']) {
             foreach ($res['brandList']['brands'] as $lk => $lv) {
             foreach ($res['brandList']['brands'] as $lk => $lv) {
-                if (isset($lv) && $lv) {
                 $listTmp = array();
                 $listTmp = array();
+                if (isset($lv) && $lv) {
                     foreach ($lv as $ltk => $ltv) {
                     foreach ($lv as $ltk => $ltv) {
                         $listTmp[$ltk] = array(
                         $listTmp[$ltk] = array(
                             'name' => $ltv['brand_name'],
                             'name' => $ltv['brand_name'],
@@ -158,33 +168,20 @@ class BrandsModel
      */
      */
     public static function getBrandInfo($brandId, $uid)
     public static function getBrandInfo($brandId, $uid)
     {
     {
-        $imgsrc = 'http://img11.static.yhbimg.com/goodsimg/2015/10/19/10/01b312c3b7a7efebcd671e73495ff3e306.jpg';
+        $data = array();
+        $res = BrandData::getBrandIntro($brandId, $uid);
+        if (isset($res['data']) && $res['data']) {
+            $icoUrlTmp = explode("?", $res['data']['brand_ico']) ;
             $data = array(
             $data = array(
-                'key' => '1000011',
-                'icon' => $imgsrc,
-                'title' => '优显led触控台灯',
-                'content' => '优显led触控台灯优显led触控台灯优显led触控台灯优显led触控台灯',
-                'subtitle' => 'AAAAAA',
-                'imgs' => array(
-                    array(
-                        'src' => $imgsrc
-                    ),
-                    array(
-                        'src' => $imgsrc
-                    ),
-                    array(
-                        'src' => $imgsrc
-                    )
-                )
+                'key' => $res['data']['brand_id'],
+                'icon' => $icoUrlTmp[0],
+                'title' =>  $res['data']['brand_name'],
+                'content' =>$res['data']['brand_intro'],
+                'subtitle' => 'FEATURED ITEMS',
+                'imgs' => array(),
             );
             );
-        $res = BrandData::getBrandIntro($brandId, $uid);
-//if(isset($res['data']) && $res['data']){
-//    $data['key']=$brandId;
-//    $data['icon']=
-//}
-        var_dump($res);
-        die();
-        
+        }
+        return $data;
     }
     }
 
 
     /*
     /*

@@ -18,12 +18,11 @@ class IndexModel
     {
     {
         $urlList = array();
         $urlList = array();
         $searchCondition = SearchModel::searchCondition($customCondition, $customOptions);
         $searchCondition = SearchModel::searchCondition($customCondition, $customOptions);
-        
         // 组合搜索商品url
         // 组合搜索商品url
         $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']);
         $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']);
         
         
         // 组合搜索分类url
         // 组合搜索分类url
-        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']);
+        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['sortCondition']);
         
         
         //用户浏览记录
         //用户浏览记录
         //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);
         //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);

@@ -20,7 +20,7 @@ class NewModel
         // 组合搜索商品url
         // 组合搜索商品url
         $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']);
         $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']);
         // 组合搜索分类url
         // 组合搜索分类url
-        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']);
+        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['sortCondition']);
         // 组合搜索最新上架url
         // 组合搜索最新上架url
         $urlList['recent'] = HelperSearch::getRecentShelveUrl($searchCondition['condition']);
         $urlList['recent'] = HelperSearch::getRecentShelveUrl($searchCondition['condition']);
         //用户浏览记录
         //用户浏览记录

@@ -23,7 +23,7 @@ class SaleModel
         $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']);
         $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']);
         
         
         // 组合搜索分类url
         // 组合搜索分类url
-        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']);
+        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['sortCondition']);
         
         
         //组合用户浏览记录url
         //组合用户浏览记录url
         //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);
         //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);

@@ -112,6 +112,7 @@ class LoginController extends WebAction
             /* 设置登录有效时间30分钟, 防机器刷 */
             /* 设置登录有效时间30分钟, 防机器刷 */
             $expire = $this->getSession('_LOGIN_EXPIRE');
             $expire = $this->getSession('_LOGIN_EXPIRE');
             if (empty($expire) || $expire < time()) {
             if (empty($expire) || $expire < time()) {
+                $data = array('code' => 400, 'message' => '页面停留时间过长，请刷新页面', 'data' => '');
                 break;
                 break;
             }
             }
 
 
@@ -135,13 +136,13 @@ class LoginController extends WebAction
             }
             }
 
 
             $refer = $this->getCookie('refer');
             $refer = $this->getCookie('refer');
-            if (empty($refer)) {
-                $refer = SITE_MAIN . '/?go=1';
+            if (empty($refer) || strstr($refer, 'signin.html') || strstr($refer, 'passport/login/index')) {
+                $refer = SITE_MAIN;
             }
             }
             else {
             else {
                 $refer = rawurldecode($refer);
                 $refer = rawurldecode($refer);
             }
             }
-            $data['data']['session'] = Helpers::syncUserSession($data['data']['uid']);
+            $data['data']['session'] = Helpers::syncUserSession($data['data']['uid'],$refer);
             $data['data']['href'] = $refer;
             $data['data']['href'] = $refer;
 
 
             $token = Helpers::makeToken($data['data']['uid']);
             $token = Helpers::makeToken($data['data']['uid']);

@@ -166,8 +166,33 @@ class Sale1Controller extends WebAction
             'saleList' => array(
             'saleList' => array(
                 'saleBanner' => array(
                 'saleBanner' => array(
                     'bannerHeight' => 350,
                     'bannerHeight' => 350,
+                    'list' => array(
+                        array(
+                            'bannerHeight' => 350,
                             'img' => 'http://img12.static.yhbimg.com/couponImg/2015/12/10/08/02d4c26f19ca2e44359d69d5cff86167fb.jpg'
                             'img' => 'http://img12.static.yhbimg.com/couponImg/2015/12/10/08/02d4c26f19ca2e44359d69d5cff86167fb.jpg'
                         ),
                         ),
+                        array(
+                            'bannerHeight' => 350,
+                            'img' => 'http://img12.static.yhbimg.com/yhb-img01/2016/01/06/05/02062366574a01418596caa38a773f6beb.jpg?imageView/1/w/1150/h/450'
+                        ),
+                        array(
+                            'bannerHeight' => 350,
+                            'img' => 'http://img11.static.yhbimg.com/yhb-img01/2016/01/06/05/013341a0632177cc3425c3c6082845be57.jpg?imageView/1/w/1150/h/450'
+                        ),
+                        array(
+                            'bannerHeight' => 350,
+                            'img' => 'http://img12.static.yhbimg.com/couponImg/2015/12/10/08/02d4c26f19ca2e44359d69d5cff86167fb.jpg'
+                        ),
+                        array(
+                            'bannerHeight' => 350,
+                            'img' => 'http://img12.static.yhbimg.com/yhb-img01/2016/01/06/05/02062366574a01418596caa38a773f6beb.jpg?imageView/1/w/1150/h/450'
+                        ),
+                        array(
+                            'bannerHeight' => 350,
+                            'img' => 'http://img11.static.yhbimg.com/yhb-img01/2016/01/06/05/013341a0632177cc3425c3c6082845be57.jpg?imageView/1/w/1150/h/450'
+                        )
+                    )
+                ),
                 'saleTitle' => array(
                 'saleTitle' => array(
                     'name' => '全部商品',
                     'name' => '全部商品',
                     'count' => 540
                     'count' => 540