Merge remote-tracking branch 'origin/feature/VIP_DAY'

@@ -41,7 +41,7 @@ exports.beforeIn = (req, res, next) => {
 
 
 exports.index = (req, res, next) => {
 exports.index = (req, res, next) => {
     res.locals.module = 'activity';
     res.locals.module = 'activity';
-    res.locals.page = 'vipday_entry';
+    res.locals.page = 'vipday-entry';
     res.locals.width750 = true;
     res.locals.width750 = true;
 
 
     let cate = {
     let cate = {
@@ -50,7 +50,7 @@ exports.index = (req, res, next) => {
         goods3: [51374524, 51338322, 51344316]
         goods3: [51374524, 51338322, 51344316]
     };
     };
 
 
-    if (req.app.get('env') !== 'product') {
+    if (req.app.get('env') !== 'production') {
         cate = {
         cate = {
             goods1: [512581904, 512581902, 512581900],
             goods1: [512581904, 512581902, 512581900],
             goods2: [512581822, 512581816, 512581812],
             goods2: [512581822, 512581816, 512581812],
@@ -79,7 +79,7 @@ exports.index = (req, res, next) => {
 
 
 exports.crazyWheel = (req, res, next) => {
 exports.crazyWheel = (req, res, next) => {
     res.locals.module = 'activity';
     res.locals.module = 'activity';
-    res.locals.page = 'vipday_wheel';
+    res.locals.page = 'vipday-wheel';
     res.locals.width750 = true;
     res.locals.width750 = true;
 
 
     if (!req.session.playwheel) {
     if (!req.session.playwheel) {
@@ -103,7 +103,7 @@ exports.crazyLuck = (req, res, next) => {
     const uid = req.user.uid;
     const uid = req.user.uid;
 
 
     res.locals.module = 'activity';
     res.locals.module = 'activity';
-    res.locals.page = 'vipday_luck';
+    res.locals.page = 'vipday-luck';
     res.locals.width750 = true;
     res.locals.width750 = true;
 
 
     co(function* () {
     co(function* () {

 <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" />-->
-            <!--<br />-->
+            <img class="banner" src="{{imgSrc 'img/activity/invite/title_new.png'}}" />
+            <br />
             <p class="fz14 intro-title">
             <p class="fz14 intro-title">
                 只需1位小伙伴领取，<br/>
                 只需1位小伙伴领取，<br/>
                 即得<strong class="fz17">10元现金券</strong>！<br/>
                 即得<strong class="fz17">10元现金券</strong>！<br/>
@@ -15,7 +15,7 @@
             </p>
             </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">
+            <ol class="rule-con hide">
                 <li>本次活动所获现金券仅限Yoho!Buy有货商城购买商品使用，不得转借他人，不可兑换现金；</li>
                 <li>本次活动所获现金券仅限Yoho!Buy有货商城购买商品使用，不得转借他人，不可兑换现金；</li>
                 <li>一个订单只可使用一张优惠券，优惠券需在有效期内使用，过期则无法使用；</li>
                 <li>一个订单只可使用一张优惠券，优惠券需在有效期内使用，过期则无法使用；</li>
                 <li>使用优惠券支付的订单，退款结算按照实际支付金额退款，优惠券返还账户，且有效期不变；</li>
                 <li>使用优惠券支付的订单，退款结算按照实际支付金额退款，优惠券返还账户，且有效期不变；</li>

@@ -187,7 +187,7 @@ gulp.task('webpack-dev-server', () => {
 
 
     new WebpackDevServer(webpack(devConfig), {
     new WebpackDevServer(webpack(devConfig), {
         contentBase: '.',
         contentBase: '.',
-        publicPath: '//localhost:5001/',
+        publicPath: 'http://localhost:5001/',
         hot: true,
         hot: true,
         stats: {
         stats: {
             colors: true
             colors: true

@@ -83,7 +83,7 @@ Game.prototype._anim = function(stopLocation, coin) {
 
 
         newLocation = newLocation > 8 ? newLocation - 8 : newLocation;
         newLocation = newLocation > 8 ? newLocation - 8 : newLocation;
 
 
-        console.log(newLocation);
+        // console.log(newLocation);
 
 
         setActive(newLocation);
         setActive(newLocation);
 
 

@@ -209,7 +209,7 @@ var page = {
                 oneMsgH = $msgRoll[0].getBoundingClientRect().height - 6;
                 oneMsgH = $msgRoll[0].getBoundingClientRect().height - 6;
                 onePageH = $fragClone[0].offsetTop;
                 onePageH = $fragClone[0].offsetTop;
 
 
-                console.log(oneMsgH);
+                // console.log(oneMsgH);
 
 
                 function rolling() {
                 function rolling() {
 
 

@@ -4,7 +4,7 @@ require('plugin/modal.alert');
 require('../common');
 require('../common');
 var yoho = require('js/yoho-app');
 var yoho = require('js/yoho-app');
 var tip = require('plugin/tip');
 var tip = require('plugin/tip');
-var Game = require('./vip_day/game');
+var Game = require('./vip-day/game');
 
 
 window.$ = $;
 window.$ = $;
 
 
@@ -25,7 +25,7 @@ function getAwards($container) {
 
 
             var $frag = $(document.createDocumentFragment());
             var $frag = $(document.createDocumentFragment());
 
 
-            if (!res.data.length) {
+            if (!res.data) {
                 $frag.append('<li><div class="text-center">快试试手气吧~</div></li>');
                 $frag.append('<li><div class="text-center">快试试手气吧~</div></li>');
             } else {
             } else {
                 $.each(res.data, function(i, li) {
                 $.each(res.data, function(i, li) {

@@ -3,7 +3,7 @@
 require('plugin/modal.alert');
 require('plugin/modal.alert');
 require('../common');
 require('../common');
 var yoho = require('js/yoho-app');
 var yoho = require('js/yoho-app');
-var Game = require('./vip_day/game');
+var Game = require('./vip-day/game');
 
 
 window.$ = $;
 window.$ = $;
 
 
@@ -35,7 +35,7 @@ $(function() {
     }, 5000);
     }, 5000);
 
 
     game.onsuccess = function(score) {
     game.onsuccess = function(score) {
-        console.log(score);
+        // console.log(score);
         upPlayers(1);
         upPlayers(1);
         $.yAlert({
         $.yAlert({
             class: 'vipday-game-alert',
             class: 'vipday-game-alert',

@@ -10,6 +10,12 @@
     font-family: "Microsoft YaHei";
     font-family: "Microsoft YaHei";
     color: #fff;
     color: #fff;
 
 
+    .banner {
+        width: 445px;
+        height: 359px;
+        margin-top: 50px;
+    }
+
     .intro-title {
     .intro-title {
         margin-top: 90px;
         margin-top: 90px;
     }
     }
@@ -19,11 +25,6 @@
         text-align: center;
         text-align: center;
         color: #fff;
         color: #fff;
 
 
-        .banner {
-            width: 445px;
-            height: 359px;
-            margin-top: 50px;
-        }
 
 
         .logo {
         .logo {
             width: 328px;
             width: 328px;

@@ -3,7 +3,7 @@
 }
 }
 
 
 .vip-day-header {
 .vip-day-header {
-    background: resolve("activity/vip_day/activity.png");
+    background: resolve("activity/vip_day/activity.jpg");
     background-size: 100% 100%;
     background-size: 100% 100%;
     height: 466px;
     height: 466px;
     /*box-shadow: inset -6px -6px 7px rgba(15, 5, 10, 0.32);*/
     /*box-shadow: inset -6px -6px 7px rgba(15, 5, 10, 0.32);*/
@@ -161,8 +161,8 @@
         }
         }
 
 
         .content {
         .content {
-            height: 224px;
-            background: no-repeat center center resolve('activity/vip_day/vip-boot-pic.png');
+            height: 263px;
+            background: no-repeat center center resolve('activity/vip_day/vip-boot-pic.jpg');
             background-size: 100% 100%;
             background-size: 100% 100%;
         }
         }
         
         
@@ -315,7 +315,7 @@
         margin-bottom: 56px;
         margin-bottom: 56px;
         color: transparent;
         color: transparent;
         height: 297px;
         height: 297px;
-        background-image: resolve('activity/vip_day/invite.png');
+        background-image: resolve('activity/vip_day/invite.jpg');
         background-size: 100% 100%;
         background-size: 100% 100%;
     }
     }
 }
 }