完善注册首页

@@ -7,10 +7,10 @@
 
 
 'use strict';
 'use strict';
 
 
-// const helpers = require(global.library + '/helpers');
+const helpers = require(global.library + '/helpers');
+const sign = require(global.library + '/sign');
 const RegService = require('../models/reg-service');
 const RegService = require('../models/reg-service');
-
-// const _ = require('lodash');
+const _ = require('lodash');
 
 
 const reg = {
 const reg = {
     index: (req, res) => {
     index: (req, res) => {
@@ -32,6 +32,96 @@ const reg = {
             areaCode: '+86', // 默认的区号
             areaCode: '+86', // 默认的区号
             countrys: RegService.getAreaData() // 地区信息列表
             countrys: RegService.getAreaData() // 地区信息列表
         });
         });
+    },
+    verifymobile: (req, res, next) => {
+        let data = {
+            code: 400,
+            message: '手机号已存在',
+            data: ''
+        };
+
+
+        let mobile = +req.body.phoneNum;
+        let area = +(req.body.areaCode || 86);
+
+        /* 判断参数是否合法 */
+        if (!_.isNumber(mobile) || !_.isNumber(area)) {
+            data.message = '手机号错误';
+            return res.json(data);
+        }
+
+        /* 设置注册有效时间30分钟, 防机器刷 */
+        let expire = req.session._REG_EXPIRE;
+
+        if (!expire || expire < Date.now()) {
+            data.message = '非法请求';
+            return res.json(data);
+        }
+
+        /* 向手机发送注册验证码 */
+        RegService.sendCodeToMobile(area, mobile).then((result) => {
+            if (!result.code) {
+                return res.json(data);
+            }
+
+            /* 返回跳转到验证页面的链接 */
+            if (result.code === 200) {
+                let token = sign.makeToken(mobile);
+
+                result.data = helpers.urlFormat('/passport/reg/code', {
+                    token: token,
+                    phoneNum: mobile,
+                    areaCode: area
+                });
+            }
+
+            return res.json(result);
+        }).catch(next);
+    },
+    verifycode: (req, res, next) => {
+        let data = {
+            code: 400,
+            message: '验证码错误',
+            data: ''
+        };
+
+        let mobile = req.body.phoneNum;
+        let area = req.body.areaCode;
+        let code = req.body.code;
+
+        /* 判断参数是否合法 */
+        if (!_.isNumber(mobile) || !_.isNumber(area)) {
+            return res.json(data);
+        }
+
+        /* 设置注册有效时间30分钟, 防机器刷 */
+        let expire = req.session._REG_EXPIRE;
+
+        if (!expire || expire < Date.now()) {
+            return res.json(data);
+        }
+
+        /* 验证注册的标识码是否有效 */
+        RegService.validMobileCode(area, mobile, code).then((result) => {
+            if (!result.code) {
+                return res.json(data);
+            }
+
+            /* 返回跳转到设置密码的链接 */
+            if (result.code === 200) {
+                let token = sign.makeToken(mobile);
+
+                result.data = helpers.urlFormat('/passport/reg/password', {
+                    token: token,
+                    phoneNum: mobile,
+                    areaCode: area
+                });
+            } else if (result.code === 404) {
+                result.message = '验证码错误'; // 统一验证提示
+            }
+
+            return res.json(result);
+        }).catch(next);
     }
     }
 };
 };
 
 

@@ -53,6 +53,7 @@ router.post('/bind/changeMobile', bind.changeMobile);
  * 注册
  * 注册
  */
  */
 router.get('/reg/index', reg.index);
 router.get('/reg/index', reg.index);
+router.post('/reg/verifymobile', reg.verifymobile);
 
 
 /**
 /**
  * 邮箱
  * 邮箱

@@ -83,7 +83,9 @@ class Http {
                 cache.setSlave(`apiCache:${reqId}`, result, 86400).catch(catchErr); // 二级缓存存储一天
                 cache.setSlave(`apiCache:${reqId}`, result, 86400).catch(catchErr); // 二级缓存存储一天
             }
             }
 
 
-            log.info(`use: ${duration}ms for ${method} api: ${options.url}?${qs.stringify(options.qs)} `);
+            let reqData = options.qs || options.form;
+
+            log.info(`use: ${duration}ms for ${method} api: ${options.url}?${qs.stringify(reqData)} `);
             return result;
             return result;
         }).catch((err)=> {
         }).catch((err)=> {
             const duration = timer.put('getApi');// 统计时间结束
             const duration = timer.put('getApi');// 统计时间结束

+require('./register/register');

+/**
+ * 注册-验证码
+ * @author: xuqi<qi.xu@yoho.cn>
+ * @date: 2015/10/8
+ */
+
+require('../code')(true);

+/**
+ * 注册-密码
+ * @author: xuqi<qi.xu@yoho.cn>
+ * @date: 2015/10/8
+ */
+var $ = require('jquery');
+
+var $pwd = $('#pwd'),
+    $btnSure = $('#btn-sure');
+
+var api = require('../api');
+var tip = require('../../plugin/tip');
+
+var trim = $.trim;
+var showErrTip = tip.show;
+
+api.bindEyesEvt({
+    status: 'open' // 默认眼睛打开
+});
+
+$pwd.bind('input', function() {
+    if (trim($pwd.val()) === '') {
+        $btnSure.addClass('disable');
+    } else {
+        $btnSure.removeClass('disable');
+    }
+});
+
+$btnSure.on('touchstart', function() {
+    var pwd = trim($pwd.val());
+
+    if ($btnSure.hasClass('disable')) {
+        return;
+    }
+
+    if (api.pwdValidate(pwd) === false) {
+        showErrTip('密码6-20位，请重新输入');
+    } else {
+        $.ajax({
+            type: 'POST',
+            url: '/passport/reg/setpassword',
+            data: {
+                password: pwd,
+                phoneNum: $('#phone-num').val(),
+                areaCode: $('#area-code').val(),
+                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 = res.href;
+                    }, 1000);
+                } else {
+                    showErrTip(data.message);
+                }
+            }
+        });
+    }
+});

+/**
+ * 注册
+ * @author: xuqi<qi.xu@yoho.cn>
+ * @date: 2015/10/8
+ */
+var $ = require('yoho-jquery');
+
+var $phoneNum = $('#phone-num'),
+    $countrySelect = $('#country-select'),
+    $areaCode = $('#area-code'),
+    $btnNext = $('#btn-next');
+
+var api = require('../api');
+var tip = require('../../plugin/tip');
+
+var trim = $.trim;
+var showErrTip = tip.show;
+
+var requested = false;
+
+api.selectCssHack($('#country-select'));
+
+api.bindClearEvt();
+
+$phoneNum.bind('input', function() {
+    if (trim($phoneNum.val()) === '') {
+        $btnNext.addClass('disable');
+    } else {
+        $btnNext.removeClass('disable');
+    }
+});
+
+$countrySelect.change(function() {
+    $areaCode.text($countrySelect.val());
+});
+
+$btnNext.on('touchstart', function() {
+    var pn = trim($phoneNum.val()),
+        areaCode = $countrySelect.val();
+
+    if ($btnNext.hasClass('disable')) {
+        return;
+    }
+
+    if (requested) {
+        return false;
+    }
+
+
+    if (api.phoneRegx[areaCode].test(pn)) {
+
+        requested = true;
+
+        $.ajax({
+            url: '/passport/reg/verifymobile',
+            type: 'POST',
+            data: {
+                areaCode: areaCode.replace('+', ''),
+                phoneNum: pn
+            },
+            success: function(data) {
+                if (data.code === 200) {
+                    location.href = data.data;
+                } else {
+                    showErrTip(data.message);
+                    requested = false;
+                }
+            },
+            error: function() {
+                showErrTip('出错了，请重试');
+                requested = false;
+            }
+        });
+    } else {
+        showErrTip('手机号格式不正确，请重新输入');
+    }
+});