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

 <div class="ad-banner">
     {{#adBanner}}
         <a href="{{url}}" target="_blank">
-            <img class="lazy-img" data-original="{{image src 1150 160}}" title="{{title}}" alt="{{alt}}">
+            <img class="lazy-img" data-original="{{image src 1150 163}}" title="{{title}}" alt="{{alt}}">
         </a>
     {{/adBanner}}
 </div>

@@ -2,9 +2,8 @@
     <div class="slide-wrapper">
         <ul>
             {{# slider}}
-            <li style="{{#if bgColor}}background:{{bgColor}}{{/if}}">
                 <a href="{{url}}" target= "_blank">
-                    <img class="lazy" data-original="{{image src 1150 570}}" alt="">
+                    <li class="banner-item" style="{{#if bgColor}}background-color:{{bgColor}}{{/if}}; background-image:url('{{image src 1150 570}}')">
                 </a>
                 {{# tips}}
                 <div class="slide-tips">

 /**
- * [个人中心]收货地址
  * @author: jiangmin
  * @date: 2016/07/05
  */
@@ -23,10 +22,11 @@ const _setDefault = (id, uid) => {
 const index = (req, res, next) => {
     let uid = req.user.uid;
 
-    addressModel.getAddressDataAsync(uid, 20).then(result => {
-        let resultData = result.data ? result.data : result;
-        let length = resultData.length ? (resultData.length > 7 ? 7 : resultData.length) : 0;
+    Promise.all([addressModel.getAddressDataAsync(uid, 20), mcHandler.getMeThumb()]).then(result => {
+        let resultData = result[0].data ? result[0].data : [];
+        let length = resultData.length > 7 ? 7 : resultData.length;
         let reg = /(\d{3})\d{4}(\d{4})/;
+        let thumb = result[1];
 
         for (let i = 0; i < length; i++) {
             resultData[i].default = resultData[i].is_default === 'Y';
@@ -34,6 +34,7 @@ const index = (req, res, next) => {
         }
         resultData.leftLength = 7 - length;
         resultData.length = length;
+
         res.display('index', {
             module: 'me',
             page: 'address',
@@ -41,7 +42,7 @@ const index = (req, res, next) => {
             content: {
                 nav: mcHandler.getMeCrumb('收货地址'),
                 navigation: mcHandler.getSideMenu('收货地址'),
-                banner: 'http://placehold.it/150x120',
+                banner: thumb,
                 address: true,
                 title: '收货地址',
                 data: resultData

@@ -47,14 +47,16 @@ const index = (req, res, next) => {
     let date2 = getDate(beginTime);
     let selectIndex = parseInt((date1 - date2) / (90 * 3600 * 24), 10);
 
-    currencyModel.getIndexData(uid, page, queryType, beginTime).then(result=> {
-        result.list.tabs[queryType].isActive = true;
-        result.list.coinList.forEach(function(x) {
+    Promise.all([currencyModel.getIndexData(uid, page, queryType, beginTime), mcHandler.getMeThumb()]).then(result => {
+        const thumb = result[1];
+
+        result[0].list.tabs[queryType].isActive = true;
+        result[0].list.coinList.forEach(function(x) {
             x.date = x.date.replace(/\-/g, '.');
         });
-        result.list.selects[selectIndex > 2 ? 2 : selectIndex].isSelected = 'selected';
-        if (result.list.paginationOpts) {
-            result.list.paginationOpts.queryParams = {
+        result[0].list.selects[selectIndex > 2 ? 2 : selectIndex].isSelected = 'selected';
+        if (result[0].list.paginationOpts) {
+            result[0].list.paginationOpts.queryParams = {
                 queryType: queryType,
                 beginTime: beginTime
             };
@@ -67,16 +69,16 @@ const index = (req, res, next) => {
             content: {
                 nav: mcHandler.getMeCrumb('我的YOHO币'),
                 navigation: mcHandler.getSideMenu('我的YOHO币'),
-                banner: 'http://placehold.it/150x120',
+                banner: thumb,
                 currency: true,
-                tabs: result.list.tabs,
+                tabs: result[0].list.tabs,
                 title: '我的YOHO币',
                 currentYear: new Date().getFullYear(),
-                data: result.list.coinList,
-                paginationOpts: result.list.paginationOpts,
-                num: result.num.data,
-                selects: result.list.selects,
-                total: result.list.total ? result.list.total : 0
+                data: result[0].list.coinList,
+                paginationOpts: result[0].list.paginationOpts,
+                num: result[0].num.data,
+                selects: result[0].list.selects,
+                total: result[0].list.total ? result[0].list.total : 0
             }
         });
     }).catch(next);

@@ -36,13 +36,15 @@ const favorite = {
             }
         };
 
-        FavoriteData.getFavoriteProduct({
+        Promise.all([FavoriteData.getFavoriteProduct({
             page: 1,
             limit: 500,
             uid: uid
-        }).then(result => {
-            if (result && result.code === 200 && result.data) {
-                let data = camelCase(result.data);
+        }), mcHandler.getMeThumb()]).then(result => {
+            let thumb = result[1];
+
+            if (result[0] && result[0].code === 200 && result[0].data) {
+                let data = camelCase(result[0].data);
                 let retData = {
                     siteUrl: config.siteUrl
                 };
@@ -80,16 +82,15 @@ const favorite = {
                         p.stateText = '已售罄';
                     }
                     p.url = `/product/pro_${p.productId}_${p.goodsId}/${p.cnAlphabet}.html`;
-                    p.imageUrl = p.image;
+                    p.imageUrl = p.image.replace('imageMogr2', 'imageMogr1');
                 });
 
                 ret.content.favorite.data = retData;
+                ret.content.banner = thumb;
             }
 
-
             res.display('index', ret);
         }).catch(next);
-
     },
 
     // 品牌收藏页
@@ -115,13 +116,15 @@ const favorite = {
             }
         };
 
-        FavoriteData.getFavoriteBrand({
+        Promise.all([FavoriteData.getFavoriteBrand({
             page: page,
             limit: limit,
             uid: uid
-        }).then(result => {
-            if (result && result.code === 200 && result.data) {
-                let data = camelCase(result.data);
+        }), mcHandler.getMeThumb()]).then(result => {
+            let thumb = result[1];
+
+            if (result[0] && result[0].code === 200 && result[0].data) {
+                let data = camelCase(result[0].data);
                 let retData = {
                     siteUrl: config.siteUrl
                 };
@@ -148,6 +151,7 @@ const favorite = {
                     });
                 }
                 ret.content.favorite.data = retData;
+                ret.content.banner = thumb;
             }
 
             res.display('index', ret);
@@ -177,13 +181,15 @@ const favorite = {
             }
         };
 
-        FavoriteData.getFavoriteEditoreial({
+        Promise.all([FavoriteData.getFavoriteEditoreial({
             uid: uid,
             page: page,
             limit: limit
-        }).then(result => {
-            if (result && result.code === 200 && result.data) {
-                let data = camelCase(result.data);
+        }), mcHandler.getMeThumb()]).then(result => {
+            let thumb = result[1];
+
+            if (result[0] && result[0].code === 200 && result[0].data) {
+                let data = camelCase(result[0].data);
                 let retData = {
                     siteUrl: config.siteUrl,
                     editorialList: data.data
@@ -199,6 +205,7 @@ const favorite = {
                 };
 
                 ret.content.favorite.data = retData;
+                ret.content.banner = thumb;
             }
             res.display('index', ret);
         }).catch(next);

@@ -43,10 +43,24 @@ const refund = (req, res, next) => {
         return next();
     }
 
-    returns.getRefundGoodsData(code, uid).then(result => {
+    // returns.getRefundGoodsData(code, uid).then(result => {
+    //     res.display('index', {
+    //         page: 'refund',
+    //         content: result
+    //     });
+    // }).catch(next);
+
+    Promise.all([returns.getRefundGoodsData(code, uid), mcHandler.getMeThumb()]).then(result => {
+        let refundGoods = result[0];
+        let thumb = result[1];
+
         res.display('index', {
             page: 'refund',
-            content: result
+            content: Object.assign({
+                nav: mcHandler.getMeCrumb('我的退/换货'),
+                navigation: mcHandler.getSideMenu('我的退/换货'),
+                banner: thumb
+            }, refundGoods)
         });
     }).catch(next);
 };
@@ -85,10 +99,17 @@ const refundDetail = (req, res, next) => {
         return next();
     }
 
-    returns.getRefundDetailData(applyId, uid).then(result => {
+    Promise.all([returns.getRefundDetailData(applyId, uid), mcHandler.getMeThumb()]).then(result => {
+        let refundDetailData = result[0];
+        let thumb = result[1];
+
         res.display('index', {
             page: 'refund-detail',
-            content: result
+            content: Object.assign({
+                nav: mcHandler.getMeCrumb('我的退/换货'),
+                navigation: mcHandler.getSideMenu('我的退/换货'),
+                banner: thumb
+            }, refundDetailData)
         });
     }).catch(next);
 };
@@ -100,15 +121,18 @@ const exchange = (req, res, next) => {
     const code = parseInt(req.query.orderCode, 10);
     const uid = req.user.uid;
 
-    returns.getChangeGoodsList(code, uid).then(result => {
+    Promise.all([returns.getChangeGoodsList(code, uid), mcHandler.getMeThumb()]).then(result => {
+        let exchangeData = result[0];
+        let thumb = result[1];
+
         res.display('index', {
             page: 'exchange',
             isMe: true,
             content: Object.assign({
                 nav: mcHandler.getMeCrumb('我的退/换货'),
                 navigation: mcHandler.getSideMenu('我的退/换货'),
-                banner: 'http://placehold.it/{width}x{height}'
-            }, result)
+                banner: thumb
+            }, exchangeData)
         });
     }).catch(next);
 };
@@ -136,7 +160,8 @@ const exchangeDeatail = (req, res) => {
     let id = parseInt(req.query.orderCode, 10),
         uid = req.user.uid;
 
-    returns.getExchangeDetailData(id, uid).then(result => {
+    Promise.all([returns.getExchangeDetailData(id, uid), mcHandler.getMeThumb()]).then(result => {
+        let thumb = result[1];
 
         res.display('index', {
             page: 'exchange-detail',
@@ -144,14 +169,13 @@ const exchangeDeatail = (req, res) => {
             content: {
                 nav: mcHandler.getMeCrumb('我的退/换货'),
                 navigation: mcHandler.getSideMenu('我的退/换货'),
-                banner: 'http://placehold.it/{width}x{height}',
+                banner: thumb,
                 returns: {
                     title: '换货申请',
-                    exchange: result.exchangeDetail
+                    exchange: result[0].exchangeDetail
                 }
             }
         });
-
     });
 };
 

@@ -79,26 +79,28 @@ const _getTitle = (type)=> {
 const index = (req, res, next) => {
     let uid = req.user.uid;
 
-    settingModel.getUserInfo(uid).then(result=> {
-        result.info.gender ? result.genders[result.info.gender - 1].checked = true :
-            result.genders[2].checked = true;
-        result.info.head_ico = result.info.head_ico ? helpers.image(result.info.head_ico, 400, 300, 2) : '';
-        result.info.mobile = result.info.mobile ? result.info.mobile.replace(regMobile, '$1****$2') : '';
-        result.stepUrl = '/me/setting/step1';
-        if (result.info.birthday) {
-            let a = result.info.birthday.split('-');
-
-            _.forEach(result.date.selectYear, function(x) {
+    Promise.all([settingModel.getUserInfo(uid), mcHandler.getMeThumb()]).then(result => {
+        const thumb = result[1];
+
+        result[0].info.gender ? result[0].genders[result[0].info.gender - 1].checked = true :
+            result[0].genders[2].checked = true;
+        result[0].info.head_ico = result[0].info.head_ico ? helpers.image(result[0].info.head_ico, 400, 300, 2) : '';
+        result[0].info.mobile = result[0].info.mobile ? result[0].info.mobile.replace(regMobile, '$1****$2') : '';
+        result[0].stepUrl = '/me/setting/step1';
+        if (result[0].info.birthday) {
+            let a = result[0].info.birthday.split('-');
+
+            _.forEach(result[0].date.selectYear, function(x) {
                 if (x.value === a[0]) {
                     x.isSelected = 'selected';
                 }
             });
-            _.forEach(result.date.selectMonth, function(x) {
+            _.forEach(result[0].date.selectMonth, function(x) {
                 if (parseInt(x.value, 10) === parseInt(a[1], 10)) {
                     x.isSelected = 'selected';
                 }
             });
-            _.forEach(result.date.selectDay, function(x) {
+            _.forEach(result[0].date.selectDay, function(x) {
                 if (parseInt(x.value, 10) === parseInt(a[2], 10)) {
                     x.isSelected = 'selected';
                 }
@@ -112,10 +114,10 @@ const index = (req, res, next) => {
             content: {
                 nav: mcHandler.getMeCrumb('个人设置'),
                 navigation: mcHandler.getSideMenu('个人设置'),
-                banner: 'http://placehold.it/150x120',
+                banner: thumb,
                 setting: true,
                 title: '个人设置',
-                userInfo: result
+                userInfo: result[0]
             }
         });
     }).catch(next);

@@ -62,7 +62,7 @@ const navigation = [
 const getMeCrumb = name => {
     return [
         {
-            link: blk.config.sitUrl,
+            link: blk.config.siteUrl,
             name: 'YOHO!BLK首页'
         },
         {

@@ -178,6 +178,8 @@ const _convertAddress = (addressList, createTime) => {
     // 增加一个默认初始状态
     addrList.push({
         time: createTime,
+        city: '默认 ',
+        hide: true,
         action: '您的订单已提交，等待付款'
     });
 
@@ -228,7 +230,7 @@ const _getDetail = (uid, code) => {
         uid: uid,
         order_code: code
     }, {
-        cache: true
+        cache: 100
     });
 };
 
@@ -248,7 +250,7 @@ const _getUserOrder = (uid, type, page) => {
         page: page,
         limit: pageSize
     }, {
-        cache: true
+        cache: 100
     }).then(result => {
         let orderList = [];
         let total = false;

@@ -22,7 +22,7 @@
                 </ul>
                 <ul class="column city">
                 {{# addressList}}
-                    <li class="text">{{city}}</li>
+                <li class="text {{#if hide}}vhide{{/if}}">{{city}}</li>
                 {{/ addressList}}
                 </ul>
                 <ul class="column action">

@@ -2,7 +2,6 @@
     <div class="order">
     {{# returnsList}}
         {{> common/subtitle}}
-        {{#if list}}
         <div class="table">
             <ul class="header">
                 <li class="info">商品信息</li>
@@ -10,6 +9,7 @@
                 <li class="op">操作</li>
             </ul>
         </div>
+        {{#if list}}
         {{#list}}
         <div class="table">
             {{> order/order-header}}

@@ -708,12 +708,16 @@ const setSizeData = (sizeInfo) => {
             }
 
             _.forEach(sizeInfo.sizeInfoBo.sizeAttributeBos, value => {
-                sizeTable.thead.push({
+                let th = {
                     name: value.attributeName || ' ',
                     id: value.id,
-                    doubt: true,
                     width: 126
-                });
+                };
+
+                if (size.sizeImage) {
+                    th.doubt = true;
+                }
+                sizeTable.thead.push(th);
             });
 
             sizeTable.tbody = [];

@@ -127,16 +127,18 @@ const ShopService = {
                 brandId: domainInfo.id,
                 shopId: ''
             };
+            let brandId = domainInfo.id;
 
             if (domainInfo.shopId) {
                 let shopId = domainInfo.shopId;
                 let shopIntro = yield ShopService.getShopIntro(shopId, uid);
+                let brandInfo = yield BrandService.getBrandInfo(brandId, uid);
 
                 info.shopId = shopId;
                 info.name = shopIntro.shopName;
                 info.info = shopIntro.shopIntro;
                 info.btnName = '品牌介绍';
-                info.isFavorite = shopIntro.isFavorite === 'Y';
+                info.isFavorite = brandInfo.isFavorite === 'Y';
 
                 let shopData = yield Promise.all([ShopService.getShopDecorator(shopId),
                     ShopService.getShopSecondSorts(domainInfo.id, shopId)]);
@@ -152,7 +154,6 @@ const ShopService = {
                 info.resources = resources;
                 info.menus = shopMenu(domain, resources.navigationBar);
             } else {
-                let brandId = domainInfo.id;
                 let brandInfo = yield BrandService.getBrandInfo(brandId, uid);
 
                 info.name = brandInfo.brandName;

@@ -186,27 +186,29 @@
                             <span class="cn">{{titleCn}}</span>
                         </label>
                     </div>
-                    <ul class="des-basic clearfix">
-                        {{# basic}}
-                            <li>
-                                {{key}}: {{value}}
-                            </li>
-                        {{/ basic}}
-                    </ul>
-                    {{#if comfort}}
-                        <ul class="des-comfort clearfix">
-                            {{# comfort}}
+                    <div class="des-wrapper">
+                        <ul class="des-basic clearfix">
+                            {{# basic}}
                                 <li>
-                                    {{name}}: 
-                                    <span class="min-des">{{minDes}}</span>
-                                    {{# blocks}}
-                                        <span class="comfort-block{{#if cur}} cur{{/if}}"></span>
-                                    {{/ blocks}}
-                                    <span class="max-des">{{maxDes}}</span>
+                                    {{key}}: {{value}}
                                 </li>
-                            {{/ comfort}}
+                            {{/ basic}}
                         </ul>
-                    {{/if}}
+                        {{#if comfort}}
+                            <ul class="des-comfort clearfix">
+                                {{# comfort}}
+                                    <li>
+                                        {{name}}: 
+                                        <span class="min-des">{{minDes}}</span>
+                                        {{# blocks}}
+                                            <span class="comfort-block{{#if cur}} cur{{/if}}"></span>
+                                        {{/ blocks}}
+                                        <span class="max-des">{{maxDes}}</span>
+                                    </li>
+                                {{/ comfort}}
+                            </ul>
+                        {{/if}}
+                    </div>
                 </div>
             {{/ description}}
 

@@ -2,7 +2,9 @@
     <div class="center-content">
         <ul class="about-us clearfix">
             <li><a href="{{siteUrl}}">BLK首页</a></li>
-            <li><a href="{{siteUrl}}/help" target="_blank">客户服务</a></li>
+            <li>
+                <a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank">客户服务</a>
+            </li>
             <li><a href="{{siteUrl}}/help?id=2" target="_blank">支付方式</a></li>
             <li><a href="{{siteUrl}}/help?id=31" target="_blank">配送方式</a></li>
             <li><a href="{{siteUrl}}/help?id=41" target="_blank">售后服务</a></li>

@@ -48,21 +48,7 @@
                     </a>
                     <div class="mini-bag-box sub-wrapper">
                         <div class="bag-goods bag-empty">
-                            <dl class="mini-goods-list">
-                                <dd class="goods-item clearfix">
-                                    <div class="thumb">
-                                        <img src="//placehold.it/48x64">
-                                    </div>
-                                    <div class="info">
-                                        <a href="">范德萨发生大幅度是</a>
-                                        <p>颜色：黄 尺码：F</p>
-                                    </div>
-                                    <div class="price">
-                                        <p>¥199.00 X1</p>
-                                        <a href="#">删除</a>
-                                    </div>
-                                </dd>
-                            </dl>
+                            <dl class="mini-goods-list"></dl>
                             <div class="go-bag-btn">
                                 <a href="{{../siteUrl}}/shopping/cart">去购物车结算</a>
                             </div>

@@ -62,8 +62,7 @@
                         <div class="search-input">
                             <form id="search-form" action="{{../siteUrl}}/product/query">
                                 <span class="iconfont left">&#xe605;</span>
-                                <input type="text" name="query" id="search-key" class="search-key" placeholder="search"
-                                       autocomplete="off">
+                                <input type="text" name="query" id="search-key" class="search-key" autocomplete="off">
                                 <span class="iconfont right clear-input">&#xe608;</span>
                             </form>
                         </div>

@@ -167,21 +167,22 @@ $searchKey.keyup(function(e) {
 });
 
 // ie8输入框提示特殊处理
-if (!!window.ActiveXObject && !!document.documentMode) {
-    $searchKey.focus(function() {
-        var key = $searchKey.val();
+// 应产品要求所有浏览器获得焦点提示文字隐藏
+// if (!!window.ActiveXObject && !!document.documentMode) {
+$searchKey.focus(function() {
+    var key = $searchKey.val();
 
-        if (key === 'search') {
-            $searchKey.val('').css('color', '#fff');
-        }
-    }).blur(function() {
-        var key = $searchKey.val();
+    if (key === 'search') {
+        $searchKey.val('').css('color', '#fff');
+    }
+}).blur(function() {
+    var key = $searchKey.val();
 
-        if ($.trim(key) === '') {
-            $searchKey.val('search').css('color', '#aaa');
-        }
-    }).val('search').css('color', '#aaa');
-}
+    if ($.trim(key) === '') {
+        $searchKey.val('search').css('color', '#aaa');
+    }
+}).val('search').css('color', '#aaa');
+// }
 
 $clearInput.click(function() {
     $searchKey.val('');

 var $ = require('yoho-jquery'),
-    Confirm = require('../plugins/dialog').Confirm;
+    Confirm = require('../plugins/dialog').Confirm,
+    lazyLoad = require('yoho-jquery-lazyload');
 
 var id = $('.exchange-detail-page').data('id');
 
@@ -14,6 +15,8 @@ var $expressCompany = $('.express-company'),
 var expressList = $editExpress.data(),
     remark = $('.reason-info').find('span').text().length;
 
+lazyLoad($('.banner-img'));
+
 function cancelExchangeApply() {
     $.ajax({
         type: 'POST',

 var colorTpl = require('../../tpl/me/color-list.hbs');
 var sizeTpl = require('../../tpl/me/size-list.hbs');
+var lazyLoad = require('yoho-jquery-lazyload');
 
 var dialog = require('../plugins/dialog');
 var _alert = dialog.Alert;
@@ -42,6 +43,8 @@ var validateMap = {
     }
 };
 
+lazyLoad($('.banner-img'));
+
 // 添加.check方法
 require('../plugins/check');
 

@@ -54,6 +54,17 @@ if ($('.left-time').length) {
     countDown.start();
 }
 
+$('body').on('click', function(e) {
+    if ($(e.target).hasClass('show-package')) {
+        return false;
+    }
+
+    e.preventDefault();
+
+    if (!$('.package-list').hasClass('hide')) {
+        $('.package-list').addClass('hide');
+    }
+});
 
 $('.show-package').on('click', function() {
     $(this).next('.package-list').toggleClass('hide');

@@ -29,7 +29,7 @@ module.exports = {
         var timeStr = min + '分';
 
 
-        if (src <= 0) {
+        if (parseInt(src, 10) <= 0) {
             timeStr = '已失效';
             $('.hide-when-invalid').hide();
             $('.user-order .table .common-column .pay-operation .left-time').css('margin-left', '0');

@@ -25,6 +25,8 @@ require('yoho-jquery-dotdotdot');
 require('../common/header'); // header
 require('../common/return-top'); // return-top
 
+lazyload($('.banner-img'));
+
 // dot
 $('.goods-item .title').dotdotdot({
     wrap: 'letter'

@@ -26,6 +26,8 @@ var imgBoxTpl = require('../../tpl/me/thumbnail.hbs');
 
 var checked;
 
+lazyload($('.banner-img'));
+
 $('.blk-footer .return-top').remove(); // 移除通用的返回顶部组件
 
 require('yoho-jquery-dotdotdot');

@@ -12,11 +12,11 @@ function _favBack(data) {
     }
 }
 
-function _favShop(shopId, isAdd) {
-    $.post('/product/shop/togglecollect', {shopId: shopId, type: isAdd ? '' : 'add'}, function(data) {
-        _favBack(data);
-    });
-}
+// function _favShop(shopId, isAdd) {
+//     $.post('/product/shop/togglecollect', {shopId: shopId, type: isAdd ? '' : 'add'}, function(data) {
+//         _favBack(data);
+//     });
+// }
 
 function _favBrand(brandId, isAdd) {
     $.post('/product/brand/togglecollect', {brandId: brandId, type: isAdd ? '' : 'add'}, function(data) {
@@ -26,13 +26,8 @@ function _favBrand(brandId, isAdd) {
 
 $('#brand-fav').click(function() {
     var $banner = $(this).parents('.brand-banner');
-    var shopId = $banner.data('shop');
     var brandId = $banner.data('brand');
     var isAdd = $(this).hasClass('coled');
 
-    if (shopId) {
-        _favShop(shopId, isAdd);
-    } else if (brandId) {
-        _favBrand(brandId, isAdd);
-    }
+    _favBrand(brandId, isAdd);
 });

 .ad-banner {
-    height: 160px;
+    height: 163px;
     margin-top: 15px;
 
     img {

 .editorial-container {
     $bigImgWidth: 390px;
-    $smallImgWidth: 358px;
-    $smallImgHeight: 243px;
+    $smallImgWidth: 360px;
+    $smallImgHeight: 240px;
     $space: 10px;
 
     @extend .resource-container;
@@ -19,7 +19,7 @@
             position: relative;
 
             &.bottom-space {
-                margin-bottom: 14px;
+                margin-bottom: 15px;
             }
 
             &.right-space {

 .home-page {
     $sliderHeight: 600px;
 
-    margin: 10px auto 0;
-
     .top-slider-container {
         height: $sliderHeight;
     }
@@ -12,6 +10,11 @@
         left: 0;
         right: 0;
         height: $sliderHeight;
+
+        .banner-item {
+            background-position: center;
+            background-repeat: no-repeat;
+        }
     }
 
     .slide-pagination {

@@ -5,7 +5,7 @@
 
     @extend .resource-container;
 
-    height: calc($textHeight+$imgHeight+60px);/* 60px is the height of the floor header */
+    height: calc($textHeight+$imgHeight+90px);/* 60px is the height of the floor header */
 
     .arrival-item-box {
         box-sizing: border-box;

@@ -25,7 +25,6 @@
 
         &:hover {
             height: 50px;
-            border-bottom: 2px solid #9a9a9a;
 
             > * {
                 color: #9a9a9a;
@@ -74,7 +73,6 @@
             &:hover {
                 color: #9a9a9a;
                 height: 50px;
-                border-bottom: 2px solid #9a9a9a;
                 cursor: default;
             }
 
@@ -157,7 +155,7 @@
             .bag-content {
                 padding: 280px 0 130px;
                 text-align: center;
-                color: #1d1d1d;
+                color: #1b1b1b;
                 background: resolve('layout/bag-bg.png') no-repeat center center;
                 display: none;
             }
@@ -193,7 +191,7 @@
         .goods-item {
             line-height: 2;
             padding: 6px 0;
-            color: #1d1d1d;
+            color: #1b1b1b;
             font-size: 14px;
 
             & > * {
@@ -249,11 +247,11 @@
             }
 
             .cur {
-                border-bottom: 2px solid #1d1d1d;
+                border-bottom: 2px solid #1b1b1b;
             }
 
             .cur > a {
-                color: #1d1d1d;
+                color: #1b1b1b;
             }
         }
 
@@ -276,7 +274,7 @@
 
     .sub-nav {
         height: 50px;
-        background: #1d1d1d;
+        background: #1b1b1b;
 
         .sub-nav-list {
             max-width: 94%;
@@ -325,7 +323,7 @@
             top: 50px;
             right: 0;
             position: absolute;
-            background: #1d1d1d;
+            background: #1b1b1b;
             text-align: left;
             display: none;
             z-index: 10;

@@ -22,6 +22,7 @@
             width: 100%;
             height: 100%;
             margin-top: -1px;
+            margin-left: 0.1px;
         }
     }
 

@@ -69,4 +69,8 @@
             left: 3px;
         }
     }
+
+    .check-all:hover {
+        @extend .blue;
+    }
 }

@@ -269,6 +269,11 @@
             }
         }
 
+        .des-wrapper {
+            width: 950px;
+            overflow: hidden;
+        }
+
         .des-basic {
             width: 1140px;
 
@@ -430,7 +435,6 @@
         border: 1px solid #f3f3f3;
         padding: 40px 130px;
         margin-top: 80px;
-        overflow: hidden;
 
         .block-title {
             height: 0;
@@ -453,15 +457,6 @@
             }
         }
     }
-
-    + .arr-notice-dialog {
-        .content {
-            width: 260px;
-            text-align: center;
-            margin: 0 auto;
-        }
-
-    }
 }
 
 .arr-notice-dialog {

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