merge feature/back

htoooth
Commit 14dd9b84fd3d2aecd7a3c09545d1830ea7e6c8e3 1 parent fe52536c
Showing 14 changed files with 260 additions and 272 deletions
apps/passport/controllers/back.js
apps/passport/controllers/bind.js
apps/passport/controllers/reg.js
apps/passport/models/auth-helper.js
apps/passport/models/back-api.js
apps/passport/models/bind-service.js
apps/passport/models/passport-alipay.js
apps/passport/models/reg-service.js
apps/passport/router.js
library/helpers.js
public/dist/m-yohobuy-node/0.1.0/index.css
public/js/passport/back/new-password.js
public/js/passport/login/international.js
public/js/passport/login/login.js
--- a/apps/passport/controllers/back.js
View file @14dd9b8
+++ b/apps/passport/controllers/back.js
View file @14dd9b8
@@ -6,76 +6,74 @@
 'use strict';
 const _       = require('lodash');
-
 const library = '../../../library';
 const helpers = require(`${library}/helpers`);
-
 const service = require('../models/back-service');
-const SIGN_IN_URL = helpers.urlFormat('/signin.html');
+const SIGN_IN = helpers.urlFormat('/passport/login');
 /**
  * 通过邮箱找回密码页面
  */
-module.exports.indexByEmailPage = (req, res) => {
-
-    let data = {
-        backUrl: SIGN_IN_URL,
-        headerText: '找回密码',
-        isPassportPage: true,
-        backEmail: true
-    };
-
+const indexEmailPage = (req, res) => {
     res.render('back/email', Object.assign({
         module: 'passport',
-        page: 'back-email',
-        title: '找回密码-通过邮箱'
-    }, data));
+        page  : 'back-email',
+        title : '找回密码-通过邮箱'
+    }, {
+        backUrl       : SIGN_IN,
+        headerText    : '找回密码',
+        isPassportPage: true,
+        backEmail     : true
+    }));
 };
 /**
  * 发送验证码到邮箱
  */
-module.exports.sendCodeToEmailAPI = (req, res) => {
+const sendCodeToEmailAPI = (req, res) => {
     let email = req.body.email || '';
-
-    let error = {
-        code: 400,
+    const ERR = {
+        code   : 400,
         message: '邮箱格式不正确，请重新输入',
-        data: ''
+        data   : ''
     };
     if (!helpers.verifyEmail(email)) {
-        res.json(error);
+        res.json(ERR);
         return;
     }
-    service.sendCodeToEmailAsync(email).then(result => {
+    service.sendCodeToEmailAsync(email)
+        .then(result => {
             if (result.code === 200) {
-            result.data = helpers.urlFormat('/passport/back/success.html', {email: email});
+                result.data = helpers.urlFormat('/passport/back/success', {email: email});
             }
             res.json(result);
-    }).catch(() => {
-        res.json(error);
+        })
+        .catch(() => {
+            res.json(ERR);
         });
 };
 /**
  * 重新发送验证码到邮箱
  */
-module.exports.resendCodeToEmailAPI = (req, res) => {
+const resendCodeToEmailAPI = (req, res) => {
     let email = req.query.email || '';
-    service.sendCodeToEmailAsync(email).then(result => {
+    service.sendCodeToEmailAsync(email)
+        .then(result => {
             if (_.isEmpty(result)) {
                 return Promise.rejected('重新发邮件失败');
             }
             res.json(result);
-    }).catch(err => {
+        })
+        .catch(err => {
             res.json({
-            code: 400,
+                code   : 400,
                 message: err
             });
         });
@@ -84,7 +82,7 @@ module.exports.resendCodeToEmailAPI = (req, res) => {
 /**
  * 邮箱找回密码-返回成功页面
  */
-module.exports.backSuccessByEmailPage = (req, res) => {
+const backSuccessByEmailPage = (req, res) => {
     let email = req.query.email || '';
     if (!helpers.verifyEmail(email)) {
@@ -92,46 +90,43 @@ module.exports.backSuccessByEmailPage = (req, res) => {
     }
     let domain   = email.split('@')[1];
-
     let emailUrl = `http://${domain === 'gmail.com' ? 'mail.google.com' : 'mail.'}${domain}`;
-
     res.render('back/email-success', Object.assign({
         module: 'passport',
-        page: 'back-email-success',
-        title: '找回密码-通过邮箱'
+        page  : 'back-email-success',
+        title : '找回密码-通过邮箱'
     }, {
-        backUrl: helpers.urlFormat('/passport/back/email.html'),
-        headerText: '找回密码',
-        isPassportPage: true,
+        backUrl         : helpers.urlFormat('/passport/back/email'),
+        headerText      : '找回密码',
+        isPassportPage  : true,
         backEmailSuccess: true,
-        goEmail: emailUrl,
-        resendUrl: helpers.urlFormat('/passport/back/resendemail', {email: email})
+        goEmail         : emailUrl,
+        resendUrl       : helpers.urlFormat('/passport/back/resendemail', {email: email})
     }));
 };
-
 /**
  * 根据邮箱修改密码
  */
-module.exports.setNewPasswordByEmailAPI = (req, res) => {
+const setNewPasswordByEmailAPI = (req, res) => {
     let pwd  = req.body.password || '';
-
     let code = req.body.code || '';
-
     let data = {
         code: 200,
-        data: SIGN_IN_URL
+        data: SIGN_IN
     };
-    service.modifyPasswordByEmailAsync(pwd, code).then(result => {
+    service.modifyPasswordByEmailAsync(pwd, code)
+        .then(result => {
             if (result.includes('history.back')) {
                 data.code    = 400;
                 data.message = '修改失败';
             }
             res.json(data);
-    }).catch(() => {
+        })
+        .catch(() => {
             res.json(data);
         });
 };
@@ -139,85 +134,78 @@ module.exports.setNewPasswordByEmailAPI = (req, res) => {
 /**
  * 找回密码页面-通过手机号
  */
-module.exports.indexByMobilePage = (req, res, next) => {
-
+const indexMobilePage = (req, res, next) => {
     service.getAreaDataAsync()
         .then(result => {
             res.render('back/mobile', Object.assign({
                 module: 'passport',
-                page: 'back-mobile',
-                title: '找回密码-通过手机号'
+                page  : 'back-mobile',
+                title : '找回密码-通过手机号'
             }, {
-                backUrl: SIGN_IN_URL,
-                headerText: '找回密码',
+                backUrl       : SIGN_IN,
+                headerText    : '找回密码',
                 isPassportPage: true,
-                backMobile: true,
-                countrys: result.data,
-                areaCode: '+86'
+                backMobile    : true,
+                countrys      : result.data,
+                areaCode      : '+86'
             }));
-        }).catch(next);
+        })
+        .catch(next);
 };
 /**
  * 发送手机验证码
  */
-module.exports.sendCodeToMobileAPI = (req, res) => {
-    let result = {
-        code: 400,
-        message: '密码只能使用数字、字母和半角标点符号，请重新输入',
-        data: ''
-    };
-
+const sendCodeToMobileAPI = (req, res, next) => {
     let phoneNum = req.body.phoneNum || '';
-
     let areaCode = req.body.areaCode || '86';
+    let ERR      = {
+        code   : 400,
+        message: '输入手机号码出错'
+    };
     if (!helpers.verifyMobile(phoneNum)) {
-        res.json(result);
-        return;
+        return res.json(ERR);
     }
-    service.sendCodeToMobileAsync(phoneNum, areaCode).then(data=> {
-        if (_.isEmpty(data)) {
-            return Promise.rejected('发送验证码出错');
+    service.sendCodeToMobileAsync(phoneNum, areaCode)
+        .then(result => {
+            if (_.isEmpty(result) || result.code !== 200) {
+                ERR.message = "发送验证码出错";
+                res.json(ERR);
             }
-        if (data.code === 200) {
-            result.data = helpers.urlFormat('/passport/back/verifycode', {
+            if (result.code === 200) {
+                return res.json({
+                    code: 200,
+                    data: helpers.urlFormat('/passport/back/mobilecode', {
                         phoneNum: phoneNum,
                         areaCode: areaCode
+                    })
                 });
-
-            res.json(result);
-        } else {
-            return Promise.rejected('发送验证码出错');
             }
-    }).catch(err => {
-        result.message = err;
-        res.json(result);
-    });
-
+        })
+        .catch(next);
 };
 /**
  * 校验验证码页面
  */
-module.exports.verifyCodeByMobilePage = (req, res) => {
+const verifyCodeByMobilePage = (req, res) => {
     let phoneNum = req.query.phoneNum || '';
-
     let areaCode = req.query.areaCode || '86';
     res.render('back/mobile-code', Object.assign({
         module: 'passport',
-        page: 'back-code',
-        title: '找回密码-通过手机号'
+        page  : 'back-code',
+        title : '找回密码-通过手机号'
     }, {
-        backUrl: helpers.urlFormat('/passport/back/mobile.html'),
-        headerText: '找回密码',
+        backUrl       : helpers.urlFormat('/passport/back/mobile'),
+        headerText    : '找回密码',
         isPassportPage: true,
-        backCode: true,
-        areaCode: areaCode,
-        phoneNum: phoneNum
+        backCode      : true,
+        areaCode      : areaCode,
+        phoneNum      : phoneNum
     }));
 };
@@ -225,78 +213,99 @@ module.exports.verifyCodeByMobilePage = (req, res) => {
 /**
  * 校验手机验证码
  */
-module.exports.verifyCodeByMobileAPI = (req, res) => {
+const verifyCodeByMobileAPI = (req, res, next) => {
     let phoneNum = req.body.phoneNum || '';
-
     let code     = req.body.code || '';
-
     let areaCode = req.body.areaCode || '86';
     service.validateMobileCodeAsync(phoneNum, code, areaCode)
         .then(result => {
             if (result.code === 200) {
-                result.data = helpers.urlFormat('/passport/back/backcode.html', {
+                res.json({
+                    code: 200,
+                    data: helpers.urlFormat('/passport/back/backcode', {
                         phoneNum: phoneNum,
-                    token: result.data.token,
+                        token   : result.data.token,
                         areaCode: areaCode
-                });
+                    })
+                })
+            } else {
+                res.json({
+                    code   : 400,
+                    message: '验证码失败'
+                })
             }
-
-            res.json(result);
-        }).catch(() => res.json({code: 400, message: '验证码失败'}));
+        })
+        .catch(next);
 };
 /**
  * 找回密码页面，设置新密码页面-手机
  */
-module.exports.setNewPasswordByMobilePage = (req, res) => {
+const setNewPasswordByMobilePage = (req, res) => {
     let phoneNum = req.query.phoneNum || '';
-
     let token    = req.query.token || '';
-
     let areaCode = req.query.areaCode || '86';
-
     let code     = req.query.code || '';
-    if (!token || (!helpers.verifyMobile(phoneNum) && !code)) {
+    if (!(code || (token && helpers.verifyMobile(phoneNum)))) {
         res.redirect(400);
         return;
     }
     res.render('back/new-password', Object.assign({
         module: 'passport',
-        page: 'back-new-password',
-        title: '找回密码-输入新密码'
+        page  : 'back-new-password',
+        title : '找回密码-输入新密码'
     }, {
-        backUrl: SIGN_IN_URL,
-        headerText: '找回密码',
+        backUrl       : SIGN_IN,
+        headerText    : '找回密码',
         isPassportPage: true,
-        backNewPwd: true,
-        phoneNum: phoneNum,
-        token: token,
-        areaCode: areaCode,
-        code: code
+        backNewPwd    : true,
+        phoneNum      : phoneNum,
+        token         : token,
+        areaCode      : areaCode,
+        code          : code
     }));
 };
 /**
  * 根据手机验证码修改密码
  */
-module.exports.setNewPasswordByMobileAPI = (req, res) => {
+const setNewPasswordByMobileAPI = (req, res, next) => {
     let phoneNum = req.body.phoneNum || '';
-
     let token    = req.body.token || '';
-
     let areaCode = req.body.areaCode || '86';
-
     let newPwd   = req.body.password || '';
     service.modifyPasswordByMobileAsync(phoneNum, token, newPwd, areaCode)
         .then(result => {
+            console.log(result);
             if (result.code === 200) {
-                result.data = SIGN_IN_URL;
+                res.json({
+                    code: 200,
+                    data: SIGN_IN
+                });
+            } else {
+                res.json({
+                    code   : 400,
+                    message: "修改密码失败"
+                })
             }
+        })
+        .catch(next);
+};
-            res.json(result);
-        }).catch(() => res.json({code: 400, message: '修改密码失败'}));
+module.exports = {
+    indexEmailPage,
+    sendCodeToEmailAPI,
+    resendCodeToEmailAPI,
+    backSuccessByEmailPage,
+    setNewPasswordByEmailAPI,
+    indexMobilePage,
+    sendCodeToMobileAPI,
+    verifyCodeByMobilePage,
+    verifyCodeByMobileAPI,
+    setNewPasswordByMobilePage,
+    setNewPasswordByMobileAPI
 };
--- a/apps/passport/controllers/bind.js
View file @14dd9b8
+++ b/apps/passport/controllers/bind.js
View file @14dd9b8
@@ -75,7 +75,7 @@ const bind = {
         });
     },
-    bindCheck: (req, res) => {
+    bindCheck: (req, res, next) => {
         let phoneNum = req.body.phoneNum;
         let openId = req.body.openId;
         let areaCode = req.body.areaCode || '86';
@@ -105,7 +105,7 @@ const bind = {
                 }
                 res.json(data);
-            });
+            }).catch(next);
         } else {
             res.json({
                 code: 400,
@@ -115,7 +115,7 @@ const bind = {
         }
     },
-    sendBindMsg: (req, res) => {
+    sendBindMsg: (req, res, next) => {
         let phoneNum = req.body.phoneNum;
         let areaCode = req.body.areaCode;
@@ -126,13 +126,13 @@ const bind = {
                 } else {
                     res.json({ code: 400, message: '', data: '' });
                 }
-            });
+            }).catch(next);
         } else {
             res.json({ code: 400, message: '', data: '' });
         }
     },
-    checkBindMsg: (req, res) => {
+    checkBindMsg: (req, res, next) => {
         let phoneNum = req.body.phoneNum;
         let code = req.body.code;
         let areaCode = req.body.areaCode;
@@ -144,13 +144,13 @@ const bind = {
                 } else {
                     res.json({ code: 400, message: '', data: '' });
                 }
-            });
+            }).catch(next);
         } else {
             res.json({ code: 400, message: '', data: '' });
         }
     },
-    bindMobile: (req, res) => {
+    bindMobile: (req, res, next) => {
         let phoneNum = req.body.phoneNum;
         let openId = req.body.openId;
         let areaCode = req.body.areaCode || '86';
@@ -176,13 +176,13 @@ const bind = {
                 return result;
             }).then(result => {
                 res.json(result);
-            });
+            }).catch(next);
         } else {
             res.json({ code: 400, message: '', data: '' });
         }
     },
-    relateMobile: (req, res) => {
+    relateMobile: (req, res, next) => {
         let phoneNum = req.body.phoneNum;
         let openId = req.body.openId;
         let areaCode = req.body.areaCode || '86';
@@ -206,7 +206,7 @@ const bind = {
                 return result;
             }).then(result => {
                 res.json(result);
-            });
+            }).catch(next);
         } else {
             res.json({ code: 400, message: '', data: '' });
         }
@@ -223,20 +223,20 @@ const bind = {
         });
     },
-    changeCheck: (req, res) => {
+    changeCheck: (req, res, next) => {
         let phoneNum = req.body.phoneNum;
         let areaCode = req.body.areaCode;
         if (_.isNumber(parseInt(phoneNum, 0)) && areaCode) {
             BindService.changeCheck(phoneNum, areaCode).then(result => {
                 res.json(result);
-            });
+            }).catch(next);
         } else {
             res.json({ code: 400, message: '', data: '' });
         }
     },
-    changeMobile: (req, res) => {
+    changeMobile: (req, res, next) => {
         let uid = req.user.uid;
         let phoneNum = req.body.phoneNum;
         let areaCode = req.body.areaCode;
@@ -245,7 +245,7 @@ const bind = {
         if (_.isNumber(parseInt(phoneNum, 0)) && uid && areaCode && code) {
             BindService.changeMobile(uid, phoneNum, areaCode, code).then(result => {
                 res.json(result);
-            });
+            }).catch(next);
         } else {
             res.json({ code: 400, message: '', data: '' });
         }
--- a/apps/passport/controllers/reg.js
View file @14dd9b8
+++ b/apps/passport/controllers/reg.js
View file @14dd9b8
@@ -14,8 +14,7 @@ const cookie = require(global.library + '/cookie');
 const RegService = require('../models/reg-service');
 const AuthHelper = require('../models/auth-helper');
-const reg = {
-    index: (req, res) => {
+let index = (req, res) => {
         // 设置注册有效时间30分钟, 防机器刷
     req.session._REG_EXPIRE = Date.now() + 1800000;
@@ -33,8 +32,8 @@ const reg = {
         areaCode: '+86', // 默认的区号
         countrys: RegService.getAreaData() // 地区信息列表
     });
-    },
-    verifyMobile: (req, res, next) => {
+};
+let verifyMobile = (req, res, next) => {
     let data = {
         code: 400,
         message: '手机号已存在',
@@ -77,8 +76,8 @@ const reg = {
         return res.json(result);
     }).catch(next);
-    },
-    code: (req, res, next) => {
+};
+let codeAction = (req, res, next) => {
     let token = req.query.token;
     let mobile = +req.query.phoneNum;
     let area = +(req.query.areaCode || 86);
@@ -102,8 +101,8 @@ const reg = {
         token: token, // 访问令牌
         serviceUrl: 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=' // 在线客服
     });
-    },
-    sendCode: (req, res, next) => {
+};
+let sendCode = (req, res, next) => {
     let data = {
         code: 400,
         message: '发送验证码失败',
@@ -131,8 +130,8 @@ const reg = {
     RegService.sendCodeToMobile(area, mobile).then((result) => {
         return result.code ? res.json(result) : res.json(data);
     }).catch(next);
-    },
-    verifyCode: (req, res, next) => {
+};
+let verifyCode = (req, res, next) => {
     let data = {
         code: 400,
         message: '验证码错误',
@@ -178,8 +177,8 @@ const reg = {
         return res.json(result);
     }).catch(next);
-    },
-    password: (req, res, next) => {
+};
+let passwordAction = (req, res, next) => {
     let token = req.query.token;
     let mobile = +req.query.phoneNum;
     let area = +(req.query.areaCode || 86);
@@ -202,8 +201,8 @@ const reg = {
         phoneNum: mobile, // 手机号
         token: token // 访问令牌
     });
-    },
-    setPassword: (req, res, next) => {
+};
+let setPassword = (req, res, next) => {
     let data = {
         code: 400,
         message: '密码格式不正确',
@@ -268,7 +267,14 @@ const reg = {
             }
         });
     }).catch(next);
-    }
 };
-module.exports = reg;
+module.exports = {
+    index,
+    verifyMobile,
+    code: codeAction,
+    sendCode,
+    verifyCode,
+    password: passwordAction,
+    setPassword
+};
--- a/apps/passport/models/auth-helper.js
View file @14dd9b8
+++ b/apps/passport/models/auth-helper.js
View file @14dd9b8
@@ -59,11 +59,11 @@ class Auth {
                     domain: 'yohobuy.com'
                 });
             }
-            req.session._TOKEN = token; // esline-disable-line
-            req.session._LOGIN_UID = uid; // esline-disable-line
+            req.session._TOKEN = token;
+            req.session._LOGIN_UID = uid;
             res.cookie('_TOKEN', token, {
                 domain: 'yohobuy.com'
-            }); // esline-disable-line
+            });
         });
     }
 }
--- a/apps/passport/models/back-api.js
View file @14dd9b8
+++ b/apps/passport/models/back-api.js
View file @14dd9b8
@@ -6,7 +6,6 @@
 var API       = require('../../../library/api').API;
 const library = '../../../library';
-const sign = require(`${library}/sign`);
 var api = new API();
@@ -15,10 +14,10 @@ const YOHOBUY_URL = 'http://www.yohobuy.com/';
 /**
  * 获取地区数据
  */
-module.exports.getAreaDataAsync = () => {
-    return api.get('', sign.apiSign({
+const getAreaDataAsync = () => {
+    return api.get('', {
         method: 'app.passport.getArea'
-    })).then(result => {
+    }).then(result => {
         result.data = result.data.map(value => {
             value.areaCode = `+${value.area}`;
@@ -41,11 +40,11 @@ module.exports.getAreaDataAsync = () => {
  *
  * @param  string  mail  邮箱地址
  */
-module.exports.sendCodeToEmailAsync = (email) => {
-    return api.get('', sign.apiSign({
+const sendCodeToEmailAsync = (email) => {
+    return api.get('', {
         method: 'app.register.backpwdByEmail',
-        email: email
-    }));
+        email : email
+    });
 };
 /**
@@ -54,13 +53,13 @@ module.exports.sendCodeToEmailAsync = (email) => {
  * @param  string  pwd       新密码
  * @param  string  code    邮箱验证码
  */
-module.exports.modifyPasswordByEmailAsync = (pwd, code) => {
+const modifyPasswordByEmailAsync = (pwd, code) => {
     const options = {
-        url: `${YOHOBUY_URL}passport/back/update`,
-        form: {
-            pwd: pwd,
+        url    : `${YOHOBUY_URL}passport/back/update`,
+        form   : {
+            pwd       : pwd,
             're-input': pwd,
-            code: code
+            code      : code
         },
         timeout: 3000
     };
@@ -74,14 +73,12 @@ module.exports.modifyPasswordByEmailAsync = (pwd, code) => {
  * @param  string  mobile 手机号
  * @param  integer area   地区码ID
  */
-module.exports.sendCodeToMobileAsync = (mobile, area) => {
-    area = area || 86;
-
-    return api.get('', sign.apiSign({
+const sendCodeToMobileAsync = (mobile, area) => {
+    return api.get('', {
         mobile: mobile,
-        area: area,
+        area  : area,
         method: 'app.register.sendBackpwdCodeToMobile'
-    }));
+    });
 };
 /**
@@ -91,14 +88,14 @@ module.exports.sendCodeToMobileAsync = (mobile, area) => {
  * @param  string  code   验证码
  * @param  integer area   地区码ID
  */
-module.exports.validateMobileCodeAsync = (mobile, code, area) => {
+const validateMobileCodeAsync = (mobile, code, area) => {
     area = area || 86;
-    return api.get('', sign.apiSign({
+    return api.get('', {
         mobile: mobile,
-        code: code,
-        area: area,
+        code  : code,
+        area  : area,
         method: 'app.register.validBackpwdCode'
-    }));
+    });
 };
 /**
@@ -108,15 +105,22 @@ module.exports.validateMobileCodeAsync = (mobile, code, area) => {
  * @param  string  token   验证手机验证码返回的token
  * @param  integer area   地区码ID
  */
-module.exports.modifyPasswordByMobileAsync = (mobile, token, newpwd, area)=> {
-    area = area || 86;
-    return api.get('', sign.apiSign({
+const modifyPasswordByMobileAsync = (mobile, token, newpwd, area)=> {
+    return api.get('', {
         mobile: mobile,
-        token: token,
+        token : token,
         newpwd: newpwd,
-        area: area,
+        area  : area,
         method: 'app.register.changepwdByMobileCode'
-    }));
+    });
 };
+module.exports = {
+    getAreaDataAsync,
+    sendCodeToEmailAsync,
+    modifyPasswordByEmailAsync,
+    sendCodeToMobileAsync,
+    validateMobileCodeAsync,
+    modifyPasswordByMobileAsync
+};
--- a/apps/passport/models/bind-service.js
View file @14dd9b8
+++ b/apps/passport/models/bind-service.js
View file @14dd9b8
@@ -10,9 +10,8 @@
 const API = require(`${global.library}/api`).API;
 const api = new API();
-class RegService {
-
-    static bindCheck(mobile, openId, sourceType, area) {
+const RegService = {
+    bindCheck(mobile, openId, sourceType, area) {
         let params = {
             method: 'app.passport.signCheck',
             area: area,
@@ -22,9 +21,8 @@ class RegService {
         };
         return api.get('', params);
-    }
-
-    static sendBindMsg(area, mobile) {
+    },
+    sendBindMsg(area, mobile) {
         let params = {
             method: 'app.passport.smsbind',
             mobile: mobile,
@@ -32,18 +30,16 @@ class RegService {
         };
         return api.get('', params);
-    }
-
-    static checkBindCode(area, mobile, code) {
+    },
+    checkBindCode(area, mobile, code) {
         return api.get('', {
             method: 'app.register.validRegCode',
             mobile: mobile,
             area: area,
             code: code
         });
-    }
-
-    static bindMobile(openId, sourceType, mobile, area, password, nickname) {
+    },
+    bindMobile(openId, sourceType, mobile, area, password, nickname) {
         let params = {
             method: 'app.passport.bind',
             mobile: mobile,
@@ -61,9 +57,8 @@ class RegService {
         }
         return api.get('', params);
-    }
-
-    static relateMobile(openId, sourceType, mobile, area) {
+    },
+    relateMobile(openId, sourceType, mobile, area) {
         return api.get('', {
             method: 'app.passport.relateMobile',
             mobile: mobile,
@@ -71,17 +66,15 @@ class RegService {
             source_type: sourceType,
             area: area
         });
-    }
-
-    static changeCheck(mobile, area) {
+    },
+    changeCheck(mobile, area) {
         return api.get('', {
             method: 'app.passport.changeCheck',
             mobile: mobile,
             area: area
         });
-    }
-
-    static changeMobile(uid, mobile, area, code) {
+    },
+    changeMobile(uid, mobile, area, code) {
         return api.get('', {
             method: 'app.passport.changeMobile',
             mobile: mobile,
@@ -90,6 +83,6 @@ class RegService {
             area: area
         });
     }
-}
+};
 module.exports = RegService;
--- a/apps/passport/models/passport-alipay.js
View file @14dd9b8
+++ b/apps/passport/models/passport-alipay.js
View file @14dd9b8
@@ -16,7 +16,7 @@ const ALIPAY_URL = 'https://mapi.alipay.com/gateway.do';
 const defaultOptions = {
     service: 'alipay.auth.authorize',
-    _input_charset: 'utf-8',   // esline-disable-line
+    _input_charset: 'utf-8',
     sign_type: 'MD5',
     target_service: 'user.auth.quick.login'
 };
--- a/apps/passport/models/reg-service.js
View file @14dd9b8
+++ b/apps/passport/models/reg-service.js
View file @14dd9b8
@@ -10,9 +10,8 @@
 const API = require(`${global.library}/api`).API;
 const api = new API();
-class RegService {
-
-    static getAreaData() {
+const RegService = {
+    getAreaData() {
         return [
             {
                 areaCode: '+61',
@@ -63,9 +62,8 @@ class RegService {
                 selected: false,
                 name: '中国香港'
             }];
-    }
-
-    static sendCodeToMobile(area, mobile) {
+    },
+    sendCodeToMobile(area, mobile) {
         let params = {
             method: 'app.register.sendRegCodeToMobile',
             area: area,
@@ -73,9 +71,8 @@ class RegService {
         };
         return api.post('', params);
-    }
-
-    static validMobileCode(area, mobile, code) {
+    },
+    validMobileCode(area, mobile, code) {
         let params = {
             method: 'app.register.validRegCode',
             area: area,
@@ -84,9 +81,8 @@ class RegService {
         };
         return api.post('', params);
-    }
-
-    static regMobile(area, mobile, password, shoppingKey) {
+    },
+    regMobile(area, mobile, password, shoppingKey) {
         let params = {
             method: 'app.passport.register',
             area: area,
@@ -95,11 +91,11 @@ class RegService {
         };
         if (shoppingKey) {
-            params.shopping_key = shoppingKey; // esline-disable-line
+            params.shopping_key = shoppingKey;
         }
         return api.post('', params);
     }
-}
+};
 module.exports = RegService;
--- a/apps/passport/router.js
View file @14dd9b8
+++ b/apps/passport/router.js
View file @14dd9b8
@@ -13,6 +13,7 @@ const back = require(cRoot + '/back');
 const bind = require(cRoot + '/bind');
 const reg = require(cRoot + '/reg');
+
 const router = express.Router(); // eslint-disable-line
 // 登出
@@ -61,44 +62,20 @@ router.get('/reg/password', reg.password);
 router.post('/reg/setpassword', reg.setPassword);
 /**
- * 邮箱
+ * 密码找回
  */
-
-// 通过邮箱找回密码
-router.get('/back/email.html', back.indexByEmailPage);
-
-// 邮箱找回密码-成功
-router.get('/back/success.html', back.backSuccessByEmailPage);
-
-// 发送邮箱验证码
-router.post('/back/sendemail', back.sendCodeToEmailAPI);
-
-// 重新发送邮箱验证码
-router.get('/back/resendemail', back.resendCodeToEmailAPI);
-
-// 据邮箱修改密码
-router.post('/back/passwordbyemail', back.setNewPasswordByEmailAPI);
-
-/**
- * 手机
- */
-
-// 通过手机找回密码
-router.get('/back/mobile.html', back.indexByMobilePage);
-
-// 发送手机验证码
-router.get('/back/mobilecode.html', back.verifyCodeByMobilePage);
-
-// 输入新密码
-router.get('/back/backcode.html', back.setNewPasswordByMobilePage);
-
-// 发送手机验证码
-router.post('/back/sendcode', back.sendCodeToMobileAPI);
-
-// 校验手机验证码
-router.post('/back/verifycode', back.verifyCodeByMobileAPI);
-
-// 根据手机验证码修改密码
-router.post('/back/passwordbymobile', back.setNewPasswordByMobileAPI);
+router.get('/back/email', back.indexEmailPage);// 通过邮箱找回密码页面
+router.post('/back/sendemail', back.sendCodeToEmailAPI);// 发送邮箱验证码
+router.get('/back/resendemail', back.resendCodeToEmailAPI);// 重新发送邮箱验证码
+router.get('/back/success', back.backSuccessByEmailPage);// 邮箱找回密码-发送成功页面
+
+router.get('/back/mobile', back.indexMobilePage);// 输入手机号找回密码页面
+router.get('/back/mobilecode', back.verifyCodeByMobilePage);// 输入手机验证码页面
+router.post('/back/sendcode', back.sendCodeToMobileAPI);// 发送手机验证码
+router.post('/back/verifycode', back.verifyCodeByMobileAPI);// 校验手机验证码
+
+router.get('/back/backcode', back.setNewPasswordByMobilePage);// 设置新密码页面
+router.post('/back/passwordbyemail', back.setNewPasswordByEmailAPI);// 依据邮箱验证码修改密码
+router.post('/back/passwordbymobile', back.setNewPasswordByMobileAPI);// 依据手机验证码修改密码
 module.exports = router;
--- a/library/helpers.js
View file @14dd9b8
+++ b/library/helpers.js
View file @14dd9b8
@@ -286,6 +286,9 @@ exports.verifyMobile = (phone) => {
     return /^1[3|4|5|8|7][0-9]{9}$/.test(phone);
 };
+/**
+ * 验证密码规则
+ */
 exports.verifyPassword = (password) => {
     if (!password) {
         return false;
--- a/public/dist/m-yohobuy-node/0.1.0/index.css
View file @14dd9b8
+++ b/public/dist/m-yohobuy-node/0.1.0/index.css
View file @14dd9b8
--- a/public/js/passport/back/new-password.js
View file @14dd9b8
+++ b/public/js/passport/back/new-password.js
View file @14dd9b8
@@ -49,7 +49,7 @@ $btnOk.on('touchstart', function() {
     if (mobileBack) {
         $.extend(setting, {
             phoneNum: $phoneNum.val(),
-            areaCode: $('#areaCode').val(),
+            areaCode: $('#area-code').val(),
             token: $('#token').val()
         });
--- a/public/js/passport/login/international.js
View file @14dd9b8
+++ b/public/js/passport/login/international.js
View file @14dd9b8
@@ -20,7 +20,7 @@ var tip = require('../../plugin/tip');
 var trim = $.trim;
 var showErrTip = tip.show;
-//登录按钮状态切换
+// 登录按钮状态切换
 function switchLoginBtnStatus() {
     if (pnPass && pwdPass) {
         $loginBtn.removeClass('disable');
@@ -29,13 +29,13 @@ function switchLoginBtnStatus() {
     }
 }
-//Android-UC下显示select的direction:rtl无效的临时解决办法
+// Android-UC下显示select的direction:rtl无效的临时解决办法
 api.selectCssHack($countrySelect);
-//显示隐藏密码
+// 显示隐藏密码
 api.bindEyesEvt();
-//清空手机号码
+// 清空手机号码
 api.bindClearEvt();
 $phoneNum.bind('input', function() {
@@ -98,14 +98,14 @@ $loginBtn.on('touchstart', function() {
                         success: function() {
                             clearTimeout(time);
-                            //Cookie写入成功后，1s后跳转页面
+                            // Cookie写入成功后，1s后跳转页面
                             setTimeout(function() {
                                 location.href = res.href;
                             }, 1000);
                         }
                     });
-                    //3秒后强制跳转
+                    // 3秒后强制跳转
                     time = setTimeout(function() {
                         location.href = res.href;
                     }, 3000);
@@ -128,6 +128,6 @@ $loginBtn.on('touchstart', function() {
     }
 });
-//对初始有默认值的情况去初始化登录按钮状态
+// 对初始有默认值的情况去初始化登录按钮状态
 $phoneNum.trigger('input');
 $pwd.trigger('input');
--- a/public/js/passport/login/login.js
View file @14dd9b8
+++ b/public/js/passport/login/login.js
View file @14dd9b8
@@ -21,7 +21,7 @@ var tip = require('../../plugin/tip');
 var trim = $.trim;
 var showErrTip = tip.show;
-//登录按钮状态切换
+// 登录按钮状态切换
 function switchLoginBtnStatus() {
     if (accPass && pwdPass) {
         $loginBtn.removeClass('disable');
@@ -30,22 +30,22 @@ function switchLoginBtnStatus() {
     }
 }
-//显示找回密码面板
+// 显示找回密码面板
 function showRetrivePanel() {
     $mask.show();
     $ways.show();
 }
-//隐藏找回密码面板
+// 隐藏找回密码面板
 function hideRetrivePanel() {
     $mask.hide();
     $ways.hide();
 }
-//密码显示与隐藏
+// 密码显示与隐藏
 api.bindEyesEvt();
-//清空账号输入框
+// 清空账号输入框
 api.bindClearEvt();
 $account.bind('input', function() {
@@ -78,7 +78,7 @@ $loginBtn.on('touchstart', function() {
     $loginBtn.text('正在登录...').addClass('disable');
-    //验证账号（数字或者邮箱）和密码合理性
+    // 验证账号（数字或者邮箱）和密码合理性
     if ((/^[0-9]+$/.test(acc) || api.emailRegx.test(acc)) && api.pwdValidate(pwd)) {
         $.ajax({
             type: 'POST',
@@ -126,6 +126,6 @@ $('#cancel-retrive').on('touchstart', function(e) {
     hideRetrivePanel();
 });
-//对初始有默认值的情况去初始化登录按钮状态
+// 对初始有默认值的情况去初始化登录按钮状态
 $account.trigger('input');
 $pwd.trigger('input');