handle merge

@@ -21,15 +21,15 @@ const index = (req, res, next) => {
     if (channel === 'women') {
         contentCode = '527079e6c46d0f125eb46b835968971b';
         name = 'WOMEN首页';
-        link = 'http://www.yohoblk.com';
+        link = 'http://www.yohoblk.com/women';
     } else if (channel === 'lifestyle') {
         contentCode = '94b5ed607b6d565ffc29c2c04be121dc';
         name = 'LIFT STYLE首页';
-        link = 'http://www.yohoblk.com/women';
+        link = 'http://www.yohoblk.com/lifestyle';
     } else {
         contentCode = '81886aaa5e82e3741bc1ba1e04ec7706';
         name = 'MEN首页';
-        link = 'http://www.yohoblk.com/lifestyle';
+        link = 'http://www.yohoblk.com';
     }
 
     let appType = 1;

@@ -124,7 +124,7 @@ const list = (req, res) => {
                     },
                     {
                         pathTitle: '资讯',
-                        name: req.query.query
+                        name: req.query.query || result.authorName
                     }
                 ],
                 pathTitle: req.query.query || result.authorName,

@@ -36,6 +36,7 @@ const _processListData = (list) => {
     });
 
     _.forEach(list.list.artList, (data) => {
+        // console.log(data)
 
         if (data.author) {
             listData = _.assign(listData, {
@@ -151,7 +152,6 @@ const _processHeadData = (list) => {
         _.forEach(list, function(data, index) {
 
             if (index === 0) {
-
                 data.isPraise = data.isPraise === 'Y';
                 data.isFavor = data.isFavor === 'Y';
 
@@ -340,13 +340,19 @@ const _processContentData = (list) => {
  * @param id
  * @returns {*}
  */
+
 const _getHeadData = (id, uid, udid, appType) => {
-    return serviceAPI.get('/guang/api/*/article/getArticleBaseInfo', {
+    let par = {
         id: id,
-        uid: uid,
         udid: udid,
         app_type: appType
-    }).then((result) => {
+    };
+
+    if (uid) {
+        par.uid = uid;
+    }
+
+    return serviceAPI.get('/guang/api/*/article/getArticleBaseInfo', par).then((result) => {
         if (result && result.code === 200) {
             return result.data;
         } else {

@@ -26,7 +26,13 @@ const getMeThumb = () => {
         cache: true,
         code: 200
     }).then(result => {
-        return result.data.list[0].data[0].src;
+
+        let thumb = {
+            banner: result.data.list[0].data[0].src,
+            url: result.data.list[0].data[0].url
+        };
+
+        return thumb;
     });
 };
 

@@ -178,6 +178,8 @@ const _convertAddress = (addressList, createTime) => {
     // 增加一个默认初始状态
     addrList.push({
         time: createTime,
+        city: '默认 ',
+        hide: true,
         action: '您的订单已提交，等待付款'
     });
 
@@ -436,11 +438,13 @@ const getOrderData = (uid, type, page) => {
         2: {
             emptyMsg: '没有待付款的订单哦~',
             btnText: '查看全部订单',
+            showEmptyEn: true,
             url: '/me/'
         },
         3: {
             emptyMsg: '没有待收货的订单哦~',
             btnText: '查看全部订单',
+            showEmptyEn: true,
             url: '/me/'
         }
     };

@@ -73,7 +73,6 @@ const getUserReturn = (uid, page) => {
                 }
             } : false;
 
-
             data.list.forEach(item => {
                 item.orderGoods = item.goods;
                 item.createTime = item.orderCreateTime;
@@ -644,7 +643,7 @@ const _setExchangeDetailData = (data) => {
                 list.reminder = true;
                 list.inDoor = true;
                 list.auditSuccess = true;
-                list.view = `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`;
+                list.view = `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`;
             }
 
             break;
@@ -652,7 +651,7 @@ const _setExchangeDetailData = (data) => {
             if (data.deliveryTpyeName === '寄回换货') {
                 list.takeGoods = true;
                 list.auditSuccess = true;
-                list.view = `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`;
+                list.view = `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`;
             } else {
                 list.takeGoods = true;
             }
@@ -662,14 +661,14 @@ const _setExchangeDetailData = (data) => {
                 send: true,
                 doubt: true,
                 auditSuccess: true,
-                view: `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`
+                view: `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`
             });
             break;
         case 40:
             Object.assign(list, {
                 finish: true,
                 auditSuccess: true,
-                view: `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`
+                view: `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`
             });
             break;
         case 91:

@@ -14,9 +14,11 @@
                         </li>
                     {{/each}}
                 </ul>
-                {{#if banner}}
-                    <img class="banner-img" data-original="{{image banner 150 120}}">
-                {{/if}}
+                {{#banner}}
+                    <a href="{{url}}">
+                        <img class="banner-img" data-original="{{image banner 150 120}}">
+                    </a>
+                {{/banner}}
             </div>
 
             {{!-- 右侧页面内容 --}}

@@ -7,7 +7,7 @@
                 <a href="/me/collection"><span class="badge"></span>商品收藏</a>
             </li>
             <li class="{{#if brand}}active{{/if}}">
-                <a href="/me/collection/brand"><span class="badge"></span>店铺收藏</a>
+                <a href="/me/collection/brand"><span class="badge"></span>品牌收藏</a>
             </li>
             <li class="{{#if editorial}}active{{/if}}">
                 <a href="/me/collection/editorial"><span class="badge"></span>资讯收藏</a>

@@ -2,6 +2,7 @@
 
     {{#if total}}
         <div class="favorite-brands">
+            <span class="num">您共收藏了{{total}}个品牌</span>
             <div class="brands-list clearfix">
                 {{#each brandList}}
                     <div class="brand-raw clearfix">
@@ -80,7 +81,7 @@
         </div>
     {{^}}
         <div class="favorite-empty">
-            <p>您还没有收藏的店铺, 去<a href="{{siteUrl}}">首页</a>看看吧</p>
+            <p>您还没有收藏的品牌, 去<a href="{{siteUrl}}">品牌频道</a>看看吧</p>
         </div>
     {{/if}}
 {{/data}}

@@ -2,6 +2,7 @@
 
     {{#if total}}
         <div class="favorite-editorials">
+            <span class="num">您共收藏了{{total}}篇文章</span>
             <div class="editorial-list clearfix">
                 {{#each editorialList}}
                     <div class="editorial-raw clearfix" data-id="{{id}}">

@@ -30,7 +30,7 @@
 
         <div class="way">
             {{#if takeGoods}}
-            <p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409" target="_blank"><span class="iconfont">&#xe61c;</span></a>在线客服</p>
+            <p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank"><span class="iconfont">&#xe61c;</span></a>在线客服</p>
             {{/if}}
 
             {{#if reminder}}
@@ -50,7 +50,7 @@
             {{/if}}
 
             {{#if doubt}}
-            <p class="contact">如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409" target="_blank"><span class="iconfont">&#xe61c;</span>在线客服</p></a>
+            <p class="contact">如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank"><span class="iconfont">&#xe61c;</span>在线客服</p></a>
             {{/if}}
 
             {{#if auditSuccess}}
@@ -155,7 +155,9 @@
                 <span>问题描述：{{remark}}</span>
                 <div class="reason-img">照片凭证：
                     <div class="evidence">
-                        <img src="{{evidenceImages}}">
+                        {{# evidenceImages}}
+                        <img src="{{image . 70 90}}">
+                        {{/ evidenceImages}}
                     </div>
                 </div>
             </div>

@@ -19,9 +19,13 @@
     <h4 class="status-title">发票信息</h4>
     {{#if invoice}}
     {{# invoice}}
+    {{#if showInvoice}}
     <p class="text">发票类型：{{typeText}}</p>
     <p class="text">发票抬头：{{title}}</p>
     <p class="text">发票内容：{{contentValue}}</p>
+    {{^}}
+    <p class="text">暂不需要发票</p>
+    {{/if}}
     {{/ invoice}}
     {{^}}
     <p class="text">暂不需要发票</p>

@@ -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">

@@ -7,7 +7,7 @@
             {{# btns}}
                 <li>
                     {{#if isPayBtn}}
-                    <a href="{{payUrl}}">
+                    <a href="{{payUrl}}" target="_blank">
                         <span class="{{classStr}}">{{name}}</span>
                     </a>
                     {{^}}

@@ -10,6 +10,8 @@
         <span>尺码：
             <span class="bold">{{sizeName}}</span>
         </span>
+        {{#if buyNumber}}
         <p class="bold buy-number"><span class="iconfont">&#xe61d;</span>{{buyNumber}}</p>
+        {{/if}}
     </div>
 </div>

@@ -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}}

@@ -49,27 +49,25 @@
                 </div>
             </li>
 
-            <form id="verification-form" class="verification-form" method="POST" action="/passport/back/backmobile">
-                <li>
-                    <div class="sms-captcha-wrapper">
-                        <input id="captcha" class="input va captcha left" type="text" name="code" maxlength="4"
-                               placeholder="请输入短信验证码">
+            <li>
+                <div class="sms-captcha-wrapper">
+                    <input id="captcha" class="input va captcha left" type="text" name="code" maxlength="4"
+                           placeholder="请输入短信验证码">
 
-                        {{> err-tip}}
-                    </div>
-                    <a id="send-captcha" class="btn send-captcha left">获取短信验证码</a>
+                    {{> err-tip}}
+                </div>
+                <a id="send-captcha" class="btn send-captcha left">获取短信验证码</a>
 
-                </li>
-                <li class="blank">
-                    <input name="area" id="area" type="hidden" value="{{area}}">
-                    <input name="mobile" id="mobile" type="hidden" value="{{mobile}}">
-                    <input name="verifyCode" id="captchaPic" type="hidden" value="{{verifyCode}}">
-                    <input name="refer" id="refer" type="hidden" value="">
-                </li>
-                <li>
-                    <a id="next-step" class="next-step disable" href="javascript:;">下一步</a>
-                </li>
-            </form>
+            </li>
+            <li class="blank">
+                <input name="area" id="area" type="hidden" value="{{area}}">
+                <input name="mobile" id="mobile" type="hidden" value="{{mobile}}">
+                <input name="verifyCode" id="captchaPic" type="hidden" value="{{verifyCode}}">
+                <input name="refer" id="refer" type="hidden" value="">
+            </li>
+            <li>
+                <a id="next-step" class="next-step disable" href="javascript:;">下一步</a>
+            </li>
 
         </ul>
 

@@ -79,7 +79,7 @@
                                 </a>
                             </li>
                             <li class="pro-info">
-                                <a class="brand-name" href="/product/shop/{{brand_domain}}">{{brand_name}}</a>
+                                <a class="brand-name" href="/product/shop/{{brand_domain}}" target="_blank">{{brand_name}}</a>
                                 <div class="pro-name"><a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" target="_blank">{{product_name}}</a></div>
                                 <div class="color-size editable" data-productId="{{product_id}}" id="edit_{{product_id}}" data-productSkn="{{product_skn}}">
                                     {{#if color_name}}
@@ -124,7 +124,7 @@
                         </a>
                     </li>
                     <li class="pro-info">
-                        <a class="brand-name" href="/product/shop/{{brand_domain}}">{{brand_name}}</a>
+                        <a class="brand-name" href="/product/shop/{{brand_domain}}" target="_blank">{{brand_name}}</a>
                         <div class="pro-name"><a href="javascript:void(0)">{{product_name}}</a></div>
                         <div>
                             {{#if color_name}}

@@ -22,8 +22,8 @@ module.exports = {
     },
     cookieDomain: 'yohoblk.com',
     domains: {
-        api: 'http://api-test1.yohops.com:9999/', // devapi.yoho.cn:58078 testapi.yoho.cn:28078 devapi.yoho.cn:58078
-        service: 'http://service-test1.yohops.com:9999/', // testservice.yoho.cn:28077 devservice.yoho.cn:58077
+        api: 'http://testapi.yoho.cn:28078/', // devapi.yoho.cn:58078 testapi.yoho.cn:28078 devapi.yoho.cn:58078
+        service: 'http://testservice.yoho.cn:28077/', // testservice.yoho.cn:28077 devservice.yoho.cn:58077
         search: 'http://192.168.102.216:8080/yohosearch/'
     },
     useOneapm: false,

@@ -54,7 +54,11 @@
                             </div>
                         </div>
                         <div class="bag-content">
-                            购物袋空空的哦，去看看心仪的商品吧~
+                            <p class="cn">您的购物袋暂无商品</p>
+                            <p class="en">
+                                Your shopping bags no goods ，<br>
+                                welcome go to shopping !
+                            </p>
                         </div>
                     </div>
                 </li>

@@ -38,6 +38,13 @@ function handelProduct(data) {
 }
 
 function refreshBag() {
+    var time = Date.parse(new Date()),
+        oldTime = this.time;
+
+    if (oldTime && time - oldTime < 100) {
+        return;
+    }
+    this.time = time;
     $.ajax({
         type: 'GET',
         url: '/shopping/cart/data',
@@ -182,6 +189,7 @@ $searchKey.focus(function() {
         $searchKey.val('search').css('color', '#aaa');
     }
 }).val('search').css('color', '#aaa');
+
 // }
 
 $clearInput.click(function() {

@@ -10,7 +10,7 @@ var addr;
 
 
 var addressReg = /^[\s\S]{2,100}$/;
-var phoneReg = /^(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
+var phoneReg = /^(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])(\*{4}[0-9]{4}|[0-9]{8})$/;
 
 var validate = require('./order/validation');
 
@@ -48,6 +48,9 @@ lazyLoad($('.banner-img'));
 // 添加.check方法
 require('../plugins/check');
 
+// 个人中心共用代码加载
+require('./me');
+
 function setActive($item) {
     var color = $item.find('.color-text').data('color');
     var size = $item.find('.size-text').data('size');
@@ -269,6 +272,7 @@ function bindConfirmEvent() {
         var $specialReason = $changeGood.find('.special-reason');
         var $imgs;
         var imgs = [];
+        var mobile = $('#mob').val();
 
         if ($(this).hasClass('disable')) {
             return false;
@@ -298,10 +302,10 @@ function bindConfirmEvent() {
             if ($specialReason.length && $specialReason.get(0).style.display === 'block') {
                 goodObj.remark = $specialReason.find('.right-content').find('.mark-text').val();
 
-                $imgs = $specialReason.find('.right-content').find('img');
+                $imgs = $specialReason.find('.right-content').find('.thumb-box');
 
                 $imgs.each(function(idx, img) {
-                    imgs.push(img.src);
+                    imgs.push($(img).data('img'));
                 });
 
                 goodObj.evidence_images = imgs;
@@ -315,9 +319,12 @@ function bindConfirmEvent() {
         changeData.order_code = $('.returns-wrap>.order').data('code');
         changeData.consignee_name = $('#user').val();
         changeData.address = $('#addr').val();
-        changeData.mobile = $('#mob').val();
         changeData.delivery_tpye = $('.change-type .type.active').data('type');
 
+        if (!/\*/.test(mobile)) {
+            changeData.mobile = $('#mob').val();
+        }
+
         submitChange(changeData);
     });
 }
@@ -373,10 +380,17 @@ function bindUploadEvent() {
                 callback: function(result) {
                     var img;
                     var $t;
+                    var o;
 
                     if (result.code === 200) {
                         n = parseInt($(that).siblings('.thumb-box').length, 10);
-                        img = imgBoxTpl({src: result.data});
+                        o = {src: result.data};
+
+                        if (result.imgs && result.imgs.length) {
+                            o.url = result.imgs[0];
+                        }
+
+                        img = imgBoxTpl(o);
                         $t = $(that).next('.img-up-tip');
                         $(that).before(img);
 

@@ -5,6 +5,9 @@ var countDown = require('./order/countdown');
 
 var lazyLoad = require('yoho-jquery-lazyload');
 
+// 个人中心共用代码加载
+require('./me');
+
 lazyLoad($('img.lazy'));
 
 function reload() {
@@ -54,6 +57,15 @@ if ($('.left-time').length) {
     countDown.start();
 }
 
+$('body').on('click', function(e) {
+    if ($(e.target).hasClass('show-package')) {
+        return false;
+    }
+
+    if (!$('.package-list').hasClass('hide')) {
+        $('.package-list').addClass('hide');
+    }
+});
 
 $('.show-package').on('click', function() {
     $(this).next('.package-list').toggleClass('hide');

@@ -18,21 +18,22 @@ module.exports = {
             var leftTime = $item.data('left');
             var i = that.intervalValue / 1000;
 
-            $item.text(that.convertLeftTime(leftTime - that.count * i));
+            $item.text(that.convertLeftTime(leftTime - that.count * i, $item));
         });
         this.count += 1;
     },
-    convertLeftTime: function(src) {
+    convertLeftTime: function(src, $el) {
         var sec = parseInt(src, 10) % 60;
         var min = parseInt(src / 60, 10) % 60;
         var hour = parseInt(src / 3600, 10);
         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');
+            $el.closest('.order').find('.hide-when-invalid').hide();
+            $el.css('margin-left', '0');
             return timeStr;
         }
 
@@ -44,8 +45,6 @@ module.exports = {
             timeStr = hour + '时' + timeStr;
         }
 
-        timeStr = '剩余' + timeStr;
-
         if (this.addtionalMsg.length > 0) {
             timeStr += this.addtionalMsg;
         }

@@ -7,7 +7,7 @@ var addr;
 var validate = require('./validation');
 
 var addressReg = /^[\s\S]{2,100}$/;
-var phoneReg = /^(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
+var phoneReg = /^(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])(\*{4}[0-9]{4}|[0-9]{8})$/;
 
 var validateMap = {
     name: {
@@ -142,16 +142,28 @@ function editOrder(onEdit) {
     var mobile = $('#user-mobile').val();
     var phone = $('#user-phone').val();
 
-    $.ajax({
-        url: '/me/editOrder',
-        data: {
+    var d = {
+        orderCode: code,
+        areaCode: areaCode,
+        userName: userName,
+        address: address,
+        mobile: mobile,
+        phone: phone
+    };
+
+    if (/\*/.test(mobile)) {
+        d = {
             orderCode: code,
             areaCode: areaCode,
             userName: userName,
             address: address,
-            mobile: mobile,
             phone: phone
-        }
+        };
+    }
+
+    $.ajax({
+        url: '/me/editOrder',
+        data: d
     }).done(function(result) {
         if (result.code === 200) {
             showSuccessMsg(onEdit);

@@ -3,6 +3,9 @@ var lazyLoad = require('yoho-jquery-lazyload');
 
 lazyLoad($('img.banner-img'));
 
+// 个人中心共用代码加载
+require('./me');
+
 $('.cancel-apply').on('click', function() {
     var id = $(this).data('applyId');
     var type = $(this).data('type');

@@ -474,7 +474,7 @@ Cart = {
                     return false;
                 });
 
-                editTarget.find('.current-sizes .size-item').click(function() {
+                editTarget.find('.size-item').click(function() {
                     var $this = $(this);
 
                     if ($this.hasClass('current')) {
@@ -484,6 +484,13 @@ Cart = {
                     $(this).addClass('current').siblings('.current').removeClass('current');
                     newProductSku = $(this).attr('data-sku');
                 });
+
+                // 初始化size list选中项(其他颜色中第一个尺码)
+                editTarget.find('.sizes-list.mb10').each(function() {
+                    if ($(this).find('.current').length === 0) {
+                        $(this).find('.size-item').first().addClass('current');
+                    }
+                });
             },
             fail: function() {
                 new _alert('此商品无法编辑颜色和尺寸').show();

@@ -50,7 +50,7 @@ var Util = {
     refreshCart: function(data, callback) {
         $('#cart_content').html(data.hasGoods ? cartTpl(data) : emptyCartTpl);
 
-        $('.pro-name a').dotdotdot({
+        $('.brand-name, .pro-name a').dotdotdot({
             wrap: 'letter'
         });
 

@@ -50,7 +50,7 @@ addressDialogTpl = require('../../../tpl/shopping/address-dialog.hbs');
 addressTpl = require('../../../tpl/shopping/address-list.hbs');
 
 // address dialog 数据验证
-function validateAddress($el) {
+function validateAddress($el, isUpdate) {
     var field = {
         name: [
             {
@@ -72,10 +72,6 @@ function validateAddress($el) {
             {
                 noEmpty: true,
                 err: '手机号码不能为空'
-            },
-            {
-                regx: /^\d{3}(\d|\*){4}\d{4}$/, // 验证正常数字或者****
-                err: '手机号码格式不正确'
             }
         ],
         phone: [
@@ -95,6 +91,19 @@ function validateAddress($el) {
 
     var pass = true;
 
+    // 新增情况下须验证正确的手机号；编辑情况下可通过****的验证
+    if (isUpdate) {
+        field.mobile.push({
+            regx: /^\d{3}(\d|\*){4}\d{4}$/, // 验证正常数字或者****
+            err: '手机号码格式不正确'
+        });
+    } else {
+        field.mobile.push({
+            regx: /^\d{11}$/,
+            err: '手机号码格式不正确'
+        });
+    }
+
     for (key in field) {
         if (field.hasOwnProperty(key)) {
             $cur = $el.find('.address-' + key);
@@ -160,7 +169,7 @@ function addressDialogFactory(opt, $the) {
                         areaCode;
 
                     // 验证输入
-                    if (validateAddress(address.$el)) {
+                    if (validateAddress(address.$el, opt && opt.id)) {
 
                         // form value
                         consignee = $el.find('.address-name').val();

@@ -73,7 +73,7 @@
             &:hover {
                 color: #9a9a9a;
                 height: 50px;
-                cursor: default;
+                cursor: pointer;
             }
 
             &:hover > a {
@@ -114,7 +114,7 @@
 
         .down-app-box {
             width: 230px;
-            color: #000;
+            color: #1b1b1b;
             font-size: 14px;
             padding: 20px 0;
             margin-left: -86px;
@@ -153,13 +153,21 @@
             display: none;
 
             .bag-content {
+                font-size: 14px;
+                line-height: 1.5;
                 padding: 280px 0 130px;
                 text-align: center;
                 color: #1b1b1b;
-                background: resolve('layout/bag-bg.png') no-repeat center center;
+                background: resolve('layout/empty-bag.png') no-repeat center center;
                 display: none;
             }
 
+            .bag-content .cn {
+                font-size: 20px;
+                font-weight: bold;
+                margin-bottom: 10px;
+            }
+
             .bag-goods {
                 background: #fff;
             }
@@ -356,7 +364,7 @@
             }
 
             .cur {
-                background: #000;
+                background: #1b1b1b;
             }
 
             a {
@@ -410,8 +418,10 @@
         }
 
         dt > a {
-            color: #000;
-            text-decoration: underline;
+            color: #1b1b1b;
+            font-weight: bold;
+            display: inline-block;
+            border-bottom: 1px solid #1b1b1b;
         }
 
         .hot {

@@ -202,7 +202,7 @@
     }
 
     .brands {
-        width: 950px;
+        width: 960px;
         padding: 30px 0 30px 30px;
         overflow: hidden;
 
@@ -242,6 +242,10 @@
         }
     }
 
+    .brand:nth-child(7n) {
+        margin-right: 0;
+    }
+
     .user-handle {
         float: right;
         ul {

@@ -67,6 +67,7 @@
         .contact {
             line-height: 50px;
             height: 50px;
+            color: #219dd6;
 
             span {
                 margin-left: 20px;
@@ -75,6 +76,7 @@
             .iconfont {
                 font-size: 12px;
                 margin-right: 5px;
+                color: #219dd6;
             }
         }
     }
@@ -200,6 +202,10 @@
 
         .good-name {
             margin-bottom: 8px;
+            display: -webkit-box;
+            overflow: hidden;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
         }
     }
 
@@ -234,6 +240,7 @@
             float: left;
             width: 70px;
             height: 90px;
+            margin-right: 10px;
 
         }
 

@@ -110,7 +110,7 @@
 }
 
 .error-msg {
-    color: #c71814;
+    @extend .blue;
 }
 
 .correct-msg {
@@ -119,7 +119,7 @@
 
 .error-msg,
 .correct-msg {
-    font-size: 14px;
+    font-size: 12px;
     padding-left: 5px;
 
     .iconfont {

 .favorite-brands {
+    position: relative;
+
+    .num {
+        position: absolute;
+        top: -30px;
+        left: 600px;
+        font-size: 16px;
+        color: #666;
+    }
 
     .brand-raw > div {
         float: left;

 .favorite-editorials {
+    position: relative;
+
+    .num {
+        position: absolute;
+        top: -30px;
+        left: 600px;
+        font-size: 16px;
+        color: #666;
+    }
 
     .editorial-raw > div {
         float: left;

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

@@ -26,9 +26,19 @@
             margin-right: 20px;
         }
 
-        span {
+        span:hover {
+            cursor: pointer;
+            color: #379ed6;
+        }
+
+        a {
+            display: block;
+            width: 100%;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+
             &:hover {
-                cursor: pointer;
                 color: #379ed6;
             }
         }

@@ -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}}

@@ -12,7 +12,7 @@
                             style="background: {{rgb}}"
                             data-imageurl="{{image pic 100 134}}"
                             data-target="{{proId}}-color-{{@index}}"
-                            data-title="{{color}}">
+                            data-title="{{color}}" title="{{color}}">
                         <span class="inner"></span>
                     </span>
                 {{/each}}
@@ -26,13 +26,8 @@
 
                     <div class="sizes-list mb10">
                         {{#each sizes}}
-                            {{#isEqual ../../defaultSize name}}
-                                <span class="size-item mr10 mb10 current {{#isEqual num 0}}disabled{{/isEqual}}"
-                                          data-sku="{{sku}}">{{name}}</span> 
-                            {{^}}
-                                <span class="size-item mr10 mb10 {{#isEqual num 0}}disabled{{/isEqual}}"
-                                          data-sku="{{sku}}">{{name}}</span> 
-                            {{/isEqual}}
+                            <span class="size-item mr10 mb10{{#isEqual ../../defaultSize name}} current{{/isEqual}}{{#isEqual num 0}} disabled{{/isEqual}}"
+                                    data-sku="{{sku}}">{{name}}</span> 
                         {{/each}}
                     </div>
                 </div>