Merge branch 'feature/3partyBind' of http://git.yoho.cn/fe/yohobuy-node into feature/3partyBind

@@ -14,7 +14,7 @@
                         <b class="no-binding">未绑定</b>
                     {{/if}}
                 </p>
-                <a href="javascript:void(0);" >收起</a>
+                <a href="javascript:void(0);" data-binding="{{#if wechatBind}}1{{else}}0{{/if}}" >收起</a>
             </div>
             <div class="account-item-body">
                 <div class="account-body-left">
@@ -47,7 +47,7 @@
                         <b class="no-binding">未绑定</b>
                     {{/if}}
                 </p>
-                <a href="javascript:void(0);" >收起</a>
+                <a href="javascript:void(0);" data-binding="{{#if qqBind}}1{{else}}0{{/if}}">收起</a>
             </div>
             <div class="account-item-body">
                 <div class="account-body-left">
@@ -80,7 +80,7 @@
                         <b class="no-binding">未绑定</b>
                     {{/if}}
                 </p>
-                <a href="javascript:void(0);" >收起</a>
+                <a href="javascript:void(0);" data-binding="{{#if sinaBind}}1{{else}}0{{/if}}" >收起</a>
             </div>
             <div class="account-item-body">
                 <div class="account-body-left">
@@ -113,7 +113,7 @@
                         <b class="no-binding">未绑定</b>
                     {{/if}}
                 </p>
-                <a href="javascript:void(0);" >收起</a>
+                <a href="javascript:void(0);" data-binding="{{#if alipayBind}}1{{else}}0{{/if}}">收起</a>
             </div>
             <div class="account-item-body">
                 <div class="account-body-left">
@@ -146,7 +146,7 @@
                         <b class="no-binding">未绑定</b>
                     {{/if}}
                 </p>
-                <a href="javascript:void(0);" >收起</a>
+                <a href="javascript:void(0);" data-binding="{{#if doubanBind}}1{{else}}0{{/if}}">收起</a>
             </div>
             <div class="account-item-body">
                 <div class="account-body-left">
@@ -179,7 +179,7 @@
                         <b class="no-binding">未绑定</b>
                     {{/if}}
                 </p>
-                <a href="javascript:void(0);" >收起</a>
+                <a href="javascript:void(0);" data-binding="{{#if renrenBind}}1{{else}}0{{/if}}">收起</a>
             </div>
             <div class="account-item-body">
                 <div class="account-body-left">

@@ -50,7 +50,8 @@
             <a target="_blank" href="{{serviceUrl}}" class="protoctol">YOHO!BUY 有货服务条款</a>
         </span>
     </div>
-    <div class="btnwrapper">
-        <a href="javascript:void(0)" class="yohobindbtn" id="bindfirststep">下一步</a>
+    <div class="btnwrapper clearfix">
+        <a href="javascript:void(0)" class="yohobindbtn left" id="bindfirststep">下一步</a>
+        <a class="jump-btn" href="{{refer}}" style="margin-top:15px;">跳过</a>
     </div>
 </div>

@@ -106,13 +106,20 @@ $('#Y_bindAccount').on('click', '.account-item .account-item-title', function()
 
     var $t = $(this);
     var $b = $t.closest('.account-item').find('.account-item-body');
+    var $a = $t.find('a');
 
+    $a.removeClass('del-binding');
     $b.toggle();
 
     if ($b.is(':visible')) {
-        $t.find('a').html('收起');
+        $a.html('收起');
     } else {
-        $t.find('a').html('展开');
+        if ($a.attr('data-binding') === '1') {
+            $a.html('解绑');
+            $a.addClass('del-binding');
+        } else {
+            $t.find('a').html('绑定');
+        }
     }
 });
 

@@ -1002,7 +1002,7 @@
                     font-weight: normal;
 
                     &.no-binding{
-                        color:#666;
+                        color:#ea4072;
                     }
                 }
             }
@@ -1011,6 +1011,10 @@
                 float: right;
                 color: #468fa2;
                 font-size: 14px;
+
+                &.del-binding{
+                    color:#bdbdbd;
+                }
             }
         }
 

@@ -68,3 +68,10 @@
         }
     }
 }
+
+.jump-btn{
+    float:left;
+    margin-top: 15px;
+    margin-left: 55px;
+    color: #AAA;
+}