fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit acc4998892a5f6e313272dd879274588f0cf5ce2 2 parents c242eba1 cf667b1f

Merge remote-tracking branch 'origin/release/5.3' into release/5.3

Inline Side-by-side
Showing 7 changed files with 70 additions and 31 deletions
... ... @@ -8,13 +8,17 @@
<div class="account-item">
<div class="account-item-title">
<p>绑定微信账号:
{{#if wechatBind}}
{{~#if wechatBind ~}}
<b>{{wechatNickname}}</b>
{{else}}
{{~else~}}
<b class="no-binding">未绑定</b>
{{/if}}
{{~/if~}}
</p>
<a href="javascript:void(0);" data-binding="{{#if wechatBind}}1{{else}}0{{/if}}" >收起</a>
<a href="javascript:void(0);"
data-binding="{{#if wechatBind}}1{{else}}0{{/if}}"
class="{{#if wechatBind}}del-binding{{/if}}">
{{#if wechatBind}}解绑{{else}}绑定{{/if}}
</a>
</div>
<div class="account-item-body">
<div class="account-body-left">
... ... @@ -41,13 +45,17 @@
<div class="account-item">
<div class="account-item-title">
<p>绑定QQ账号:
{{#if qqBind}}
{{~#if qqBind~}}
<b>{{qqNickname}}</b>
{{else}}
{{~else~}}
<b class="no-binding">未绑定</b>
{{/if}}
{{~/if~}}
</p>
<a href="javascript:void(0);" data-binding="{{#if qqBind}}1{{else}}0{{/if}}">收起</a>
<a href="javascript:void(0);"
data-binding="{{#if qqBind}}1{{else}}0{{/if}}"
class="{{#if qqBind}}del-binding{{/if}}">
{{#if qqBind}}解绑{{else}}绑定{{/if}}
</a>
</div>
<div class="account-item-body">
<div class="account-body-left">
... ... @@ -74,13 +82,17 @@
<div class="account-item">
<div class="account-item-title">
<p>绑定新浪微博账号:
{{#if sinaBind}}
{{~#if sinaBind~}}
<b>{{sinaNickname}}</b>
{{else}}
{{~else~}}
<b class="no-binding">未绑定</b>
{{/if}}
{{~/if~}}
</p>
<a href="javascript:void(0);" data-binding="{{#if sinaBind}}1{{else}}0{{/if}}" >收起</a>
<a href="javascript:void(0);"
data-binding="{{#if sinaBind}}1{{else}}0{{/if}}"
class="{{#if sinaBind}}del-binding{{/if}}">
{{#if sinaBind}}解绑{{else}}绑定{{/if}}
</a>
</div>
<div class="account-item-body">
<div class="account-body-left">
... ... @@ -107,13 +119,17 @@
<div class="account-item">
<div class="account-item-title">
<p>绑定支付宝账号:
{{#if alipayBind}}
{{~#if alipayBind~}}
<b>{{alipayNickname}}</b>
{{else}}
{{~else~}}
<b class="no-binding">未绑定</b>
{{/if}}
{{~/if~}}
</p>
<a href="javascript:void(0);" data-binding="{{#if alipayBind}}1{{else}}0{{/if}}">收起</a>
<a href="javascript:void(0);"
data-binding="{{#if alipayBind}}1{{else}}0{{/if}}"
class="{{#if alipayBind}}del-binding{{/if}}">
{{#if alipayBind}}解绑{{else}}绑定{{/if}}
</a>
</div>
<div class="account-item-body">
<div class="account-body-left">
... ... @@ -140,13 +156,17 @@
<div class="account-item">
<div class="account-item-title">
<p>绑定豆瓣账号:
{{#if doubanBind}}
{{~#if doubanBind~}}
<b>{{doubanNickname}}</b>
{{else}}
{{~else~}}
<b class="no-binding">未绑定</b>
{{/if}}
{{~/if~}}
</p>
<a href="javascript:void(0);" data-binding="{{#if doubanBind}}1{{else}}0{{/if}}">收起</a>
<a href="javascript:void(0);"
data-binding="{{#if doubanBind}}1{{else}}0{{/if}}"
class="{{#if doubanBind}}del-binding{{/if}}">
{{#if doubanBind}}解绑{{else}}绑定{{/if}}
</a>
</div>
<div class="account-item-body">
<div class="account-body-left">
... ... @@ -173,13 +193,17 @@
<div class="account-item">
<div class="account-item-title">
<p>绑定人人账号:
{{#if renrenBind}}
{{~#if renrenBind~}}
<b>{{renrenNickname}}</b>
{{else}}
{{~else~}}
<b class="no-binding">未绑定</b>
{{/if}}
{{~/if~}}
</p>
<a href="javascript:void(0);" data-binding="{{#if renrenBind}}1{{else}}0{{/if}}">收起</a>
<a href="javascript:void(0);"
data-binding="{{#if renrenBind}}1{{else}}0{{/if}}"
class="{{#if renrenBind}}del-binding{{/if}}">
{{#if renrenBind}}解绑{{else}}绑定{{/if}}
</a>
</div>
<div class="account-item-body">
<div class="account-body-left">
... ...
... ... @@ -31,7 +31,7 @@
<div class="btnwrapper confirmwrapper">
<a href="javascript:void(0)" class="yohobindbtn left" id="confirmsubmit" >确定</a>
<a class="perv-step right" href="{{prevUrl}}" class="right" style="margin-top:15px;">返回上一步</a>
<a class="perv-step right" href="{{prevUrl}}">返回上一步</a>
</div>
<input type="hidden" value="{{mobile}}" id="mobile" name="mobile"/>
... ...
... ... @@ -33,12 +33,9 @@
</div>
</div>
<div class="action-link">
<button id="relate-btn" class="relate-btn">确定</button>
<button id="relate-btn" class="relate-btn left">确定</button>
<a class="perv-step" href="javascript:void(0)">返回上一步</a>
</div>
<p class="remind-tips">
<span class="left">注：关联的手机号码不能用来登录此账户</span>
<a class="perv-step right">返回上一步</a>
</p>
</div>
<div id="hide-info" data-mobile="{{phoneNum}}" data-area="{{areaCode}}" data-refer="{{refer}}"></div>
</div>
... ...
... ... @@ -847,7 +847,7 @@ function emailUserCertTip() {
if (jsonData && jsonData.data === 'Y') {
$('#yoho-header .yoho-cert-tip').html(
'<i class="iconfont left">&#xe63f;</i> ' +
'<a href="//www.yohobuy.com/passport/cert/index">您的账号安全等级较低，建议您立即绑定手机号</a>');
'您的账号安全等级较低，建议您立即<a href="//www.yohobuy.com/passport/cert/index">绑定手机号</a>');
}
});
}
... ...
... ... @@ -312,6 +312,10 @@
margin-left:20px;
.iconfont{
margin-right: 2px;
color:red;
}
a{
color:red;
}
}
}
... ...
... ... @@ -1019,6 +1019,7 @@
}
.account-item-body{
display:none;
padding: 25px 35px 30px;
&:after{
... ...
... ... @@ -75,3 +75,16 @@
margin-left: 55px;
color: #AAA;
}
.code-validate .perv-step {
color: #f12200;
float: left;
margin-top: 22px;
margin-left: 40px;
text-decoration: underline;
}
.bindwrapper .perv-step{
margin-top: 15px;
text-decoration: underline;
color: #f12200;
}
... ...