Merge remote-tracking branch 'origin/hotfix/app' into feature/openapp

@@ -349,7 +349,7 @@ exports.receiveCoupon = (receiveData, uid) => {
                 break;
                 break;
             default:
             default:
                 returnData = {
                 returnData = {
-                    msg: '领券失败！',
+                    msg: result.message || '领券失败！',
                     status: false
                     status: false
                 };
                 };
                 break;
                 break;

@@ -14,7 +14,7 @@
         {{#content.floors}}
         {{#content.floors}}
             {{#isEqualOr type 'sidebar'}}
             {{#isEqualOr type 'sidebar'}}
                 {{! 侧悬浮}}
                 {{! 侧悬浮}}
-                <div id="sidebar" pageid="{{param.sidebarPageId}}"></div>    
+                <div id="sidebar" pageid="{{param.sidebarPageId}}"></div>
             {{/isEqualOr}}
             {{/isEqualOr}}
             {{#isEqualOr type '' 'common_floor' 'fix'}}
             {{#isEqualOr type '' 'common_floor' 'fix'}}
                 {{! 普通楼层 顶悬浮}}
                 {{! 普通楼层 顶悬浮}}
@@ -84,12 +84,12 @@
                                 {{/repeat}}
                                 {{/repeat}}
                             </div>
                             </div>
                         {{/isEqualOr}}
                         {{/isEqualOr}}
-                        
+
                         {{#isEqualOr type 'productGroup'}}
                         {{#isEqualOr type 'productGroup'}}
                             {{! 商品池}}
                             {{! 商品池}}
-                            <div class="product-container item{{numOfOneRow}}" {{#if proBgImg}}style="background:url({{image2 proBgImg q=60}})repeat;"{{/if}}>
+                            <div class="product-container item{{numOfOneRow}}" {{#if proBgImg}}style="background:url({{image2 proBgImg q=60}}) repeat;background-size:100%;"{{/if}}>
                                 <div class="product-source" condition='{{stringify searchCondition}}' fp="{{getAnalysis ../this @index}}"
                                 <div class="product-source" condition='{{stringify searchCondition}}' fp="{{getAnalysis ../this @index}}"
-                                    {{#unless defaultPros.length}} 
+                                    {{#unless defaultPros.length}}
                                         {{#if searchCondition.item}}
                                         {{#if searchCondition.item}}
                                             cloneitem="{{searchCondition.item}}"
                                             cloneitem="{{searchCondition.item}}"
                                         {{else}}
                                         {{else}}
@@ -130,7 +130,7 @@
                                                 <img class="brand-img lazy" data-original="{{image2 ../brandImg q=60}}">
                                                 <img class="brand-img lazy" data-original="{{image2 ../brandImg q=60}}">
                                             </a>
                                             </a>
                                         {{/if}}
                                         {{/if}}
-                                    </div>    
+                                    </div>
                                     {{/defaultPros}}
                                     {{/defaultPros}}
                                 {{else}}
                                 {{else}}
                                 <div class="feature-product-info novisible">
                                 <div class="feature-product-info novisible">
@@ -158,7 +158,7 @@
                                     {{#if brandImg}}
                                     {{#if brandImg}}
                                     <a class="second-part {{#isEqualOr showBrandUrl '1'}}product-brand{{else}}product-detail{{/isEqualOr}}" href=''>
                                     <a class="second-part {{#isEqualOr showBrandUrl '1'}}product-brand{{else}}product-detail{{/isEqualOr}}" href=''>
                                         <div class="brand-div">
                                         <div class="brand-div">
-                                            <span class="brand-name" {{#if fontColor}}style="color:{{fontColor}};"{{/if}}></span>    
+                                            <span class="brand-name" {{#if fontColor}}style="color:{{fontColor}};"{{/if}}></span>
                                         </div>
                                         </div>
                                         <img class="brand-img" src="{{image2 brandImg q=60}}">
                                         <img class="brand-img" src="{{image2 brandImg q=60}}">
                                     </a>
                                     </a>
@@ -171,6 +171,6 @@
                     {{/component}}
                     {{/component}}
                 </div>
                 </div>
             {{/isEqualOr}}
             {{/isEqualOr}}
-        {{/content.floors}}                            
+        {{/content.floors}}
     {{/unless}}
     {{/unless}}
-</div>
+</div>

@@ -159,7 +159,8 @@ const add = (req, res, next) => {
     return indexModel.addToCart(productSku, buyNumber, goodsType, isEdit, promotionId, uid, shoppingKey).then(data => {
     return indexModel.addToCart(productSku, buyNumber, goodsType, isEdit, promotionId, uid, shoppingKey).then(data => {
         if (!shoppingKey && _.has(data, 'data.shopping_key')) {
         if (!shoppingKey && _.has(data, 'data.shopping_key')) {
             res.cookie('_SPK', data.data.shopping_key, {
             res.cookie('_SPK', data.data.shopping_key, {
-                expires: new Date(Date.now() + 86400 * 360)
+                expires: new Date(Date.now() + 86400 * 360),
+                domain: '.m.yohobuy.com'
             });
             });
         }
         }
         data ? res.json(data) : res.status(400).json({
         data ? res.json(data) : res.status(400).json({

@@ -70,23 +70,26 @@ exports.orderEnsure = (req, res, next) => {
         addressModel.addressData(uid)
         addressModel.addressData(uid)
     ];
     ];
 
 
-    if (_.isUndefined(req.cookies._isNewUser)) {
-        allPromise.push(orderModel.isNewUser(uid));
-    }
+    /* tar note 170426 品众去除 */
+    // if (_.isUndefined(req.cookies._isNewUser)) {
+    //     allPromise.push(orderModel.isNewUser(uid));
+    // }
 
 
     return Promise.all(allPromise).then(result => {
     return Promise.all(allPromise).then(result => {
         let order = result[0];
         let order = result[0];
         let userProfile = result[1];
         let userProfile = result[1];
         let address = result[2];
         let address = result[2];
-        let isNewUser = result[3];
 
 
-        if (!_.isUndefined(isNewUser)) {
-            if (isNewUser) {
-                res.cookie('_isNewUser', true, actCkOpthn);
-            } else {
-                res.cookie('_isNewUser', false, actCkOpthn);
-            }
-        }
+        /* tar note 170426 品众去除 */
+        // let isNewUser = result[3];
+
+        // if (!_.isUndefined(isNewUser)) {
+        //     if (isNewUser) {
+        //         res.cookie('_isNewUser', true, actCkOpthn);
+        //     } else {
+        //         res.cookie('_isNewUser', false, actCkOpthn);
+        //     }
+        // }
 
 
         if (order.cartUrl) {
         if (order.cartUrl) {
             logger.info(`orderEnsure: order cartUrl has value:${order.cartUrl}, order data is null`);
             logger.info(`orderEnsure: order cartUrl has value:${order.cartUrl}, order data is null`);

@@ -3,12 +3,27 @@
 const api = global.yoho.API;
 const api = global.yoho.API;
 
 
 const cartCount = (uid, shoppingKey) => {
 const cartCount = (uid, shoppingKey) => {
+    let params = {
+        method: 'app.Shopping.count'
+    };
 
 
-    return api.get('', {
-        method: 'app.Shopping.count',
-        uid: uid,
-        shopping_key: shoppingKey
-    }).then((result) => {
+    if (!uid && !shoppingKey) {
+        return Promise.resolve({});
+    }
+
+    if (uid) {
+        Object.assign(params, {
+            uid: uid
+        });
+    }
+
+    if (shoppingKey) {
+        Object.assign(params, {
+            shopping_key: shoppingKey
+        });
+    }
+
+    return api.get('', params).then((result) => {
         return result;
         return result;
     });
     });
 };
 };

@@ -17,6 +17,7 @@ const helpers = global.yoho.helpers;
 const _ = require('lodash');
 const _ = require('lodash');
 const co = require('bluebird').coroutine;
 const co = require('bluebird').coroutine;
 const logger = global.yoho.logger;
 const logger = global.yoho.logger;
+const stringProcess = require(`${global.utils}/string-process`);
 
 
 // 支付方式
 // 支付方式
 const payments = {
 const payments = {
@@ -55,7 +56,7 @@ const _getOthersBuy2 = (param) => {
 
 
 // 订单信息
 // 订单信息
 const _getOtherDetail = (param) => {
 const _getOtherDetail = (param) => {
-    if (!param.uid || !param.orderCode) {
+    if (!param.uid || !param.orderCode || !stringProcess.isNumeric(param.orderCode)) {
         return Promise.resolve({});
         return Promise.resolve({});
     }
     }
 
 

@@ -8,12 +8,14 @@
 const installmentModel = require('../models/installment');
 const installmentModel = require('../models/installment');
 const _ = require('lodash');
 const _ = require('lodash');
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
+const logger = global.yoho.logger;
 
 
 // 服务器报错页面
 // 服务器报错页面
 const _serverCrash = (res, params, err, next) => {
 const _serverCrash = (res, params, err, next) => {
     if (err && err.code === 401) {
     if (err && err.code === 401) {
         return next(err);
         return next(err);
     }
     }
+    logger.error(err);
     params.title = params.title || '有货分期';
     params.title = params.title || '有货分期';
     res.render('installment/server-crash', params);
     res.render('installment/server-crash', params);
 };
 };
@@ -54,6 +56,7 @@ const _repaymentList = (req, res, next, opt, params) => {
 const index = (req, res, next) => {
 const index = (req, res, next) => {
     let uid = req.user.uid;
     let uid = req.user.uid;
 
 
+    logger.info(`installment index info: client_type=${req.query.client_type},req.user.uid=${req.user.uid},req.query.uid=${req.query.uid},cookies=${JSON.stringify(req.cookies)}`); // eslint-disable-line
     Promise.all([
     Promise.all([
         installmentModel.getStauts(uid),
         installmentModel.getStauts(uid),
         installmentModel.getSearchIntallment({
         installmentModel.getSearchIntallment({

@@ -145,8 +145,7 @@ const addressModify = (req, res, next) => {
 
 
     addressModel.getAddressData({uid: uid}).then(result => {
     addressModel.getAddressData({uid: uid}).then(result => {
         let userAddressList = result;
         let userAddressList = result;
-        let addressData = addressProcess.getAddressByAreaCode(areaCode,
-            _.get(userAddressList, 'data', [])) || {};
+        let addressData = addressProcess.getAddressByAreaCode(areaCode, _.get(userAddressList, 'data', [])) || {};
 
 
         Object.assign(addressData, {
         Object.assign(addressData, {
             orderCode: orderCode,
             orderCode: orderCode,
@@ -154,7 +153,7 @@ const addressModify = (req, res, next) => {
 
 
         if (provinceAreaCode) {
         if (provinceAreaCode) {
             // 不允许修改省份，字符串拆分
             // 不允许修改省份，字符串拆分
-            let areaArray = addressData.area.split(' ');
+            let areaArray = addressData.area ? addressData.area.split(' ') : [];
             let area = _.slice(areaArray, 1);
             let area = _.slice(areaArray, 1);
 
 
             Object.assign(addressData, {
             Object.assign(addressData, {

@@ -28,7 +28,7 @@ const _userData = (params) => {
             code: 200
             code: 200
         });
         });
     } else {
     } else {
-        return false;
+        return Promise.resolve({});
     }
     }
 };
 };
 
 

@@ -12,6 +12,7 @@ const helpers = global.yoho.helpers;
 const api = global.yoho.API;
 const api = global.yoho.API;
 const serviceAPI = global.yoho.ServiceAPI;
 const serviceAPI = global.yoho.ServiceAPI;
 const logger = global.yoho.logger;
 const logger = global.yoho.logger;
+const stringProcess = require(`${global.utils}/string-process`);
 const API_TIMEOUT = 10000;
 const API_TIMEOUT = 10000;
 const codeContent = {
 const codeContent = {
     openN: '0876085ff46bed27f1a1eb6ee8b68987',
     openN: '0876085ff46bed27f1a1eb6ee8b68987',
@@ -207,7 +208,7 @@ const getStauts = (uid) => {
         if (result && result.code === 200) {
         if (result && result.code === 200) {
             return result.data.status;
             return result.data.status;
         } else {
         } else {
-            logger.error('get installment open status return code is not 200');
+            logger.error(`get installment open status return code is not 200,uid:${uid},result=${JSON.stringify(result)}`); // eslint-disable-line
             return Promise.reject(result);
             return Promise.reject(result);
         }
         }
     });
     });
@@ -423,6 +424,10 @@ const getBankCards = (uid) => {
 const getInstallmentOrderDetail = (params) => {
 const getInstallmentOrderDetail = (params) => {
     const method = 'app.SpaceOrders.installDetail';
     const method = 'app.SpaceOrders.installDetail';
 
 
+    if (!params.uid || !params.orderCode || !stringProcess.isNumeric(params.orderCode)) {
+        return Promise.resolve({});
+    }
+
     return api.get('', {
     return api.get('', {
         method: method,
         method: method,
         uid: params.uid,
         uid: params.uid,

@@ -10,6 +10,7 @@ const _ = require('lodash');
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
 const camelCase = global.yoho.camelCase;
 const camelCase = global.yoho.camelCase;
 const logger = global.yoho.logger;
 const logger = global.yoho.logger;
+const stringProcess = require(`${global.utils}/string-process`);
 
 
 const CODE_LOGISTIC_BANNER = '1fc9b2484fcd559049f2f7e0db313f20'; // 物流详情banner资源码
 const CODE_LOGISTIC_BANNER = '1fc9b2484fcd559049f2f7e0db313f20'; // 物流详情banner资源码
 
 
@@ -143,6 +144,10 @@ const _getOrderStatus = (order, showLogistics) => {
 
 
 const orderDetailData = (uid, orderCode) => {
 const orderDetailData = (uid, orderCode) => {
 
 
+    if (!uid || !orderCode || !stringProcess.isNumeric(orderCode)) {
+        return Promise.resolve({});
+    }
+
     return api.get('', {
     return api.get('', {
         method: 'app.SpaceOrders.detail',
         method: 'app.SpaceOrders.detail',
         uid: uid,
         uid: uid,

@@ -237,6 +237,8 @@ const sendCodeToMobileAPI = (req, res, next) => {
                     _.set(req.session, 'backupCaptch.timeout', Date.now() + 5 * 60 * 1000);
                     _.set(req.session, 'backupCaptch.timeout', Date.now() + 5 * 60 * 1000);
                 }
                 }
 
 
+                req.session.backupCaptchStep2 = true; // 允许跳到第二步
+
                 return res.json({
                 return res.json({
                     code: 200,
                     code: 200,
                     data: helpers.urlFormat('/passport/back/mobilecode', {
                     data: helpers.urlFormat('/passport/back/mobilecode', {
@@ -286,14 +288,17 @@ const verifyCodeByMobileAPI = (req, res, next) => {
 
 
     service.validateMobileCodeAsync(phoneNum, code, areaCode)
     service.validateMobileCodeAsync(phoneNum, code, areaCode)
         .then(result => {
         .then(result => {
-            if (result.code === 200) {
+            if (result.code === 200 && result.data) {
+                req.session.backcode = {
+                    phoneNum: phoneNum,
+                    token: result.data.token,
+                    areaCode: areaCode,
+                    code: code
+                };
+
                 res.json({
                 res.json({
                     code: 200,
                     code: 200,
-                    data: helpers.urlFormat('/passport/back/backcode', {
-                        phoneNum: phoneNum,
-                        token: result.data.token,
-                        areaCode: areaCode
-                    })
+                    data: helpers.urlFormat('/passport/back/backcode')
                 });
                 });
             } else {
             } else {
                 res.json({
                 res.json({
@@ -309,16 +314,15 @@ const verifyCodeByMobileAPI = (req, res, next) => {
  * 找回密码页面，设置新密码页面-手机
  * 找回密码页面，设置新密码页面-手机
  */
  */
 const 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 || '';
+    let backcode = req.session.backcode;
 
 
-    if (!(code || (token && helpers.verifyMobile(phoneNum)))) {
+    if (!backcode || !(backcode.code || (backcode.token && helpers.verifyMobile(backcode.phoneNum)))) {
         res.redirect(400);
         res.redirect(400);
         return;
         return;
     }
     }
 
 
+    req.session.backcode = null;
+
     res.render('back/new-password', Object.assign({
     res.render('back/new-password', Object.assign({
         module: 'passport',
         module: 'passport',
         page: 'back-new-password',
         page: 'back-new-password',
@@ -328,10 +332,10 @@ const setNewPasswordByMobilePage = (req, res) => {
         headerText: '找回密码',
         headerText: '找回密码',
         isPassportPage: true,
         isPassportPage: true,
         backNewPwd: true,
         backNewPwd: true,
-        phoneNum: phoneNum,
-        token: token,
-        areaCode: areaCode,
-        code: code
+        phoneNum: backcode.phoneNum,
+        token: backcode.token,
+        areaCode: backcode.areaCode,
+        code: backcode.code
     }));
     }));
 };
 };
 
 
@@ -361,6 +365,20 @@ const setNewPasswordByMobileAPI = (req, res, next) => {
         .catch(next);
         .catch(next);
 };
 };
 
 
+/**
+ * 直接调用发短信接口的情况
+ */
+const verifySmsAllow = (req, res, next) => {
+    if (_.get(req, 'session.backupCaptch.verifyResult')) {
+        return next();
+    } else {
+        return res.json({
+            code: 400,
+            message: '非法请求'
+        });
+    }
+};
+
 module.exports = {
 module.exports = {
     indexEmailPage,
     indexEmailPage,
     sendCodeToEmailAPI,
     sendCodeToEmailAPI,
@@ -373,5 +391,6 @@ module.exports = {
     verifyCodeByMobileAPI,
     verifyCodeByMobileAPI,
     setNewPasswordByMobilePage,
     setNewPasswordByMobilePage,
     setNewPasswordByMobileAPI,
     setNewPasswordByMobileAPI,
-    generateCodeImg
+    generateCodeImg,
+    verifySmsAllow
 };
 };

@@ -38,6 +38,7 @@ exports.imgCheck = (req, res, next) => {
             }, '');
             }, '');
 
 
             req.session.captcha = codeStr;
             req.session.captcha = codeStr;
+            req.session.captchaTimeout = new Date().getTime() + 1000 * 60;
             req.session.captchaSrc = result.data.verifiedGraphicCode;
             req.session.captchaSrc = result.data.verifiedGraphicCode;
 
 
             return request(`${result.data.verifiedGraphicCode}?imageView2/0/format/jpg/q/70|watermark/2/text/${uuid.v4()}/fontsize/120/dissolve/10`).pipe(res); // eslint-disable-line
             return request(`${result.data.verifiedGraphicCode}?imageView2/0/format/jpg/q/70|watermark/2/text/${uuid.v4()}/fontsize/120/dissolve/10`).pipe(res); // eslint-disable-line
@@ -52,6 +53,18 @@ exports.imgCheck = (req, res, next) => {
 exports.validate = (req, res, next) => {
 exports.validate = (req, res, next) => {
     let captchaInput = req.body.captcha;
     let captchaInput = req.body.captcha;
     let captchaCode = _.get(req.session, 'captcha');
     let captchaCode = _.get(req.session, 'captcha');
+    let captchaTimeout = _.get(req.session, 'captchaTimeout');
+
+    if (new Date().getTime() > captchaTimeout) {
+        _.set(req.session, 'captchaValidCount', 5);
+        req.session.captcha = null;
+        return res.json({
+            code: 400,
+            message: '验证码超时，请重试',
+            changeCaptcha: true,
+            captchaShow: true
+        });
+    }
 
 
     let errorCount = _.get(req.session, 'captchaValidCount'); // 初始1次 + 后续4次， 同一个验证码 共5次
     let errorCount = _.get(req.session, 'captchaValidCount'); // 初始1次 + 后续4次， 同一个验证码 共5次
 
 

@@ -117,8 +117,29 @@ const common = {
                 return next();
                 return next();
             });
             });
         }
         }
-    }
+    },
+    isLoginUser: (req, res, next) => {
+        // 微信里边已经登录的时候，不再跳转登录
+        if (req.user.uid) {
+            AuthHelper.profile(req.user.uid).then(function(result) {
+                if (result.code !== 200) {
+                    return next();
+                }
+                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);
+            }).catch(() => {
+                return next();
+            });
+        } else {
+            return next();
+        }
+    }
 };
 };
 
 
 
 
@@ -280,19 +301,6 @@ const local = {
 
 
 const wechat = {
 const wechat = {
     login: (req, res, next) => {
     login: (req, res, next) => {
-        // 微信里边已经登录的时候，不再跳转登录
-        // 与 5.6 的 session 有冲突
-        // 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();

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Author: Targaryen
  * @Date: 2017-04-13 10:21:07
  * @Date: 2017-04-13 10:21:07
  * @Last Modified by: Targaryen
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-04-20 18:33:48
+ * @Last Modified time: 2017-04-24 10:52:08
  */
  */
 
 
 /* ********************
 /* ********************
@@ -49,9 +49,9 @@ const passwordResetPage = (req, res) => {
  */
  */
 const passwordReset = (req, res, next) => {
 const passwordReset = (req, res, next) => {
     let passwordWeakObj = req.session.passwordWeak;
     let passwordWeakObj = req.session.passwordWeak;
-    let uid = req.user && req.user.uid || passwordWeakObj.uid;
+    let uid = (req.user && req.user.uid) || (passwordWeakObj && passwordWeakObj.uid);
 
 
-    if (!uid || !passwordWeakObj.token) {
+    if (!uid || !passwordWeakObj || !passwordWeakObj.token) {
         return res.json({
         return res.json({
             code: 400,
             code: 400,
             massage: '非法请求'
             massage: '非法请求'

@@ -75,7 +75,7 @@ router.post('/passport/sms_login/password.json', smsLogin.password);
 router.get('/passport/login/user', login.user);
 router.get('/passport/login/user', login.user);
 
 
 // 微信登录
 // 微信登录
-router.get('/passport/login/wechat', login.common.beforeLogin, login.wechat.login);
+router.get('/passport/login/wechat', login.common.beforeLogin, login.common.isLoginUser, login.wechat.login);
 router.get('/passport/login/wechat/callback', login.wechat.callback);
 router.get('/passport/login/wechat/callback', login.wechat.callback);
 
 
 // sina登录
 // sina登录
@@ -134,6 +134,7 @@ router.get('/passport/back/mobile', validateCode.load, back.indexMobilePage);//
 router.get('/passport/back/mobilecode', back.verifyCodeByMobilePage);// 输入手机验证码页面
 router.get('/passport/back/mobilecode', back.verifyCodeByMobilePage);// 输入手机验证码页面
 router.get('/passport/back/generatecodeimg.png', back.generateCodeImg);// 生成图片验证码
 router.get('/passport/back/generatecodeimg.png', back.generateCodeImg);// 生成图片验证码
 router.post('/passport/back/sendcode', validateCode.check, back.sendCodeToMobileAPI);// 发送手机验证码
 router.post('/passport/back/sendcode', validateCode.check, back.sendCodeToMobileAPI);// 发送手机验证码
+router.post('/passport/back/sendcodeagain', back.verifySmsAllow, back.sendCodeToMobileAPI);// 重新发送手机验证码
 router.post('/passport/back/verifycode', back.verifyCodeByMobileAPI);// 校验手机验证码
 router.post('/passport/back/verifycode', back.verifyCodeByMobileAPI);// 校验手机验证码
 
 
 router.get('/passport/back/backcode', back.setNewPasswordByMobilePage);// 设置新密码页面
 router.get('/passport/back/backcode', back.setNewPasswordByMobilePage);// 设置新密码页面

@@ -224,7 +224,7 @@ const shop = {
             }
             }
 
 
             /* 红人店铺直接跳转 */
             /* 红人店铺直接跳转 */
-            if (shopInfoResult.is_red_shop) {
+            if (shopInfoResult && shopInfoResult.is_red_shop) {
                 shop.redShop(req, res, next);
                 shop.redShop(req, res, next);
                 return false;
                 return false;
             }
             }
@@ -439,6 +439,8 @@ const shop = {
                     shop_id: shopId,
                     shop_id: shopId,
                     title: '全部商品'
                     title: '全部商品'
                 }, 'list'),
                 }, 'list'),
+                appPath: 'yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.shop","params":{"shop_template_type":"1","is_red_shop":"1","shop_id":"' +
+                                shopId + '","shop_name":"' + shopInfo.shop_name + '"}}',
                 shopHeadHide: true,
                 shopHeadHide: true,
                 shopPage: true,
                 shopPage: true,
                 width750: true,
                 width750: true,

@@ -7,11 +7,17 @@
 
 
 const newsaleModel = require('../models/newsale');
 const newsaleModel = require('../models/newsale');
 const headerModel = require('../../../doraemon/models/header');
 const headerModel = require('../../../doraemon/models/header');
+
+let yhchannels = {
+    '1,3': 1,
+    '2,3': 2
+};
+
 let channels = {
 let channels = {
-    boys: '1,3',
-    girl: '2,3',
-    kids: '1,2,3',
-    lifestyle: '1,2,3'
+    boys: 1,
+    girls: 2,
+    kids: 3,
+    lifestyle: 4
 };
 };
 
 
 const index = (req, res, next) => {
 const index = (req, res, next) => {
@@ -56,10 +62,10 @@ const selectHotrank = (req, res, next) => {
     let limit = 50;
     let limit = 50;
     let page = req.query.page || 1;
     let page = req.query.page || 1;
     let notab = req.query.notab || 0;
     let notab = req.query.notab || 0;
-    let yhChannel = req.query.yh_channel || 1;
-    let gender = req.query.gender || req.cookies._Channel && channels[req.cookies._Channel] || '1,3';
+    let yhChannel = (req.query.gender && yhchannels[req.query.gender]) ||
+                    (req.cookies._Channel && channels[req.cookies._Channel]) || 1;
 
 
-    newsaleModel.selectHotrank(yhChannel, gender, sort, tab_id, limit, page, notab).then((result) => {
+    newsaleModel.selectHotrank(yhChannel, sort, tab_id, limit, page, notab).then((result) => {
 
 
         res.render('newsale/hotlist', {
         res.render('newsale/hotlist', {
             layout: false,
             layout: false,

@@ -33,6 +33,11 @@ const _getUserProfile = (uid) => {
         uid: uid
         uid: uid
     }, {
     }, {
         cache: true
         cache: true
+    }).catch(function() {
+        return {
+            code: 200,
+            data: {}
+        };
     });
     });
 };
 };
 
 

@@ -11,6 +11,7 @@ const helpers = global.yoho.helpers;
 const api = global.yoho.API;
 const api = global.yoho.API;
 const searchModel = require('./search');
 const searchModel = require('./search');
 const productProcess = require(`${utils}/product-process`);
 const productProcess = require(`${utils}/product-process`);
+const stringProcess = require(`${global.utils}/string-process`);
 
 
 /**
 /**
  * 频道
  * 频道
@@ -122,14 +123,22 @@ const _getShopDecorator = (shopId) => {
  * @return array
  * @return array
  */
  */
 const _getShopInfo = (shopId, uid) => {
 const _getShopInfo = (shopId, uid) => {
-    if (uid === 'undefined') {
-        uid = 0;
-    }
-    return api.get('', {
+    let finalParams = {
         method: 'app.shops.getIntro',
         method: 'app.shops.getIntro',
         shop_id: shopId,
         shop_id: shopId,
-        uid: uid || 0
-    }, {code: 200}).then((result) => {
+    };
+
+    if (!shopId || !stringProcess.isNumeric(shopId)) {
+        return Promise.resolve({});
+    }
+
+    if (uid && uid !== 'undefined') {
+        Object.assign(finalParams, {
+            uid: uid
+        });
+    }
+
+    return api.get('', finalParams, {code: 200}).then((result) => {
         return result && result.data;
         return result && result.data;
     });
     });
 };
 };
@@ -144,6 +153,10 @@ const getShopIntro = (shopId, uid) => {
         shop_id: shopId
         shop_id: shopId
     };
     };
 
 
+    if (!shopId || !stringProcess.isNumeric(shopId)) {
+        return Promise.resolve({});
+    }
+
     if (uid && uid !== 'undefined') {
     if (uid && uid !== 'undefined') {
         params.uid = uid;
         params.uid = uid;
     }
     }

@@ -40,10 +40,9 @@ const getHotRank = (codeKey) => {
     });
     });
 };
 };
 
 
-const selectHotrank = (yhChannel, gender, sort, tabId, limit, page, notab) => {
+const selectHotrank = (yhChannel, sort, tabId, limit, page, notab) => {
     let param = {
     let param = {
         method: 'app.search.top',
         method: 'app.search.top',
-        gender: gender,
         yh_channel: yhChannel,
         yh_channel: yhChannel,
         page: page,
         page: page,
         limit: limit
         limit: limit

@@ -5,6 +5,7 @@
 
 
 const api = global.yoho.API;
 const api = global.yoho.API;
 const singleAPI = global.yoho.SingleAPI;
 const singleAPI = global.yoho.SingleAPI;
+const stringProcess = require(`${global.utils}/string-process`);
 
 
 /**
 /**
  * 频道
  * 频道
@@ -41,6 +42,10 @@ exports.getIntro = shopId => {
         shop_id: shopId
         shop_id: shopId
     };
     };
 
 
+    if (!shopId || !stringProcess.isNumeric(shopId)) {
+        return Promise.resolve({});
+    }
+
     return api.get('', params, {cache: true, code: 200});
     return api.get('', params, {cache: true, code: 200});
 };
 };
 
 
@@ -77,12 +82,19 @@ exports.getShopCategory = (shopId, channel) => {
  * 店铺收藏数量
  * 店铺收藏数量
  */
  */
 exports.favCount = (shopId, uid, channel, udid) => {
 exports.favCount = (shopId, uid, channel, udid) => {
-    return singleAPI.get('favorite', {
+    let finalParams = {
         method: 'app.favorite.queryFavoriteCountByShopIds',
         method: 'app.favorite.queryFavoriteCountByShopIds',
         favIds: shopId,
         favIds: shopId,
         type: 'shop',
         type: 'shop',
         udid: udid,
         udid: udid,
-        uid: uid,
         physical_channel: yhChannel[channel],
         physical_channel: yhChannel[channel],
-    });
+    };
+
+    if (uid) {
+        Object.assign(finalParams, {
+            uid: uid
+        });
+    }
+
+    return singleAPI.get('favorite', finalParams);
 };
 };

@@ -224,6 +224,11 @@ const _getUserProfile = (uid, params) => {
         uid: uid
         uid: uid
     }, {
     }, {
         cache: true
         cache: true
+    }).catch(function() {
+        return {
+            code: 200,
+            data: {}
+        };
     });
     });
 };
 };
 
 

@@ -43,6 +43,9 @@
             <div id="red-index" class="tab-panel red-shop-index active">
             <div id="red-index" class="tab-panel red-shop-index active">
                 <div class="shop-coupon coupon-group"></div>
                 <div class="shop-coupon coupon-group"></div>
                 {{> reds-shop/modules}}
                 {{> reds-shop/modules}}
+                <div id="indexGoodsContainer" class="goods-container">
+                    <div class="default-goods container clearfix"></div>
+                </div>
                 <div class="all-goods">
                 <div class="all-goods">
                     <a href="{{allGoodsUrl}}">点击查看全部商品</a>
                     <a href="{{allGoodsUrl}}">点击查看全部商品</a>
                 </div>
                 </div>

 <div class="item">
 <div class="item">
     <a {{#if link}}href="{{link}}"{{/if}}>
     <a {{#if link}}href="{{link}}"{{/if}}>
         {{#if isGood}}
         {{#if isGood}}
-            {{#ifor triple double}}
-            <img class="item-pic" src="{{image2 src w=235 h=314}}" alt="">
+            {{#ifor triple double single}}
+                {{#within index 3}}
+                    <img class="item-pic" src="{{image2 src w=235 h=314}}">
+                {{^}}
+                    <img class="item-pic lazy" data-original="{{image2 src w=235 h=314}}">
+                {{/within}}
             {{/ifor}}
             {{/ifor}}
         {{^}}
         {{^}}
-        <img class="item-pic" src="{{image2 src}}" alt="">
+            {{#within index 3}}
+                <img class="item-pic" src="{{image2 src}}" alt="">
+            {{^}}
+                <img class="item-pic lazy" data-original="{{image2 src}}">
+            {{/within}}
         {{/if}}
         {{/if}}
     </a>
     </a>
 
 

@@ -15,13 +15,13 @@
             <ul class="swiper-wrapper">
             <ul class="swiper-wrapper">
                 {{#each ../pics}}
                 {{#each ../pics}}
                     <li class="swiper-slide">
                     <li class="swiper-slide">
-                        {{#if link}}
-                            <a href="{{link}}">
+                        <a{{#if link}} href="{{link}}"{{/if}}>
+                            {{#within @../index 3}}
                                 <img src="{{image2 src}}" alt="">
                                 <img src="{{image2 src}}" alt="">
-                            </a>
-                        {{^}}
-                            <img src="{{image2 src}}" alt="">
-                        {{/if}}
+                            {{^}}
+                                <img class="lazy" data-original="{{image2 src}}" alt="">
+                            {{/within}}
+                        </a>
                     </li>
                     </li>
                 {{/each}}
                 {{/each}}
             </ul>
             </ul>
@@ -51,7 +51,7 @@
     {{#isEqual module_type 'SingleImage'}}
     {{#isEqual module_type 'SingleImage'}}
         <div class="items-s1 clearfix">
         <div class="items-s1 clearfix">
             {{#each ../pics}}
             {{#each ../pics}}
-                {{> reds-shop/item}}
+                {{> reds-shop/item index=@../index single=true}}
             {{/each}}
             {{/each}}
         </div>
         </div>
         {{#if ../isModuleMargin}}
         {{#if ../isModuleMargin}}
@@ -61,7 +61,7 @@
     {{#isEqual module_type 'DoubleImage'}}
     {{#isEqual module_type 'DoubleImage'}}
         <div class="items-s2 clearfix">
         <div class="items-s2 clearfix">
             {{#each ../pics}}
             {{#each ../pics}}
-                {{> reds-shop/item double=true}}
+                {{> reds-shop/item index=@../index double=true}}
             {{/each}}
             {{/each}}
         </div>
         </div>
         {{#if ../isModuleMargin}}
         {{#if ../isModuleMargin}}
@@ -71,7 +71,7 @@
     {{#isEqual module_type 'TripleImage'}}
     {{#isEqual module_type 'TripleImage'}}
         <div class="{{#isEqual ../displayType 1}}items-3-3{{/isEqual}}{{#isEqual ../displayType 2}}items-3-3 items-small{{/isEqual}}{{#isEqual ../displayType 3}}items-3-2 items-3-2-right{{/isEqual}}{{#isEqual ../displayType 4}}items-3-2 items-3-2-left{{/isEqual}} clearfix">
         <div class="{{#isEqual ../displayType 1}}items-3-3{{/isEqual}}{{#isEqual ../displayType 2}}items-3-3 items-small{{/isEqual}}{{#isEqual ../displayType 3}}items-3-2 items-3-2-right{{/isEqual}}{{#isEqual ../displayType 4}}items-3-2 items-3-2-left{{/isEqual}} clearfix">
             {{#each ../pics}}
             {{#each ../pics}}
-                {{> reds-shop/item triple=true}}
+                {{> reds-shop/item index=@../index triple=true}}
             {{/each}}
             {{/each}}
         </div>
         </div>
         {{#if ../isModuleMargin}}
         {{#if ../isModuleMargin}}
@@ -81,14 +81,14 @@
     {{#isEqual module_type 'FourImage'}}
     {{#isEqual module_type 'FourImage'}}
         <div class="items-s4 clearfix">
         <div class="items-s4 clearfix">
             {{#each ../pics}}
             {{#each ../pics}}
-                {{> reds-shop/item four=true}}
+                {{> reds-shop/item index=@../index four=true}}
             {{/each}}
             {{/each}}
         </div>
         </div>
         {{#if ../isModuleMargin}}
         {{#if ../isModuleMargin}}
             <div class="margin-bottom"></div>
             <div class="margin-bottom"></div>
         {{/if}}
         {{/if}}
     {{/isEqual}}
     {{/isEqual}}
-    {{#isEqual module_type 'RecommentProduct'}}
+    {{#isEqual module_type 'AppRecommendProduct'}}
          <div class="index-goods-container" data-type="{{../type}}" data-skns="{{../skns}}" data-order="{{../order}}"></div>
          <div class="index-goods-container" data-type="{{../type}}" data-skns="{{../skns}}" data-order="{{../order}}"></div>
          {{#if ../isModuleMargin}}
          {{#if ../isModuleMargin}}
              <div class="margin-bottom"></div>
              <div class="margin-bottom"></div>

@@ -56,12 +56,12 @@ const qaDetail = (params) => {
 
 
             // 根据子id，父id，关键字，匹配问题详情
             // 根据子id，父id，关键字，匹配问题详情
         if (params.keyword) {
         if (params.keyword) {
-                // 从搜索列表进入，有关键字
+            // 从搜索列表进入，有关键字
             if (result && result[1] && result[1].data) {
             if (result && result[1] && result[1].data) {
                 let keyList = result[1].data.helper_list;
                 let keyList = result[1].data.helper_list;
 
 
                 _.forEach(keyList, function(val) {
                 _.forEach(keyList, function(val) {
-                    if (val.id === params.sonId) {
+                    if (parseInt(val.id, 10) === parseInt(params.sonId, 10)) {
                         resu = {
                         resu = {
                             caption: val.caption,
                             caption: val.caption,
                             content: val.content
                             content: val.content
@@ -70,11 +70,11 @@ const qaDetail = (params) => {
                 });
                 });
             }
             }
         } else {
         } else {
-                // 常见问题没有parentId
+            // 常见问题没有parentId
             if (result && result[0] && result[0].data) {
             if (result && result[0] && result[0].data) {
                 if (!params.parentId) {
                 if (!params.parentId) {
                     _.forEach(result[0].data.faqs, function(val) {
                     _.forEach(result[0].data.faqs, function(val) {
-                        if (val.id === params.sonId) {
+                        if (parseInt(val.id, 10) === parseInt(params.sonId, 10)) {
                             resu = {
                             resu = {
                                 caption: val.caption,
                                 caption: val.caption,
                                 content: val.content
                                 content: val.content
@@ -83,10 +83,10 @@ const qaDetail = (params) => {
                     });
                     });
                 } else {
                 } else {
                     _.forEach(result[0].data.categorys, function(val) {
                     _.forEach(result[0].data.categorys, function(val) {
-                        if (val.id === params.parentId) {
+                        if (parseInt(val.id, 10) === parseInt(params.parentId, 10)) {
                             _.forEach(val.contentItems, function(item) {
                             _.forEach(val.contentItems, function(item) {
 
 
-                                if (item.id === params.sonId) {
+                                if (parseInt(item.id, 10) === parseInt(params.sonId, 10)) {
                                     resu = {
                                     resu = {
                                         caption: item.caption,
                                         caption: item.caption,
                                         content: item.content
                                         content: item.content

@@ -14,8 +14,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.yoho.cn/',
-    service: 'http://service.yoho.cn/',
+    api: 'http://api-test3.yohops.com:9999/',
+    service: 'http://service-test3.yohops.com:9999/',
     global: 'http://api-global.yohobuy.com',
     global: 'http://api-global.yohobuy.com',
 
 
     // liveApi: 'http://api.live.yoho.cn/',
     // liveApi: 'http://api.live.yoho.cn/',

@@ -51,6 +51,8 @@ exports.serverError = () => {
         forceNoCache(res);
         forceNoCache(res);
 
 
         if (err && err.code === 401) {
         if (err && err.code === 401) {
+            logger.error(`401 error info:client_type=${req.query.client_type},req.user=${JSON.stringify(req.user)},req.query=${JSON.stringify(req.query)},cookies=${JSON.stringify(req.cookies)}`); // eslint-disable-line
+
             if (req.xhr) {
             if (req.xhr) {
                 return res.status(401).json(err);
                 return res.status(401).json(err);
             } else if (req.yoho.isApp) {
             } else if (req.yoho.isApp) {

@@ -48,7 +48,9 @@ module.exports = () => {
         yoho.channel = channel;
         yoho.channel = channel;
 
 
         // 判断请求是否来自app
         // 判断请求是否来自app
-        yoho.isApp = req.query.app_version || req.query.appVersion || req.cookies.app_version;
+        yoho.isApp = (req.query.app_version && req.query.app_version !== 'false') ||
+            (req.query.appVersion && req.query.appVersion !== 'false') ||
+            req.cookies.app_version;
         yoho.isWechat = /micromessenger/i.test(req.get('User-Agent') || '');
         yoho.isWechat = /micromessenger/i.test(req.get('User-Agent') || '');
         yoho.isWeibo = ua.indexOf('weibo') !== -1;
         yoho.isWeibo = ua.indexOf('weibo') !== -1;
         yoho.isqq = /MQQBrowser/i.test(req.get('User-Agent') || '');
         yoho.isqq = /MQQBrowser/i.test(req.get('User-Agent') || '');

@@ -6,33 +6,36 @@ const authcode = require('../../utils/authcode');
 
 
 module.exports = () => {
 module.exports = () => {
     return (req, res, next) => {
     return (req, res, next) => {
-        // 从 SESSION 中获取到当前登录用户的 UID
-        if (req.session && _.isNumber(req.session.LOGIN_UID)) {
-            // 调用接口传参时切勿使用toString获得字符串
-            req.user.uid = {
-                toString: () => {
-                    return req.session.LOGIN_UID;
-                },
-                sessionKey: req.session.SESSION_KEY
-            };
-            let userData = _.get(req.session, 'USER', {});
 
 
-            _.merge(req.user, userData);
-        }
+        if (!req.yoho.isApp) {
+            // 从 SESSION 中获取到当前登录用户的 UID
+            if (req.session && _.isNumber(req.session.LOGIN_UID)) {
+                // 调用接口传参时切勿使用toString获得字符串
+                req.user.uid = {
+                    toString: () => {
+                        return _.parseInt(req.session.LOGIN_UID);
+                    },
+                    sessionKey: req.session.SESSION_KEY
+                };
+                let userData = _.get(req.session, 'USER', {});
 
 
-        // session 没有读取到的时候，从 cookie 读取 UID
-        if (!req.user.uid && req.cookies._UID) {
-            let sessionKey = req.cookies._SESSION_KEY && authcode(req.cookies._SESSION_KEY, '_SESSION_KEY', 2592000000);
+                _.merge(req.user, userData);
+            }
 
 
-            // 调用接口传参时切勿使用toString获得字符串
-            req.user.uid = {
-                toString: () => {
-                    return cookie.getUid(req);
-                },
-                sessionKey
-            };
-        }
+            // session 没有读取到的时候，从 cookie 读取 UID
+            if (!req.user.uid && req.cookies._UID) {
+                let sessionKey = req.cookies._SESSION_KEY &&
+                    authcode(req.cookies._SESSION_KEY, '_SESSION_KEY', 2592000000);
 
 
+                // 调用接口传参时切勿使用toString获得字符串
+                req.user.uid = {
+                    toString: () => {
+                        return _.parseInt(cookie.getUid(req));
+                    },
+                    sessionKey
+                };
+            }
+        }
         if (!req.user.uid &&
         if (!req.user.uid &&
             req.cookies.app_uid &&
             req.cookies.app_uid &&
             req.cookies.app_uid !== '0' &&
             req.cookies.app_uid !== '0' &&

@@ -57,7 +57,7 @@
         <link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
         <link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
     </head>
     </head>
     <body class="{{pageStyle}} {{#if isWechat}}wechat-body{{/if}} {{#if width750}}width750{{/if}} {{#if isPassportPage}}passport-body{{/if}} {{#if isStarIndexPage}}star-index-bg{{/if}} {{#if isStarDetailPage}}star-class-body{{/if}} {{#if isInstallmentPage}}installment-body{{/if}}">
     <body class="{{pageStyle}} {{#if isWechat}}wechat-body{{/if}} {{#if width750}}width750{{/if}} {{#if isPassportPage}}passport-body{{/if}} {{#if isStarIndexPage}}star-index-bg{{/if}} {{#if isStarDetailPage}}star-class-body{{/if}} {{#if isInstallmentPage}}installment-body{{/if}}">
-    <div class="main-wrap" id="main-wrap" {{#if appPath}}data-apppath='{{appPath}}'{{/if}}>
+    <div class="main-wrap" id="main-wrap" {{#if appPath}}data-apppath='{{{appPath}}}'{{/if}}>
             {{#if systemUpdate}}
             {{#if systemUpdate}}
                 {{> updata}}
                 {{> updata}}
             {{/if}}
             {{/if}}

@@ -75,8 +75,8 @@
         }, 1000);
         }, 1000);
     }());
     }());
 
 
-    /* tar add 190222 */
-    window._fxcmd = window._fxcmd || [];
+    /* tar add 170426 品众代码去除 */
+    {{!--window._fxcmd = window._fxcmd || [];
     _fxcmd.sid = 'bb3b16fa1106a6ab8619da0095755f32';
     _fxcmd.sid = 'bb3b16fa1106a6ab8619da0095755f32';
     _fxcmd.trackAll = false;
     _fxcmd.trackAll = false;
     // 参数配置(可选)...
     // 参数配置(可选)...
@@ -89,7 +89,7 @@
         _pzfx.src = '//static.w3t.cn/fx/1/1/fx.js';
         _pzfx.src = '//static.w3t.cn/fx/1/1/fx.js';
         var sc = document.getElementsByTagName('script')[0];
         var sc = document.getElementsByTagName('script')[0];
         sc.parentNode.insertBefore(_pzfx,sc);
         sc.parentNode.insertBefore(_pzfx,sc);
-    }, 1000);
+    }, 1000);--}}
     
     
 
 
 </script>
 </script>

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "5.6.2",
+  "version": "5.6.4",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -323,15 +323,15 @@ function submitOrder() {
                 }, true);
                 }, true);
             }
             }
 
 
-            /* tar add 190222 */
-            if (window._fxcmd) {
-                window._fxcmd.push(['trackOrder', {
-                    oid: res.data.order_code,
-                    otp: res.data.order_amount,
-                    u_info: cookie.get('_UID'),
-                    u_type: cookie.get('_isNewUser') ? 1 : 0
-                }, []]);
-            }
+            /* tar add 170426 品众代码去除 */
+            // if (window._fxcmd) {
+            //     window._fxcmd.push(['trackOrder', {
+            //         oid: res.data.order_code,
+            //         otp: res.data.order_amount,
+            //         u_info: cookie.get('_UID'),
+            //         u_type: cookie.get('_isNewUser') ? 1 : 0
+            //     }, []]);
+            // }
 
 
             cookie.remove(['order-info', 'activity-info']);
             cookie.remove(['order-info', 'activity-info']);
             window.location.href = url;
             window.location.href = url;

@@ -118,7 +118,7 @@ module.exports = function(useInRegister, useForBind, useForRelate) {
 
 
         $.ajax({
         $.ajax({
             type: 'POST',
             type: 'POST',
-            url: (useForBind || useForRelate) ? '/passport/bind/sendBindMsg' : '/passport/' + urlMid + '/sendcode',
+            url: (useForBind || useForRelate) ? '/passport/bind/sendBindMsg' : '/passport/' + urlMid + '/sendcodeagain',
             data: {
             data: {
                 phoneNum: phoneNum,
                 phoneNum: phoneNum,
                 areaCode: areaCode
                 areaCode: areaCode

@@ -6,6 +6,9 @@
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     ImgCheck = require('plugin/img-check'),
     ImgCheck = require('plugin/img-check'),
     tip = require('plugin/tip');
     tip = require('plugin/tip');
+
+let loading = require('plugin/loading');
+
 const validType = {
 const validType = {
     IMG_CHECK: 1,
     IMG_CHECK: 1,
     GEETEST: 2
     GEETEST: 2
@@ -94,7 +97,9 @@ class Validate {
             }
             }
             return Promise.resolve({captcha});
             return Promise.resolve({captcha});
         } else {
         } else {
+            loading.showLoadingMask();
             return new Promise((resolve) => {
             return new Promise((resolve) => {
+                loading.hideLoadingMask();
                 this.$container.removeClass('hide');
                 this.$container.removeClass('hide');
                 this.captchaObj.onSuccess(() => {
                 this.captchaObj.onSuccess(() => {
                     resolve(this.captchaObj.getValidate());
                     resolve(this.captchaObj.getValidate());

 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     Swiper = require('yoho-swiper'),
     Swiper = require('yoho-swiper'),
     lazyLoad = require('yoho-jquery-lazyload'),
     lazyLoad = require('yoho-jquery-lazyload'),
-    loading = require('plugin/loading');
+    loading = require('plugin/loading'),
+    qs = require('yoho-qs');
 
 
 let page = 1,
 let page = 1,
     winH,
     winH,
@@ -34,7 +35,8 @@ function hotrank(pageIndex, sortIndex, tabId, noTab) {
         data: {
         data: {
             page: pageIndex,
             page: pageIndex,
             tab_id: tabId,
             tab_id: tabId,
-            notab: noTab
+            notab: noTab,
+            gender: qs.gender
         },
         },
         success: function(data) {
         success: function(data) {
             if (data === ' ') {
             if (data === ' ') {

@@ -2,19 +2,64 @@
  * @Author: Targaryen
  * @Author: Targaryen
  * @Date: 2017-03-23 11:31:51
  * @Date: 2017-03-23 11:31:51
  * @Last Modified by: Targaryen
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-04-14 11:17:55
+ * @Last Modified time: 2017-05-02 11:17:31
  */
  */
 
 
 /** *****************
 /** *****************
  * 红人店铺首页
  * 红人店铺首页
  ********************/
  ********************/
 const Swiper2 = require('yoho-swiper2');
 const Swiper2 = require('yoho-swiper2');
+const lazyLoad = require('yoho-jquery-lazyload');
 let tip = require('../../plugin/tip');
 let tip = require('../../plugin/tip');
 let $goodsContainer = $('.index-goods-container');
 let $goodsContainer = $('.index-goods-container');
+let $indexGoodsContaniner = $('#indexGoodsContainer');
 let $collect = $('#collect');
 let $collect = $('#collect');
 
 
 const shopId = $('#shopId').val();
 const shopId = $('#shopId').val();
 
 
+lazyLoad($('.lazy'));
+
+/**
+ * 异步检测是否已经收藏
+ */
+$.ajax({
+    type: 'GET',
+    url: location.protocol + '//m.yohobuy.com/product/index/shopFav',
+    xhrFields: {
+        withCredentials: true
+    },
+    data: {
+        shopId: shopId
+    },
+    success: function(data) {
+        if (data.collect) {
+            $collect.attr('class', 'already-collect pull-left');
+        }
+    },
+    error: function() {
+        tip.show('网络断开连接了~');
+    }
+});
+
+/**
+ * 店铺轮播图
+ */
+if ($('.shop-swiper')) {
+    let num = $('.shop-swiper').length;
+
+    for (let i = 1; i <= num; i++) {
+        new Swiper2('.shop-swiper-' + i, {
+            lazyLoading: true,
+            lazyLoadingInPrevNext: true,
+            loop: true,
+            autoplay: 3000,
+            slideElement: 'li',
+            paginationClickable: true,
+            pagination: $(this).closest('.shop-swiper-' + i).find('.pagination-inner').get(0)
+        });
+    }
+}
+
 /**
 /**
  * 异步加载推荐商品
  * 异步加载推荐商品
  */
  */
@@ -47,51 +92,33 @@ $.each($goodsContainer, function(index, elem) {
         },
         },
         data: data,
         data: data,
         success: function(result) {
         success: function(result) {
-            $(elem).html(result);
+            let $result = $(result);
+
+            lazyLoad($result.find('img[class=lazy]'));
+            $(elem).html($result);
         }
         }
     });
     });
 });
 });
 
 
 /**
 /**
- * 异步检测是否已经收藏
+ * 异步加载首页全部商品
  */
  */
 $.ajax({
 $.ajax({
     type: 'GET',
     type: 'GET',
-    url: location.protocol + '//m.yohobuy.com/product/index/shopFav',
+    url: '/product/search/search',
     xhrFields: {
     xhrFields: {
         withCredentials: true
         withCredentials: true
     },
     },
     data: {
     data: {
-        shopId: shopId
+        shop_id: shopId
     },
     },
-    success: function(data) {
-        if (data.collect) {
-            $collect.attr('class', 'already-collect pull-left');
-        }
-    },
-    error: function() {
-        tip.show('网络断开连接了~');
-    }
-});
+    success: function(result) {
+        let $result = $(result);
 
 
-/**
- * 店铺轮播图
- */
-if ($('.shop-swiper')) {
-    let num = $('.shop-swiper').length;
-
-    for (let i = 1; i <= num; i++) {
-        new Swiper2('.shop-swiper-' + i, {
-            lazyLoading: true,
-            lazyLoadingInPrevNext: true,
-            loop: true,
-            autoplay: 3000,
-            slideElement: 'li',
-            paginationClickable: true,
-            pagination: $(this).closest('.shop-swiper-' + i).find('.pagination-inner').get(0)
-        });
+        lazyLoad($result.find('img[class=lazy]'));
+        $indexGoodsContaniner.find('.container').html($result);
     }
     }
-}
+});
 
 
 /**
 /**
  * 店铺收藏取消收藏操作
  * 店铺收藏取消收藏操作

@@ -53,6 +53,8 @@ body {
 
 
 .goods-container {
 .goods-container {
     overflow: hidden;
     overflow: hidden;
+    background-color: #fff;
+    padding-left: 15px;
 
 
     .goods-box {
     .goods-box {
         .no-result {
         .no-result {

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Author: Targaryen
  * @Date: 2017-03-23 17:12:53
  * @Date: 2017-03-23 17:12:53
  * @Last Modified by: Targaryen
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-04-20 10:19:41
+ * @Last Modified time: 2017-04-25 15:54:23
  */
  */
 // 红人店铺首页
 // 红人店铺首页
 
 
@@ -230,16 +230,29 @@
 
 
     /* 四张小图 */
     /* 四张小图 */
     .items-s4 {
     .items-s4 {
+        border-bottom: 1px solid #e0e0e0;
+
         .item {
         .item {
             float: left;
             float: left;
             width: 25%;
             width: 25%;
+            border-top: 1px solid #e0e0e0;
+            border-right: 1px solid #e0e0e0;
+        }
+
+        .item:last-child {
+            border-right: none;
         }
         }
 
 
         .item-info {
         .item-info {
             text-align: center;
             text-align: center;
+            background-color: #f5f7f6;
             color: #000;
             color: #000;
             position: relative;
             position: relative;
 
 
+            .text {
+                line-height: 36px;
+            }
+
             .name,
             .name,
             .price {
             .price {
                 display: none;
                 display: none;

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Author: Targaryen
  * @Date: 2017-03-23 11:02:31
  * @Date: 2017-03-23 11:02:31
  * @Last Modified by: Targaryen
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-04-20 15:41:44
+ * @Last Modified time: 2017-05-02 11:09:37
  */
  */
 /* 红人店铺数据处理 */
 /* 红人店铺数据处理 */
 
 
@@ -174,14 +174,14 @@ const _tools = {
     },
     },
 
 
     /**
     /**
-     * 商品列表
+     * 推荐商品列表
      * @param {*} moduleData
      * @param {*} moduleData
      */
      */
-    recommentProduct(moduleData) {
+    appRecommendProduct(moduleData) {
         let displayType = _.parseInt(_.get(moduleData, 'properties.displayType', 0));
         let displayType = _.parseInt(_.get(moduleData, 'properties.displayType', 0));
 
 
         let result = {
         let result = {
-            module_type: 'RecommentProduct',
+            module_type: 'AppRecommendProduct',
             type: displayType
             type: displayType
         };
         };
 
 
@@ -206,10 +206,7 @@ const _tools = {
                 break;
                 break;
         }
         }
 
 
-        return {
-            module_type: 'RecommentProduct',
-            skns: skns,
-        };
+        return result;
     }
     }
 };
 };
 
 
@@ -256,8 +253,8 @@ const floor = (decoratorsData) => {
             case 'SknList':
             case 'SknList':
                 skns = _.get(value, 'module_data.data').join(',');
                 skns = _.get(value, 'module_data.data').join(',');
                 break;
                 break;
-            case 'RecommentProduct':
-                decorators.push(_tools.recommentProduct(value.module_data));
+            case 'AppRecommendProduct':
+                decorators.push(_tools.appRecommendProduct(value.module_data));
                 break;
                 break;
             default:
             default:
                 break;
                 break;
@@ -339,8 +336,11 @@ const pushGoodsInfo = (decorators, goodsList) => {
                 decorators[key].pics[subKey].marketPrice = marketPrice ? '￥' + marketPrice : '';
                 decorators[key].pics[subKey].marketPrice = marketPrice ? '￥' + marketPrice : '';
                 decorators[key].pics[subKey].isGood = true;
                 decorators[key].pics[subKey].isGood = true;
 
 
-                if (value.module_type === 'TripleImage' || value.module_type === 'DoubleImage') {
-                    decorators[key].pics[subKey].src = imageSrc;
+                if (value.module_type === 'TripleImage' ||
+                    value.module_type === 'DoubleImage' ||
+                    value.module_type === 'SingleImage') {
+
+                    // decorators[key].pics[subKey].src = imageSrc; // 为了和 APP 统一，图暂时不取商品图
                 } else if (value.module_type === 'FourImage') {
                 } else if (value.module_type === 'FourImage') {
                     decorators[key].pics[subKey].isGood = false;
                     decorators[key].pics[subKey].isGood = false;
                 } else {
                 } else {