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 @@ @@ -8,13 +8,17 @@
8 <div class="account-item"> 8 <div class="account-item">
9 <div class="account-item-title"> 9 <div class="account-item-title">
10 <p>绑定微信账号: 10 <p>绑定微信账号:
11 - {{#if wechatBind}} 11 + {{~#if wechatBind ~}}
12 <b>{{wechatNickname}}</b> 12 <b>{{wechatNickname}}</b>
13 - {{else}} 13 + {{~else~}}
14 <b class="no-binding">未绑定</b> 14 <b class="no-binding">未绑定</b>
15 - {{/if}} 15 + {{~/if~}}
16 </p> 16 </p>
17 - <a href="javascript:void(0);" data-binding="{{#if wechatBind}}1{{else}}0{{/if}}" >收起</a> 17 + <a href="javascript:void(0);"
  18 + data-binding="{{#if wechatBind}}1{{else}}0{{/if}}"
  19 + class="{{#if wechatBind}}del-binding{{/if}}">
  20 + {{#if wechatBind}}解绑{{else}}绑定{{/if}}
  21 + </a>
18 </div> 22 </div>
19 <div class="account-item-body"> 23 <div class="account-item-body">
20 <div class="account-body-left"> 24 <div class="account-body-left">
@@ -41,13 +45,17 @@ @@ -41,13 +45,17 @@
41 <div class="account-item"> 45 <div class="account-item">
42 <div class="account-item-title"> 46 <div class="account-item-title">
43 <p>绑定QQ账号: 47 <p>绑定QQ账号:
44 - {{#if qqBind}} 48 + {{~#if qqBind~}}
45 <b>{{qqNickname}}</b> 49 <b>{{qqNickname}}</b>
46 - {{else}} 50 + {{~else~}}
47 <b class="no-binding">未绑定</b> 51 <b class="no-binding">未绑定</b>
48 - {{/if}} 52 + {{~/if~}}
49 </p> 53 </p>
50 - <a href="javascript:void(0);" data-binding="{{#if qqBind}}1{{else}}0{{/if}}">收起</a> 54 + <a href="javascript:void(0);"
  55 + data-binding="{{#if qqBind}}1{{else}}0{{/if}}"
  56 + class="{{#if qqBind}}del-binding{{/if}}">
  57 + {{#if qqBind}}解绑{{else}}绑定{{/if}}
  58 + </a>
51 </div> 59 </div>
52 <div class="account-item-body"> 60 <div class="account-item-body">
53 <div class="account-body-left"> 61 <div class="account-body-left">
@@ -74,13 +82,17 @@ @@ -74,13 +82,17 @@
74 <div class="account-item"> 82 <div class="account-item">
75 <div class="account-item-title"> 83 <div class="account-item-title">
76 <p>绑定新浪微博账号: 84 <p>绑定新浪微博账号:
77 - {{#if sinaBind}} 85 + {{~#if sinaBind~}}
78 <b>{{sinaNickname}}</b> 86 <b>{{sinaNickname}}</b>
79 - {{else}} 87 + {{~else~}}
80 <b class="no-binding">未绑定</b> 88 <b class="no-binding">未绑定</b>
81 - {{/if}} 89 + {{~/if~}}
82 </p> 90 </p>
83 - <a href="javascript:void(0);" data-binding="{{#if sinaBind}}1{{else}}0{{/if}}" >收起</a> 91 + <a href="javascript:void(0);"
  92 + data-binding="{{#if sinaBind}}1{{else}}0{{/if}}"
  93 + class="{{#if sinaBind}}del-binding{{/if}}">
  94 + {{#if sinaBind}}解绑{{else}}绑定{{/if}}
  95 + </a>
84 </div> 96 </div>
85 <div class="account-item-body"> 97 <div class="account-item-body">
86 <div class="account-body-left"> 98 <div class="account-body-left">
@@ -107,13 +119,17 @@ @@ -107,13 +119,17 @@
107 <div class="account-item"> 119 <div class="account-item">
108 <div class="account-item-title"> 120 <div class="account-item-title">
109 <p>绑定支付宝账号: 121 <p>绑定支付宝账号:
110 - {{#if alipayBind}} 122 + {{~#if alipayBind~}}
111 <b>{{alipayNickname}}</b> 123 <b>{{alipayNickname}}</b>
112 - {{else}} 124 + {{~else~}}
113 <b class="no-binding">未绑定</b> 125 <b class="no-binding">未绑定</b>
114 - {{/if}} 126 + {{~/if~}}
115 </p> 127 </p>
116 - <a href="javascript:void(0);" data-binding="{{#if alipayBind}}1{{else}}0{{/if}}">收起</a> 128 + <a href="javascript:void(0);"
  129 + data-binding="{{#if alipayBind}}1{{else}}0{{/if}}"
  130 + class="{{#if alipayBind}}del-binding{{/if}}">
  131 + {{#if alipayBind}}解绑{{else}}绑定{{/if}}
  132 + </a>
117 </div> 133 </div>
118 <div class="account-item-body"> 134 <div class="account-item-body">
119 <div class="account-body-left"> 135 <div class="account-body-left">
@@ -140,13 +156,17 @@ @@ -140,13 +156,17 @@
140 <div class="account-item"> 156 <div class="account-item">
141 <div class="account-item-title"> 157 <div class="account-item-title">
142 <p>绑定豆瓣账号: 158 <p>绑定豆瓣账号:
143 - {{#if doubanBind}} 159 + {{~#if doubanBind~}}
144 <b>{{doubanNickname}}</b> 160 <b>{{doubanNickname}}</b>
145 - {{else}} 161 + {{~else~}}
146 <b class="no-binding">未绑定</b> 162 <b class="no-binding">未绑定</b>
147 - {{/if}} 163 + {{~/if~}}
148 </p> 164 </p>
149 - <a href="javascript:void(0);" data-binding="{{#if doubanBind}}1{{else}}0{{/if}}">收起</a> 165 + <a href="javascript:void(0);"
  166 + data-binding="{{#if doubanBind}}1{{else}}0{{/if}}"
  167 + class="{{#if doubanBind}}del-binding{{/if}}">
  168 + {{#if doubanBind}}解绑{{else}}绑定{{/if}}
  169 + </a>
150 </div> 170 </div>
151 <div class="account-item-body"> 171 <div class="account-item-body">
152 <div class="account-body-left"> 172 <div class="account-body-left">
@@ -173,13 +193,17 @@ @@ -173,13 +193,17 @@
173 <div class="account-item"> 193 <div class="account-item">
174 <div class="account-item-title"> 194 <div class="account-item-title">
175 <p>绑定人人账号: 195 <p>绑定人人账号:
176 - {{#if renrenBind}} 196 + {{~#if renrenBind~}}
177 <b>{{renrenNickname}}</b> 197 <b>{{renrenNickname}}</b>
178 - {{else}} 198 + {{~else~}}
179 <b class="no-binding">未绑定</b> 199 <b class="no-binding">未绑定</b>
180 - {{/if}} 200 + {{~/if~}}
181 </p> 201 </p>
182 - <a href="javascript:void(0);" data-binding="{{#if renrenBind}}1{{else}}0{{/if}}">收起</a> 202 + <a href="javascript:void(0);"
  203 + data-binding="{{#if renrenBind}}1{{else}}0{{/if}}"
  204 + class="{{#if renrenBind}}del-binding{{/if}}">
  205 + {{#if renrenBind}}解绑{{else}}绑定{{/if}}
  206 + </a>
183 </div> 207 </div>
184 <div class="account-item-body"> 208 <div class="account-item-body">
185 <div class="account-body-left"> 209 <div class="account-body-left">
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 31
32 <div class="btnwrapper confirmwrapper"> 32 <div class="btnwrapper confirmwrapper">
33 <a href="javascript:void(0)" class="yohobindbtn left" id="confirmsubmit" >确定</a> 33 <a href="javascript:void(0)" class="yohobindbtn left" id="confirmsubmit" >确定</a>
34 - <a class="perv-step right" href="{{prevUrl}}" class="right" style="margin-top:15px;">返回上一步</a> 34 + <a class="perv-step right" href="{{prevUrl}}">返回上一步</a>
35 </div> 35 </div>
36 36
37 <input type="hidden" value="{{mobile}}" id="mobile" name="mobile"/> 37 <input type="hidden" value="{{mobile}}" id="mobile" name="mobile"/>
@@ -33,12 +33,9 @@ @@ -33,12 +33,9 @@
33 </div> 33 </div>
34 </div> 34 </div>
35 <div class="action-link"> 35 <div class="action-link">
36 - <button id="relate-btn" class="relate-btn">确定</button> 36 + <button id="relate-btn" class="relate-btn left">确定</button>
  37 + <a class="perv-step" href="javascript:void(0)">返回上一步</a>
37 </div> 38 </div>
38 - <p class="remind-tips">  
39 - <span class="left">注：关联的手机号码不能用来登录此账户</span>  
40 - <a class="perv-step right">返回上一步</a>  
41 - </p>  
42 </div> 39 </div>
43 <div id="hide-info" data-mobile="{{phoneNum}}" data-area="{{areaCode}}" data-refer="{{refer}}"></div> 40 <div id="hide-info" data-mobile="{{phoneNum}}" data-area="{{areaCode}}" data-refer="{{refer}}"></div>
44 </div> 41 </div>
@@ -847,7 +847,7 @@ function emailUserCertTip() { @@ -847,7 +847,7 @@ function emailUserCertTip() {
847 if (jsonData && jsonData.data === 'Y') { 847 if (jsonData && jsonData.data === 'Y') {
848 $('#yoho-header .yoho-cert-tip').html( 848 $('#yoho-header .yoho-cert-tip').html(
849 '<i class="iconfont left">&#xe63f;</i> ' + 849 '<i class="iconfont left">&#xe63f;</i> ' +
850 - '<a href="//www.yohobuy.com/passport/cert/index">您的账号安全等级较低，建议您立即绑定手机号</a>'); 850 + '您的账号安全等级较低，建议您立即<a href="//www.yohobuy.com/passport/cert/index">绑定手机号</a>');
851 } 851 }
852 }); 852 });
853 } 853 }
@@ -312,6 +312,10 @@ @@ -312,6 +312,10 @@
312 margin-left:20px; 312 margin-left:20px;
313 .iconfont{ 313 .iconfont{
314 margin-right: 2px; 314 margin-right: 2px;
  315 + color:red;
  316 + }
  317 + a{
  318 + color:red;
315 } 319 }
316 } 320 }
317 } 321 }
@@ -1019,6 +1019,7 @@ @@ -1019,6 +1019,7 @@
1019 } 1019 }
1020 1020
1021 .account-item-body{ 1021 .account-item-body{
  1022 + display:none;
1022 padding: 25px 35px 30px; 1023 padding: 25px 35px 30px;
1023 1024
1024 &:after{ 1025 &:after{
@@ -75,3 +75,16 @@ @@ -75,3 +75,16 @@
75 margin-left: 55px; 75 margin-left: 55px;
76 color: #AAA; 76 color: #AAA;
77 } 77 }
  78 +
  79 +.code-validate .perv-step {
  80 + color: #f12200;
  81 + float: left;
  82 + margin-top: 22px;
  83 + margin-left: 40px;
  84 + text-decoration: underline;
  85 +}
  86 +.bindwrapper .perv-step{
  87 + margin-top: 15px;
  88 + text-decoration: underline;
  89 + color: #f12200;
  90 +}