fe / yohobuywap-node · Commits

Go to a project

Authored by huangyi
Commit 49800b8579c2ca160f734238c159f6533aa551ea 1 parent 3843f25a

Merge branches 'feature/redpack' and 'release/6.7.9' of http://git.yoho.cn/fe/yo… 

…hobuywap-node into feature/redpack

# Conflicts:
#	apps/activity/router.js
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
24 </div> 24 </div>
25 {{/if}} 25 {{/if}}
26 <div class="wx-account-info"> 26 <div class="wx-account-info">
27 - <div id="hasCode" style="{{#if userInfo.submitWechat}}display: block{{/if}}">已提交微信号：<span id="wxCode">{{userInfo.userWechatCode}}</span></div>  
28 - <div id="noCode" style="{{#if userInfo.submitWechat}}display: none;{{/if}}">未提交微信</div> 27 + <div id="hasCode" style="display:{{#if userInfo.submitWechat}}block;{{else}}none;{{/if}}">已提交微信号：<span id="wxCode">{{userInfo.userWechatCode}}</span></div>
  28 + <div id="noCode" style="display:{{#if userInfo.submitWechat}}none;{{else}}block;{{/if}}">未提交微信</div>
29 </div> 29 </div>
30 </div> 30 </div>
31 <div class="user-label"> 31 <div class="user-label">