handle merge

@@ -73,10 +73,10 @@ const Auth = {
     syncUserSession(uid, req, res) {
         return Auth.profile(uid).then((userInfo) => {
             let token = sign.makeToken(uid);
-            let data = userInfo.data;
+            let user = userInfo.data;
 
-            if (data) {
-                let uidCookie = `{data.profile_name}::${data.uid}::${data.vip_info.title}::${token}`;
+            if (user) {
+                let uidCookie = `{data.profile_name}::${user.uid}::${user.vip_info.title}::${token}`;
 
                 req.session._TOKEN = token;
                 req.session._LOGIN_UID = uid;

@@ -427,7 +427,9 @@ function disableSMSBtn() {
         second = 60;
         $smsCaptchaCtrl.text('获取短信验证码');
         $smsCaptchaCtrl.removeClass('disable');
+        $smsCaptchaCtrl.removeClass('progress');
     } else {
+        $smsCaptchaCtrl.add('progress');
         $smsCaptchaCtrl.text(second + '秒后可重新操作');
         window.setTimeout(disableSMSBtn, 1000);
     }
@@ -460,8 +462,8 @@ exports.init = function() {
     });
 
     // 图形验证通过时，发送短信按钮可点击
-    ep.on('captcha-img', function(auth) {
-        if (auth) {
+    ep.tail('captcha-img', 'phone-num', function(captchaAuth, phoneAuth) {
+        if (captchaAuth && phoneAuth && !$smsCaptchaCtrl.hasClass('progress')) {
             $smsCaptchaCtrl.removeClass('disable');
         } else {
             $smsCaptchaCtrl.addClass('disable');