Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0

@@ -2,10 +2,10 @@
     <div class="brand-img-box {{#if right}}right{{/if}} {{#if bottomSpace}}mb10{{/if}}">
         <a href="{{url}}" target="_blank">
         {{# big}}
-            <img class="big-img lazy-img" data-original="{{image src 565 340}}" alt="big-img">
+            <img class="big-img" src="{{image src 565 340}}" alt="big-img">
         {{/ big}}
         {{# small}}
-            <img class="small-img lazy-img {{#if @first}}first{{/if}}" data-original="{{image src 281 285}}" alt="big-img">
+            <img class="small-img {{#if @first}}first{{/if}}" src="{{image src 281 285}}" alt="big-img">
         {{/ small}}
         </a>
 </div>

@@ -120,7 +120,7 @@ const list = (req, res) => {
                     {
                         link: 'http://www.yohoblk.com/editorial',
                         pathTitle: '资讯',
-                        name: '资讯'
+                        name: 'Editorial资讯'
                     },
                     {
                         pathTitle: '资讯',
@@ -185,7 +185,7 @@ const detail = (req, res, next) => {
                     {
                         link: 'http://www.yohoblk.com/editorial',
                         pathTitle: '资讯',
-                        name: '资讯'
+                        name: 'Editorial资讯'
                     },
                     {
                         pathTitle: '资讯',

@@ -38,9 +38,12 @@ const list = {
                 let nav = [DataHelper.getChannelNav(channel)];
 
                 if (data.filter) {
+                    data.filter.standard = data.standard;
                     data.filter.groupSort = DataHelper.sortConvert(allSort.data.sort);
                     retData.filter = DataHelper.filterHandle(data.filter, q);
                     retData.filter.showPrice = data.total > 10;
+                    retData.filter.showInfo = (retData.filter.style && retData.filter.style.length > 0)
+                        || (data.standard && data.standard.length > 0);  //eslint-disable-line
                     nav = _.concat(nav, retData.filter.nav);
                 }
 
@@ -96,9 +99,12 @@ const list = {
                     let data = camelCase(listData.data);
 
                     if (data.filter) {
+                        data.filter.standard = data.standard;
                         data.filter.groupSort = DataHelper.sortConvert(sortData.data.sort);
                         retData.filter = DataHelper.filterHandle(data.filter, q);
                         retData.filter.showPrice = data.total > 10;
+                        retData.filter.showInfo = (retData.filter.style && retData.filter.style.length > 0)
+                            || (data.standard && data.standard.length > 0);  //eslint-disable-line
                     }
 
                     retData.navPath = {

@@ -29,9 +29,7 @@ const Query = {
             query: query
         };
 
-        Promise.all([Search.queryAllSort({
-            query: query
-        }), Search.queryProduct(q)]).then(allResult => {
+        Promise.all([Search.queryAllSort(q), Search.queryProduct(q)]).then(allResult => {
             let allSort = camelCase(allResult[0]);
             let result = allResult[1];
 
@@ -51,7 +49,6 @@ const Query = {
                     retData.filter.showInfo = (retData.filter.style && retData.filter.style.length > 0)
                         || (data.standard && data.standard.length > 0);  //eslint-disable-line
 
-                    console.log(retData.filter.standard);
                 }
 
                 retData.navPath = {

@@ -134,9 +134,12 @@ const shop = {
                             if (!hasBrand) {
                                 delete q.brand;
                             }
+                            ret.filter.standard = ret.standard;
                             ret.filter.groupSort = DataHelper.sortConvert(allSort.data.sort);
                             data.filter = DataHelper.filterHandle(ret.filter, q);
                             data.filter.showPrice = ret.total > 10;
+                            data.filter.showInfo = (data.filter.style && data.filter.style.length > 0)
+                                || (ret.standard && ret.standard.length > 0);  //eslint-disable-line
                         }
 
                         data.paginationData = {

@@ -91,6 +91,12 @@ const Search = {
         return api.get('', finalParams);
     },
     queryAllSort(params) {
+
+        params = _.clone(params) || {};
+
+        delete params.msort;
+        delete params.misort;
+
         return api.get('', _.assign({
             method: 'web.regular.groupsort'
         }, params), {code: 200});

@@ -23,7 +23,7 @@ const _ = require('lodash');
 function shopMenu(domain, customMenu) {
     let menus = [
         {id: 'index', name: '店铺首页', url: `/product/shop/${domain}`},
-        {id: 'all', name: '全部商品', url: `/product/shop/${domain}/list`, icon: ''},
+        {id: 'all', name: '全部商品', url: `/product/shop/${domain}/list`},
         {id: 'hot', name: '人气单品', url: `/product/shop/${domain}/list?order=s_n_desc`},
         {id: 'new', name: '新品上架', url: `/product/shop/${domain}/list?order=s_t_desc`}
     ];

 var cancelOrder = require('./order/cancel-order');
+var confirmReceive = require('./order/confirm-receive');
 var editOrder = require('./order/edit-order');
 var countDown = require('./order/countdown');
 
@@ -40,6 +41,13 @@ $('.order .edit-btn').on('click', function() {
     }, reload);
 });
 
+$('.complete-btn').on('click', function() {
+    var code = $(this).closest('.order').data('code');
+
+    confirmReceive.done(code);
+
+});
+
 if ($('.left-time').length) {
     countDown.intervalValue = 1000;
     countDown.showSec = true;

@@ -296,11 +296,29 @@ function bindCancelEvent() {
 
 
 function bindExpressEvent() {
+    $('body').on('click', function(e) {
+        if ($(e.target).hasClass('express')) {
+            return false;
+        }
+
+        $('.express-info').each(function(idx, el) {
+            if (!$(el).hasClass('hide')) {
+                $(el).addClass('hide');
+            }
+        });
+    });
+
     $('.express').on('click', function() {
         var $this = $(this);
         var code = $this.closest('.order').data('code');
         var $info = $this.find('.express-info');
 
+        $('.express-info').each(function(idx, el) {
+            if (!$(el).hasClass('hide')) {
+                $(el).addClass('hide');
+            }
+        });
+
         if ($info.length) {
             $info.toggleClass('hide');
         } else {
@@ -318,7 +336,6 @@ function bindConfirmReceiveEvent() {
     });
 }
 
-
 function bindEvent() {
     bindPaginationClick();
     bindDeleteEvent();

@@ -8,6 +8,8 @@ var $ = require('yoho-jquery');
 var Cart = require('./cart/cart');
 var Stepper = require('./cart/stepper');
 
+require('../common/return-top');
+
 $(function() {
     var $this;
     var editable = true;

@@ -396,7 +396,8 @@ Cart = {
                             sizes: color.sizes,
                             pic: color.thumbs[0],
                             selectable: color.total > 0,
-                            colorName: color.name
+                            colorName: color.name,
+                            rbg: color.rgb
                         });
                         if (color.color === defaultColor && color.cur) {
                             defaultImg = color.thumbs[0];

@@ -150,6 +150,7 @@ summary {
 html,
 body {
     font-family: BrownStd, "黑体";
+    color: #1b1b1b;
 }
 
 .clearfix {
@@ -173,7 +174,7 @@ img {
 a {
     outline: none;
     text-decoration: none;
-    color: #000;
+    color: #1b1b1b;
 }
 
 *:focus {

@@ -39,11 +39,12 @@
         width: 140px;
         height: 35px;
         position: absolute;
-        bottom: 29px;
+        bottom: 50px;
         background-color: white;
         outline: none;
-        border: 1pX solid black;
-        font-size: 16px;
+        border: 2px solid black;
+        font-size: 14px;
+        font-weight: bold;
         cursor: pointer;
     }
 }

@@ -89,12 +89,12 @@
 
             &.prev {
                 left: 50%;
-                margin-left: -620px;
+                margin-left: -615px;
             }
 
             &.next {
                 right: 50%;
-                margin-right: -620px;
+                margin-right: -615px;
             }
 
             &:hover {
@@ -161,8 +161,8 @@
             position: relative;
             display: inline-block;
             margin: 0 3px;
-            width: 9px;
-            height: 9px;
+            width: 10px;
+            height: 10px;
             background: #ccc;
             cursor: pointer;
             z-index: 2;

@@ -35,18 +35,22 @@
         }
 
         .brand-text-box {
-            $size: 16px;
+            $size: 14px;
             $line-height: 1.4;
             $lines-to-show: 3;
 
             width: 0;
             border: none;
+            padding-top: 35px !important;
+            padding-bottom: 50px !important;
 
             p {
                 height: calc($size*$line-height*$lines-to-show);
                 width: calc($width-2*$space);
+                margin: 15px 0;
                 padding-right: $space;
                 font-size: $size;
+                font-weight: bold;
                 line-height: $line-height;
                 overflow: hidden;
                 -webkit-line-clamp: $lines-to-show;
@@ -55,6 +59,7 @@
             }
 
             button {
+                width: 120px;
                 left: calc($width/2-$buttonWidth/2); /* stylelint-disable-line */
             }
 

@@ -115,12 +115,17 @@
             height: 30px;
         }
 
+        .table-body {
+            height: 53px;
+        }
+
         .table-body td {
             padding: 8px 0 8px 10px;
         }
 
         .select-row {
             border: solid 2px black;
+            height: 54px;
         }
 
         .width-name {

@@ -17,10 +17,13 @@
             }
         }
 
+        .good-info {
+            width: 515px !important;
+        }
+
         &.returns {
             .good-info {
                 border: none;
-                width: 530px !important;
 
                 .detail {
                     width: 380px !important;

 .blk-cart-page {
     .cart-header {
-        margin: 50px auto;
+        margin: 10px auto;
         width: 100%;
         padding: 30px;
         border-bottom: 1px solid #eee;
@@ -11,7 +11,7 @@
 
         .toggle-chk {
             span {
-                font-weight: bold;
+                font-weight: normal;
             }
             .not-checked {
                 color: #999;
@@ -38,8 +38,8 @@
         }
 
         .iconfont {
-            font-size: 16px;
-            line-height: 16px;
+            font-size: 14px;
+            line-height: 14px;
         }
 
         .item {

@@ -63,9 +63,6 @@ $hoverColor: #379ed6;
             }
 
             .toggle-chk-item {
-                span {
-                    font-weight: bold;
-                }
                 .not-checked {
                     color: #999;
                 }
@@ -85,8 +82,8 @@ $hoverColor: #379ed6;
             }
 
             .iconfont {
-                font-size: 16px;
-                line-height: 16px;
+                font-size: 14px;
+                line-height: 14px;
             }
 
             .pro-info {

@@ -672,6 +672,7 @@
     .invoice-content-radio {
         display: inline-block;
         cursor: pointer;
+        width: 115px;
     }
 
     .row {
@@ -680,6 +681,11 @@
 
         .iconfont {
             font-size: 16px;
+            color: #e0e0e0;
+        }
+
+        .checked {
+            color: #1b1b1b;
         }
 
         .input {

@@ -6,9 +6,6 @@
         padding: 30px;
         border: 1px solid #eee;
         .toggle-chk {
-            span {
-                font-weight: bold;
-            }
             .not-checked {
                 color: #999;
             }
@@ -28,8 +25,8 @@
         }
 
         .iconfont {
-            font-size: 16px;
-            line-height: 16px;
+            font-size: 14px;
+            line-height: 14px;
         }
 
         .action {

@@ -14,7 +14,7 @@
     {{# sub_express_deatil}}
     {{#if @first}}
     <div class="tip">
-        <p>以上为最新跟踪信息<a href='/me/order/detail?code={{order_code}}'>查看全部</a></p>
+        <p>以上为最新跟踪信息<a href='/me/order/detail?orderCode={{order_code}}' target="_blank">查看全部</a></p>
     </div>
     {{/if}}
     {{/ sub_express_deatil}}