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

@@ -45,8 +45,8 @@ class redEnvelopeModel extends global.yoho.BaseModel {
         return await this.get({
             data: {
                 method: 'app.passport.submitUserWechatCode',
-                uid: obj.userUid,
-                wechat_uid: obj.uid,
+                uid: obj.uid,
+                wechat_uid: obj.userUid,
                 userCode: obj.userCode
             }
         });

@@ -18,16 +18,14 @@
                 </div>
                 {{#if userInfo.related}}
                     <div class="wx-account">
-                    <input placeholder="请输入用户微信号" class="account-input" bindinput="bindAccount" value="{{account}}"/>
+                        <input placeholder="请输入用户微信号" class="account-input" bindinput="bindAccount"
+                               value="{{account}}"/>
                         <button class="submitWxAccount">提交微信</button>
                     </div>
                 {{/if}}
                 <div class="wx-account-info">
-                {{#if userInfo.submitWechat}}
-                    <div>已提交微信号：{{userInfo.userWechatCode}}</div>
-                {{else}}
-                    <div>未提交微信</div>
-                {{/if}}
+                    <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>
             </div>
             <div class="user-label">
@@ -51,7 +49,8 @@
 {{else}}
     <div class="no-box">
         <div class="no-received">
-            <image src="http://img12.static.yhbimg.com/sns/2018/09/20/10/02f45a44a7dc9012468441eae604f1c910.png" class="no-icon"/>
+            <image src="http://img12.static.yhbimg.com/sns/2018/09/20/10/02f45a44a7dc9012468441eae604f1c910.png"
+                   class="no-icon"/>
             <div class="no-txt">礼包尚未被领取</div>
             <div class="no-txt">可以微信提醒用户尽快领取！</div>
         </div>

@@ -21,6 +21,9 @@ $('.submitWxAccount').click(function() {
         },
         success: function(data) {
             if (data.code === 200) {
+                $('#wxCode').text($('.account-input')[0].value);
+                $('#noCode').hide();
+                $('#hasCode').show();
                 tip.show('提交成功');
             } else {
                 tip.show(data.message);

@@ -35,9 +35,9 @@ $(() => {
                 },
                 success: function(res) {
                     if (res.code === 200) {
-                        // setTimeout(() => {
-                        //     window.location.reload();
-                        // }, 500);
+                        setTimeout(() => {
+                            window.location.reload();
+                        }, 500);
                     }
                     tip.show(res.message);
                 },

@@ -197,6 +197,7 @@ body {
 }
 
 .user-coupon-info {
+    height: 100%;
     background: #fff;
     min-height: 87vh;
 }

@@ -80,7 +80,8 @@
 
     .activity-rule {
         width: 680px;
-        height: 440px;
+        height: 100%;
+        min-height: 440px;
         margin: 0 auto;
         padding: 33px;
         background: url("img/activity/red-envelope/txt-bg.png") no-repeat;