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

@@ -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'}}" />
+            <img class="logo" src="{{imgSrc 'img/activity/invite/logo.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 +16,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>

@@ -26,7 +26,7 @@
         <i class="title-pic"></i>
         <i class="title-pic"></i>
     </header>
     </header>
     <div class="content">
     <div class="content">
-            <a href='/home/mycurrency?openby:yohobuy＝{"action":"go.signin"}' class="d-chit-more"></a>
+            <a href='/home/mycurrency{{#if isApp}}?openby:yohobuy＝{"action":"go.signin"}{{/if}}' class="d-chit-more"></a>
         <ul class="clearfix">
         <ul class="clearfix">
             <li class="item item-1 pull-left" id="js-qiandao">
             <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'}}">-->
                 <!--<a href="http://m.yohobuy.com/home/mycurrency?openby:yohobuy={'action':'go.h5','params':{'islogin':'Y','url':'http://m.yohobuy.com/home/mycurrency'}}">-->
@@ -83,7 +83,7 @@
                 {{/each}}
                 {{/each}}
             </ul>
             </ul>
             <div class="text-center">
             <div class="text-center">
-                <a href='http://sale.yohobuy.com/?channel=&specialsale_id=7?openby:yohobuy={"action":"go.vippro"}' class="vip-goods-more">点击查看更多</a>
+                <a href='https://m.yohobuy.com/product/sale/vip?channel={{channel}}&openby:yohobuy={"action":"go.vippro"}' class="vip-goods-more">点击查看更多</a>
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>

@@ -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];
     }
     }

@@ -16,16 +16,9 @@ module.exports = {
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//localhost:5001',
     assetUrl: '//localhost:5001',
     domains: {
     domains: {
-         api: 'http://dev-api.yohops.com:9999/',
-        // service: 'http://devservice.yoho.cn:58077/'
-        // api: 'http://api.yoho.cn/',
-        service: 'http://192.168.102.14:8090',
-        // service: 'http://service.yoho.cn/',
+        api: 'http://api-test3.yohops.com:9999/',
+        service: 'http://service-test3.yohops.com:9999/',
         liveApi: 'http://testapi.live.yohops.com:9999/'
         liveApi: 'http://testapi.live.yohops.com:9999/'
-
-        // api: 'http://api.yoho.cn/',
-        // service: 'http://service.yoho.cn/',
-        // liveApi: 'http://testapi.live.yohops.com:9999/'
     },
     },
     subDomains: {
     subDomains: {
         host: '.m.yohobuy.com',
         host: '.m.yohobuy.com',

@@ -2,7 +2,15 @@
 <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 <script>
 <script>
 var _hmt = _hmt || [];
 var _hmt = _hmt || [];
+
 function async_load(){
 function async_load(){
+    (function() {
+        var hm = document.createElement("script");
+        hm.src = "//hm.baidu.com/hm.js?e5b83a487a4458aa5abca43f5779b764";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+    })();
+
     (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
     (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
             new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
             new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
             j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
             j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "4.9.27",
+  "version": "4.9.28",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {
@@ -38,7 +38,7 @@
     "cookie-parser": "^1.4.3",
     "cookie-parser": "^1.4.3",
     "express": "^4.14.0",
     "express": "^4.14.0",
     "express-handlebars": "^3.0.0",
     "express-handlebars": "^3.0.0",
-    "express-session": "^1.14.0",
+    "express-session": "^1.14.1",
     "influxdb-winston": "^1.0.1",
     "influxdb-winston": "^1.0.1",
     "lodash": "^4.16.1",
     "lodash": "^4.16.1",
     "md5": "^2.1.0",
     "md5": "^2.1.0",

@@ -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);
 
 

@@ -41,8 +41,8 @@ var page = {
         share({
         share({
             title: '有货【会员日】开启啦！9月28日潮集狂欢趴等你来HI！限时6大福利，快参与起来喽~',
             title: '有货【会员日】开启啦！9月28日潮集狂欢趴等你来HI！限时6大福利，快参与起来喽~',
             link: location.href,
             link: location.href,
-            desc: 'YOHO！BUY',
-            imgUrl: 'http://static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png'
+            desc: 'm.yohobuy.com',
+            imgUrl: 'http://img10.static.yhbimg.com/taobaocms/2016/09/23/18/010ccac2955e7e50ffb66b75110e73e3e1.png'
         });
         });
     },
     },
 
 
@@ -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,15 +10,6 @@
     font-family: "Microsoft YaHei";
     font-family: "Microsoft YaHei";
     color: #fff;
     color: #fff;
 
 
-    .intro-title {
-        margin-top: 90px;
-    }
-    /* 手机号 领福利 */
-    .invite-content-page {
-
-        text-align: center;
-        color: #fff;
-
     .banner {
     .banner {
         width: 445px;
         width: 445px;
         height: 359px;
         height: 359px;
@@ -32,6 +23,17 @@
         margin-bottom: 10px;
         margin-bottom: 10px;
     }
     }
 
 
+    .intro-title {
+        // margin-top: 90px;
+    }
+    /* 手机号 领福利 */
+    .invite-content-page {
+
+        text-align: center;
+        color: #fff;
+
+
+
         .bold {
         .bold {
             font-weight: bold;
             font-weight: bold;
         }
         }

@@ -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%;
         }
         }
         
         
@@ -247,7 +247,7 @@
 
 
     .vip-good-show {
     .vip-good-show {
         width: 220px;
         width: 220px;
-        height: 155px;
+        height: calc(220 * 4 / 3px);
     }
     }
 
 
     .vip-good-price {
     .vip-good-price {
@@ -298,8 +298,10 @@
     .vip-good-name {
     .vip-good-name {
         font-size: 20px;
         font-size: 20px;
         color: #fff;
         color: #fff;
-        height: 2em;
+        height: calc(2*20*1.4px);
         margin-bottom: 10px;
         margin-bottom: 10px;
+        margin-left: 5px;
+        margin-right: 5px;
     }
     }
 
 
     .vip-good-fav {
     .vip-good-fav {
@@ -315,7 +317,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%;
     }
     }
 }
 }
@@ -438,7 +440,7 @@
         z-index: 1;
         z-index: 1;
         background-color: #131313;
         background-color: #131313;
         color: #345abc;
         color: #345abc;
-        text-shadow: 0px 0px 5px #0919f5;
+        text-shadow: 0 0 5px #0919f5;
 
 
         li {
         li {
             position: relative;
             position: relative;