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

@@ -16,12 +16,13 @@ $resend.on('touchstart', function(e) {
 
     $.ajax({
         url: $resend.data('url'),
-        type: 'GET'
-    }).then(function(data) {
+        type: 'GET',
+        success: function(data) {
             if (data.code === 200) {
                 showErrTip(data.message);
             } else {
                 showErrTip(data.message);
             }
+        }
     });
 });
\ No newline at end of file

@@ -37,13 +37,14 @@ $btnSure.on('touchstart', function() {
             type: 'POST',
             data: {
                 email: email
-            }
-        }).then(function(data) {
+            },
+            success: function(data) {
                 if (data.code === 200) {
                     location.href = data.data;
                 } else {
                     showErrTip(data.message);
                 }
+            }
         });
     } else {
         showErrTip('邮箱格式不正确，请重新输入');

@@ -45,13 +45,14 @@ $btnNext.on('touchstart', function() {
             data: {
                 area: country.split('+')[1],
                 mobile: pn
-            }
-        }).then(function(data) {
+            },
+            success: function(data) {
                 if (data.code === 200) {
                     location.href = '/passport/back/code';
                 } else {
                     showErrTip(data.message);
                 }
+            }
         });
     } else {
         showErrTip('手机号格式不正确，请重新输入');

@@ -37,8 +37,8 @@ $btnOk.on('touchstart', function() {
             url: '/passport/back/update',
             data: {
                 password: pwd
-            }
-        }).then(function(data) {
+            },
+            success: function(data) {
                 if (data.code === 200) {
                     showErrTip('密码修改成功');
 
@@ -49,6 +49,7 @@ $btnOk.on('touchstart', function() {
                 } else {
                     showErrTip(data.message);
                 }
+            }
         });
     } else {
         showErrTip('密码6-20位，请重新输入');

@@ -50,8 +50,8 @@ module.exports = function(useInRegister) {
 
         $.ajax({
             type: 'POST',
-            url: '/passport/' + urlMid + '/sendPhone'
-        }).then(function (data) {
+            url: '/passport/' + urlMid + '/sendPhone',
+            success: function(data) {
                 if (data.code === 200) {
                     $captchaTip.text('重发验证码 (60秒)').addClass('disable');
                     countDown();
@@ -60,6 +60,7 @@ module.exports = function(useInRegister) {
                     //验证码不正确，显示提示
                     showErrTip(data.message);
                 }
+            }
         });
     });
 
@@ -73,8 +74,8 @@ module.exports = function(useInRegister) {
             url: '/passport/' + urlMid + '/verifycode',
             data: {
                 verifyCode: trim($captcha.val())
-            }
-        }).then(function (data) {
+            },
+            success: function(data) {
                 if (data.code === 200) {
                     location.href = data.data;
                 } else {
@@ -82,6 +83,7 @@ module.exports = function(useInRegister) {
                     //验证码不正确，显示提示
                     showErrTip(data.message);
                 }
+            }
         });
     });
 

@@ -81,8 +81,8 @@ $loginBtn.on('touchstart', function() {
                 area: country.split('+')[1],
                 account: pn,
                 pwd: pwd
-            }
-        }).then(function(data) {
+            },
+            success: function(data) {
                 if (data.code === 200) {
                     showErrTip('登录成功');
 
@@ -93,8 +93,10 @@ $loginBtn.on('touchstart', function() {
                 } else {
                     showErrTip(data.message);
                 }
-        }, function() {
+            },
+            error: function() {
                 showErrTip('网络断开连接啦~');
+            }
         });
     } else {
         showErrTip('账号或密码有错误，请重新输入');

@@ -84,8 +84,8 @@ $loginBtn.on('touchstart', function() {
             data: {
                 account: acc,
                 pwd: pwd
-            }
-        }).then(function(data) {
+            },
+            success: function(data) {
                 if (data.code === 200) {
                     showErrTip('登录成功');
 
@@ -96,8 +96,10 @@ $loginBtn.on('touchstart', function() {
                 } else {
                     showErrTip(data.message);
                 }
-        }, function() {
+            },
+            error: function() {
                 showErrTip('网络断开连接啦~');
+            }
         });
     } else {
         showErrTip('账号或密码有错误，请重新输入');

@@ -39,8 +39,8 @@ $btnSure.on('touchstart', function() {
             url: '/passport/register/regmobile',
             data: {
                 password: pwd
-            }
-        }).then(function(data) {
+            },
+            success: function(data) {
                 if (data.code === 200) {
                     showErrTip('注册成功');
 
@@ -58,6 +58,7 @@ $btnSure.on('touchstart', function() {
                         }, 1000);
                     }
                 }
+            }
         });
     }
 });
\ No newline at end of file

@@ -45,13 +45,14 @@ $btnNext.on('touchstart', function() {
             data: {
                 area: country.split('+')[1],
                 profile: pn
-            }
-        }).then(function(data) {
+            },
+            success: function(data) {
                 if (data.code === 200) {
                     location.href = '/passport/register/code';
                 } else {
                     showErrTip(data.message);
                 }
+            }
         });
     } else {
         showErrTip('手机号格式不正确，请重新输入');

@@ -4,50 +4,64 @@
     <script>
         seajs.use('js/guang/plus-star/list');
     </script>
-{{else if psDetail}}
+{{/if}}
+{{#if psDetail}}
     <script>
         seajs.use('js/guang/plus-star/detail');
     </script>
+{{/if}}
+
 {{!-- 注册 --}}
-{{else if regIndex}}
+{{#if regIndex}}
     <script>
         seajs.use('js/passport/register/register');
     </script>
-{{else if regCode}}
+{{/if}}
+{{#if regCode}}
     <script>
         seajs.use('js/passport/register/code');
     </script>
-{{else if regPwd}}
+{{/if}}
+{{#if regPwd}}
     <script>
         seajs.use('js/passport/register/password');
     </script>
+{{/if}}
+
 {{!-- 登陆 --}}
-{{else if loginIndex}}
+{{#if loginIndex}}
     <script>
         seajs.use('js/passport/login/login');
     </script>
-{{else if loginInterational}}
+{{/if}}
+{{#if loginInterational}}
     <script>
         seajs.use('js/passport/login/interational');
     </script>
+{{/if}}
+
 {{!-- 密码找回 --}}
-{{else if backEmail}}
+{{#if backEmail}}
     <script>
         seajs.use('js/passport/back/email');
     </script>
-{{else if backEmailSuccess}}
+{{/if}}
+{{#if backEmailSuccess}}
     <script>
         seajs.use('js/passport/back/email-success');
     </script>
-{{else if backMobile}}
+{{/if}}
+{{#if backMobile}}
     <script>
         seajs.use('js/passport/back/mobile');
     </script>
-{{else if backCode}}
+{{/if}}
+{{#if backCode}}
     <script>
         seajs.use('js/passport/back/code');
     </script>
-{{else if backNewPwd}}
+{{/if}}
+{{#if backNewPwd}}
     <script>
         seajs.use('js/passport/back/new-password');
     </script>