Merge branch 'hotfix/5.0' into release/usercenter

@@ -5,11 +5,35 @@
  */
  */
 'use strict';
 'use strict';
 const inviteModel = require('../models/invite');
 const inviteModel = require('../models/invite');
-const inviteTitle = '有货 邀请好友赢福利';
+const inviteTitle = {
+    vipDay: '有货会员日 赢更多福利',
+    normal: '有货 邀请好友赢福利'
+};
 const _ = require('lodash');
 const _ = require('lodash');
 const md5 = require('md5');
 const md5 = require('md5');
 const secretKey = '5466ee572bcbc75830d044e66ab429bc';// 秘钥
 const secretKey = '5466ee572bcbc75830d044e66ab429bc';// 秘钥
 
 
+
+/*
+    判断邀请 好友 类型
+ */
+exports.checkType = function(req, res, next) {
+    inviteModel.checkType()
+        .then(function(result) {
+            if (result.code === 200 && result.data) {
+                res.locals.isVipDay = true;
+                res.locals.title = inviteTitle.vipDay;
+            } else {
+                res.locals.isVipDay = false;
+                res.locals.title = inviteTitle.normal;
+            }
+
+            return next();
+        })
+        .catch(next);
+};
+
+
 // 简介、好友领取列表页面
 // 简介、好友领取列表页面
 exports.index = (req, res, next) => {
 exports.index = (req, res, next) => {
     let actId = req.query.act_id * 1 || 0;
     let actId = req.query.act_id * 1 || 0;
@@ -34,14 +58,15 @@ exports.index = (req, res, next) => {
         res.render(renderPage, {
         res.render(renderPage, {
             module: 'activity',
             module: 'activity',
             page: 'invite',
             page: 'invite',
-            result: result,
-            title: inviteTitle
+            width750: true,
+            result: result
         });
         });
     }).catch(next);
     }).catch(next);
 };
 };
 
 
 // 微信好友获取红包方法(即分享出去的地址)页面
 // 微信好友获取红包方法(即分享出去的地址)页面
 exports.share = (req, res, next) => {
 exports.share = (req, res, next) => {
+
     let shareUid = req.params[0];
     let shareUid = req.params[0];
     let actId = req.params[1];
     let actId = req.params[1];
     let nums = req.params[2];
     let nums = req.params[2];
@@ -78,16 +103,14 @@ exports.share = (req, res, next) => {
                     nums: nums,
                     nums: nums,
                     actId: actId,
                     actId: actId,
                     openId: wxUserInfo.unionid
                     openId: wxUserInfo.unionid
-                },
-                title: inviteTitle
+                }
             });
             });
         } else {
         } else {
             // 是自己分享的连接
             // 是自己分享的连接
             res.render('invite/list', {
             res.render('invite/list', {
                 module: 'activity',
                 module: 'activity',
                 page: 'invite',
                 page: 'invite',
-                result: result.data.list,
-                title: inviteTitle
+                result: result.data.list
             });
             });
         }
         }
 
 
@@ -204,8 +227,7 @@ exports.myCoupons = (req, res, next) => {
             page: 'invite',
             page: 'invite',
             result: result[0],
             result: result[0],
             userInfo: result[1],
             userInfo: result[1],
-            amount: amount,
-            title: inviteTitle
+            amount: amount
         });
         });
     }).catch(next);
     }).catch(next);
 };
 };
@@ -215,18 +237,12 @@ exports.shareover = (req, res) => {
     let amount = req.query.amount * 1 || 5;
     let amount = req.query.amount * 1 || 5;
     let sign = req.query.sign;
     let sign = req.query.sign;
 
 
-    if (md5(amount + secretKey) !== sign) {
-        res.redirect('/');
-        return false;
-    }
-
     res.render('invite/shareover', {
     res.render('invite/shareover', {
         module: 'activity',
         module: 'activity',
         page: 'invite',
         page: 'invite',
         result: {
         result: {
             amount: amount
             amount: amount
-        },
-        title: inviteTitle
+        }
     });
     });
 };
 };
 
 
@@ -254,8 +270,7 @@ exports.over = (req, res) => {
     res.render('invite/over', {
     res.render('invite/over', {
         module: 'activity',
         module: 'activity',
         page: 'invite',
         page: 'invite',
-        result: [],
-        title: inviteTitle
+        result: []
     });
     });
 };
 };
 
 

@@ -201,7 +201,7 @@ exports.index = (req, res, next) => {
         }
         }
 
 
         return userAcquireStatus(uid, couponids.join(',')).then((cous) => {
         return userAcquireStatus(uid, couponids.join(',')).then((cous) => {
-            coupons.data = (coupons.data || []).map((item)=>{
+            coupons.data = _.get(coupons, 'data', []).map((item)=>{
                 item.status = 1;
                 item.status = 1;
                 (cous.data || []).forEach((it) => {
                 (cous.data || []).forEach((it) => {
 
 

+/* eslint no-unused-vars: ["error", { "args": "none" }]*/
+/* eslint-disable no-shadow, camelcase */
+'use strict';
+const helpers = global.yoho.helpers;
+const vipDayModel = require('../models/vipDay');
+const auth = require('../../passport/models/auth-helper');
+const co = require('bluebird').coroutine;
+
+
+function humanNum_wan(num) {
+    return num;
+
+    // if (num > 9999) {
+    //     num = (num / 10000).toFixed(2) + '万'
+    // }
+
+    // return num;
+}
+
+exports.beforeIn = (req, res, next) => {
+    // 将APP登录状态正常化
+    if (req.yoho.isApp) {
+        req.user.uid = Number(req.user.uid || req.query.uid);
+    }
+
+    // 未登录
+    if (!req.user.uid) {
+        if (req.xhr) {
+            return res.json({
+                code: 401,
+                message: '抱歉,您还未登录',
+                redirect: '/signin.html'
+            });
+        }
+
+        return res.redirect(helpers.urlFormat('/signin.html', {
+            refer: req.originalUrl
+        }));
+    }
+
+    next();
+};
+
+exports.index = (req, res, next) => {
+    res.locals.module = 'activity';
+    res.locals.page = 'vipday-entry';
+    res.locals.width750 = true;
+
+    let cate = {
+        goods1: [51281456, 51228151, 51315660],
+        goods2: [51362376, 51339512, 51316684],
+        goods3: [51374524, 51338322, 51344316]
+    };
+
+    if (req.app.get('env') !== 'production') {
+        cate = {
+            goods1: [512581904, 512581902, 512581900],
+            goods2: [512581822, 512581816, 512581812],
+            goods3: [512581806, 512581796, 512581792]
+        };
+    }
+
+
+    vipDayModel.getGoods(cate)
+        .then(result => {
+            // console.log(result.data)
+            if (result.code !== 200) {
+                return Promise.reject('error');
+            }
+
+            res.render('vip_day/index', {
+                title: '会员日活动',
+                pageStyle: 'vip-day entry',
+                goods1: result.data.goods1,
+                goods2: result.data.goods2,
+                goods3: result.data.goods3
+            });
+            return;
+        }).catch(next);
+};
+
+exports.crazyWheel = (req, res, next) => {
+    res.locals.module = 'activity';
+    res.locals.page = 'vipday-wheel';
+    res.locals.width750 = true;
+
+    if (!req.session.playwheel) {
+        return res.redirect('/activity/vip-day');
+    }
+
+    vipDayModel.getJoinNum(1).then(result => {
+        let joins = result && result.data || 0;
+
+        res.render('vip_day/crazy_wheel', {
+            title: '疯狂大转盘',
+            pageStyle: 'vip-day game',
+            isWheel: true,
+            joins: humanNum_wan(joins),
+            joinNum: joins
+        });
+    });
+};
+
+exports.crazyLuck = (req, res, next) => {
+    const uid = req.user.uid;
+
+    res.locals.module = 'activity';
+    res.locals.page = 'vipday-luck';
+    res.locals.width750 = true;
+
+    co(function* () {
+        let coins = yield vipDayModel.getCoins(uid);
+        let joinNum = yield vipDayModel.getJoinNum(2);
+
+        coins = (coins && coins.data && coins.data.total) || 0;
+        joinNum = (joinNum && joinNum.data) || 0;
+
+        res.render('vip_day/crazy_luck', {
+            title: '拼手气',
+            pageStyle: 'vip-day game',
+            isLuck: true,
+            coins: humanNum_wan(coins),
+            coinNum: coins,
+            joins: humanNum_wan(joinNum),
+            joinNum: joinNum,
+        });
+    })().catch(next);
+};
+
+
+/* 会员日签到 */
+exports.signin = (req, res, next) => {
+    let uid = req.user.uid;
+
+    return vipDayModel.signin(uid)
+        .then(function(result) {
+            res.json(result);
+        })
+        .catch(next);
+};
+
+exports.saveMsg = (req, res, next) => {
+    let uid = req.user.uid;
+    let content = req.body.content;
+
+    auth.profile(uid)
+        .then(profile => {
+            // 1. get nick_name
+            return profile.data.profile_name;
+        })
+        .then(nick_name => {
+            // 2. save message
+            return vipDayModel.saveMsg(uid, nick_name, content);
+        })
+        .then(result => {
+            if (result.code === 200 && result.data === 1) {
+                req.session.playwheel = true;
+            }
+
+            res.json(result);
+        })
+        .catch(next);
+};
+
+// 获取 会员日的 用户留言
+exports.fetchMsg = (req, res, next) => {
+    let uid = req.user.uid || (req.yoho.isApp && Number(req.query.uid)) || 0;
+
+    vipDayModel.queryLeaveWordsList(uid).then(result => {
+        return res.json(result);
+    }).catch(next);
+};
+
+
+exports.wheelResult = (req, res, next) => {
+    let uid = req.user.uid;
+    let prize_type = 2;
+
+    return vipDayModel.addPrizeLog(uid, prize_type).then(result => {
+        return res.json(result);
+    }).catch(next);
+
+
+};
+
+exports.luckResult = (req, res, next) => {
+    let uid = req.user.uid;
+    let prize_type = 1;
+    let cost = 20;
+
+    let handle = co(function* (uid) {
+        // 查询用户 有货币
+        let r1 = yield vipDayModel.getCoins(uid);
+
+        if (r1.code !== 200) {
+            return {
+                code: r1.code,
+                message: '请求不合法'
+            };
+        }
+
+        let coin = r1.data.total;
+
+        // console.log(coin);
+        if (coin < 20) {
+            return { code: 400, message: '有货币不够...' };
+        }
+
+        // 得出 中奖结果
+        let result = yield vipDayModel.addPrizeLog(uid, prize_type);
+
+        if (result.code !== 200) {
+            return result;
+        }
+
+        Object.assign(result, { coin: coin - cost + result.data });
+        return result;
+    });
+
+    handle(uid).then(function(result) {
+        return res.json(result);
+    }).catch(next);
+};
+
+exports.luckResultCollect = (req, res, next) => {
+    let uid = req.user.uid;
+    let prize_type = 1;
+
+    return vipDayModel.queryPrizeLog(uid, prize_type).then(result => {
+        if (result.code === 200 && result.data) {
+            result.data = result.data.filter(award => award.prizeValue);
+        }
+
+        res.json(result);
+    });
+};

@@ -23,7 +23,7 @@ app.engine('.hbs', hbs({
     extname: '.hbs',
     extname: '.hbs',
     defaultLayout: 'layout',
     defaultLayout: 'layout',
     layoutsDir: doraemon,
     layoutsDir: doraemon,
-    partialsDir: ['./views/partial', `${doraemon}/partial`],
+    partialsDir: [path.join(__dirname, 'views/partial'), `${doraemon}/partial`],
     helpers: Object.assign({}, global.yoho.helpers, helpers)
     helpers: Object.assign({}, global.yoho.helpers, helpers)
 }));
 }));
 
 

 'use strict';
 'use strict';
 const api = global.yoho.API;
 const api = global.yoho.API;
+const serviceAPI = global.yoho.ServiceAPI;
 const camelCase = global.yoho.camelCase;
 const camelCase = global.yoho.camelCase;
 const _ = require('lodash');
 const _ = require('lodash');
 
 
@@ -341,8 +342,20 @@ const getWxUserInfo = (params) => {
         });
         });
 };
 };
 
 
+/**
+ * 获取 邀请好友赢福利的类型:
+ * 1. 普通的要求好友赢福利
+ * 2. 会员日的邀请好友 赢福利
+ */
+const checkType = () => {
+    const url = '/activity/UserdaySigninController/isUserday';
+
+    return serviceAPI.get(url, {});
+};
+
 module.exports = {
 module.exports = {
     index,
     index,
+    checkType,
     shareModel,
     shareModel,
     getBindLogByOpenId,
     getBindLogByOpenId,
     sendRegCodeToMobile,
     sendRegCodeToMobile,

+/* eslint-disable camelcase */
+'use strict';
+const url = require('url');
+const _ = require('lodash');
+const API = global.yoho.API;
+const serviceAPI = global.yoho.ServiceAPI;
+const utils = require(global.utils + '/product-process');
+const helpers = global.yoho.helpers;
+
+// 签到
+// doc: http://git.yoho.cn/yoho-documents/api-interfaces/blob/master/%E4%BC%9A%E5%91%98%E6%97%A5%E6%B4%BB%E5%8A%A8/%E4%BC%9A%E5%91%98%E6%97%A5%E7%AD%BE%E5%88%B0.md
+exports.signin = (uid)=> {
+    const url = '/activity/UserdaySigninController/signin';
+
+    return serviceAPI.post(url, {uid});
+};
+
+// 写留言
+// doc: http://git.yoho.cn/yoho-documents/api-interfaces/blob/master/%E4%BC%9A%E5%91%98%E6%97%A5%E6%B4%BB%E5%8A%A8/%E4%BF%9D%E5%AD%98%E7%94%A8%E6%88%B7%E7%95%99%E8%A8%80.md
+exports.saveMsg = (uid, nick_name, content) => {
+    const url = '/activity/UserdayLeaveWordsController/addLeaveWords';
+
+    return serviceAPI.post(url, {
+        uid,
+        nick_name,
+        content
+    });
+};
+
+exports.queryLeaveWordsList = (uid) => {
+    const url = '/activity/UserdayLeaveWordsController/queryLeaveWordsList';
+
+    return serviceAPI.get(url, {uid});
+};
+
+
+// 拼手气大转盘 抽奖
+// doc: http://git.yoho.cn/yoho-documents/api-interfaces/blob/master/%E4%BC%9A%E5%91%98%E6%97%A5%E6%B4%BB%E5%8A%A8/%E6%8B%BC%E6%89%8B%E6%B0%94%E5%A4%A7%E8%BD%AC%E7%9B%98%E6%8A%BD%E5%A5%96.md
+exports.addPrizeLog = (uid, prize_type) => {
+    const url = '/activity/UserdayPrizeLogController/addPrizeLog';
+
+    return serviceAPI.post(url, {
+        uid,
+        prize_type
+    });
+};
+
+// 查询 中奖纪录
+exports.queryPrizeLog = (uid, prize_type) => {
+    const url = '/activity/UserdayPrizeLogController/queryPrizeLog';
+
+    return serviceAPI.get(url, {
+        uid,
+        prize_type
+    });
+};
+
+
+// 获取用户的有货币
+// doc: http://git.yoho.cn/yoho-documents/api-interfaces/tree/master/%E6%9C%89%E8%B4%A7%E5%B8%81
+exports.getCoins = uid => {
+    return API.get('', {
+        method: 'app.yohocoin.total',
+        uid
+    });
+};
+
+// 获取抽奖人数
+// doc: http://git.yoho.cn/yoho-documents/api-interfaces/blob/master/%E4%BC%9A%E5%91%98%E6%97%A5%E6%B4%BB%E5%8A%A8/%E6%9F%A5%E8%AF%A2%E5%8F%82%E4%B8%8E%E6%8A%BD%E5%A5%96%E4%BA%BA%E6%95%B0.md
+exports.getJoinNum = prize_type => {
+    const url = '/activity/UserdayPrizeLogController/queryPrizeLogNum';
+
+    return serviceAPI.get(url, {
+        prize_type,
+    });
+};
+
+/**
+ *  cate [object Object]
+ */
+exports.getGoods = cate => {
+    let skns = '';
+    let cates = Object.keys(cate);
+
+    _.forEach(cate, function(val, key) {
+        skns = skns.concat(',').concat(val.join(','));
+    });
+
+    skns = skns.slice(1);
+
+    return API.get('', {
+        method: 'h5.product.batch',
+        productSkn: skns
+    }).then(result => {
+        if (result.code !== 200) {
+            return {
+                code: result.code,
+                message: result.message
+            };
+        }
+        let productList = utils.processProductList(result.data.product_list);
+        let data = {};
+
+        productList.forEach(product=> {
+            let skn = product.productSkn;
+            let imgSrc = url.parse(product.defaultImages);
+
+            product.defaultImages = ['//', imgSrc.hostname, imgSrc.pathname].join(''); 
+
+            product.url = helpers.appUrlFormat(product.url, 'go.productDetail', {
+                product_skn: skn
+            });
+
+            for (let c of cates) {
+                let index = cate[c].indexOf(skn);
+
+                if (index !== -1) {
+                    cate[c].splice(index, 1);
+
+                    data[c] || (data[c] = []);
+                    data[c].push(product);
+                    break;
+                }
+            }
+        });
+
+        // console.log(data.goods1.length)
+        // console.log(data.goods2.length)
+        // console.log(data.goods3.length)
+
+        return {
+            code: 200,
+            data
+        };
+    });
+};

@@ -14,6 +14,7 @@ const wechat = require(`${cRoot}/wechat`);
 const student = require(`${cRoot}/student`);
 const student = require(`${cRoot}/student`);
 const live = require(`${cRoot}/live`);
 const live = require(`${cRoot}/live`);
 const invite = require(`${cRoot}/invite`);
 const invite = require(`${cRoot}/invite`);
+const vipDay = require(`${cRoot}/vipDay`);
 const market = require(`${cRoot}/market`);
 const market = require(`${cRoot}/market`);
 
 
 // routers
 // routers
@@ -48,21 +49,32 @@ router.get('/live/replay/barrage', live.replayBarrage);
 router.get('/live/replay/:id', live.main);
 router.get('/live/replay/:id', live.main);
 router.get('/live/:id', live.main);
 router.get('/live/:id', live.main);
 
 
-router.get('/invite', invite.index);
-router.get('/invite/index', invite.index);
+router.get('/invite', invite.checkType, invite.index);
+router.get('/invite/index', invite.checkType, invite.index);
 
 
 router.get('/market', market.index);// 市场推广活动
 router.get('/market', market.index);// 市场推广活动
 
 
-router.get(/\/invite\/share_([\d]+)_([\d]+)_([\d]+).html/, invite.share);
+router.get(/\/invite\/share_([\d]+)_([\d]+)_([\d]+).html/, invite.checkType, invite.share);
 router.get('/invite/sendRegCodeToMobile', invite.sendRegCodeToMobile);
 router.get('/invite/sendRegCodeToMobile', invite.sendRegCodeToMobile);
 router.get('/invite/checkOldUserCoupon', invite.checkOldUserCoupon);
 router.get('/invite/checkOldUserCoupon', invite.checkOldUserCoupon);
 router.get('/invite/validRegCode', invite.validRegCode);
 router.get('/invite/validRegCode', invite.validRegCode);
 router.get('/invite/register', invite.register);
 router.get('/invite/register', invite.register);
 router.get('/invite/receiveCoupons', invite.receiveCoupons);
 router.get('/invite/receiveCoupons', invite.receiveCoupons);
-router.get(/\/invite\/mycoupons_([\d]+)_([\d]+)_([\d]+)_([\d]+).html/, invite.myCoupons); // 好友领取完优惠券的页面
+router.get(/\/invite\/mycoupons_([\d]+)_([\d]+)_([\d]+)_([\d]+).html/, invite.checkType, invite.myCoupons); // 好友领取完优惠券的页面
 router.get('/invite/getwxinfo', invite.getwxinfo);
 router.get('/invite/getwxinfo', invite.getwxinfo);
 router.get('/invite/shareover', invite.shareover);
 router.get('/invite/shareover', invite.shareover);
 router.get('/invite/over', invite.over);
 router.get('/invite/over', invite.over);
 
 
+router.get('/vip-day', vipDay.index);
+router.get('/vip-day/crazy-wheel', vipDay.beforeIn, vipDay.crazyWheel);
+router.post('/vip-day/crazy-wheel/award.json', vipDay.beforeIn, vipDay.wheelResult);
+router.post('/vip-day/crazy-luck/award.json', vipDay.beforeIn, vipDay.luckResult);
+router.get('/vip-day/crazy-luck/award-list.json', vipDay.beforeIn, vipDay.luckResultCollect);
+router.get('/vip-day/crazy-luck', vipDay.beforeIn, vipDay.crazyLuck);
+router.post('/vip-day/signin.json', vipDay.beforeIn, vipDay.signin);
+router.post('/vip-day/msg/save.json', vipDay.beforeIn, vipDay.saveMsg);
+router.get('/vip-day/msg/fetch.json', vipDay.fetchMsg);
+
+
 
 
 module.exports = router;
 module.exports = router;

@@ -11,7 +11,7 @@
             <h6>权益1：新品立享9折</h6>
             <h6>权益1：新品立享9折</h6>
             <p>1、学生购买原价新品时，可立即享受9折优惠，与VIP折扣不可同时享受。</p>
             <p>1、学生购买原价新品时，可立即享受9折优惠，与VIP折扣不可同时享受。</p>
             <h6>权益2：每1元返1个有货币</h6>
             <h6>权益2：每1元返1个有货币</h6>
-            <p>1、学生购买商品时，以商品的实际成交金额计算，每1元返1个有货币；</p>
+            <p>1、学生购买指定商品时，以商品的实际成交金额计算，每1元返1个有货币；</p>
             <p>2、返有货币时间：确认收货7日后，系统将自动将对应数量的有货币返至购买账户；</p>
             <p>2、返有货币时间：确认收货7日后，系统将自动将对应数量的有货币返至购买账户；</p>
             <p>3、有货币有效期：获得当日至次年12月31日，逾期自动作废；</p>
             <p>3、有货币有效期：获得当日至次年12月31日，逾期自动作废；</p>
             <p>4、查看有货币：登录后，点击“个人中心”在“我的有货币”中可以查看有货币余额及明细。</p>
             <p>4、查看有货币：登录后，点击“个人中心”在“我的有货币”中可以查看有货币余额及明细。</p>

 <div class="invite-page invite-page-bg">
 <div class="invite-page invite-page-bg">
     <div class="invite-content-list">
     <div class="invite-content-list">
         <div>
         <div>
-            <img src="//cdn.yoho.cn/m-yohobuy-node/assets/img/activity/invite/title_new.png" />
+            <img class="banner" src="{{imgSrc 'img/activity/invite/title_new.png'}}" />
+            <img class="logo" src="{{imgSrc 'img/activity/invite/logo.png'}}" >
             <br />
             <br />
-            <p class="fz14">只需1位小伙伴领取，<br/>即得<strong class="fz17">10元现金券</strong>！<br/>全部领完，可继续发，上不封顶！<br/>奔跑吧，潮人们！</p>
-
+            <p class="fz14 intro-title">
+                只需1位小伙伴领取，<br/>
+                即得<strong class="fz17">10元现金券</strong>！<br/>
+                全部领完，可继续发，上不封顶！<br/>
+                {{#if isVipDay}}
+                    <strong class="fz17">每月28日，会员潮集狂欢</strong>
+                {{else}}
+                    <strong class="fz17">动动指尖吧！潮人们</strong>
+                {{/if}}
+            </p>
             <a href="javascript:void(0)" class="weal-btn fz16"  id="send_gift">立刻发福利</a>
             <a href="javascript:void(0)" class="weal-btn fz16"  id="send_gift">立刻发福利</a>
             <h2 class="rule-tit fz15">活动细则</h2>
             <h2 class="rule-tit fz15">活动细则</h2>
             <ol class="rule-con hide">
             <ol class="rule-con hide">

 <div class="invite-page invite-page-bg">
 <div class="invite-page invite-page-bg">
     <div class="invite-content-list">
     <div class="invite-content-list">
         {{#if result.isEmpty}}
         {{#if result.isEmpty}}
-            <div class="coupon-box coupon-box02 relative mar-top-a">
+            <!--<div class="coupon-box coupon-box02 relative mar-top-a">
                 <p class="fz9 bold">YUAN</p>
                 <p class="fz9 bold">YUAN</p>
                 <strong class="fz18">现金券</strong>
                 <strong class="fz18">现金券</strong>
                 <p class="fz9 bold">CPOUPON</p>
                 <p class="fz9 bold">CPOUPON</p>
                 <div class="pirbox absolute">
                 <div class="pirbox absolute">
                     <em class="absolute">￥</em>0
                     <em class="absolute">￥</em>0
                 </div>
                 </div>
-            </div>
+            </div>-->
+            <div class="coupon-box chit0"></div>
 
 
             <p class="draw-coupon fz19 bold t-shadow">至少1位小伙伴领取<br />才能获得现金券！</p>
             <p class="draw-coupon fz19 bold t-shadow">至少1位小伙伴领取<br />才能获得现金券！</p>
             <p class="goon fz11 t-shadow">～继续呼唤小伙伴吧～</p>
             <p class="goon fz11 t-shadow">～继续呼唤小伙伴吧～</p>
@@ -24,39 +25,24 @@
             <p><a href="javascript:void(0)" class="weal-btn fz16">再次分享</a></p>
             <p><a href="javascript:void(0)" class="weal-btn fz16">再次分享</a></p>
         {{else if result.isFive}}
         {{else if result.isFive}}
             <!-- 现金券 start -->
             <!-- 现金券 start -->
-            <div class="coupon-box coupon-box02 relative mar-top-a">
-                <p class="fz9 bold">YUAN</p>
-                <strong class="fz18">现金券</strong>
-                <p class="fz9 bold">CPOUPON</p>
-                <div class="pirbox absolute">
-                    <em class="absolute">￥</em>10
-                </div>
-                <div class="count-not fz11 absolute"><hr class="fn-left"><hr class="fn-right">已送达您的账户</div>
-            </div>
+            <div class="coupon-box chit10"></div>
             <!-- 现金券 end -->
             <!-- 现金券 end -->
 
 
-            <p class="draw-coupon fz16 bold t-shadow">您的号召力爆棚！！！</p>
+            <p class="draw-coupon fz16 bold t-shadow">您的号召力爆棚！！</p>
             <p class="fz11">已有5位小伙伴领取红包</p>
             <p class="fz11">已有5位小伙伴领取红包</p>
+            <p class="fz16 bold">打开【Yoho!Buy有货】客户端<br>再次分享吧</p>
             <ul class="list-port">
             <ul class="list-port">
                 {{# result.data}}
                 {{# result.data}}
                     <li><img class="pic" src="{{img}}"><p class="name">{{nick}}</p><p class="pon">{{couponAmount}}元</p></li>
                     <li><img class="pic" src="{{img}}"><p class="name">{{nick}}</p><p class="pon">{{couponAmount}}元</p></li>
                 {{/ result.data}}
                 {{/ result.data}}
             </ul>
             </ul>
             <br />
             <br />
-            <p><a href="javascript:void(0)" class="weal-btn fz16">还要发福利</a></p>
+            <!--<p><a href="javascript:void(0)" class="weal-btn fz16">还要发福利</a></p>-->
             <br />
             <br />
             <p class="fz11 t-shadow">优惠券有效期：优惠券到账以后7天内有效（自然天）</p>
             <p class="fz11 t-shadow">优惠券有效期：优惠券到账以后7天内有效（自然天）</p>
         {{else}}
         {{else}}
             <!-- 现金券 start -->
             <!-- 现金券 start -->
-            <div class="coupon-box coupon-box02 relative mar-top-a">
-                <p class="fz9 bold">YUAN</p>
-                <strong class="fz18">现金券</strong>
-                <p class="fz9 bold">CPOUPON</p>
-                <div class="pirbox absolute">
-                    <em class="absolute">￥</em>10
-                </div>
-                <div class="count-not fz11 absolute"><hr class="fn-left"><hr class="fn-right">已送达您的账户</div>
-            </div>
+            <div class="coupon-box chit10"></div>
             <!-- 现金券 end -->
             <!-- 现金券 end -->
 
 
             <p class="draw-coupon fz19 bold t-shadow">召集5位小伙伴领取，<br>即可再发福利，赶快召唤吧！</p>
             <p class="draw-coupon fz19 bold t-shadow">召集5位小伙伴领取，<br>即可再发福利，赶快召唤吧！</p>

 <div class="invite-page invite-page-bg">
 <div class="invite-page invite-page-bg">
     <div class="invite-content-page">
     <div class="invite-content-page">
-        <img src="//cdn.yoho.cn/m-yohobuy-node/assets/img/activity/invite/title_new.png" />
-        <h2 class="bold fz16">YoHo!Buy有货福利来袭，即领即用！</h2>
-        <p>全球1000+潮流品牌每日上新!</p>
+        <img class="banner" src="{{imgSrc 'img/activity/invite/title_new.png'}}" >
+        <img class="logo" src="{{imgSrc 'img/activity/invite/logo.png'}}" >
+        {{#if isVipDay}}
+        <h2 class="fz16">会员日大波福利来袭，只在今日！</h2>
+        {{else}}
+        <h2 class="fz16">福利来袭,即领即用</h2>
+        {{/if}}
+        <p class="fz16">全球1400+潮流品牌每日上新!</p>
         <div class='invite-group relative'>
         <div class='invite-group relative'>
-            <p class="fz13">—&nbsp;&nbsp;&nbsp;&nbsp;<span class='bold'>填写您的手机号码,来YOHO潮流!</span>&nbsp;&nbsp;&nbsp;&nbsp;—</p>
-            <p class='fz11'>已注册YOHO!Buy有货的手机号不能领取哦</p><br />
+            <p class="fz13"><span class='bold'>填写您的手机号码，来YOHO！玩潮流!</span></p>
+            <p class='fz11'>已注册YOHO!Buy有货的手机号不能领取哦</p>
+            <div class="form">
             <span class='send-validate-btn'>发送验证码</span>
             <span class='send-validate-btn'>发送验证码</span>
             <input type='text' placeholder='输入手机号' class='invite-mobile' />
             <input type='text' placeholder='输入手机号' class='invite-mobile' />
             <input type='text' placeholder='输入验证码' class='invite-code' />
             <input type='text' placeholder='输入验证码' class='invite-code' />
@@ -14,17 +20,21 @@
             <input type="hidden"  name="shareUid"  value="{{result.shareUid}}" />
             <input type="hidden"  name="shareUid"  value="{{result.shareUid}}" />
             <input type="hidden"  name="openId"  value="{{result.openId}}" />
             <input type="hidden"  name="openId"  value="{{result.openId}}" />
             <input type='button' value='领福利' class='invite-btn receive-btn'/>
             <input type='button' value='领福利' class='invite-btn receive-btn'/>
+            </div>
         </div>
         </div>
 
 
         <div class='invite-dialog oldget hide'>
         <div class='invite-dialog oldget hide'>
             <div class='invite-dialog-center'>
             <div class='invite-dialog-center'>
-                <p class="fz13 mtTop03">您已是Yoho!Buy有货的顾客，</p>
+                <p class="fz13 mtTop03">您已是有货的顾客，</p>
                 <p class="fz13">此福利仅限新用户领取，</p>
                 <p class="fz13">此福利仅限新用户领取，</p>
-                <p class="fz13">您只需下载Yoho!Buy有货手机客户端，</p>
-                <p class="fz13">在【我的】栏目中邀请好友领福利，</p>
-                <p class="fz13 mtTop04">即可赢取<strong class="fz18">10元现金券</strong></p>
+                {{#if isVipDay}}
+                <p class="fz13">你还可以参加会员日其他活动, 购物即享</p>
+                <p class="fz13">VIP翻倍升级, 还有大批有货币等你玩</p>
+                {{else}}
+                {{/if}}
                 <div class='btn-group'>
                 <div class='btn-group'>
                     <input type='button' class='invite-btn cancelbtn' value='重新输入' />
                     <input type='button' class='invite-btn cancelbtn' value='重新输入' />
+                    <span class="btn-group-gap"></span>
                     <input type='button' class='invite-btn download-btn' value='立即查看'  />
                     <input type='button' class='invite-btn download-btn' value='立即查看'  />
                 </div>
                 </div>
             </div>
             </div>
@@ -40,6 +50,7 @@
             <br />
             <br />
             <div class='btn-group'>
             <div class='btn-group'>
                 <input type='button' class='invite-btn cancelbtn' value='重新输入' />
                 <input type='button' class='invite-btn cancelbtn' value='重新输入' />
+                <span class="btn-group-gap"></span>
                 <input type='button' class='invite-btn download-btn' value='立即查看'  />
                 <input type='button' class='invite-btn download-btn' value='立即查看'  />
             </div>
             </div>
         </div><!--/isreg-->
         </div><!--/isreg-->

@@ -3,7 +3,7 @@
         <div>
         <div>
             <img src="//cdn.yoho.cn/m-yohobuy-node/assets/img/activity/invite/title_new.png" />
             <img src="//cdn.yoho.cn/m-yohobuy-node/assets/img/activity/invite/title_new.png" />
             <br />
             <br />
-            <p class="fz14">只需1位小伙伴领取，<br/>即得<strong class="fz17">10元现金券</strong>！<br/>全部领完，可继续发，上不封顶！<br/>奔跑吧，潮人们！</p>
+            <p class="fz14">只需1位小伙伴领取，<br/>即得<strong class="fz17">10元现金券</strong>！<br/>全部领完，可继续发，上不封顶！<br/>动动指尖吧！潮人们</p>
 
 
             <a href="javascript:void(0)" class="invite-btn fz16">立刻发福利</a>
             <a href="javascript:void(0)" class="invite-btn fz16">立刻发福利</a>
             <h2 class="rule-tit fz15">活动细则</h2>
             <h2 class="rule-tit fz15">活动细则</h2>

 <div class="invite-page invite-page-bg">
 <div class="invite-page invite-page-bg">
     <div class="invite-content-list">
     <div class="invite-content-list">
         <div class='mar-top-a'>
         <div class='mar-top-a'>
-            <h2 class="fz37 bold">太可惜了,</h2>
-            <p class="fz15 t-shadow">您与88元现金券擦肩而过！别伤心，</p>
             <p class="fz22 bold">赠您{{result.amount}}元现金券</p>
             <p class="fz22 bold">赠您{{result.amount}}元现金券</p>
             <p class="t-shadow">（仅限Yobo!Buy有货客户端使用）</p>
             <p class="t-shadow">（仅限Yobo!Buy有货客户端使用）</p>
             <!-- 现金券 start -->
             <!-- 现金券 start -->
-            <div class="coupon-box coupon-box02 relative mar-top-a">
-                <p class="fz9 bold">YUAN</p>
-                <strong class="fz18">现金券</strong>
-                <p class="fz9 bold">CPOUPON</p>
-                <div class="pirbox absolute">
-                    <em class="absolute">￥</em>{{result.amount}}
-                </div>
-                <div class="count-not fz11 absolute"><hr class="fn-left"><hr class="fn-right">已送达您的账户</div>
-            </div>
+            <div class="coupon-box chit10"></div>
             <!-- 现金券 end -->
             <!-- 现金券 end -->
 
 
             <p class="hurry-size fz16 bold">赶紧来Yobo!Buy有货<br/>逛潮牌吧！</p>
             <p class="hurry-size fz16 bold">赶紧来Yobo!Buy有货<br/>逛潮牌吧！</p>

@@ -18,7 +18,7 @@
     </div>
     </div>
     {{# floorAdListTitle}}
     {{# floorAdListTitle}}
         <div class="floor-top">
         <div class="floor-top">
-        	<img src="{{imgSrc '//cdn.yoho.cn/m-yohobuy-node/assets/img/activity/market/floor-top-1.jpg'}}" />
+        	<img src="{{imgSrc 'img/activity/market/floor-top-1.jpg'}}" />
         </div>
         </div>
     {{/ floorAdListTitle}}
     {{/ floorAdListTitle}}
     <ul class="floor-ul">
     <ul class="floor-ul">
@@ -33,7 +33,7 @@
     </ul>
     </ul>
     {{# newsList}}
     {{# newsList}}
         <div class="floor-top">
         <div class="floor-top">
-            <img src="{{imgSrc '//cdn.yoho.cn/m-yohobuy-node/assets/img/activity/market/floor-top-2.jpg'}}" />
+            <img src="{{imgSrc 'img/activity/market/floor-top-2.jpg'}}" />
         </div>
         </div>
         <div class="floor-c">
         <div class="floor-c">
         	<a href="{{url}}">
         	<a href="{{url}}">

@@ -14,7 +14,7 @@
         </section>
         </section>
     {{else}}
     {{else}}
         <section class='s-section  clearfix'>
         <section class='s-section  clearfix'>
-            <div class='s-verify-img s-verify-fail'></div>
+            <div class='s-verify-img s-verify-fail' prompt='{{./prompt}}'></div>
             <p class='s-verify-title'>太遗憾了,{{./prompt}}</p>
             <p class='s-verify-title'>太遗憾了,{{./prompt}}</p>
             <p class='s-verify-txt'>您可以<a class='red' href='//m.yohobuy.com/activity/student/register'>重新验证  ></a></p>
             <p class='s-verify-txt'>您可以<a class='red' href='//m.yohobuy.com/activity/student/register'>重新验证  ></a></p>
         </section>
         </section>

+<div class="vipday-game game-luck">
+    {{> vip_day/game-header message="花20有货币就能获一次抽奖机会哦!"}} 
+    {{> vip_day/game-main}}
+    <div class="info">
+        <div class="info-item my-icon">
+            <div class="my-icon-label">
+                <i class="small-icon"></i><span>我的有货币</span>
+            </div>
+            <span id="my-coin" class="game-val game-rect">{{coins}}</span>
+        </div>
+        <div class="info-item">
+            <button id="my-award" class="game-btn my-award" type="button" data-toggle="ymodal" data-target="#js-awards">我的奖品</button>
+        </div>
+        <div class="info-item player-num">
+            <div>
+                已有:<span id="player-num" class="player-num-val">{{joins}}</span>人
+            </div>
+            <span>参加抽奖</span>
+        </div>
+    </div>
+    <div class="explain">
+        <div class="explain-txt">
+            <h6 class="explain-title">有货币抽奖规则:</h6>
+            <ul class="explain-rules">
+                <li>1、 每次投入20有货币,用户账内有货币需大于20;每位用户不限参与次数</li>
+                <li>2、 奖品为20、50、100、200、1000、2000、5000有货币，抽中对应奖品即可获得；如未中奖则告知“很遗憾您没有中奖，继续加油哦~~”！</li>
+            </ul>
+        </div>
+    </div>
+</div>
+
+<div class="ymodal ymodal-alert vipday-luck-awards" id="js-awards">
+    <div class="ymodal-dialog">
+        <div class="ymodal-content">
+            <div class="ymodal-header">我的奖品<i class="iconfont close" data-dismiss="ymodal">&#xe623</i></div>
+            <ol class="ymodal-body">
+                <!-- placeholder -->
+            </ol>
+        </div>
+    </div>
+</div>
+
+<script>
+    var coin = {{coinNum}};
+    var joinNum = {{joinNum}};
+</script>

+<div class="vipday-game game-wheel">
+    {{> vip_day/game-header message="您有1次抽奖机会"}} 
+    {{> vip_day/game-main}}
+    <div class="info">
+        <div class="info-item">
+            已有<span class="game-val game-rect" id="js-join-num">{{joins}}</span>人参与抽奖
+        </div>
+    </div>
+    <div class="explain">
+        <div class="explain-txt">
+            <h6 class="explain-title">留言板细则:</h6>
+            <ul class="explain-rules">
+                <li>每位用户限写一条留言，完成提交后获得一次抽奖机会。可随机获得10元现金券、20元现金券、50元现金券、100元现金券</li>
+                <li>您的想法有可能会在后面的会员日实现哦~<br>本次活动解释权归有货所有</li>
+            </ul>
+        </div>
+    </div>
+</div>
+
+<script>
+    var joinNum = {{joinNum}};
+</script>

+{{! header }}
+<header class="vip-day-header"></header>
+
+<div class="vip-day-slogan"></div>
+
+<section class="vip-day-sec qiangjuan" id="qiangquan">
+    <div class="content">
+        <ul class="chits">
+            <li>
+                <div class="chit chit10"></div>
+            </li>
+            <li>
+                <div class="chit chit30"></div>
+            </li>
+            <li>
+                <div class="chit chit60"></div>
+            </li>
+        </ul>
+        <button class="qiangjuan-foucs" data-toggle="ymodal" data-target="#chit-qcode">立刻关注抢优惠券</button>
+    </div>
+</section>
+
+{{! section: 玩转有货币 }}
+<section class="vip-day-sec play-coin" id="play-coin">
+    <header class="header">
+        <i class="title-pic"></i>
+    </header>
+    <div class="content">
+            <a href='/home/mycurrency{{#if isApp}}?openby:yohobuy＝{"action":"go.signin"}{{/if}}' class="d-chit-more"></a>
+        <ul class="clearfix">
+            <li class="item item-1 pull-left" id="js-qiandao">
+                <!--<a href="http://m.yohobuy.com/home/mycurrency?openby:yohobuy={'action':'go.h5','params':{'islogin':'Y','url':'http://m.yohobuy.com/home/mycurrency'}}">-->
+                    <img class="play-icon-flag play-coin-left" src="{{imgSrc 'img/activity/vip_day/play-coin-1.png'}}" alt="签到福利">
+                <!--</a>-->
+            </li>
+            <li class="play-coin-div"></li>
+            <li class="item item-2 pull-right" id="js-game-luck">
+                <a href='http://m.yohobuy.com/activity/vip-day/crazy-luck{{#if isApp}}?openby:yohobuy={"action":"go.h5","params":{"islogin":"Y","url":"http://m.yohobuy.com/activity/vip-day/crazy-luck"}}{{/if}}'>
+                    <img class="play-icon-flag play-coin-right" src="{{imgSrc 'img/activity/vip_day/play-coin-2.png'}}" alt="拼手气">
+                </a>
+            </li>
+        </ul>
+    </div>
+</section>
+
+{{! section: vip等级加速 }}
+<section class="vip-day-sec vip-rocket" id="vip-rocket">
+    <header class="header">
+        <i class="title-pic"></i>
+    </header>
+    <div class="content text-center">
+        <a href="javascript:;" data-toggle="ymodal" data-target="#vip-privilege" class="vip-rocket-a"></a>
+        <i class="vip-rocket-point"></i>
+    </div>
+</section>
+
+{{! section: 会员日专享商品 }}
+<section class="vip-day-sec vip-goods" id="vip-goods">
+    <header class="header">
+        <i class="title-pic"></i>
+    </header>
+    <div class="content">
+        <div class="vip-goods-sec">
+            <!--                  good class 1-->
+            <h5 class="vip-goods-sec-label">明星潮牌</h5>
+            <ul class="vip-goods-list clearfix">
+                {{#each goods1}}
+                    {{> vip_day/vip-good}}
+                {{/each}}
+            </ul>
+            <!--                  good class 2-->
+            <h5 class="vip-goods-sec-label">新品释出</h5>
+            <ul class="vip-goods-list clearfix">
+                {{#each goods2}}
+                    {{> vip_day/vip-good}}
+                {{/each}}
+            </ul>
+            <!--                       good class 3-->
+            <h5 class="vip-goods-sec-label">VIP独享</h5>
+            <ul class="vip-goods-list clearfix">
+                {{#each goods3}}
+                    {{> vip_day/vip-good}}
+                {{/each}}
+            </ul>
+            <div class="text-center">
+                <a href='https://m.yohobuy.com/product/sale/vip?channel={{channel}}&openby:yohobuy={"action":"go.vippro"}' class="vip-goods-more">点击查看更多</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+{{! section: 欢乐福利加倍区 }}
+<section id="js-msg-sec" class="vip-day-sec vip-day-fuli">
+    <header class="header">
+        <i class="title-pic"></i>
+    </header>
+    <div class="content vip-day-msg">
+        <div class="clearfix">
+            <div class="mirror">
+                <textarea class="vip-msg-content"></textarea>
+                <button class="vip-msg-send" type="button">写好啦!</button>
+            </div>
+            <img class="txt" src="{{imgSrc 'img/activity/vip_day/leava-msg.png'}}" alt="">
+        </div>
+        <div class="vip-day-msg-input"></div>
+    </div>
+</section>
+
+{{! section： 召唤神龙}}
+<!--<a href="/activity/invite?act_id=29&openby:yohobuy={'action':'go.h5','params':{url:'http://m.yohobuy.com/activity/invite?act_id=29'}}">-->
+    <div class="vip-day-sec friends" id="js-invite-friends">"呼朋唤友一起玩！更多福利，欢乐加倍"</div>
+<!--</a>-->
+
+{{! footer }}
+<footer class="vip-day-footer">
+   {{#unless isApp}} <a href="http://www.yohoshow.com/about/index/yohobuyqr/" class="app-download"></a> {{/unless}}
+</footer>
+{{> vip_day/footer-nav }}
+
+{{! 立刻关注抢优惠券 弹出二维码}}
+<div class="ymodal" id="chit-qcode">
+    <div class="vh-center ymodal-dialog" data-dismiss="ymodal">
+        <div>
+            <img class="qcode" src="{{imgSrc 'img/activity/vip_day/qcode.jpg'}}">
+            <p class="chit-qcode-tip">扫码关注有货微信或搜索“yohobuy”关注订阅号</p>
+        </div>
+    </div>
+</div>
+
+<div class="ymodal" id="qiandao-modal">
+    <div class="vh-center ymodal-dialog" data-dismiss="ymodal">
+            <img src="{{imgSrc 'img/activity/vip_day/qiandao.png'}}">
+    </div>
+</div>
+
+<div class="ymodal" id="vip-privilege">
+    <div class="vh-center ymodal-dialog" data-dismiss="ymodal">
+            <img src="{{imgSrc 'img/activity/vip_day/privilege.png'}}" alt="VIP 权益">
+    </div>
+</div>

+<nav class="footer-nav">
+    <ul>
+        <li>
+            <i class="bg-chit"></i>
+            <br>
+            <span>立刻抢券</span>
+            <a href="#qiangquan"></a>
+        </li>
+        <li>
+            <i class="bg-coin"></i>
+            <br>
+            <span>玩转有货币</span>
+            <a href="#play-coin"></a>
+        </li>
+        <li>
+            <i class="bg-level"></i>
+            <br>
+            <span>翻倍升级</span>
+            <a href="#vip-rocket"></a>
+        </li>
+        <li>
+            <i class="bg-goods"></i>
+            <br>
+            <span>专享产品</span>
+            <a href="#vip-goods"></a>
+        </li>
+        <li>
+            <i class="bg-fuli"></i>
+            <br>
+            <span>福利加倍</span>
+            <a href="#js-msg-sec"></a>
+        </li>
+    </ul>
+</nav>

+<div class="header">
+    <div class="header-banner"></div>
+    <div class="game-notify game-rect">
+        <p id="js-game-notify">{{message}}</p>
+    </div>
+</div>

+<div class="game">
+    <div class="game-stage" id="js-stage">
+        <div class="game-item game-award is-active" data-index="1"></div>
+        <div class="game-item game-award" data-index="2"></div>
+        <div class="game-item game-award" data-index="3"></div>
+        <div class="game-item game-award" data-index="8"></div>
+        <div class="game-item game-boot"></div>
+        <div class="game-item game-award" data-index="4"></div>
+        <div class="game-item game-award" data-index="7"></div>
+        <div class="game-item game-award" data-index="6"></div>
+        <div class="game-item game-award" data-index="5"></div>
+    </div>
+</div>

+<li class="vip-good">
+    <div style="border: 1px solid #000;">
+        <img class="vip-good-show" src="{{image defaultImages 220 115}}" alt="">
+        <div class="vip-good-price">
+            {{!-- 
+            <div class="text-right">
+                <sup>¥</sup><span>539</span>
+            </div>
+            <div class="text-left">
+                <span class="disable-price">¥539</span>
+            </div>
+            --}}
+            {{#if marketPrice}}
+            <sup>¥</sup><span>{{salesPrice}}</span><span class="disable-price">¥{{marketPrice}}</span>
+            {{else}}
+            <sup>¥</sup><span>{{salesPrice}}</span>
+            {{/if}}
+        </div>
+        <div class="vip-good-bottom">
+            <h6 class="vip-good-name line-clamp-2">{{productName}}</h6>
+            <button class="vip-good-fav" type="button">马上购买</button>
+        </div>
+    </div>
+    <a class="vip-good-link" href='{{url}}'></a>
+</li>

@@ -239,8 +239,9 @@ let getChannelSwitchData = () => {
  */
  */
 let getChannelData = (params) => {
 let getChannelData = (params) => {
     var channelData = {};
     var channelData = {};
+    let navGender = _.cloneDeep(params.gender);
 
 
-    return Promise.all([_getChannelResource(params), _getLeftNav(params.gender)]).then((data) => {
+    return Promise.all([_getChannelResource(params), _getLeftNav(navGender)]).then((data) => {
         channelData.content = data[0]; // 资源位数据
         channelData.content = data[0]; // 资源位数据
         channelData.sideNav = data[1]; // 侧边栏数据
         channelData.sideNav = data[1]; // 侧边栏数据
 
 

@@ -63,4 +63,8 @@
     {{#if livePicture}}
     {{#if livePicture}}
         {{> resources/live-picture}}
         {{> resources/live-picture}}
     {{/if}}
     {{/if}}
+    {{! 六层图}}
+    {{#if sixLinesFloor}}
+        {{> resources/six-lines-floor}}
+    {{/if}}
 {{/content}}
 {{/content}}

@@ -110,7 +110,7 @@ const _processIndexData = (dataList) => {
             let url = `/guang/star/detail?tag=${data.tagName}&openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"http://m.yohobuy.com/guang/star/detail","param":{"tag":"${data.tagName}"}}}`; // eslint-disable-line
             let url = `/guang/star/detail?tag=${data.tagName}&openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"http://m.yohobuy.com/guang/star/detail","param":{"tag":"${data.tagName}"}}}`; // eslint-disable-line
 
 
             formatData.starAvatar.push({
             formatData.starAvatar.push({
-                //noLazy: index < 6,
+                // noLazy: index < 6,
                 url: url,
                 url: url,
                 cover: data.cover ? (data.cover + '?imageView2/2/w/180/h/180') : data.cover
                 cover: data.cover ? (data.cover + '?imageView2/2/w/180/h/180') : data.cover
             });
             });

@@ -67,23 +67,22 @@ const _reviewStatus = (res, req, uid, status) => {
 };
 };
 
 
 // 还款列表公共处理块
 // 还款列表公共处理块
-const _repaymentList = (req, res, title, params) => {
+const _repaymentList = (req, res, opt, params) => {
     params = _.assign({
     params = _.assign({
         uid: req.cookies.installmentUid || 1
         uid: req.cookies.installmentUid || 1
     }, params);
     }, params);
 
 
     installmentModel.getQueryAmtList(params).then((result) => {
     installmentModel.getQueryAmtList(params).then((result) => {
-        res.render('installment/repayment-list', {
+        res.render('installment/repayment-list', _.assign({
             module: 'home',
             module: 'home',
             page: 'repayment-list',
             page: 'repayment-list',
             isInstallmentPage: true,
             isInstallmentPage: true,
-            title: title,
             data: result
             data: result
-        });
+        }, opt));
     }).catch(() => {
     }).catch(() => {
         _serverCrash(res, {
         _serverCrash(res, {
             url: req.originalUrl,
             url: req.originalUrl,
-            title: title
+            title: opt.title
         });
         });
     });
     });
 };
 };
@@ -195,28 +194,40 @@ const review = (req, res) => {
 
 
 // 逾期未还款列表
 // 逾期未还款列表
 const overdueList = (req, res) => {
 const overdueList = (req, res) => {
-    _repaymentList(req, res, '逾期未还金额', {
+    _repaymentList(req, res, {
+        title: '逾期未还金额',
+        posId: 1
+    }, {
         queryDays: -1
         queryDays: -1
     });
     });
 };
 };
 
 
 // 7日待还款列表
 // 7日待还款列表
 const sevenDayList = (req, res) => {
 const sevenDayList = (req, res) => {
-    _repaymentList(req, res, '近7日待还款', {
+    _repaymentList(req, res, {
+        title: '近7日待还款',
+        posId: 2
+    }, {
         queryDays: 7
         queryDays: 7
     });
     });
 };
 };
 
 
 // 本月待还款列表
 // 本月待还款列表
 const monthRepayList = (req, res) => {
 const monthRepayList = (req, res) => {
-    _repaymentList(req, res, '本月待还金额', {
+    _repaymentList(req, res, {
+        title: '本月待还金额',
+        posId: 3
+    }, {
         queryDays: 30
         queryDays: 30
     });
     });
 };
 };
 
 
 // 待还总金额列表
 // 待还总金额列表
 const totalRepayList = (req, res) => {
 const totalRepayList = (req, res) => {
-    _repaymentList(req, res, '待还总金额', {
+    _repaymentList(req, res, {
+        title: '待还总金额',
+        posId: 4
+    }, {
         queryDays: 0
         queryDays: 0
     });
     });
 };
 };
@@ -227,7 +238,8 @@ const repayRecordPage = (req, res) => {
         module: 'home',
         module: 'home',
         page: 'repay-record',
         page: 'repay-record',
         isInstallmentPage: true,
         isInstallmentPage: true,
-        title: '还款记录'
+        title: '还款记录',
+        posId: 5
     });
     });
 };
 };
 
 
@@ -258,8 +270,11 @@ const getRepayRecord = (req, res) => {
 // 账号管理
 // 账号管理
 const account = (req, res) => {
 const account = (req, res) => {
     res.render('installment/account', {
     res.render('installment/account', {
+        module: 'home',
+        page: 'account',
         title: '账号管理',
         title: '账号管理',
-        isInstallmentPage: true
+        isInstallmentPage: true,
+        posId: 7
     });
     });
 };
 };
 
 
@@ -368,7 +383,8 @@ const orderIndex = (req, res) => {
         page: 'installment.order',
         page: 'installment.order',
         title: '我的分期订单',
         title: '我的分期订单',
         navBtn: false,
         navBtn: false,
-        isInstallmentPage: true
+        isInstallmentPage: true,
+        posId: 6
     });
     });
 };
 };
 
 

+'use strict';
+
+const model = require('../models/myqrcode'),
+    headerModel = require('../../../doraemon/models/header'); // 头部model
+
+exports.index = (req, res, next) => {
+    let params = req.query;
+
+    model.getQr({
+        token: params.token,
+    }).then(result => {
+        params.token = result;
+        params.uname = decodeURIComponent(params.uname);
+        params.icon = params.icon || 'https://img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/2/w/{width}/h/{height}';
+        res.render('myqrcode', {
+            title: '查看二维码',
+            module: 'home',
+            page: 'myqrcode',
+            isPassportPage: true,
+            data: params,
+            pageHeader: headerModel.setNav({
+                navTitle: '查看二维码'
+            })
+        });
+    }).catch(next);
+};
+
+

@@ -80,10 +80,14 @@ const _infoNum = (params) => {
  * @param params
  * @param params
  */
  */
 const _getAddressData = (params) => {
 const _getAddressData = (params) => {
-    return api.get('', {
-        method: 'app.address.gethidden',
-        uid: params.uid
-    }, {code: 200});
+    if (params.uid) {
+        return api.get('', {
+            method: 'app.address.gethidden',
+            uid: params.uid
+        }, {code: 200});
+    } else {
+        return false;
+    }
 };
 };
 
 
 /**
 /**
@@ -102,7 +106,8 @@ const index = (params) => {
         cartUrl: helpers.urlFormat('/cart/index/index'),
         cartUrl: helpers.urlFormat('/cart/index/index'),
         signinUrl: helpers.urlFormat('/signin.html', {
         signinUrl: helpers.urlFormat('/signin.html', {
             refer: helpers.urlFormat('/home')
             refer: helpers.urlFormat('/home')
-        })
+        }),
+        verifyUrl: helpers.urlFormat('/activity/student/register')
     };
     };
 
 
     return api.all([
     return api.all([
@@ -116,7 +121,8 @@ const index = (params) => {
             Object.assign(finalResult, {
             Object.assign(finalResult, {
                 profileName: result[0].data.profile_name,
                 profileName: result[0].data.profile_name,
                 headIco: result[0].data.head_ico,
                 headIco: result[0].data.head_ico,
-                vipInfo: result[0].data.vip_info
+                vipInfo: result[0].data.vip_info,
+                students: _.get(result[0].data, 'vip_info.is_student', 0) === 1
             });
             });
         }
         }
 
 

+'use strict';
+
+const api = global.yoho.API;
+const crypto = global.yoho.crypto;
+const PASSWORD = 'yoho9646yoho9646';
+
+exports.getQr = (params) => {
+    let uid = '';
+
+    try {
+        uid = crypto.decrypt(PASSWORD, decodeURIComponent(params.token));
+    } catch (e) {
+        console.error(e);
+        uid = params.token;
+    }
+
+    return api.get('', {
+        method: 'app.twoDimen.getCode',
+        uid: uid,
+    }).then(result => {
+        return (result && result.data && result.data.code) || '';
+    });
+};

@@ -15,6 +15,7 @@ const cRoot = './controllers';
 const installment = require(cRoot + '/installment');
 const installment = require(cRoot + '/installment');
 
 
 const personalController = require(`${cRoot}/qrcode`);
 const personalController = require(`${cRoot}/qrcode`);
+const userQrcode = require(`${cRoot}/myqrcode`);
 const homeController = require(`${cRoot}/index`);
 const homeController = require(`${cRoot}/index`);
 const addressController = require(`${cRoot}/address`);
 const addressController = require(`${cRoot}/address`);
 const favorite = require(`${cRoot}/favorite`);
 const favorite = require(`${cRoot}/favorite`);
@@ -33,8 +34,10 @@ const recommendForYou = require(`${cRoot}/recommend-for-you`);
 
 
 // const myDetail = require(`${cRoot}/myDetail);
 // const myDetail = require(`${cRoot}/myDetail);
 
 
+
 // 查看二维码
 // 查看二维码
 router.get('/QRcode/:id', personalController.QRcode);
 router.get('/QRcode/:id', personalController.QRcode);
+router.get('/user/qrcode', userQrcode.index);
 
 
 /* 个人中心地址管理相关路由 */
 /* 个人中心地址管理相关路由 */
 router.get('/address', auth, addressController.address); // 地址管理页面
 router.get('/address', auth, addressController.address); // 地址管理页面

     <div class="my-page yoho-page">
     <div class="my-page yoho-page">
         <div class="my-header">
         <div class="my-header">
             {{#isLogin}}
             {{#isLogin}}
-            <a class="user-info" href="/home/mydetails">
-                <span class="user-avatar" data-avatar="{{image headIco 128 128}}"></span>
-                <span class="username">{{profileName}}</span>
-                {{#vipInfo}}
-                <span class="vip-icon vip-{{cur_level}}"></span>
-                {{/vipInfo}}
-                <div class="iconfont more-icon tap-hightlight">&#xe604;</div>
-            </a>
-            {{/isLogin}}
-            {{^isLogin}}
-            <div class="user-info">
-                <a class="login-btn" href="{{signinUrl}}">
-                    登录/注册
+                <a class="user-info" href="/home/mydetails">
+                    <span class="user-avatar" data-avatar="{{image headIco 128 128}}"></span>
+                    <span class="username">{{profileName}}</span>
+                    {{#vipInfo}}
+                    <span class="vip-icon vip-{{cur_level}}"></span>
+                    {{/vipInfo}}
+
+                    {{#if students}}
+                        <span class="vip-icon students"></span>
+                    {{/if}}
+                    <div class="iconfont more-icon tap-hightlight">&#xe604;</div>
                 </a>
                 </a>
-            </div>
+                {{#unless students}}
+                    <a class="students-entry" href="{{verifyUrl}}">学生认证</a>
+                {{/unless}}
+            {{^}}
+                <div class="user-info">
+                    <a class="login-btn" href="{{signinUrl}}">
+                        登录/注册
+                    </a>
+                    <a class="students-entry" href="{{verifyUrl}}">学生认证</a>
+                </div>
             {{/isLogin}}
             {{/isLogin}}
         </div>
         </div>
         <div class="my-link clearfix {{^isLogin}}no-login{{/isLogin}}">
         <div class="my-link clearfix {{^isLogin}}no-login{{/isLogin}}">
@@ -32,18 +39,16 @@
                 <p>浏览记录</p>
                 <p>浏览记录</p>
             </a>
             </a>
         </div>
         </div>
-
-        <div class="notice" data-time="{{notice.time}}">
-            {{#notice}}
-            <a class="notice-item item-{{@index}}" href="{{url}}">
-                <span class="notice-icon"></span>
-                {{title}}
-            </a>
-            {{/notice}}
-        </div>
-
-       <!-- {{#if notice.open}}
-        {{/if}}-->
+        {{#if notice.open}}
+            <div class="notice" data-time="{{notice.time}}">
+                {{#notice}}
+                <a class="notice-item item-{{@index}}" href="{{url}}">
+                    <span class="notice-icon"></span>
+                    {{title}}
+                </a>
+                {{/notice}}
+            </div>
+        {{/if}}
         <div class="my-order">
         <div class="my-order">
             <a class="order-title"  href="/home/orders">
             <a class="order-title"  href="/home/orders">
                 我的订单
                 我的订单

-<div class="account-page">
+<div class="account-page" data-pos-id="{{posId}}">
     <ul class="account-list">
     <ul class="account-list">
         <li><a href="/home/installment/bank-card">我的银行卡：<div class="list-right"><span class="iconfont">&#xe604;</span></div></a></li>
         <li><a href="/home/installment/bank-card">我的银行卡：<div class="list-right"><span class="iconfont">&#xe604;</span></div></a></li>
     </ul>
     </ul>

 <div class="installment-page installment-bg">
 <div class="installment-page installment-bg">
     {{#if notOpen}}
     {{#if notOpen}}
+        <input type="hidden" value="false" class="is-open"> 
         {{# bannerTop}}
         {{# bannerTop}}
             {{> resources/banner-top}}
             {{> resources/banner-top}}
         {{/ bannerTop}}
         {{/ bannerTop}}
@@ -26,6 +27,7 @@
             {{> installment/installment-only}}
             {{> installment/installment-only}}
         {{/ installmentOnly}}
         {{/ installmentOnly}}
     {{else}}
     {{else}}
+        <input type="hidden" value="true" class="is-open">
         <div class="detail-tab">
         <div class="detail-tab">
             <span class="on is-repay">待还款金额</span>
             <span class="on is-repay">待还款金额</span>
             <span class="is-usable">可用额度</span>
             <span class="is-usable">可用额度</span>
@@ -35,19 +37,19 @@
                 <p class="detail-txt1">近7日待还款</p>
                 <p class="detail-txt1">近7日待还款</p>
                 <p class="detail-txt1">¥<span class="detail-txt2">{{dayAmt}}</span></p>
                 <p class="detail-txt1">¥<span class="detail-txt2">{{dayAmt}}</span></p>
                 {{#if isOverdue}}
                 {{#if isOverdue}}
-                    <p class="detail-txt3">您有¥{{overAmt}}已逾期，点击<a href="/home/installment/repay/overdue">查看详情</a></p>
+                    <p class="detail-txt3">您有¥{{overAmt}}已逾期，点击<a href="/home/installment/repay/overdue" class="nav-bit" data-id="1">查看详情</a></p>
                 {{/if}}
                 {{/if}}
-                <a href="/home/installment/repay/7daylist" class="see-btn">明细</a>
+                <a href="/home/installment/repay/7daylist" class="see-btn nav-bit" data-id="2">明细</a>
             </div>
             </div>
             <ul class="group-list">
             <ul class="group-list">
-                <li><a href="/home/installment/repay/month">本月待还金额：<div class="list-right"><span class="list-r-txt">¥{{monthAmt}}</span><span class="iconfont"> &#xe604;</span></div></a></li>
-                <li><a href="/home/installment/repay/total">待还总金额：<div class="list-right"><span class="list-r-txt">¥{{totalAmt}}</span><span class="iconfont"> &#xe604;</span></div></a></li>
-                <li><a href="/home/installment/repay/record">还款记录：<div class="list-right iconfont">&#xe604;</div></a></li>
-                <li><a href="/home/installment/order">分期订单：<div class="list-right iconfont">&#xe604;</div></a></li>
+                <li><a href="/home/installment/repay/month" class="nav-bit" data-id="3">本月待还金额：<div class="list-right"><span class="list-r-txt">¥{{monthAmt}}</span><span class="iconfont"> &#xe604;</span></div></a></li>
+                <li><a href="/home/installment/repay/total" class="nav-bit" data-id="4">待还总金额：<div class="list-right"><span class="list-r-txt">¥{{totalAmt}}</span><span class="iconfont"> &#xe604;</span></div></a></li>
+                <li><a href="/home/installment/repay/record" class="nav-bit" data-id="5">还款记录：<div class="list-right iconfont">&#xe604;</div></a></li>
+                <li><a href="/home/installment/order" class="nav-bit" data-id="6">分期订单：<div class="list-right iconfont">&#xe604;</div></a></li>
             </ul>
             </ul>
 
 
             <ul class="group-list">
             <ul class="group-list">
-                <li><a href="/home/installment/account">账户管理：<span class="list-right iconfont">&#xe604;</span></a></li>
+                <li><a href="/home/installment/account" class="nav-bit" data-id="7">账户管理：<span class="list-right iconfont">&#xe604;</span></a></li>
             </ul>
             </ul>
         </div>
         </div>
         <div class="usable installment-cont">
         <div class="usable installment-cont">

 {{#if orders}}
 {{#if orders}}
     {{#each orders}}
     {{#each orders}}
         <li>
         <li>
-            <a href="/home/installment/order/{{orderCode}}">
+            <a href="/home/installment/order/{{orderCode}}" data-code="{{orderCode}}">
                 {{#orderGoods}}
                 {{#orderGoods}}
                     <div class="image-box">
                     <div class="image-box">
                         <img src="{{image goodsImage 90 120}}" alt="{{productName}}"/>
                         <img src="{{image goodsImage 90 120}}" alt="{{productName}}"/>

-<div class="repayment-list-page installment-order-page yoho-page">
+<div class="repayment-list-page installment-order-page yoho-page" data-pos-id="{{posId}}">
     {{> resources/banner-top}}
     {{> resources/banner-top}}
     <ul class="header-tab">
     <ul class="header-tab">
         <li class="active">
         <li class="active">

-<div class="repayment-list-page">
+<div class="repayment-list-page" data-pos-id="{{posId}}">
     <ul class="record-list"></ul>
     <ul class="record-list"></ul>
     <div class="no-result" style="display: none;">
     <div class="no-result" style="display: none;">
         <i class="result-icon"></i>
         <i class="result-icon"></i>

-<div class="repayment-list-page yoho-page">
+<div class="repayment-list-page yoho-page" data-pos-id="{{posId}}">
     {{#data}}
     {{#data}}
         {{#if isNoResult}}
         {{#if isNoResult}}
             <div class="no-result">
             <div class="no-result">
@@ -9,7 +9,7 @@
         {{else}}
         {{else}}
             <ul class="repay-list">
             <ul class="repay-list">
                 {{#each repaymentList}}
                 {{#each repaymentList}}
-                    <li data-currfee="{{currFee}}" data-currnofeeamt="{{currNoFeeAmt}}" data-curramt="{{currAmt}}" data-bill-no="{{billNo}}" data-currterm={{currTerm}}>
+                    <li data-currfee="{{currFee}}" data-currnofeeamt="{{currNoFeeAmt}}" data-curramt="{{currAmt}}" data-bill-no="{{billNo}}" data-currterm={{currTerm}} data-terms={{terms}}>
                         <input id="list-{{key}}" type="checkbox" class="installment-check-btn" {{#if isChecked}}checked{{/if}}/>
                         <input id="list-{{key}}" type="checkbox" class="installment-check-btn" {{#if isChecked}}checked{{/if}}/>
                         <label for="list-{{key}}">
                         <label for="list-{{key}}">
                             <div class="cont">
                             <div class="cont">

+{{#data}}
+<section class="myqrcode">
+    <img src="{{image icon 120 120}}" class="myqrcode_head" alt="">
+    <p class="myqrcode_uname">{{uname}}</p>
+    <div class="myqrcode_vip myqrcode_vip_{{vip}}"></div>
+    <div class="myqrcode_qr" qr-data="{{token}}">
+        <img src="{{image icon 100 100}}" class="myqrcode_icon" alt="">
+    </div>
+</section>
+{{/data}}

@@ -14,8 +14,8 @@
 <div class="repayment-bottom" style="display: none;">
 <div class="repayment-bottom" style="display: none;">
     <input id="repayment-total" type="checkbox" class="installment-check-btn" {{#if isAllChecked}}checked{{/if}}/>
     <input id="repayment-total" type="checkbox" class="installment-check-btn" {{#if isAllChecked}}checked{{/if}}/>
     <label for="repayment-total">
     <label for="repayment-total">
-        <p class="repay-price">待支付：<span>¥<span class="curr-amt">{{round currAmtCount}}</span></span></p>
-        <p class="serve-price" {{#if isCurrFee}}style="display:block;"{{/if}}>含逾期服务费¥<span class="curr-fee">{{round currFeeCount}}</span></p>
+        <p class="repay-price">待支付：<span>¥<span class="curr-amt">{{currAmtCount}}</span></span></p>
+        <p class="serve-price" {{#if isCurrFee}}style="display:block;"{{/if}}>含逾期服务费¥<span class="curr-fee">{{currFeeCount}}</span></p>
     </label>
     </label>
     <a href='' class="repayment-btn">立即还款</a>
     <a href='' class="repayment-btn">立即还款</a>
 </div>
 </div>

@@ -245,7 +245,9 @@ const bind = {
         let refer = req.cookies.refer;
         let refer = req.cookies.refer;
         let type = req.query.type;
         let type = req.query.type;
 
 
-        refer = helpers.urlFormat('/?go=1');
+        if (!refer || /signin|login/.test(refer)) {
+            refer = helpers.urlFormat('/?go=1');
+        }
 
 
         res.render('bind/success', {
         res.render('bind/success', {
             isPassportPage: true,
             isPassportPage: true,

@@ -639,7 +639,7 @@ const _detailDataPkg = (origin, uid, vipLevel, ua) => {
             vipList.push({
             vipList.push({
                 level: levelList[value.caption],
                 level: levelList[value.caption],
                 text: value.price,
                 text: value.price,
-                currentLevel: (value.vipLevel === vipLevel)
+                currentLevel: (levelList[value.caption] === parseInt(vipLevel, 10))
             });
             });
         });
         });
 
 

@@ -181,9 +181,14 @@ const _searchSales = (params) => {
     }
     }
 
 
     params = Object.assign({
     params = Object.assign({
-        limit: '50'
+        limit: '60'
     }, params);
     }, params);
 
 
+    // 5.0.0 sale 按后台导入顺序排列
+    if (params.type === 'all') {
+        params.type = '';
+    }
+
     if (typeCont[params.type]) {
     if (typeCont[params.type]) {
         params.order = typeCont[params.type][params.order];
         params.order = typeCont[params.type][params.order];
     }
     }

@@ -78,12 +78,12 @@ module.exports = {
 if (isProduction) {
 if (isProduction) {
     Object.assign(module.exports, {
     Object.assign(module.exports, {
         appName: 'm.yohobuy.com',
         appName: 'm.yohobuy.com',
-        assetUrl: '//cdn.yoho.cn/m-yohobuy-node/assets',
+        assetUrl: '//cdn.yoho.cn/m-yohobuy-node/assets/',
         domains: {
         domains: {
             api: 'http://api.yoho.yohoops.org/',
             api: 'http://api.yoho.yohoops.org/',
             service: 'http://service.yoho.yohoops.org/',
             service: 'http://service.yoho.yohoops.org/',
             liveApi: 'http://api.live.yoho.cn/',
             liveApi: 'http://api.live.yoho.cn/',
-            singleApi: 'http://singleapi.yoho.cn/'
+            singleApi: 'http://single.yoho.cn/'
         },
         },
         memcache: {
         memcache: {
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
@@ -101,7 +101,7 @@ if (isProduction) {
 } else if (isTest) {
 } else if (isTest) {
     Object.assign(module.exports, {
     Object.assign(module.exports, {
         appName: 'm.yohobuy.com for test',
         appName: 'm.yohobuy.com for test',
-        assetUrl: '//cdn.yoho.cn/m-yohobuy-node/assets',
+        assetUrl: '//cdn.yoho.cn/m-yohobuy-node/assets/',
         domains: {
         domains: {
             api: process.env.TEST_API || 'http://api-test1.yohops.com:9999/',
             api: process.env.TEST_API || 'http://api-test1.yohops.com:9999/',
             service: process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/',
             service: process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/',

@@ -32,13 +32,14 @@
         <link rel="apple-touch-startup-image" sizes="640x920" href="http://static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
         <link rel="apple-touch-startup-image" sizes="640x920" href="http://static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
         <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="{{#if width750}}width750{{/if}} {{#if isWechat}}wechat-body{{/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">
         <div class="main-wrap">
             {{#if systemUpdate}}
             {{#if systemUpdate}}
                 {{> updata}}
                 {{> updata}}
             {{/if}}
             {{/if}}
-
+            {{#unless isApp}}
             {{> header}}
             {{> header}}
+            {{/unless}}
             {{{body}}}
             {{{body}}}
             {{> footer}}
             {{> footer}}
         </div>
         </div>

 {{#if this}} {{!-- 剔除值为false的项 --}}
 {{#if this}} {{!-- 剔除值为false的项 --}}
-    {{#this}}
-    <div class="good-info {{#if @root.saleViplogin}}sale-vip{{/if}}" data-id="{{productSkn}}" data-bp-id="guang_goodList_{{productName}}_false">
+    <div class="good-info {{#if @root.saleViplogin}}sale-vip{{/if}}" data-good-id="{{productId}}" data-id="{{productSkn}}" data-bp-id="guang_goodList_{{productName}}_false">
         <div class="tag-container clearfix">
         <div class="tag-container clearfix">
             {{# tags}}
             {{# tags}}
                 {{# isNew}}
                 {{# isNew}}
@@ -60,5 +59,4 @@
             {{/if}}
             {{/if}}
         </div>
         </div>
     </div>
     </div>
-    {{/this}}
 {{/if}}
 {{/if}}

+{{#data}}
+    <div class="best-week">
+        {{> common/floor-header-more}}
+        
+        <ul class="six-lines-floor clearfix">
+            {{# list}}
+            <li>
+                <a href="{{url}}">
+                    <div class="img-box">
+                        <img class="lazy" data-original="{{image src 180 320}}" alt="">
+                    </div>
+                </a>
+            </li>
+            {{/ list}}
+        </ul>
+    </div>
+{{/data}}

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "4.9.27",
+  "version": "5.0.0",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {
@@ -28,10 +28,10 @@
     "express-handlebars": "^3.0.0",
     "express-handlebars": "^3.0.0",
     "express-session": "^1.14.1",
     "express-session": "^1.14.1",
     "influxdb-winston": "^1.0.1",
     "influxdb-winston": "^1.0.1",
-    "lodash": "^4.15.0",
+    "lodash": "^4.16.1",
     "md5": "^2.1.0",
     "md5": "^2.1.0",
     "memcached": "^2.2.1",
     "memcached": "^2.2.1",
-    "moment": "^2.14.1",
+    "moment": "^2.15.1",
     "morgan": "^1.7.0",
     "morgan": "^1.7.0",
     "passport": "^0.3.2",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
     "passport-local": "^1.0.0",
@@ -41,7 +41,7 @@
     "passport-weixin": "^0.1.0",
     "passport-weixin": "^0.1.0",
     "request-promise": "^3.0.0",
     "request-promise": "^3.0.0",
     "serve-favicon": "^2.3.0",
     "serve-favicon": "^2.3.0",
-    "uuid": "^2.0.2",
+    "uuid": "^2.0.3",
     "winston": "^2.2.0",
     "winston": "^2.2.0",
     "winston-daily-rotate-file": "^1.3.0",
     "winston-daily-rotate-file": "^1.3.0",
     "yoho-node-lib": "0.0.49"
     "yoho-node-lib": "0.0.49"
@@ -58,7 +58,8 @@
     "gulp-postcss": "^6.2.0",
     "gulp-postcss": "^6.2.0",
     "gulp-sourcemaps": "^2.0.0-alpha",
     "gulp-sourcemaps": "^2.0.0-alpha",
     "gulp-util": "^3.0.7",
     "gulp-util": "^3.0.7",
-    "husky": "^0.11.4",
+    "handlebars-loader": "^1.4.0",
+    "husky": "^0.11.8",
     "nodemon": "^1.10.2",
     "nodemon": "^1.10.2",
     "postcss-assets": "^4.0.1",
     "postcss-assets": "^4.0.1",
     "postcss-cachebuster": "^0.1.3",
     "postcss-cachebuster": "^0.1.3",
@@ -69,14 +70,14 @@
     "postcss-position": "^0.5.0",
     "postcss-position": "^0.5.0",
     "postcss-pxtorem": "^3.3.1",
     "postcss-pxtorem": "^3.3.1",
     "postcss-short": "^1.4.0",
     "postcss-short": "^1.4.0",
-    "postcss-sprites": "^3.1.2",
+    "postcss-sprites": "^3.3.0",
     "postcss-use": "^2.3.0",
     "postcss-use": "^2.3.0",
     "precss": "^1.4.0",
     "precss": "^1.4.0",
     "shelljs": "^0.7.0",
     "shelljs": "^0.7.0",
-    "stylelint": "^7.1.0",
+    "stylelint": "^7.3.1",
     "stylelint-config-yoho": "^1.2.7",
     "stylelint-config-yoho": "^1.2.7",
     "webpack": "^1.13.2",
     "webpack": "^1.13.2",
-    "webpack-dev-server": "^1.15.0",
+    "webpack-dev-server": "^1.16.1",
     "webpack-stream": "^3.1.0",
     "webpack-stream": "^3.1.0",
     "yoho-fastclick": "^1.0.6",
     "yoho-fastclick": "^1.0.6",
     "yoho-hammer": "^2.0.7",
     "yoho-hammer": "^2.0.7",
@@ -84,6 +85,7 @@
     "yoho-iscroll": "^5.2.0",
     "yoho-iscroll": "^5.2.0",
     "yoho-jquery": "^2.2.4",
     "yoho-jquery": "^2.2.4",
     "yoho-jquery-lazyload": "^1.9.7",
     "yoho-jquery-lazyload": "^1.9.7",
+    "yoho-jquery-qrcode": "^0.14.0",
     "yoho-mlellipsis": "0.0.3",
     "yoho-mlellipsis": "0.0.3",
     "yoho-swiper": "^3.3.1"
     "yoho-swiper": "^3.3.1"
   }
   }