Merge branch 'release/5.2' of git.yoho.cn:fe/yohobuywap-node into release/5.2

沈志敏
Commit f518425370d06bd3f87022bd00c22cd6967ee60b 2 parents 2a9cce76 0868d66e
Showing 24 changed files with 440 additions and 70 deletions
apps/guang/models/rss.js
apps/home/controllers/suggest.js
apps/home/models/suggest.js
apps/passport/controllers/back.js
apps/passport/controllers/reg.js
apps/passport/models/captcha-service.js
apps/passport/router.js
apps/passport/views/action/back/mobile.hbs
apps/passport/views/action/reg/index.hbs
apps/product/controllers/detail.js
apps/product/models/consult-comment.js
apps/product/models/list.js
apps/product/views/action/shop/index.hbs
apps/product/views/partial/search/list.hbs
package.json
public/js/activity/coupon-floor.page.js
public/js/passport/back/mobile.js
public/js/passport/register/register.js
public/js/product/detail/comments-consults.js
public/js/product/detail/consultform.js
--- a/apps/guang/models/rss.js
View file @f518425
+++ b/apps/guang/models/rss.js
View file @f518425
@@ -55,7 +55,6 @@ const getRssArticle = (gender) => {
                     resolve(result);
                 }
             };
-
             return new Promise((resolve) => {
                 artListFunc(0, article.data.list.artList.length, resolve);
             });
@@ -96,4 +95,4 @@ const _genIntro = (id) => {
 module.exports = {
     getRssArticle
-};
+};
--- a/apps/home/controllers/suggest.js
View file @f518425
+++ b/apps/home/controllers/suggest.js
View file @f518425
@@ -11,11 +11,11 @@ const headerModel = require('../../../doraemon/models/header'); // 头部model
 const _ = require('lodash');
 const suggestData = (req, res, next) => {
+    let uid = req.user.uid;
     let udid = req.sessionID || 'yoho';
     let page = req.query.page || 1;
     let limit = 10;
-
-    suggestModel.suggestData(udid, page, limit).then((result) => {
+    suggestModel.suggestData(uid, udid, page, limit).then((result) => {
         res.render('suggest', {
             module: 'home',
--- a/apps/home/models/suggest.js
View file @f518425
+++ b/apps/home/models/suggest.js
View file @f518425
@@ -11,14 +11,13 @@ const serviceAPI = global.yoho.ServiceAPI;
 const camelCase = global.yoho.camelCase;
 const _ = require('lodash');
-const suggestData = (udid, page, limit) => {
+const suggestData = (uid, udid, page, limit) => {
     return serviceAPI.get('suggest/api/v1/suggest/getList', {
         udid: udid,
         page: page,
         limit: limit
     }).then((result) => {
-
         if (result && result.code === 200 && result.data) {
             _.forEach(result.data.list, function(data) {
@@ -36,7 +35,6 @@ const suggestData = (udid, page, limit) => {
 };
 const upAndDown = (uid, udid, reliable, suggestId) => {
-
     return serviceAPI.get('suggest/api/v1/suggest/is_reliable', {
         uid: uid,
         udid: udid,
--- a/apps/passport/controllers/back.js
View file @f518425
+++ b/apps/passport/controllers/back.js
View file @f518425
@@ -10,6 +10,7 @@ const _ = require('lodash');
 const helpers = global.yoho.helpers;
 const service = require('../models/back-service');
+const captchaService = require('../models/captcha-service');
 const SIGN_IN = helpers.urlFormat('/passport/login');
@@ -150,18 +151,93 @@ const indexMobilePage = (req, res, next) => {
                 isPassportPage: true,
                 backMobile: true,
                 countrys: result.data,
-                areaCode: '+86'
+                areaCode: '+86',
+                verifySrc: helpers.urlFormat('/passport/back/generatecodeimg.png', {t: Date.now()})
             }));
         })
         .catch(next);
 };
 /**
+ * 生成验证码
+ * @param req
+ * @param res
+ */
+const generateCodeImg = (req, res) => {
+    let verifyCodeImg = captchaService.generateCaptcha(109, 50, 4);
+
+    if (verifyCodeImg) {
+
+        if (req.session.backupCaptch) {
+            req.session.backupCaptch.code = verifyCodeImg.text;
+            req.session.backupCaptch.verifyResult = false;
+        } else {
+            req.session.backupCaptch = {
+                code: verifyCodeImg.text,
+                verifyResult: false
+            };
+        }
+
+        res.set('Cache-Control', 'no-cache').send(verifyCodeImg.image);
+    }
+};
+
+/**
  * 发送手机验证码
  */
 const sendCodeToMobileAPI = (req, res, next) => {
+    let verifyCode = req.body.verifyCode || '';
     let phoneNum = req.body.phoneNum || '';
     let areaCode = req.body.areaCode || '86';
+
+    /* 如果设置了冻结时间，验证 */
+    if (_.has(req.session, 'backupCaptch.timeout')) {
+        let untilTime = (parseInt(req.session.backupCaptch.timeout, 10) -
+            parseInt(Date.now(), 10)) / 1000 / 60;
+
+        if (parseInt(Date.now(), 10) < parseInt(req.session.backupCaptch.timeout, 10)) {
+            return res.json({
+                code: 401,
+                message: '请' + (parseInt(untilTime, 10) + 1) + '分钟后尝试！'
+            });
+        }
+    }
+
+    /* 如果设置了验证次数，验证是否合法，验证次数减 1；没有，设置验证次数 */
+    if (_.has(req.session, 'backupCaptch.useTime')) {
+        if (parseInt(req.session.backupCaptch.useTime, 10) <= 0) {
+
+            /* 如果超过验证次数，冻结 5 分钟，更新验证次数 */
+            req.session.backupCaptch.timeout = Date.now() + 5 * 60 * 1000;
+            req.session.backupCaptch.useTime = 5;
+            return res.json({
+                code: 401,
+                message: '请5分钟后尝试！'
+            });
+        }
+        req.session.backupCaptch.useTime = req.session.backupCaptch.useTime - 1;
+    } else {
+        req.session.backupCaptch.useTime = 5;
+    }
+
+    if (verifyCode) {
+        if (verifyCode.toString() === _.get(req, 'session.backupCaptch.code', '').toString()) {
+            req.session.backupCaptch.verifyResult = true;
+        } else {
+            return res.json({
+                code: 400,
+                message: '验证码输入错误'
+            });
+        }
+    } else if (!req.session.backupCaptch.verifyResult) {
+
+        return res.json({
+            code: 409,
+            message: '非法请求！',
+            refer: helpers.urlFormat('/')
+        });
+    }
+
     let ERR = {
         code: 400,
         message: '输入手机号码出错'
@@ -198,6 +274,11 @@ const verifyCodeByMobilePage = (req, res) => {
     let phoneNum = req.query.phoneNum || '';
     let areaCode = req.query.areaCode || '86';
+    /* 用户直接进入第二个页面的情况 */
+    if (!_.get(req, 'session.backupCaptch.verifyResult')) {
+        return res.redirect(helpers.urlFormat('/'));
+    }
+
     res.render('back/mobile-code', Object.assign({
         module: 'passport',
         page: 'back-code',
@@ -208,8 +289,8 @@ const verifyCodeByMobilePage = (req, res) => {
         isPassportPage: true,
         backCode: true,
         areaCode: areaCode,
-        phoneNum: phoneNum
-
+        phoneNum: phoneNum,
+        verifySrc: helpers.urlFormat('/passport/back/generatecodeimg.png', {t: Date.now()})
     }));
 };
@@ -309,5 +390,6 @@ module.exports = {
     verifyCodeByMobilePage,
     verifyCodeByMobileAPI,
     setNewPasswordByMobilePage,
-    setNewPasswordByMobileAPI
+    setNewPasswordByMobileAPI,
+    generateCodeImg
 };
--- a/apps/passport/controllers/reg.js
View file @f518425
+++ b/apps/passport/controllers/reg.js
View file @f518425
@@ -13,8 +13,49 @@ const sign = global.yoho.sign;
 const cookie = global.yoho.cookie;
 const RegService = require('../models/reg-service');
 const AuthHelper = require('../models/auth-helper');
+const captchaService = require('../models/captcha-service');
+
+/*
+    session 结构
+    phoneReg: {
+        step  //当前步骤
+        captcha // step1 的校验码
+        count: 5 // 默认可以重发5次, 当count: 0, 冻结30min,之后解冻
+        expire // 解冻时间
+    }
+*/
+
+/**
+ *  步骤校验
+ *  step: 预期步骤
+ */
+let guardStep = function(step) {
+    return (req, res, next) => {
+        let curStep = _.get(req.session, 'phoneReg.step');
+
+        if (curStep !== step) {
+            if (req.xhr) {
+                return res.json({
+                    code: 400,
+                    refer: '/reg.html'
+                });
+            } else {
+                return res.redirect('/reg.html');
+            }
+        }
+
+        return next();
+    };
+};
+/**
+ *  Step1: 输入手机号码 + 验证码
+ */
 let index = (req, res) => {
+    if (req.user.uid) {
+        return res.redirect(req.get('refer') || '/');
+    }
+
     // 设置注册有效时间30分钟, 防机器刷
     // req.session.REG_EXPIRE = Date.now() + 1800000;
     let refer = req.query.refer;
@@ -23,17 +64,27 @@ let index = (req, res) => {
         domain: 'yohobuy.com'
     });
+    // session init
+    _.set(req.session, 'phoneReg.step', 1);
+
+    if (req.session.phoneReg.count == null) { // eslint-disable-line
+        req.session.phoneReg.count = 5;
+    }
+
     res.render('reg/index', {
         module: 'passport',
         page: 'reg',
         title: '注册',
         backUrl: 'javascript:history.go(-1)', // eslint-disable-line
+        captchaUrl: helpers.urlFormat('/passport/reg/captcha.png', {t: Date.now()}),
         headerText: '注册', // 头部信息
         isPassportPage: true, // 模板中模块标识
         areaCode: '+86', // 默认的区号
         countrys: RegService.getAreaData() // 地区信息列表
     });
 };
+
+
 let verifyMobile = (req, res, next) => {
     let data = {
         code: 400,
@@ -43,6 +94,15 @@ let verifyMobile = (req, res, next) => {
     let mobile = +req.body.phoneNum;
     let area = +(req.body.areaCode || 86);
+    let captcha = (req.body.captcha || '').trim();
+
+    if (captcha !== _.get(req.session, 'phoneReg.captcha')) {
+        return res.json({
+            code: 400,
+            message: '校验码不正确',
+            refreshCaptcha: true
+        });
+    }
     // 判断参数是否合法
     if (!_.isNumber(mobile) || !_.isNumber(area)) {
@@ -58,6 +118,7 @@ let verifyMobile = (req, res, next) => {
     //     return res.json(data);
     // }
+
     // 向手机发送注册验证码
     RegService.sendCodeToMobile(area, mobile).then((result) => {
         if (!result.code) {
@@ -68,6 +129,8 @@ let verifyMobile = (req, res, next) => {
         if (result.code === 200) {
             let token = sign.makeToken(mobile);
+            _.set(req.session, 'phoneReg.step', 2); // go step 2
+
             result.data = helpers.urlFormat('/passport/reg/code', {
                 token: token,
                 phoneNum: mobile,
@@ -78,6 +141,11 @@ let verifyMobile = (req, res, next) => {
         return res.json(result);
     }).catch(next);
 };
+
+
+/**
+ *  Step2: 校验 手机验证码
+ */
 let codeAction = (req, res, next) => {
     let token = req.query.token;
     let mobile = +req.query.phoneNum;
@@ -103,6 +171,36 @@ let codeAction = (req, res, next) => {
         serviceUrl: 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=' // 在线客服
     });
 };
+
+let sendCodeBusyBoy = (req, res, next) => {
+    let count = _.get(req.session, 'phoneReg.count');
+    let expire = _.get(req.session, 'phoneReg.expire');
+
+    if (count) {
+        return next();
+    } else {
+
+        /*
+            如果 count === 0
+                1. 没过解冻期
+                2. 过了解冻期, count reset to 5
+        */
+        let now = Date.now();
+
+        if (now > expire) {
+            _.set(req.session, 'phoneReg.count', 5);
+            return next();
+
+        } else {
+            return res.json({
+                code: 400,
+                message: '错误次数太多, 5分钟稍后再试'
+            });
+        }
+
+    }
+};
+
 let sendCode = (req, res, next) => {
     let data = {
         code: 400,
@@ -129,10 +227,21 @@ let sendCode = (req, res, next) => {
     // 向手机发送注册验证码
     RegService.sendCodeToMobile(area, mobile).then((result) => {
-        return result.code ? res.json(result) : res.json(data);
+        let code = _.get(result, 'code');
+
+        if (code) {
+            --req.session.phoneReg.count;
+
+            // count is 0, will freeze;
+            if (!req.session.phoneReg.count) {
+                _.set(req.session, 'phoneReg.expire', Date.now() + 5 * 60 * 1000);
+            }
+            return res.json(result);
+        } else {
+            return res.json(data);
+        }
     }).catch(next);
 };
-
 let verifyCode = (req, res, next) => {
     let data = {
         code: 400,
@@ -164,26 +273,33 @@ let verifyCode = (req, res, next) => {
             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,
-                smsCode: code
-            });
-        } else if (result.code === 404) {
-            result.message = '验证码错误'; // 统一验证提示
+        let resultCode = _.get(result, 'code');
+        let token = sign.makeToken(mobile);
+
+        switch (resultCode) {
+            case 200:
+                _.set(req.session, 'phoneReg.step', 3); // go step 3
+                result.data = helpers.urlFormat('/passport/reg/password', {
+                    token: token,
+                    phoneNum: mobile,
+                    areaCode: area,
+                    smsCode: code
+                });
+                break;
+            case 404:
+            default:
+                result = data;
         }
         return res.json(result);
     }).catch(next);
 };
+/**
+ *  Step3: set Password
+ */
-let passwordAction = (req, res, next) => {
+let passwordAction = (req, res) => {
     let token = req.query.token;
     let mobile = +req.query.phoneNum;
     let area = +(req.query.areaCode || 86);
@@ -210,7 +326,6 @@ let passwordAction = (req, res, next) => {
     });
 };
-
 let setPassword = (req, res, next) => {
     let data = {
         code: 400,
@@ -267,6 +382,8 @@ let setPassword = (req, res, next) => {
             refer = '/home';
         }
+        delete req.session.phoneNum;
+
         return res.json({
             code: 200,
             message: '注册成功',
@@ -278,12 +395,29 @@ let setPassword = (req, res, next) => {
     }).catch(next);
 };
+/**
+ *  生成 校验码
+ */
+const genCaptcha = (req, res) => {
+    let captcha = captchaService.generateCaptcha(90, 52, 4);
+
+    _.set(req.session, 'phoneReg.captcha', captcha.text);
+
+    res.type('png')
+       .set('Cache-Control', 'no-cache')
+       .status(200)
+       .send(captcha.image);
+};
+
 module.exports = {
+    guardStep,
+    sendCodeBusyBoy,
     index,
     verifyMobile,
     code: codeAction,
     sendCode,
     verifyCode,
     password: passwordAction,
-    setPassword
+    setPassword,
+    genCaptcha
 };
--- a/apps/passport/models/captcha-service.js 0 → 100644
View file @f518425
+++ b/apps/passport/models/captcha-service.js 0 → 100644
View file @f518425
+/**
+ * Created by TaoHuang on 2016/7/1.
+ */
+
+'use strict';
+
+const _ = require('lodash');
+const Captchapng = require('captchapng');
+
+exports.generateCaptcha = (width, height, length) => {
+    let min = Math.pow(10, (length - 1 || 1));
+    let max = Math.pow(10, (length - 1 || 1)) * 9;
+    let token = '' + _.random(min, max);
+
+    let png = new Captchapng(width, height, token);//
+
+    png.color(0, 0, 0, 0);  // First color: background (red, green, blue, alpha)
+    png.color(80, 80, 80, 255); // Second color: paint (red, green, blue, alpha)
+
+    return {
+        image: new Buffer(png.getBase64(), 'base64'),
+        text: token
+    };
+};
--- a/apps/passport/router.js
View file @f518425
+++ b/apps/passport/router.js
View file @f518425
@@ -12,7 +12,8 @@ const login = require(cRoot + '/login');
 const back = require(cRoot + '/back');
 const bind = require(cRoot + '/bind');
 const reg = require(cRoot + '/reg');
-const smsLogin = require(cRoot + '/sms');
+
+// const smsLogin = require(cRoot + '/sms');
 const update = require(cRoot + '/update');
 const agreement = require(cRoot + '/app-agreement');
@@ -84,12 +85,13 @@ router.post('/passport/bind/changeMobile', bind.changeMobile);
  * 注册
  */
 router.get('/passport/reg/index', reg.index);
-router.post('/passport/reg/verifymobile', reg.verifyMobile);
-router.get('/passport/reg/code', reg.code);
-router.post('/passport/reg/sendcode', reg.sendCode);
-router.post('/passport/reg/verifycode', reg.verifyCode);
-router.get('/passport/reg/password', reg.password);
-router.post('/passport/reg/setpassword', reg.setPassword);
+router.get('/passport/reg/captcha.png', reg.genCaptcha);
+router.post('/passport/reg/verifymobile', reg.sendCodeBusyBoy, reg.verifyMobile);
+router.get('/passport/reg/code', reg.guardStep(2), reg.code);
+router.post('/passport/reg/sendcode', reg.guardStep(2), reg.sendCodeBusyBoy, reg.sendCode);
+router.post('/passport/reg/verifycode', reg.guardStep(2), reg.verifyCode);
+router.get('/passport/reg/password', reg.guardStep(3), reg.password);
+router.post('/passport/reg/setpassword', reg.guardStep(3), reg.setPassword);
 /**
  * 密码找回
@@ -101,6 +103,7 @@ router.get('/passport/back/success', back.backSuccessByEmailPage);// 邮箱找
 router.get('/passport/back/mobile', back.indexMobilePage);// 输入手机号找回密码页面
 router.get('/passport/back/mobilecode', back.verifyCodeByMobilePage);// 输入手机验证码页面
+router.get('/passport/back/generatecodeimg.png', back.generateCodeImg);// 生成图片验证码
 router.post('/passport/back/sendcode', back.sendCodeToMobileAPI);// 发送手机验证码
 router.post('/passport/back/verifycode', back.verifyCodeByMobileAPI);// 校验手机验证码
--- a/apps/passport/views/action/back/mobile.hbs
View file @f518425
+++ b/apps/passport/views/action/back/mobile.hbs
View file @f518425
@@ -6,6 +6,10 @@
             <span id="area-code" class="area-code">{{areaCode}}</span>
             <input id="phone-num" class="input phone-num" type="text" placeholder="手机号">
         </div>
+        <div class="passport-captcha row">
+            <input id="verify-code" type="text" placeholder="验证码">
+            <div class="passport-captcha-img"><img id="verify-code-img" src="{{verifySrc}}" alt="verify code"></div>
+        </div>
         <span id="btn-next" class="btn btn-next disable row">下一步</span>
     </div>
 </div>
--- a/apps/passport/views/action/reg/index.hbs
View file @f518425
+++ b/apps/passport/views/action/reg/index.hbs
View file @f518425
@@ -6,7 +6,15 @@
             <span id="area-code" class="area-code">{{areaCode}}</span>
             <input id="phone-num" class="input phone-num" type="text" placeholder="手机号">
         </div>
+        <!-- 验证码: start-->
+        <div class="passport-captcha row">
+            <input id="js-captcha"  type="text" placeholder="验证码">
+            <div class="passport-captcha-img">
+                <img class="passport-captcha-png" src="{{captchaUrl}}">
+            </div>
+        </div>
+        <!-- 验证码: end-->
         <span id="btn-next" class="btn btn-next disable row">下一步</span>
         <p class="register-tip">Yoho!Family账号可登录Yoho!Buy有货、Yoho!Now、mars及SHOW</p>
     </div>
-</div>
+</div>
--- a/apps/product/controllers/detail.js
View file @f518425
+++ b/apps/product/controllers/detail.js
View file @f518425
@@ -176,12 +176,12 @@ exports.consults = (req, res, next) => {
     if (!req.query.product_id) {
         return next();
     }
-
+    let uid = req.user.uid || 0;
     let headerData = headerModel.setNav({
         navTitle: '购买咨询'
     });
-    detailRelated.consults(req.query).then((result) => {
+    detailRelated.consults(req.query, uid).then((result) => {
         res.render('detail/consults', Object.assign({
             title: '购买咨询',
             pageHeader: headerData,
@@ -253,8 +253,7 @@ exports.consultsubmit = (req, res, next) => {
         return res.json(data);
     }
-    detailRelated.addConsult(req.user.uid, req.body.product_id, req.body.content).then((result) => {
-
+    return detailRelated.addConsult(req.user.uid, req.body.product_id, req.body.content).then((result) => {
         if (result) {
             Object.assign(data, result);
         }
--- a/apps/product/models/consult-comment.js
View file @f518425
+++ b/apps/product/models/consult-comment.js
View file @f518425
@@ -64,12 +64,13 @@ const _formatConsultsList = (data) => {
  * @limit  {[number]} 每页咨询数量
  * @return {[object]}
  */
-const getConsults = (id, page, limit) => {
+const getConsults = (id, page, limit, uid) => {
     let params = {
         method: 'app.consult.li',
         product_id: id,
         page: page ? page : 1,
-        limit: limit ? limit : 300
+        limit: limit ? limit : 300,
+        uid
     };
     return api.get('', params, {
@@ -160,10 +161,10 @@ let comments = (params) => {
  * @params  {[object]} 查询参数
  * @return {[object]}
  */
-let consults = (params) => {
+let consults = (params, uid) => {
     return api.all([
         _getCommonConsult(),
-        getConsults(params.product_id, 1, 60)
+        getConsults(params.product_id, 1, 60, uid)
     ]).then(result => {
         let data = {
             link: `/product/detail/consultform?product_id=${params.product_id}`
--- a/apps/product/models/list.js
View file @f518425
+++ b/apps/product/models/list.js
View file @f518425
@@ -515,6 +515,7 @@ const getShopData = (req, shopId, uid, isApp) => {
             return Promise.all([
                 searchModel.getFilterSearchData({
                     shop_id: shopId,
+                    type: 'default',//默认
                     brand: brandData.join(','),
                     order: '0',
                     channel: channel
--- a/apps/product/views/action/shop/index.hbs
View file @f518425
+++ b/apps/product/views/action/shop/index.hbs
View file @f518425
@@ -121,9 +121,9 @@
                 <div class="discount-area first" id="navlist2">
                     <ul id="list-nav" class="home-sub-nav list-nav pos-list clearfix">
-                        <li data-bp-id="shop_listnav_new_1" class="new active buriedpoint first-li-more">
+                        <li data-bp-id="shop_listnav_default_1" class="default active buriedpoint first-li-more">
                             <a href="javascript:void(0);">
-                                <span class="spanTest">最新</span>
+                                <span class="spanTest">默认</span>
                                 <span class="iconfont up cur hide">&#xe615;</span>
                                 <span class="iconfont down cur">&#xe616;</span>
                             </a>
@@ -191,9 +191,9 @@
         </ul>
         <div id="pos-list" class='hide'>
             <ul  class="home-sub-nav pos-list">
-                <li class="new active buriedpoint first-li-more" data-bp-id="shop_poslist_new_1">
+                <li class="default active buriedpoint first-li-more" data-bp-id="shop_listnav_default_1">
                     <a href="javascript:void(0);">
-                        <span class="spanTest">最新</span>
+                        <span class="spanTest">默认</span>
                         <span class="iconfont cur">&#xe616;</span>
                         <b></b>
                     </a>
@@ -230,7 +230,6 @@
                 <ul>
                     <li class='active default' data-bp-id='shop_listnav_default_1'>默认</li>
                     <li class='new' data-bp-id='shop_listnav_new_1'>最新</li>
-                    <li class='sale' data-bp-id='shop_listnav_sale_1'>销量</li>
                 </ul>
             </div>
         </div>
--- a/apps/product/views/partial/search/list.hbs
View file @f518425
+++ b/apps/product/views/partial/search/list.hbs
View file @f518425
@@ -92,9 +92,9 @@
     <div>
         <ul id="list-nav" class="list-nav clearfix">
-            <li class="new active buriedpoint first-li-more" data-bp-id="shop_listnav_new_1">
+            <li class="default active buriedpoint first-li-more" data-bp-id="shop_listnav_default_1">
                 <a href="javascript:void(0);">
-                    <span class="nav-txt">最新</span>
+                    <span class="nav-txt">默认</span>
                     <span class="iconfont up cur hide">&#xe615;</span>
                     <span class="iconfont down cur">&#xe616;</span>
                 </a>
--- a/package.json
View file @f518425
+++ b/package.json
View file @f518425
@@ -20,6 +20,7 @@
   "dependencies": {
     "bluebird": "^3.4.6",
     "body-parser": "^1.15.2",
+    "captchapng": "0.0.1",
     "cheerio": "^0.22.0",
     "compression": "^1.6.2",
     "connect-multiparty": "^2.0.0",
--- a/public/js/activity/coupon-floor.page.js
View file @f518425
+++ b/public/js/activity/coupon-floor.page.js
View file @f518425
@@ -196,7 +196,7 @@ getChannel = function functionName() {
 C_ID = getChannel();
 $('.floor-focus').find('li').on('click', function() {
-    event.preventDefault();
+    // event.preventDefault();
     var foId = $(this).parents('.floor-focus').data('id'),
         foName = $(this).parents('.floor-focus').data('floor-name'),
         foindex = $(this).parents('.floor-focus').index() + 1,
--- a/public/js/passport/back/mobile.js
View file @f518425
+++ b/public/js/passport/back/mobile.js
View file @f518425
@@ -9,6 +9,8 @@ var $ = require('yoho-jquery');
 var $phoneNum = $('#phone-num'),
     $countrySelect = $('#country-select'),
     $areaCode = $('#area-code'),
+    $verifyCode = $('#verify-code'),
+    $verifyCodeImg = $('#verify-code-img'),
     $btnNext = $('#btn-next');
 var api = require('../api');
@@ -33,25 +35,36 @@ $countrySelect.change(function() {
     $areaCode.text($countrySelect.val());
 });
+$verifyCodeImg.on('touchstart', function() {
+    var oldSrc = $verifyCodeImg.attr('src').split('=');
+
+    $verifyCodeImg.attr('src', oldSrc[0] + '=' + Date.now());
+});
+
 $btnNext.on('touchstart', function() {
     var pn = trim($phoneNum.val()),
-        area = trim($countrySelect.val());
+        area = trim($countrySelect.val()),
+        verify = trim($verifyCode.val());
     if ($btnNext.hasClass('disable')) {
         return;
     }
-    if (area && pn && api.phoneRegx[area].test(pn)) {
+    if (verify && area && pn && api.phoneRegx[area].test(pn)) {
         $.ajax({
             url: '/passport/back/sendcode',
             type: 'POST',
             data: {
                 areaCode: area.replace('+', ''),
-                phoneNum: pn
+                phoneNum: pn,
+                verifyCode: verify
             },
             success: function(data) {
                 if (data.code === 200) {
                     location.href = data.data;
+                } else if (data.code === 409) {
+                    showErrTip(data.message);
+                    location.href = data.refer;
                 } else {
                     showErrTip(data.message);
                 }
@@ -59,6 +72,8 @@ $btnNext.on('touchstart', function() {
         });
     } else if (!area) {
         showErrTip('出错了，请重新刷新页面');
+    } else if (!verify) {
+        showErrTip('请输入验证码');
     } else {
         showErrTip('手机号格式不正确，请重新输入');
     }
--- a/public/js/passport/register/register.js
View file @f518425
+++ b/public/js/passport/register/register.js
View file @f518425
@@ -8,6 +8,8 @@ var $ = require('yoho-jquery');
 var $phoneNum = $('#phone-num'),
     $countrySelect = $('#country-select'),
     $areaCode = $('#area-code'),
+    $captcha = $('#js-captcha'),
+    $captchaPNG = $('.passport-captcha-png'),
     $btnNext = $('#btn-next');
 var api = require('../api');
@@ -22,13 +24,44 @@ api.selectCssHack($('#country-select'));
 api.bindClearEvt();
-$phoneNum.bind('input', function() {
-    if (trim($phoneNum.val()) === '') {
-        $btnNext.addClass('disable');
-    } else {
-        $btnNext.removeClass('disable');
-    }
-});
+/**
+ * 必填校验
+ */
+function checkEnableNext() {
+    var phone = trim($phoneNum.val());
+    var area = trim($countrySelect.val());
+    var captcha = trim($captcha.val());
+
+    var ret = true;
+
+    $.each([phone, area, captcha], function(i, val) {
+        if (!val) {
+            ret = false;
+            return ret;
+        }
+    });
+
+    return ret;
+}
+
+
+/**
+ *  刷新 校验码
+ */
+function refreshCaptcha() {
+    $captcha.val('').focus();
+    $captchaPNG.attr('src', ['//m.yohobuy.com/passport/reg/captcha.png', '?t=', Date.now()].join(''));
+}
+
+
+/*
+    Event bind
+*/
+$('.reg-page')
+    .on('input', '.phone-num, #js-captcha', function() {
+        $btnNext.toggleClass('disable', !checkEnableNext());
+    })
+    .on('click', '.passport-captcha-png', refreshCaptcha);
 $countrySelect.change(function() {
     $areaCode.text($countrySelect.val());
@@ -36,7 +69,13 @@ $countrySelect.change(function() {
 $btnNext.on('touchstart', function() {
     var pn = trim($phoneNum.val()),
-        areaCode = $countrySelect.val();
+        areaCode = $countrySelect.val(),
+        captcha = $captcha.val().trim();
+
+    if (!captcha) {
+        tip.show('请输入验证码');
+        return false;
+    }
     if ($btnNext.hasClass('disable')) {
         return;
@@ -56,12 +95,15 @@ $btnNext.on('touchstart', function() {
             type: 'POST',
             data: {
                 areaCode: areaCode.replace('+', ''),
-                phoneNum: pn
+                phoneNum: pn,
+                captcha: captcha
             },
             success: function(data) {
                 if (data.code === 200) {
                     location.href = data.data;
                 } else {
+                    data.refreshCaptcha && refreshCaptcha();
+
                     showErrTip(data.message);
                     requested = false;
                 }
--- a/public/js/product/detail/comments-consults.js
View file @f518425
+++ b/public/js/product/detail/comments-consults.js
View file @f518425
@@ -76,7 +76,9 @@ if (navtabHammer) {
 if (gotoConsultHammer) {
     gotoConsultHammer.on('tap', function() {
-        location.href = $(gotoConsultEle).find('a').attr('href');
+        var link = $(gotoConsultEle).find('a').attr('href');
+        link += (link.indexOf('?') >=0 ? '&' : '?') + 'from=' + encodeURIComponent(location.href);
+        location.href = link;
     });
 }
--- a/public/js/product/detail/consultform.js
View file @f518425
+++ b/public/js/product/detail/consultform.js
View file @f518425
@@ -32,6 +32,11 @@ $content.on('focus', function() {
         $content.val('请输入咨询内容');
     }
 });
+var getUrlParam = function (paramName) {
+    var reg = "[\\?|\\&]+" + paramName + "=([^&]*)[^&]?";
+    var exp = (window.location.href + "").match(reg);
+    return exp ? exp[1] : "";
+}
 // 提交表单请求
 $consultForm.on('submit', function() {
@@ -68,7 +73,12 @@ $consultForm.on('submit', function() {
         } else {
             tip.show('提交成功~');
             setTimeout(function() {
-                window.history.go(-1);
+                var from = getUrlParam('from');
+                if (from) {
+                    window.location = decodeURIComponent(from);
+                } else {
+                    window.history.go(-1);
+                }
             }, 3000);
         }
     }).fail(function() {
--- a/public/js/product/detail/page-render.js
View file @f518425
+++ b/public/js/product/detail/page-render.js
View file @f518425
@@ -127,7 +127,7 @@ function render(data) {
             $('#limitProductCode').val(data.cartInfo.limitProductCode).removeClass(dbClass);
         }
     }
-    if (data.isCollect) {
+    if (data.isCollect === true) {
         $('#likeBtn').addClass('liked');
     }
     if (data.tickets) {
--- a/public/scss/passport/_index.css
View file @f518425
+++ b/public/scss/passport/_index.css
View file @f518425
@@ -8,3 +8,4 @@
 @import "success";
 @import "app-update";
 @import "app-agreement";
+@import "passport-captcha"
--- a/public/scss/passport/_passport-captcha.css 0 → 100644
View file @f518425
+++ b/public/scss/passport/_passport-captcha.css 0 → 100644
View file @f518425
+/*  验证码 css
+-----------------------------------
+结构：
+div.passport-captch
+    input
+    div.passport-captcha-img
+       img
+
+emmet:
+div.passport-captcha>input+div.passport-captcha-img>img
+
+*/
+
+.passport-captcha {
+    text-align: left;
+
+    input {
+        position: relative;
+        padding-left: 15px;
+        height: 52PX;
+        font-size: 20PX;
+        background-color: #575757;
+        border: 1px solid #606060;
+        border-radius: 5PX;
+        color: #fff;
+    }
+}
+
+.passport-captcha-img {
+    float: right;
+    text-align: right;
+
+    img {
+        display: inline-block;
+        background-color: #fff;
+        height: 52PX;
+        width: 90PX;
+        vertical-align: bottom;
+    }
+}
--- a/public/scss/product/detail/_detail.css
View file @f518425
+++ b/public/scss/product/detail/_detail.css
View file @f518425
@@ -40,6 +40,11 @@ $basicBtnC: #eb0313;
             margin-bottom: 20px;
         }
+        video {
+            width: 100%;
+            height: auto;
+        }
+
         .detail {
             margin-top: 20px;
             margin-bottom: 20px;
@@ -313,7 +318,7 @@ $basicBtnC: #eb0313;
             margin-right: 20px;
         }
-        .font-right{
+        .font-right {
             color: $subFontC;
         }
@@ -428,8 +433,8 @@ $basicBtnC: #eb0313;
     .seckill-chose {
         position: absolute;
-        bottom: 0px;
-        right: 0px;
+        bottom: 0;
+        right: 0;
     }
     .limit-num-text {
@@ -792,6 +797,7 @@ $basicBtnC: #eb0313;
             }
         }
     }
+
     /*
     秒杀倒计时栏
      */
@@ -827,6 +833,7 @@ $basicBtnC: #eb0313;
             font-size: 28px;
         }
     }
+
     /*
     底部固定栏
      */