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

@@ -52,6 +52,19 @@
         }
     }
 
+    .login-btn {
+        display: block;
+        position: absolute;
+        top: pxToRem(40px);
+        left: pxToRem(194px);
+        width: pxToRem(244px);
+        height: pxToRem(82px);
+        line-height: pxToRem(82px);
+        color: #fff;
+        border: pxToRem(4px) solid #fff;
+        text-align: center;
+    }
+
     .my-link {
         margin-bottom: pxToRem(30px);
         padding: pxToRem(6px) 0;
@@ -60,12 +73,35 @@
         height: pxToRem(76px);
 
         .link-item {
+            position: relative;
             float: left;
             color: #fff;
             font-size: pxToRem(22px);
             line-height: pxToRem(38px);
             width: pxToRem(213px);
+            
+            &:after {
+                content: '';
+                position: absolute;
+                right: 0;
+                top: pxToRem(24px);
+                width: 0;
+                height: pxToRem(44px);
+                border-right: 1px solid #fff;
+            }
+
+            &:last-of-type:after {
+                content: none;
+            }
+        }
 
+        &.no-login {
+            padding: 0;
+            height: pxToRem(88px);
+            .link-item {
+                font-size: pxToRem(32px);
+                line-height: pxToRem(88px);
+            }
         }
     }
 

 {{> layout/header}}
     <div class="my-page yoho-page">
         <div class="my-header">
+            {{#isLogin}}
             <a class="user-info" href="/home/personaldetails">
                 <img class="user-avatar" src="{{head_ico}}">
                 <span class="username">{{profile_name}}</span>
@@ -9,18 +10,26 @@
                 {{/vip_info}}
                 <div class="iconfont more-icon">&#xe604;</div>
             </a>
+            {{/isLogin}}
+            {{^isLogin}}
+            <div class="user-info">
+                <a class="login-btn" href="http://m.dev.yohobuy.com/signin.html">
+                    登录/注册
+                </a>
+            </div>
+            {{/isLogin}}
         </div>
-        <div class="my-link clearfix">
+        <div class="my-link clearfix {{^isLogin}}no-login{{/isLogin}}">
             <a class="link-item" href="/home/favorite">
-                {{product_favorite_total}}
+                {{#if product_favorite_total}}{{product_favorite_total}}{{/if}}
                 <p>收藏的商品</p>
             </a>
             <a class="link-item" href="/home/favorite?tab=brand">
-	            {{brand_favorite_total}}
+                {{#if brand_favorite_total}}{{brand_favorite_total}}{{/if}}
                 <p>收藏的品牌</p>
             </a>
             <a class="link-item" href="/home/">
-                {{product_browse}}
+                {{#if product_browse}}{{product_browse}}{{/if}}
                 <p>浏览记录</p>
             </a>
         </div>
@@ -50,26 +59,26 @@
             <a class="list-item" href="/home/address">
                 <span class="iconfont icon">&#xe637;</span>
                 地址管理
-                <span class="iconfont num">{{address_num}} &#xe604;</span>
+                <span class="iconfont num">{{#if address_num}}{{address_num}}{{/if}} &#xe604;</span>
             </a>
         </div>
         <div class="group-list">
             <a class="list-item" href="/home/coupons">
                 <span class="iconfont icon">&#xe63a;</span>
                 优惠券
-                <span class="iconfont num">{{coupon_num}} &#xe604;</span>
+                <span class="iconfont num">{{#if coupon_num}}{{coupon_num}}{{/if}} &#xe604;</span>
             </a>
             <a class="list-item" href="/home/currency">
                 <span class="iconfont icon">&#xe635;</span>
                 YOHO 币
-                <span class="iconfont num">{{yoho_coin_num}} &#xe604;</span>
+                <span class="iconfont num">{{#if yoho_coin_num}}{{yoho_coin_num}}{{/if}} &#xe604;</span>
             </a>
         </div>
         <div class="group-list">
             <a class="list-item" href="/home/message">
                 <span class="iconfont icon">&#xe636;</span>
                 消息
-                <span class="iconfont num">{{inbox_total}} &#xe604;</span>
+                <span class="iconfont num">{{#if inbox_total}}{{inbox_total}}{{/if}} &#xe604;</span>
             </a>
         </div>
         <div class="group-list">