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

@@ -132,6 +132,7 @@ Session.vim
 *~
 *~
 # auto-generated tag files
 # auto-generated tag files
 tags
 tags
+
 ### VS Code ###
 ### VS Code ###
 .vscode/
 .vscode/
 
 

@@ -18,12 +18,10 @@ const path = require('path');
 const bodyParser = require('body-parser');
 const bodyParser = require('body-parser');
 const cookieParser = require('cookie-parser');
 const cookieParser = require('cookie-parser');
 const favicon = require('serve-favicon');
 const favicon = require('serve-favicon');
-const session = require('yoho-express-session');
-const memcached = require('yoho-connect-memcached');
-const uuid = require('uuid');
+const session = require('express-session');
+const memcached = require('connect-memcached');
 const _ = require('lodash');
 const _ = require('lodash');
 const pkg = require('./package.json');
 const pkg = require('./package.json');
-const sign = require('./library/sign');
 const cookie = require('./library/cookie');
 const cookie = require('./library/cookie');
 
 
 const app = express();
 const app = express();
@@ -52,19 +50,15 @@ app.use(session({
     resave: false,
     resave: false,
     saveUninitialized: true,
     saveUninitialized: true,
     unset: 'destroy',
     unset: 'destroy',
-    secret: 'nothing', // 兼容 PHP SESSION，sessionID 不加密
-    name: 'PHPSESSID', // 兼容 PHP SESSION
-    genid: () => {
-        return uuid.v4(); // 兼容 PHP SESSION
-    },
+    secret: '82dd7e724f2c6870472c89dfa43cf48d',
+    name: 'yohobuy_session',
     cookie: {
     cookie: {
-        domain: 'yohobuy.com',
+        // domain: 'yohobuy.com',
         httpOnly: false
         httpOnly: false
     },
     },
     store: new MemcachedStore({
     store: new MemcachedStore({
         hosts: config.memcache.session,
         hosts: config.memcache.session,
-        prefix: 'qinsessionsession:', // 兼容 PHP SESSION
-        key: 'yohobuy_session' // 兼容 PHP SESSION
+        prefix: 'yohobuy_session:'
     })
     })
 }));
 }));
 
 
@@ -78,14 +72,8 @@ app.use((req, res, next) => {
 
 
     // session 没有读取到的时候，从 cookie 读取 UID
     // session 没有读取到的时候，从 cookie 读取 UID
     if (!req.user.uid && req.cookies._UID) {
     if (!req.user.uid && req.cookies._UID) {
-        let uid = cookie.getUid(req);
-
-        // 校验 cookie 的 uid 有没有被修改
-        if (req.cookies._TOKEN === sign.makeToken(uid)) {
-            req.user.uid = uid;
-        }
+        req.user.uid = cookie.getUid(req);
     }
     }
-
     next();
     next();
 });
 });
 
 

@@ -10,7 +10,10 @@ const sign = require(`${library}/sign`);
  */
  */
 const getPageInfo = (pageInfo) => {
 const getPageInfo = (pageInfo) => {
     var dest = {};
     var dest = {};
-
+    dest.shareTitle = pageInfo.data.shareTitle;
+    dest.shareDesc = pageInfo.data.shareContent;
+    dest.shareImg = pageInfo.data.shareImgUrl;
+    dest.shareLink = pageInfo.data.shareUrl;
     dest.code = pageInfo.code;
     dest.code = pageInfo.code;
     dest.activityID = pageInfo.id;
     dest.activityID = pageInfo.id;
     dest.title = pageInfo.data.h5Title;
     dest.title = pageInfo.data.h5Title;
@@ -18,9 +21,12 @@ const getPageInfo = (pageInfo) => {
     dest.couponPic = pageInfo.data.couponPic;
     dest.couponPic = pageInfo.data.couponPic;
     dest.oldUserCouponPic = pageInfo.data.oldUserCouponPic;
     dest.oldUserCouponPic = pageInfo.data.oldUserCouponPic;
     dest.mobile = pageInfo.data.mobile;
     dest.mobile = pageInfo.data.mobile;
+
+    // 强制活动开始，活动上线产品要求这样设置
+    pageInfo.data.flag = 1;
     if (pageInfo.data.flag === 1) {
     if (pageInfo.data.flag === 1) {
         dest.bgImg = pageInfo.data.activityNormalPic;
         dest.bgImg = pageInfo.data.activityNormalPic;
-    } else if (pageInfo.data.flag !== 1) {
+    } else {
         dest.bgImg = pageInfo.data.activityEndPic;
         dest.bgImg = pageInfo.data.activityEndPic;
         dest.ended = true;
         dest.ended = true;
     }
     }

@@ -13,10 +13,10 @@ const coupon = require(`${cRoot}/coupon`);
 
 
 // routers
 // routers
 
 
-router.get('/index', coupon.index);
+router.get('/coupon', coupon.index);
 
 
-router.get('/phone', coupon.getCoupon);
+router.get('/coupon/phone', coupon.getCoupon);
 
 
-router.get('/verify', coupon.verify);
+router.get('/coupon/verify', coupon.verify);
 
 
 module.exports = router;
 module.exports = router;

@@ -10,6 +10,11 @@
     <p class="hidden" id="newUser">{{newUser}}</p>
     <p class="hidden" id="newUser">{{newUser}}</p>
     <p class="hidden" id="tipMessage">{{message}}</p>
     <p class="hidden" id="tipMessage">{{message}}</p>
     <p class="hidden" id="activityID">{{activityID}}</p>
     <p class="hidden" id="activityID">{{activityID}}</p>
+    <input type="hidden" id="shareTitle" value="{{shareTitle}}">
+    <input type="hidden" id="shareDesc" value="{{shareDesc}}">
+    <input type="hidden" id="shareImg" value="{{shareImg}}">
+    <input type="hidden" id="shareLink" value="{{shareLink}}">
+    
     <div class="page">
     <div class="page">
         <div class="gain-coupon-centent hidden">
         <div class="gain-coupon-centent hidden">
             <div class="coupon">
             <div class="coupon">

@@ -6,7 +6,7 @@
 
 
 'use strict';
 'use strict';
 const passport = require('passport');
 const passport = require('passport');
-const WeixinStrategy = require('passport-weixin-plus');
+const WeixinStrategy = require('passport-weixin');
 
 
 const config = require('../../config/common');
 const config = require('../../config/common');
 
 
@@ -15,14 +15,14 @@ let siteUrl = config.siteUrl.indexOf('//') === 0 ? 'http:' + config.siteUrl : co
 /**
 /**
  * wechat登录
  * wechat登录
  */
  */
-passport.use(new WeixinStrategy({
-    authorizationURL: 'https://open.weixin.qq.com/connect/oauth2/authorize',
-    tokenURL: 'https://api.weixin.qq.com/sns/oauth2/access_token',
+
+passport.use('weixin', new WeixinStrategy({
     clientID: config.thirdLogin.wechat.appID,
     clientID: config.thirdLogin.wechat.appID,
     clientSecret: config.thirdLogin.wechat.appSecret,
     clientSecret: config.thirdLogin.wechat.appSecret,
     callbackURL: `${siteUrl}/passport/login/wechat/callback`,
     callbackURL: `${siteUrl}/passport/login/wechat/callback`,
-    requireState: false,
+    requireState: true,
+    authorizationURL: 'https://open.weixin.qq.com/connect/oauth2/authorize',
     scope: 'snsapi_userinfo'
     scope: 'snsapi_userinfo'
-}, (accessToken, refreshToken, profile, done) => {
+}, function(accessToken, refreshToken, profile, done) {
     done(null, profile);
     done(null, profile);
 }));
 }));

@@ -7,6 +7,7 @@
 
 
 const library = '../../../library';
 const library = '../../../library';
 const passport = require('passport');
 const passport = require('passport');
+const uuid = require('uuid');
 const cookie = require(`${library}/cookie`);
 const cookie = require(`${library}/cookie`);
 const helpers = require(`${library}/helpers`);
 const helpers = require(`${library}/helpers`);
 const log = require(`${library}/logger`);
 const log = require(`${library}/logger`);
@@ -42,7 +43,6 @@ function doPassportCallback(openId, nickname, sourceType, req, res) {
                 });
                 });
             }
             }
         }).then((redirectTo) => {
         }).then((redirectTo) => {
-            console.log('redirectTo=', redirectTo);
             return res.redirect(redirectTo);
             return res.redirect(redirectTo);
         }).catch((e) => {
         }).catch((e) => {
             log.error('频道页面渲染错误:' + JSON.stringify(e));
             log.error('频道页面渲染错误:' + JSON.stringify(e));
@@ -64,7 +64,9 @@ const wechat = {
         next();
         next();
     },
     },
     login: (req, res, next) => {
     login: (req, res, next) => {
-        return passport.authenticate('weixin')(req, res, next);
+        return passport.authenticate('weixin', {
+            state: uuid.v4()
+        })(req, res, next);
     },
     },
     callback: (req, res, next) => {
     callback: (req, res, next) => {
         passport.authenticate('weixin', (err, user) => {
         passport.authenticate('weixin', (err, user) => {
@@ -72,8 +74,8 @@ const wechat = {
                 log.error(`wechat authenticate error : ${JSON.stringify(err)}`);
                 log.error(`wechat authenticate error : ${JSON.stringify(err)}`);
                 return res.redirect(loginPage);
                 return res.redirect(loginPage);
             }
             }
-            let nickname = user.displayName || user._json.nickname;
-            let openId = user.id || user._json.unionid;
+            let nickname = user._json.nickname || user.displayName;
+            let openId = user._json.unionid || user.id;
 
 
             doPassportCallback(openId, nickname, 'wechat', req, res);
             doPassportCallback(openId, nickname, 'wechat', req, res);
         })(req, res, next);
         })(req, res, next);

@@ -13,8 +13,8 @@ module.exports = {
     port: 6001,
     port: 6001,
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     domains: {
     domains: {
-        api: 'http://testapi.yoho.cn:58078/',
-        service: 'http://testservice.yoho.cn:58077/'
+        api: 'http://testapi.yoho.cn:28078/',
+        service: 'http://testservice.yoho.cn:28077/'
     },
     },
     useOneapm: false,
     useOneapm: false,
     useCache: false,
     useCache: false,
@@ -64,9 +64,9 @@ if (isProduction) {
             service: 'http://service.yoho.yohoops.org/'
             service: 'http://service.yoho.yohoops.org/'
         },
         },
         memcache: {
         memcache: {
-            master: ['172.31.22.1:12111', '172.31.20.56:12111', '172.31.31.146:12111'],
-            slave: ['172.31.22.1:12112', '172.31.20.56:12112', '172.31.31.146:12112'],
-            session: ['172.31.22.1:12111', '172.31.20.56:12111', '172.31.31.146:12111'],
+            master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
+            slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'],
+            session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             timeout: 1000,
             timeout: 1000,
             retries: 0
             retries: 0
         },
         },

@@ -15,5 +15,5 @@ module.exports = app => {
     app.use('/product', require('./apps/product'));
     app.use('/product', require('./apps/product'));
     app.use('/guang', require('./apps/guang'));
     app.use('/guang', require('./apps/guang'));
     app.use('/passport', require('./apps/passport'));
     app.use('/passport', require('./apps/passport'));
-    app.use('/coupon', require('./apps/coupon'));
+    app.use('/activity', require('./apps/activity'));
 };
 };

@@ -17,6 +17,7 @@
         <script type="text/javascript">
         <script type="text/javascript">
             (function(d,c){var e=d.documentElement,a="orientationchange" in window?"orientationchange":"resize",b=function(){var f=e.clientWidth;if(!f){return}if(f>=640){e.style.fontSize="40px"}else{e.style.fontSize=40*(f/640)+"px"}};if(!d.addEventListener){return}b();c.addEventListener(a,b,false);d.addEventListener("DOMContentLoaded",b,false)})(document,window);
             (function(d,c){var e=d.documentElement,a="orientationchange" in window?"orientationchange":"resize",b=function(){var f=e.clientWidth;if(!f){return}if(f>=640){e.style.fontSize="40px"}else{e.style.fontSize=40*(f/640)+"px"}};if(!d.addEventListener){return}b();c.addEventListener(a,b,false);d.addEventListener("DOMContentLoaded",b,false)})(document,window);
         </script>
         </script>
+        <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
         {{#if devEnv}}
         {{#if devEnv}}
             <link rel="stylesheet" href="//localhost:5001/css/index.css">
             <link rel="stylesheet" href="//localhost:5001/css/index.css">
         {{^}}
         {{^}}

@@ -4,6 +4,7 @@
  * @return {[string]}
  * @return {[string]}
  */
  */
 'use strict';
 'use strict';
+const sign = require('./sign');
 
 
 exports.getUid = (req) => {
 exports.getUid = (req) => {
     const cookie = req.cookies._UID;
     const cookie = req.cookies._UID;
@@ -21,6 +22,11 @@ exports.getUid = (req) => {
         }
         }
     }
     }
 
 
+    // 校验 cookie 的 uid 有没有被修改
+    if (req.cookies._TOKEN !== sign.makeToken(_uid)) {
+        _uid = 0;
+    }
+
     return _uid;
     return _uid;
 };
 };
 
 

@@ -33,9 +33,11 @@
   "dependencies": {
   "dependencies": {
     "bluebird": "^3.4.0",
     "bluebird": "^3.4.0",
     "body-parser": "^1.15.0",
     "body-parser": "^1.15.0",
+    "connect-memcached": "^0.2.0",
     "cookie-parser": "^1.4.3",
     "cookie-parser": "^1.4.3",
     "express": "^4.13.1",
     "express": "^4.13.1",
     "express-handlebars": "^3.0.0",
     "express-handlebars": "^3.0.0",
+    "express-session": "^1.13.0",
     "influxdb-winston": "^1.0.1",
     "influxdb-winston": "^1.0.1",
     "lodash": "^4.13.1",
     "lodash": "^4.13.1",
     "md5": "^2.1.0",
     "md5": "^2.1.0",
@@ -44,15 +46,12 @@
     "morgan": "^1.7.0",
     "morgan": "^1.7.0",
     "oneapm": "^1.2.20",
     "oneapm": "^1.2.20",
     "passport": "^0.3.2",
     "passport": "^0.3.2",
-    "passport-weixin-plus": "0.0.4",
+    "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.2",
     "winston": "^2.2.0",
     "winston": "^2.2.0",
-    "winston-daily-rotate-file": "^1.1.3",
-    "yoho-connect-memcached": "^1.0.3",
-    "yoho-express-session": "^1.0.3",
-    "yoho-iscroll": "0.0.1"
+    "winston-daily-rotate-file": "^1.1.4"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "autoprefixer": "^6.3.6",
     "autoprefixer": "^6.3.6",
@@ -85,7 +84,7 @@
     "precss": "^1.4.0",
     "precss": "^1.4.0",
     "rewire": "^2.5.1",
     "rewire": "^2.5.1",
     "shelljs": "^0.7.0",
     "shelljs": "^0.7.0",
-    "stylelint": "^6.5.1",
+    "stylelint": "^6.6.0",
     "stylelint-config-yoho": "^1.2.3",
     "stylelint-config-yoho": "^1.2.3",
     "webpack": "^1.13.1",
     "webpack": "^1.13.1",
     "webpack-dev-server": "^1.14.1",
     "webpack-dev-server": "^1.14.1",

@@ -205,6 +205,7 @@ gulp.task('webpack', () => {
     var proConfig = Object.assign({}, webpackConfig);
     var proConfig = Object.assign({}, webpackConfig);
 
 
     proConfig.output.path = dist.js;
     proConfig.output.path = dist.js;
+    proConfig.plugins = [new webpack.optimize.UglifyJsPlugin()];
     webpack(proConfig, (err, stats) => {
     webpack(proConfig, (err, stats) => {
         if (err) {
         if (err) {
             throw new gutil.PluginError('webpack', err);
             throw new gutil.PluginError('webpack', err);

@@ -6,7 +6,14 @@ var $ = require('yoho-jquery'),
     oldUserCouponPic = $('#oldUserCouponPic').html(),
     oldUserCouponPic = $('#oldUserCouponPic').html(),
     newUserCouponPic = $('#newUserCouponPic').html(),
     newUserCouponPic = $('#newUserCouponPic').html(),
     tipMessage = $('#tipMessage').html(),
     tipMessage = $('#tipMessage').html(),
-    activityID = $('#activityID').html();
+    activityID = $('#activityID').html(),
+    pageInfo = $('#pageInfo').html(),
+    _weChatInterface = 'http://www.yohoshow.com/api/wechat/getSignPackage',
+    shareTitle = $('#shareTitle').val(),
+    shareImg = $('#shareImg').val(),
+    shareDesc = $('#shareDesc').val(),
+    shareLink = $('#shareLink').val(),
+    wx = window.wx;
 
 
 $('#phone').bind('input propertychange', function() {
 $('#phone').bind('input propertychange', function() {
     if ($(this).val().length === 11) {
     if ($(this).val().length === 11) {
@@ -42,8 +49,90 @@ if (!$('#newUser').html()) {
     $('.gain-coupon-centent .coupon img').attr('src', oldUserCouponPic);
     $('.gain-coupon-centent .coupon img').attr('src', oldUserCouponPic);
 }
 }
 
 
-$('.input-content').on('click', '.verification-code', function() {
-    $('.input-content div').eq('0').removeClass('verification-code');
+/**
+ * 微信分享
+ */
+if (typeof wx !== 'undefined') {
+    $.getJSON(_weChatInterface + '?pageurl=' +
+        encodeURIComponent(location.href.split('#')[0]) + '&callback=?',
+        function(json) {
+            var _appId, _timestamp, _nonceStr, _signature;
+
+            if (json) {
+                _appId = json.appId.toString();
+                _timestamp = json.timestamp;
+                _nonceStr = json.nonceStr.toString();
+                _signature = json.signature.toString();
+
+                wx.config({
+                    debug: false,
+                    appId: _appId,
+                    timestamp: _timestamp,
+                    nonceStr: _nonceStr,
+                    signature: _signature,
+                    jsApiList: [
+                        'checkJsApi',
+                        'onMenuShareTimeline',
+                        'onMenuShareAppMessage',
+                        'onMenuShareQQ',
+                        'onMenuShareWeibo',
+                        'hideMenuItems',
+                        'showMenuItems',
+                        'hideAllNonBaseMenuItem',
+                        'showAllNonBaseMenuItem',
+                        'translateVoice',
+                        'startRecord',
+                        'stopRecord',
+                        'onRecordEnd',
+                        'playVoice',
+                        'pauseVoice',
+                        'stopVoice',
+                        'uploadVoice',
+                        'downloadVoice',
+                        'chooseImage',
+                        'previewImage',
+                        'uploadImage',
+                        'downloadImage',
+                        'getNetworkType',
+                        'openLocation',
+                        'getLocation',
+                        'hideOptionMenu',
+                        'showOptionMenu',
+                        'closeWindow',
+                        'scanQRCode',
+                        'chooseWXPay',
+                        'openProductSpecificView',
+                        'addCard',
+                        'chooseCard',
+                        'openCard'
+                    ]
+                });
+            }
+        });
+
+    wx.ready(function() {
+        var shareData = {
+            title: shareTitle,
+            desc: shareDesc,
+            imgUrl: shareImg,
+            link: shareLink
+        };
+
+        // 分享给朋友
+        wx.onMenuShareAppMessage(shareData);
+
+        // 分享到朋友圈
+        wx.onMenuShareTimeline(shareData);
+
+        // 分享到QQ
+        wx.onMenuShareQQ(shareData);
+
+        // 分享到微博
+        wx.onMenuShareWeibo(shareData);
+    });
+}
+
+$('.input-content  div').on('click', function() {
     phone = $(this).siblings('input').val();
     phone = $(this).siblings('input').val();
     reg = /[0-9]{11}/;
     reg = /[0-9]{11}/;
     if (!reg.test(phone)) {
     if (!reg.test(phone)) {
@@ -58,12 +147,11 @@ $('.input-content').on('click', '.verification-code', function() {
         return;
         return;
     }
     }
     $.ajax({
     $.ajax({
-        url: '/coupon/phone',
+        url: '/activity/coupon/phone',
         data: {
         data: {
             mobile: $('#phone').val(),
             mobile: $('#phone').val(),
             ordercode: orderCode
             ordercode: orderCode
         },
         },
-        dataType: 'json',
         success: function(data) {
         success: function(data) {
             if (data.result.code === 200) {
             if (data.result.code === 200) {
                 if (window._yas) {
                 if (window._yas) {
@@ -122,11 +210,15 @@ $('.input-content').on('click', '.verification-code', function() {
                 }, 1400);
                 }, 1400);
             }
             }
         },
         },
-        error: function(data) {
+        error: function() {
             $('#dialog').removeClass('hidden');
             $('#dialog').removeClass('hidden');
             $('.mask').removeClass('hidden');
             $('.mask').removeClass('hidden');
             $('#dialog .content').html('<p class="phone-error">网络错误，稍后再试！<p>');
             $('#dialog .content').html('<p class="phone-error">网络错误，稍后再试！<p>');
-            console.log(data);
+            setTimeout(function() {
+                $('.messages').addClass('hidden');
+                $('.mask').addClass('hidden');
+                $('#dialog .content').html(' ');
+            }, 1400);
         }
         }
     });
     });
 });
 });
@@ -134,7 +226,7 @@ $('.input-content').on('click', '.get', function() {
     $('.input-content div').eq('1').removeClass('get');
     $('.input-content div').eq('1').removeClass('get');
     if ($(this).siblings('input').val().length === 4) {
     if ($(this).siblings('input').val().length === 4) {
         $.ajax({
         $.ajax({
-            url: '/coupon/verify',
+            url: '/activity/coupon/verify',
             data: {
             data: {
                 identifycode: $('#verification').val(),
                 identifycode: $('#verification').val(),
                 mobile: $('#phone').val(),
                 mobile: $('#phone').val(),
@@ -211,11 +303,15 @@ $('.input-content').on('click', '.get', function() {
                     }, 1400);
                     }, 1400);
                 }
                 }
             },
             },
-            error: function(data) {
+            error: function() {
                 $('#dialog').removeClass('hidden');
                 $('#dialog').removeClass('hidden');
                 $('.mask').removeClass('hidden');
                 $('.mask').removeClass('hidden');
                 $('#dialog .content').html('<p class="phone-error">网络错误，稍后再试！<p>');
                 $('#dialog .content').html('<p class="phone-error">网络错误，稍后再试！<p>');
-                console.log(data);
+                setTimeout(function() {
+                    $('.messages').addClass('hidden');
+                    $('.mask').addClass('hidden');
+                    $('#dialog .content').html(' ');
+                }, 1400);
             }
             }
         });
         });
     } else {
     } else {
@@ -243,7 +339,7 @@ $('.description').on('click', function() {
     $('.mask').removeClass('hidden');
     $('.mask').removeClass('hidden');
 });
 });
 
 
-$('.input-content').on('click', '.get', function() {
+$('.use-coupon-btn').on('click', function() {
     if (window._yas) {
     if (window._yas) {
         window._yas.sendCustomInfo({
         window._yas.sendCustomInfo({
             activityID: activityID
             activityID: activityID

@@ -9,7 +9,7 @@ var $ = require('yoho-jquery'),
 
 
 var search = require('./sale/search');
 var search = require('./sale/search');
 
 
-require('../common/common');
+require('../common');
 
 
 search.start();
 search.start();
 
 

@@ -210,7 +210,7 @@ exports.processFilter = (list, options) => {
             subs: []
             subs: []
         };
         };
 
 
-        if (key === 'group_sort') {
+        if (key === 'group_sort' || !filtersType[key]) {
             return;
             return;
         }
         }