Merge branch 'feature/giftCart' into release/6.1

@@ -149,7 +149,12 @@ module.exports = class extends global.yoho.BaseModel {
 
     // 修改绑定的手机号
     changeMobile(params, uid) {
-        return this.meGiftAPi.changeMobile(params.area, params.mobile, params.code, uid);
+        return this.meGiftAPi.changeMobile(params.area, params.mobile, params.code, uid).then(res => {
+            if (res.code === 200) {
+                _.set(this.ctx, 'req.session.USER_MOBILE', params.mobile.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2'));
+            }
+            return res;
+        });
     }
 
     // 激活礼品卡

@@ -141,15 +141,15 @@ meGift = {
 
             if (intTime-- <= 0) {
                 clearInterval(intval);
-                $dom.removeClass('int-timer').val('获取短信验证码');
+                $dom.removeClass('int-timer').html('获取短信验证码');
                 return false;
             }
 
-            $dom.val(intTime + ' S');
+            $dom.html(intTime + 's');
         }, 1000);
 
         $dom.addClass('int-timer');
-        $dom.val(intTime + ' S');
+        $dom.html(intTime + 's');
     },
 
     // 获取邮箱验证码

@@ -163,7 +163,7 @@
         }
 
         .email-code {
-            margin-left: 30px;
+            margin-left: 35px;
         }
 
         .email-btn {