Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -83,12 +83,20 @@ $loginBtn.on('touchstart', function() {
                 password: pwd
             },
             success: function(data) {
+                var res;
+
                 if (data.code === 200) {
+                    res = data.data;
                     showErrTip('登录成功');
 
+                    $.ajax({
+                        url: res.session,
+                        dataType: 'jsonp'
+                    });
+
                     //1000ms后跳转页面
                     setTimeout(function() {
-                        location.href = data.data;
+                        location.href = res.href;
                     }, 1000);
                 } else {
                     showErrTip(data.message);

@@ -94,7 +94,8 @@ $loginBtn.on('touchstart', function() {
                     showErrTip('登录成功');
 
                     $.ajax({
-                        url: res.session
+                        url: res.session,
+                        dataType: 'jsonp'
                     });
 
                     //1s后跳转页面

@@ -46,12 +46,20 @@ $btnSure.on('touchstart', function() {
                 token: $('#token').val()
             },
             success: function(data) {
+                var res;
+
                 if (data.code === 200) {
+                    res = data.data;
                     showErrTip('注册成功');
 
+                    $.ajax({
+                        url: res.session,
+                        dataType: 'jsonp'
+                    });
+
                     //1000ms后跳转页面
                     setTimeout(function() {
-                        location.href = data.data;
+                        location.href = res.href;
                     }, 1000);
                 } else {
                     showErrTip(data.message);

@@ -31,6 +31,8 @@ $basicBtnC:#eb0313;
             margin-bottom: pxToRem(20px);
             font-size: pxToRem(24px);
             line-height: pxToRem(36px);
+            display: flex;
+            flex-wrap: wrap;
             &.table {
                 width: 100%;
                 .column {
@@ -42,6 +44,8 @@ $basicBtnC:#eb0313;
                     font-size: pxToRem(24px);
                     background-color: $tableCellC;
                     float: left;
+                    display: flex;
+                    align-items: center;
                 }
             }
         }