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

@@ -24,8 +24,8 @@
                     </div>
                 {{/if}}
                 <div class="wx-account-info">
-                    <div id="hasCode" style="{{#if userInfo.submitWechat}}display: block{{/if}}">已提交微信号：<span id="wxCode">{{userInfo.userWechatCode}}</span></div>
-                    <div id="noCode" style="{{#if userInfo.submitWechat}}display: none;{{/if}}">未提交微信</div>
+                    <div id="hasCode" style="display:{{#if userInfo.submitWechat}}block;{{else}}none;{{/if}}">已提交微信号：<span id="wxCode">{{userInfo.userWechatCode}}</span></div>
+                    <div id="noCode" style="display:{{#if userInfo.submitWechat}}none;{{else}}block;{{/if}}">未提交微信</div>
                 </div>
             </div>
             <div class="user-label">