Merge branch 'master' into feature/reds

@@ -73,7 +73,6 @@ app.use(global.yoho.hbs({
     helpers: _.assign(global.yoho.helpers, require('./utils/helpers'))
     helpers: _.assign(global.yoho.helpers, require('./utils/helpers'))
 }));
 }));
 
 
-app.use(global.yoho.middleware());
 
 
 app.use(bodyParser.json());
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({
 app.use(bodyParser.urlencoded({
@@ -149,6 +148,17 @@ app.use((req, res, next) => {
     req.yoho = {}; // req和res绑定yoho对象，用于传递全局数据, 如req.yoho.channel等
     req.yoho = {}; // req和res绑定yoho对象，用于传递全局数据, 如req.yoho.channel等
     req.app.locals.wap = app.locals.wap; // zookeper对象赋值
     req.app.locals.wap = app.locals.wap; // zookeper对象赋值
 
 
+    // 临时增加错误日志记录
+    let sendJson = res.json;
+
+    res.json = function(...args) {
+        try {
+            sendJson(...args);
+        } catch (e) {
+            logger.error(`res.json error data: ${JSON.stringify(args)}`);
+        }
+    };
+
     next();
     next();
 });
 });
 
 

@@ -31,4 +31,4 @@ exports.sidebar = function(req, res, next) {
             layout: false
             layout: false
         });
         });
     }).catch(next);
     }).catch(next);
-}
+};

@@ -373,7 +373,7 @@ const order = (params) => {
         code: 200
         code: 200
     }).then((result) => {
     }).then((result) => {
 
 
-        if (result.data) {
+        if (result && result.data) {
             Object.assign(finalResult, {cancelReason: result.data});
             Object.assign(finalResult, {cancelReason: result.data});
         }
         }
         return finalResult;
         return finalResult;
@@ -385,7 +385,7 @@ const order = (params) => {
  * @param params
  * @param params
  */
  */
 const getOrders = (params) => {
 const getOrders = (params) => {
-    let finalResult = Promise.resolve([]);
+    let finalResult = [];
 
 
     if (!params.uid) {
     if (!params.uid) {
         return Promise.resolve([]);
         return Promise.resolve([]);

@@ -182,7 +182,6 @@ exports.orderSub = (req, res, next) => {
     let yohoCoin = req.body.yohoCoin || 0;
     let yohoCoin = req.body.yohoCoin || 0;
     let skuList = req.body.skuList || '';
     let skuList = req.body.skuList || '';
     let orderInfo;
     let orderInfo;
-    let isWechat = req.yoho.isWechat;
 
 
     try {
     try {
         orderInfo = JSON.parse(req.cookies['order-info']);
         orderInfo = JSON.parse(req.cookies['order-info']);
@@ -254,7 +253,15 @@ exports.orderSub = (req, res, next) => {
 
 
     return co(function* () {
     return co(function* () {
         let result;
         let result;
-        let ip = req.ip || '';
+
+        // 接口需要的其他参数
+        let otherParams = {
+            unionKey: unionKey, // 友盟数据
+            userAgent: userAgent,
+            isWechat: req.yoho.isWechat,
+            ip: req.ip || '',
+            udid: req.cookies._yasvd || 'yoho'
+        };
 
 
         /* tar modified 161206 套餐 */
         /* tar modified 161206 套餐 */
         if (req.body.cartType === 'bundle') {
         if (req.body.cartType === 'bundle') {
@@ -262,11 +269,11 @@ exports.orderSub = (req, res, next) => {
 
 
             result = yield cartModel.orderSub(uid, addressId, 'bundle', deliveryTimeId,
             result = yield cartModel.orderSub(uid, addressId, 'bundle', deliveryTimeId,
                 deliveryId, invoices, paymentTypeId, paymentType, msg, couponCode,
                 deliveryId, invoices, paymentTypeId, paymentType, msg, couponCode,
-                yohoCoin, null, unionKey, userAgent, times, activityInfo, ip, isWechat);
+                yohoCoin, null, times, activityInfo, otherParams);
         } else {
         } else {
             result = yield cartModel.orderSub(uid, addressId, cartType, deliveryTimeId,
             result = yield cartModel.orderSub(uid, addressId, cartType, deliveryTimeId,
                 deliveryId, invoices, paymentTypeId, paymentType, msg, couponCode,
                 deliveryId, invoices, paymentTypeId, paymentType, msg, couponCode,
-                yohoCoin, skuList, unionKey, userAgent, null, null, ip, isWechat);
+                yohoCoin, skuList, null, null, otherParams);
         }
         }
 
 
         // 提交成功清除Cookie
         // 提交成功清除Cookie

@@ -180,23 +180,21 @@ exports.ticketsOrderCompute = (uid, productSku, buyNumber, yohoCoin) => {
  * @param string $couponCode 优惠券码
  * @param string $couponCode 优惠券码
  * @param mixed $yohoCoin 使用的有货币数量或为空
  * @param mixed $yohoCoin 使用的有货币数量或为空
  * @param string $skuList 购买限购商品时需要传递的参数
  * @param string $skuList 购买限购商品时需要传递的参数
- * @param string $qhyUnio 友盟有关信息
  * @param string|null $userAgent 联盟过来用户下单时需要的User-Agent信息
  * @param string|null $userAgent 联盟过来用户下单时需要的User-Agent信息
  * @param int $times
  * @param int $times
  * @param null $activityInfo 套餐数据
  * @param null $activityInfo 套餐数据
- * @param isWechat 是否是微信商城
+ * @param otherParams 其他参数
  * @return array 接口返回的数据
  * @return array 接口返回的数据
  */
  */
 exports.orderSub = (uid, addressId, cartType, deliveryTime,
 exports.orderSub = (uid, addressId, cartType, deliveryTime,
     deliveryWay, invoices, paymentId, paymentType, remark,
     deliveryWay, invoices, paymentId, paymentType, remark,
-    couponCode, yohoCoin, skuList, qhyUnio,
-    userAgent, times, activityInfo, ip, isWechat) => {
-    if (!qhyUnio) {
-        qhyUnio = '';
+    couponCode, yohoCoin, skuList, times, activityInfo, otherParams) => {
+    if (!otherParams.unionKey) {
+        otherParams.unionKey = '';
     }
     }
 
 
-    if (!userAgent) {
-        userAgent = null;
+    if (!otherParams.userAgent) {
+        otherParams.userAgent = null;
     }
     }
 
 
     if (!times) {
     if (!times) {
@@ -221,8 +219,7 @@ exports.orderSub = (uid, addressId, cartType, deliveryTime,
 
 
     return shoppingAPI.orderSub(uid, addressId, cartType, deliveryTime,
     return shoppingAPI.orderSub(uid, addressId, cartType, deliveryTime,
         deliveryWay, invoices, paymentId, paymentType,
         deliveryWay, invoices, paymentId, paymentType,
-        remark, couponCode, yohoCoin, skuList, qhyUnio,
-        userAgent, times, activityInfo, ip, isWechat).then(orderSubRes => {
+        remark, couponCode, yohoCoin, skuList, times, activityInfo, otherParams).then(orderSubRes => {
             let finalResult = {};
             let finalResult = {};
 
 
             if (orderSubRes && orderSubRes.data && orderSubRes.data.is_hint === 'Y') {
             if (orderSubRes && orderSubRes.data && orderSubRes.data.is_hint === 'Y') {

@@ -149,16 +149,15 @@ exports.checkTickets = (uid, productSku, buyNumber, useYohoCoin, yohoCoinMode) =
  * @param string $couponCode 优惠券码
  * @param string $couponCode 优惠券码
  * @param mixed $yohoCoin 使用的有货币数量或为空
  * @param mixed $yohoCoin 使用的有货币数量或为空
  * @param string $skuList 购买限购商品时需要传递的参数
  * @param string $skuList 购买限购商品时需要传递的参数
- * @param string $qhyUnion 友盟有关信息
  * @param string|null $userAgent 联盟过来用户下单时需要的User-Agent信息
  * @param string|null $userAgent 联盟过来用户下单时需要的User-Agent信息
  * @param $times
  * @param $times
  * @param null $activityInfo 套餐信息
  * @param null $activityInfo 套餐信息
- * @param isWechat 是否是微信商城
+ * @param @param otherParams 其他参数
  * @return array 接口返回的数据
  * @return array 接口返回的数据
  */
  */
 exports.orderSub = (uid, addressId, cartType, deliveryTime,
 exports.orderSub = (uid, addressId, cartType, deliveryTime,
  deliveryWay, invoices, paymentId, paymentType, remark, couponCode,
  deliveryWay, invoices, paymentId, paymentType, remark, couponCode,
- yohoCoin, skuList, qhyUnion, userAgent, times, activityInfo, ip, isWechat) => {
+ yohoCoin, skuList, times, activityInfo, otherParams) => {
     if (!activityInfo) {
     if (!activityInfo) {
         activityInfo = null;
         activityInfo = null;
     }
     }
@@ -173,7 +172,8 @@ exports.orderSub = (uid, addressId, cartType, deliveryTime,
         payment_id: paymentId,
         payment_id: paymentId,
         payment_type: paymentType,
         payment_type: paymentType,
         remark: remark,
         remark: remark,
-        uid: uid
+        uid: uid,
+        udid: otherParams.udid
     };
     };
 
 
     /* tar add 161130 结算优化 */
     /* tar add 161130 结算优化 */
@@ -223,19 +223,19 @@ exports.orderSub = (uid, addressId, cartType, deliveryTime,
     }
     }
 
 
     // 友盟有关信息的传递
     // 友盟有关信息的传递
-    if (qhyUnion) {
-        params.qhy_union = qhyUnion;
+    if (otherParams.unionKey) {
+        params.qhy_union = otherParams.unionKey;
     }
     }
 
 
     // 是否是微信商城
     // 是否是微信商城
-    if (isWechat) {
+    if (otherParams.isWechat) {
         params.client_type = 'wechat';
         params.client_type = 'wechat';
     }
     }
 
 
     return api.post('', params, {
     return api.post('', params, {
         headers: {
         headers: {
-            'X-Forwarded-For': ip || '',
-            'User-Agent': userAgent
+            'X-Forwarded-For': otherParams.ip || '',
+            'User-Agent': otherParams.userAgent
         }
         }
     });
     });
 };
 };

@@ -188,6 +188,7 @@ const addressModify = (req, res, next) => {
  */
  */
 const changeAddress = (req, res, next) => {
 const changeAddress = (req, res, next) => {
     let uid = req.user.uid;
     let uid = req.user.uid;
+    let udid = req.cookies._yasvd || 'yoho';
 
 
     if (!uid) {
     if (!uid) {
         return res.json({
         return res.json({
@@ -202,7 +203,8 @@ const changeAddress = (req, res, next) => {
         username: req.body.username,
         username: req.body.username,
         areaCode: req.body.area_code,
         areaCode: req.body.area_code,
         address: req.body.address,
         address: req.body.address,
-        mobile: req.body.mobile
+        mobile: req.body.mobile,
+        udid: udid
     }).then(result => {
     }).then(result => {
         res.json(result);
         res.json(result);
     }).catch(next);
     }).catch(next);

@@ -374,7 +374,8 @@ const changeAddress = (params) => {
         user_name: params.username,
         user_name: params.username,
         area_code: params.areaCode,
         area_code: params.areaCode,
         address: params.address,
         address: params.address,
-        mobile: params.mobile
+        mobile: params.mobile,
+        udid: params.udid
     };
     };
 
 
     if (params.addressId) {
     if (params.addressId) {

@@ -90,8 +90,8 @@ router.get('/helpDetail', help.helpDetail);
 // 意见反馈
 // 意见反馈
 router.get('/suggest', suggest.suggestData);
 router.get('/suggest', suggest.suggestData);
 router.post('/upAndDown', suggest.upAndDown);
 router.post('/upAndDown', suggest.upAndDown);
-router.get('/suggestSub', suggest.suggestSub);
-router.post('/savesuggest', suggest.saveSuggest);
+router.get('/suggestSub', auth, suggest.suggestSub);
+router.post('/savesuggest', auth, suggest.saveSuggest);
 
 
 // 消息
 // 消息
 router.use('/message', auth, disableBFCache, message.index);
 router.use('/message', auth, disableBFCache, message.index);

@@ -81,7 +81,9 @@ const common = {
         let passLogin = _.get(req, 'cookies._WX_PASS_LOGIN', false);
         let passLogin = _.get(req, 'cookies._WX_PASS_LOGIN', false);
 
 
         if (req.yoho.isWechat && !passLogin) {
         if (req.yoho.isWechat && !passLogin) {
-            return res.redirect('/passport/login/wechat');
+            return res.redirect(helpers.urlFormat('/passport/login/wechat', {
+                refer: req.query.refer || req.get('Referer') || '/'
+            }));
         }
         }
         next();
         next();
     },
     },
@@ -128,11 +130,13 @@ const local = {
         // 设置登录有效时间30分钟, 防机器刷，cache不稳定，改为cookie
         // 设置登录有效时间30分钟, 防机器刷，cache不稳定，改为cookie
         // res.cookie('LE' + md5('_LOGIN_EXPIRE'), (new Date()).getTime() / 1000 + 1800);
         // res.cookie('LE' + md5('_LOGIN_EXPIRE'), (new Date()).getTime() / 1000 + 1800);
 
 
+        // 170406 账户密码方式登录可以选择是否开启验证码，默认开关是关闭状态，此时开启验证码，开关开启，无需验证
+        let captchaShow = _.get(req.app.locals.wap, 'close.loginValidation', false);
 
 
         res.render('login', {
         res.render('login', {
             width750: true,
             width750: true,
             loginIndex: true, // 模板中使用JS的标识
             loginIndex: true, // 模板中使用JS的标识
-            captchaShow: true, // 170306 因为暴力破解密码问题，要求每次都展示验证码
+            captchaShow: !captchaShow, // 170306 因为暴力破解密码问题，要求每次都展示验证码
             backUrl: 'javascript:history.go(-1)', // eslint-disable-line
             backUrl: 'javascript:history.go(-1)', // eslint-disable-line
             showHeaderImg: true, // 控制显示头部图片
             showHeaderImg: true, // 控制显示头部图片
             isPassportPage: true, // 模板中模块标识
             isPassportPage: true, // 模板中模块标识
@@ -170,13 +174,14 @@ const local = {
         // 设置登录有效时间30分钟, 防机器刷，cache不稳定，改为cookie
         // 设置登录有效时间30分钟, 防机器刷，cache不稳定，改为cookie
         // res.cookie('LE' + md5('_LOGIN_EXPIRE'), (new Date()).getTime() / 1000 + 1800);
         // res.cookie('LE' + md5('_LOGIN_EXPIRE'), (new Date()).getTime() / 1000 + 1800);
 
 
-
+        // 170406 账户密码方式登录可以选择是否开启验证码，默认开关是关闭状态，此时开启验证码，开关开启，无需验证
+        let captchaShow = _.get(req.app.locals.wap, 'close.loginValidation', false);
 
 
         res.render('international', {
         res.render('international', {
             width750: true,
             width750: true,
             backUrl: 'javascript:history.go(-1)', // eslint-disable-line
             backUrl: 'javascript:history.go(-1)', // eslint-disable-line
             loginInternational: true, // 模板中使用JS的标识
             loginInternational: true, // 模板中使用JS的标识
-            captchaShow: true, // 170306 因为暴力破解密码问题，要求每次都展示验证码
+            captchaShow: !captchaShow, // 170306 因为暴力破解密码问题，要求每次都展示验证码
             isPassportPage: true, // 模板中模块标识
             isPassportPage: true, // 模板中模块标识
             headerText: '登录',
             headerText: '登录',
             areaCode: '+86', // 默认区号
             areaCode: '+86', // 默认区号
@@ -250,6 +255,18 @@ const local = {
 
 
 const wechat = {
 const wechat = {
     login: (req, res, next) => {
     login: (req, res, next) => {
+        // 微信里边已经登录的时候，不再跳转登录
+        if (req.user.uid) {
+            let refer = req.query.refer || decodeURI(req.cookies.refer) || config.siteUrl;
+
+            if (/sign|login/.test(refer)) {
+                refer = `${config.siteUrl}/home`;
+            }
+
+            refer = utils.refererLimit(refer);
+            return res.redirect(refer);
+        }
+
         // 设置为原链接标识originalUrl
         // 设置为原链接标识originalUrl
         req.session.originalUrl = 'true';
         req.session.originalUrl = 'true';
         req.session.authState = uuid.v4();
         req.session.authState = uuid.v4();

@@ -20,6 +20,11 @@ const check = (req, res, next) => {
         return next();
         return next();
     }
     }
 
 
+    // 170406 采用账号密码方式登录验证码可以配置关闭，默认开关是关闭状态，这时需要验证，开关开启，无需验证
+    if (_.get(req.app.locals.wap, 'close.loginValidation', false) && req.path === '/passport/login/auth') {
+        return next();
+    }
+
     // 使用极验证
     // 使用极验证
     let useGeetest = !_.get(req.app.locals.wap, 'geetest.validation', false);
     let useGeetest = !_.get(req.app.locals.wap, 'geetest.validation', false);
 
 

@@ -2,6 +2,7 @@
 const _ = require('lodash');
 const _ = require('lodash');
 const aes = require('./aes-pwd');
 const aes = require('./aes-pwd');
 const authcode = require('../../../utils/authcode');
 const authcode = require('../../../utils/authcode');
+const logger = global.yoho.logger;
 const sign = global.yoho.sign;
 const sign = global.yoho.sign;
 const api = global.yoho.API;
 const api = global.yoho.API;
 const uuid = require('uuid');
 const uuid = require('uuid');
@@ -35,10 +36,13 @@ class Auth {
             param.shopping_key = shoppingKey;
             param.shopping_key = shoppingKey;
         }
         }
 
 
+        logger.info(`${profile}, login from ${ip}`);
+
         return api.post('', param, {
         return api.post('', param, {
             headers: {
             headers: {
                 'user-agent': 'yoho/nodejs',
                 'user-agent': 'yoho/nodejs',
-                'X-YOHO-IP': ip
+                'X-YOHO-IP': ip,
+                'X-Forwarded-For': ip
             }
             }
         });
         });
     }
     }

@@ -27,7 +27,7 @@ const router = express.Router(); // eslint-disable-line
 router.get('/passport/geetest/register', geetest.register);
 router.get('/passport/geetest/register', geetest.register);
 
 
 // 兼容老的路由
 // 兼容老的路由
-router.get('/signin.html', validateCode.load, login.common.weixinCheck,
+router.get('/signin.html', login.common.weixinCheck, validateCode.load,
  login.common.beforeLogin, login.common.clearCookie, smsLogin.loginPage);
  login.common.beforeLogin, login.common.clearCookie, smsLogin.loginPage);
 router.get('/reg.html', validateCode.load, disableBFCahce, reg.index);
 router.get('/reg.html', validateCode.load, disableBFCahce, reg.index);
 router.get('/login.html', validateCode.load,
 router.get('/login.html', validateCode.load,
@@ -78,10 +78,6 @@ router.get('/passport/login/qq/callback', login.qq.callback);
 router.get('/passport/login/alipay', login.common.beforeLogin, login.alipay.login);
 router.get('/passport/login/alipay', login.common.beforeLogin, login.alipay.login);
 router.get('/passport/login/alipay/callback', login.alipay.callback);
 router.get('/passport/login/alipay/callback', login.alipay.callback);
 
 
-// alipay登录
-router.get('/login/alipay', login.common.beforeLogin, login.alipay.login);
-router.get('/login/alipay/callback', login.alipay.callback);
-
 // 登录绑定
 // 登录绑定
 router.get('/passport/bind/index', validateCode.load, bind.indexPage);
 router.get('/passport/bind/index', validateCode.load, bind.indexPage);
 router.post('/passport/bind/bindCheck', validateCode.check, bind.bindCheck);
 router.post('/passport/bind/bindCheck', validateCode.check, bind.bindCheck);

@@ -10,7 +10,7 @@
             <input id="pwd" class="pwd input" type="password" placeholder="密码">
             <input id="pwd" class="pwd input" type="password" placeholder="密码">
         </div>
         </div>
         {{!--图片验证--}}
         {{!--图片验证--}}
-        <div data-geetest="{{useGeetest}}" id="js-img-check"></div>
+        <div data-userverify="{{captchaShow}}" data-geetest="{{useGeetest}}" id="js-img-check"></div>
 
 
         <span id="btn-login" class="btn btn-login disble row">登录</span>
         <span id="btn-login" class="btn btn-login disble row">登录</span>
     </div>
     </div>

@@ -9,7 +9,7 @@
             <input id="pwd" class="pwd input" type="password" placeholder="密码">
             <input id="pwd" class="pwd input" type="password" placeholder="密码">
         </div>
         </div>
         {{!--图片验证--}}
         {{!--图片验证--}}
-        <div data-geetest="{{useGeetest}}" id="js-img-check"></div>
+        <div data-userverify="{{captchaShow}}" data-geetest="{{useGeetest}}" id="js-img-check"></div>
         <span id="btn-login" class="btn btn-login disable">登录</span>
         <span id="btn-login" class="btn btn-login disable">登录</span>
         <p class="op-container">
         <p class="op-container">
             <a class="op-item internat" href={{internationalUrl}}>海外手机</a>
             <a class="op-item internat" href={{internationalUrl}}>海外手机</a>

@@ -231,6 +231,7 @@ const category = (req, res, next) => {
         order: '0',
         order: '0',
         page: 1,
         page: 1,
         limit: 12,
         limit: 12,
+        isApp: params.app_version
     }, params);
     }, params);
 
 
     if (uid) {
     if (uid) {

@@ -13,8 +13,8 @@ const domains = {
     liveApi: 'http://testapi.live.yohops.com:9999/',
     liveApi: 'http://testapi.live.yohops.com:9999/',
     singleApi: 'http://api-test3.yohops.com:9999/',
     singleApi: 'http://api-test3.yohops.com:9999/',
 
 
-    api: 'http://api-test3.yohops.com:9999/',
-    service: 'http://service-test3.yohops.com:9999/',
+    api: 'http://api.yoho.cn/',
+    service: 'http://service.yoho.cn/',
 
 
     // liveApi: 'http://api.live.yoho.cn/',
     // liveApi: 'http://api.live.yoho.cn/',
     // singleApi: 'http://single.yoho.cn/',
     // singleApi: 'http://single.yoho.cn/',
@@ -25,7 +25,7 @@ const domains = {
 
 
 module.exports = {
 module.exports = {
     app: 'h5',
     app: 'h5',
-    appVersion: '5.5.1', // 调用api的版本
+    appVersion: '5.5.2', // 调用api的版本
     port: 6001,
     port: 6001,
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//127.0.0.1:5001',
     assetUrl: '//127.0.0.1:5001',
@@ -67,11 +67,6 @@ module.exports = {
             handleExceptions: true,
             handleExceptions: true,
             maxFiles: 7
             maxFiles: 7
         },
         },
-        udp: { // send by udp
-            measurement: 'yohobuy_wap_node_log',
-            level: 'error', // logger level
-            port: '4444' // influxdb port
-        },
         console: {
         console: {
             level: 'info',
             level: 'info',
             colorize: 'all',
             colorize: 'all',

@@ -22,7 +22,7 @@ module.exports = (req, res, next) => {
         return next();
         return next();
     }
     }
 
 
-    if (res.statusCode == 403) {
+    if (_.toNumber(res.statusCode) === 403) {
         return res.end();
         return res.end();
     }
     }
 
 

@@ -21,7 +21,11 @@ const _getClientIp = req => {
         remoteIp = _.trim(arr[arr.length - 1]);
         remoteIp = _.trim(arr[arr.length - 1]);
     }
     }
 
 
-    return remoteIp;
+    if (_.startsWith(remoteIp, '10.66.')) {
+        remoteIp = req.get('X-Real-IP');
+    }
+
+    return _.trim(remoteIp);
 };
 };
 
 
 module.exports = () => {
 module.exports = () => {

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "5.5.11",
+  "version": "5.5.12",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {
@@ -50,13 +50,14 @@
     "xml2js": "^0.4.17",
     "xml2js": "^0.4.17",
     "yoho-express-session": "^2.0.0",
     "yoho-express-session": "^2.0.0",
     "yoho-md5": "^2.0.0",
     "yoho-md5": "^2.0.0",
-    "yoho-node-lib": "=0.2.11",
+    "yoho-node-lib": "=0.2.16",
     "yoho-zookeeper": "^1.0.8"
     "yoho-zookeeper": "^1.0.8"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "autoprefixer": "^6.7.4",
     "autoprefixer": "^6.7.4",
     "babel-core": "^6.24.0",
     "babel-core": "^6.24.0",
     "babel-loader": "^6.4.1",
     "babel-loader": "^6.4.1",
+    "babel-polyfill": "^6.23.0",
     "babel-preset-env": "^1.2.2",
     "babel-preset-env": "^1.2.2",
     "css-loader": "^0.27.3",
     "css-loader": "^0.27.3",
     "cssnano": "^3.10.0",
     "cssnano": "^3.10.0",

@@ -66,7 +66,7 @@ const cssLoader = (env, type) => {
 
 
 const getEntries = () => {
 const getEntries = () => {
     const entries = {
     const entries = {
-        libs: ['yoho-jquery'],
+        libs: ['babel-polyfill', 'yoho-jquery'],
         index: path.join(__dirname, '../scss/index.css'),
         index: path.join(__dirname, '../scss/index.css'),
         common: path.join(__dirname, '../scss/common.css'),
         common: path.join(__dirname, '../scss/common.css'),
         feature: path.join(__dirname, '../scss/feature.css')
         feature: path.join(__dirname, '../scss/feature.css')

@@ -13,6 +13,7 @@ let $phoneNum = $('#phone-num'),
     $loginBtn = $('#btn-login'),
     $loginBtn = $('#btn-login'),
 
 
     $captcha = $('#js-img-check'),
     $captcha = $('#js-img-check'),
+    useVerify = $captcha.data('userverify'), // 170406 是否使用验证
 
 
     pnPass = false,
     pnPass = false,
     pwdPass = false;
     pwdPass = false;
@@ -23,15 +24,18 @@ let tip = require('plugin/tip');
 let trim = $.trim;
 let trim = $.trim;
 let showErrTip = tip.show;
 let showErrTip = tip.show;
 
 
-let validate = new Validate($captcha, {
-    useREM: {
-        rootFontSize: 40,
-        picWidth: 150
-    }
-});
+let validate = {};
 
 
-validate.init();
+if (useVerify) {
+    validate = new Validate($captcha, {
+        useREM: {
+            rootFontSize: 40,
+            picWidth: 150
+        }
+    });
 
 
+    validate.init();
+}
 
 
 // 登录按钮状态切换
 // 登录按钮状态切换
 function switchLoginBtnStatus() {
 function switchLoginBtnStatus() {
@@ -45,6 +49,47 @@ function resetForm() {
     $loginBtn.text('登录').addClass('disable');
     $loginBtn.text('登录').addClass('disable');
 }
 }
 
 
+/**
+ * 登录校验
+ */
+function loginAuth(params) {
+    $.ajax({
+        type: 'POST',
+        url: '/passport/login/auth',
+        data: params,
+        success: function(data) {
+            let res;
+
+            validate && validate.type === 2 && validate.refresh();
+            if (data.code === 200) {
+                res = data.data;
+                showErrTip('登录成功');
+
+                // 3秒后强制跳转
+                setTimeout(() => {
+                    location.href = res.href;
+                }, 1500);
+
+                $loginBtn.text('登录成功');
+                showErrTip('登录成功');
+            } else {
+                if (useVerify && data.captchaShow) {
+                    ((data.changeCaptcha && validate.type !== 2) && validate.refresh());
+                }
+
+                showErrTip(data.message);
+                resetForm();
+            }
+        },
+        error: function() {
+            showErrTip('网络断开连接啦~');
+            $loginBtn.text('登录');
+
+            validate && validate.refresh();
+        }
+    });
+}
+
 // Android-UC下显示select的direction:rtl无效的临时解决办法
 // Android-UC下显示select的direction:rtl无效的临时解决办法
 api.selectCssHack($countrySelect);
 api.selectCssHack($countrySelect);
 
 
@@ -90,52 +135,21 @@ $loginBtn.on('touchstart', function() {
     }
     }
 
 
     if ((api.phoneRegx[areaCode].test(pn) || areaCode !== '+86') && api.pwdValidate(pwd)) {
     if ((api.phoneRegx[areaCode].test(pn) || areaCode !== '+86') && api.pwdValidate(pwd)) {
-        validate.getResults().then((result) => {
-            $loginBtn.text('正在登录...').addClass('disable');
-            let params = {
-                areaCode: areaCode.replace('+', ''),
-                account: pn,
-                password: pwd
-            };
-
-            $.extend(params, result);
-
-            $.ajax({
-                type: 'POST',
-                url: '/passport/login/auth',
-                data: params,
-                success: function(data) {
-                    let res;
-
-                    validate.type === 2 && validate.refresh();
-                    if (data.code === 200) {
-                        res = data.data;
-                        showErrTip('登录成功');
-
-                        // 3秒后强制跳转
-                        setTimeout(() => {
-                            location.href = res.href;
-                        }, 1500);
-
-                        $loginBtn.text('登录成功');
-                        showErrTip('登录成功');
-                    } else {
-                        if (data.captchaShow) {
-                            ((data.changeCaptcha && validate.type !== 2) && validate.refresh());
-                        }
-
-                        showErrTip(data.message);
-                        resetForm();
-                    }
-                },
-                error: function() {
-                    showErrTip('网络断开连接啦~');
-                    $loginBtn.text('登录');
-
-                    validate.refresh();
-                }
+        let params = {
+            areaCode: areaCode.replace('+', ''),
+            account: pn,
+            password: pwd
+        };
+
+        if (useVerify) {
+            validate.getResults().then((result) => {
+                $loginBtn.text('正在登录...').addClass('disable');
+                $.extend(params, result);
+                loginAuth(params);
             });
             });
-        });
+        } else {
+            loginAuth(params);
+        }
     } else {
     } else {
         showErrTip('账号或密码有错误，请重新输入');
         showErrTip('账号或密码有错误，请重新输入');
         $loginBtn.text('登录').addClass('disable');
         $loginBtn.text('登录').addClass('disable');

@@ -14,6 +14,7 @@ let $account = $('#account'),
     $ways = $('#retrive-pwd-ways'),
     $ways = $('#retrive-pwd-ways'),
 
 
     $captcha = $('#js-img-check'),
     $captcha = $('#js-img-check'),
+    useVerify = $captcha.data('userverify'), // 170406 是否使用验证
 
 
     accPass = false,
     accPass = false,
     pwdPass = false;
     pwdPass = false;
@@ -25,14 +26,18 @@ let trim = $.trim;
 let showErrTip = tip.show;
 let showErrTip = tip.show;
 
 
 
 
-let validate = new Validate($captcha, {
-    useREM: {
-        rootFontSize: 40,
-        picWidth: 150
-    }
-});
+let validate = {};
+
+if (useVerify) {
+    validate = new Validate($captcha, {
+        useREM: {
+            rootFontSize: 40,
+            picWidth: 150
+        }
+    });
 
 
-validate.init();
+    validate.init();
+}
 
 
 // 登录按钮状态切换
 // 登录按钮状态切换
 function switchLoginBtnStatus() {
 function switchLoginBtnStatus() {
@@ -60,6 +65,62 @@ function hideRetrivePanel() {
     $ways.hide();
     $ways.hide();
 }
 }
 
 
+/**
+ * 登录校验
+ */
+function loginAuth(params, acc) {
+    $.ajax({
+        type: 'POST',
+        url: '/passport/login/auth',
+        data: params,
+        success: function(data) {
+            let res,
+                LOGI_TYPE;
+
+            if (acc.indexOf('@') > 0) {
+                LOGI_TYPE = 8;
+            } else {
+                LOGI_TYPE = 5;
+            }
+
+            if (window._yas && window._yas.sendCustomInfo) {
+                window._yas.sendCustomInfo({
+                    op: 'YB_MY_LOGIN_C',
+                    param: JSON.stringify({
+                        C_ID: window._ChannelVary[window.cookie('_Channel')],
+                        LOGI_TYPE: LOGI_TYPE
+                    })
+                }, true);
+            }
+            validate && validate.type === 2 && validate.refresh();
+            if (data.code === 200) {
+                res = data.data;
+
+                showErrTip('登录成功');
+                location.href = res.href;
+                $loginBtn.text('登录成功');
+            } else {
+                if (useVerify && data.captchaShow) {
+                    ((data.changeCaptcha && validate.type !== 2) && validate.refresh());
+                }
+
+                showErrTip(data.message);
+                resetForm();
+            }
+
+            return data;
+        },
+        error: function() {
+            showErrTip('网络断开连接啦~');
+
+            validate && validate.refresh();
+        },
+        complete: function() {
+            $loginBtn.text('登录').removeClass('disable');
+        }
+    });
+}
+
 // 密码显示与隐藏
 // 密码显示与隐藏
 api.bindEyesEvt();
 api.bindEyesEvt();
 
 
@@ -95,67 +156,23 @@ $loginBtn.on('touchstart', function() {
 
 
     // 验证账号（数字或者邮箱）和密码合理性
     // 验证账号（数字或者邮箱）和密码合理性
     if ((/^[0-9]+$/.test(acc) || api.emailRegx.test(acc)) && api.pwdValidate(pwd)) {
     if ((/^[0-9]+$/.test(acc) || api.emailRegx.test(acc)) && api.pwdValidate(pwd)) {
-        validate.getResults().then((result) => {
-            $loginBtn.text('正在登录...').addClass('disable');
-
-            let params = {
-                account: acc,
-                password: pwd
-            };
-
-            $.extend(params, result);
-
-            $.ajax({
-                type: 'POST',
-                url: '/passport/login/auth',
-                data: params,
-                success: function(data) {
-                    let res,
-                        LOGI_TYPE;
-
-                    if (acc.indexOf('@') > 0) {
-                        LOGI_TYPE = 8;
-                    } else {
-                        LOGI_TYPE = 5;
-                    }
-
-                    if (window._yas && window._yas.sendCustomInfo) {
-                        window._yas.sendCustomInfo({
-                            op: 'YB_MY_LOGIN_C',
-                            param: JSON.stringify({
-                                C_ID: window._ChannelVary[window.cookie('_Channel')],
-                                LOGI_TYPE: LOGI_TYPE
-                            })
-                        }, true);
-                    }
-                    validate.type === 2 && validate.refresh();
-                    if (data.code === 200) {
-                        res = data.data;
-
-                        showErrTip('登录成功');
-                        location.href = res.href;
-                        $loginBtn.text('登录成功');
-                    } else {
-                        if (data.captchaShow) {
-                            ((data.changeCaptcha && validate.type !== 2) && validate.refresh());
-                        }
-
-                        showErrTip(data.message);
-                        resetForm();
-                    }
-
-                    return data;
-                },
-                error: function() {
-                    showErrTip('网络断开连接啦~');
-
-                    validate.refresh();
-                },
-                complete: function() {
-                    $loginBtn.text('登录').removeClass('disable');
-                }
-            });
-        }, () => {});
+        let params = {
+            account: acc,
+            password: pwd
+        };
+
+        if (useVerify) {
+            validate.getResults().then((result) => {
+                $loginBtn.text('正在登录...').addClass('disable');
+
+                $.extend(params, result);
+
+                // auth
+                loginAuth(params, acc);
+            }, () => {});
+        } else {
+            loginAuth(params, acc);
+        }
     } else {
     } else {
         showErrTip('账号或密码有错误，请重新输入');
         showErrTip('账号或密码有错误，请重新输入');
         $loginBtn.text('登录').removeClass('disable');
         $loginBtn.text('登录').removeClass('disable');

@@ -102,6 +102,11 @@ exports.processProductList = (list, options) => {
             return;
             return;
         }
         }
 
 
+        // H5 暂时不支持全球购商品，先过滤掉 2017.04.09
+        if (product.is_global === 'Y') {
+            return;
+        }
+
         // 商品信息有问题，则不显示
         // 商品信息有问题，则不显示
         if (!(
         if (!(
             (product.product_id && _.get(product, 'goods_list.length', 0)) || product.recommend_type
             (product.product_id && _.get(product, 'goods_list.length', 0)) || product.recommend_type