Merge branch 'master' into feature/zerobuy

@@ -16,7 +16,7 @@ const TABLE_ACT_PRIZE_PRODUCT_USER = 'act_prize_product_user';
 const MINUTE_TIMES = 60;
 const PRODUCT_CACHE_TIMES = MINUTE_TIMES / 6; // 商品（列表&详情）缓存时间
 const RECENT_CODE_CACHE_TIME = MINUTE_TIMES / 12; // 最近获取记录缓存时间
-const MAX_JOIN_TIMES = 5; // 最大活动参与次数
+const MAX_JOIN_TIMES = 100; // 最大活动参与次数
 const MAX_RECOMEND_NUM = 10; // 最大推荐活动数目
 const PAGE_SIZE = 10;
 

@@ -41,7 +41,7 @@ const shoes = {
             } else {
                 let addFriend = await req.ctx(ShoesModel).addFriends(actId, unionId, friendUnionId);
 
-                console.log(addFriend);
+                // console.log(addFriend);
                 return res.json({
                     code: 200,
                     data: addFriend,

@@ -204,7 +204,8 @@ const yohood = {
     async getCoupon(req, res) {
         let {uid, couponId} = req.query;
 
-        console.log(uid, couponId);
+        // console.log(uid, couponId);
+        uid = parseInt(uid, 10);
 
         if (!uid || !couponId) {
             return res.json({

@@ -104,7 +104,7 @@ const y100 = {
     async y100DeviceScan(req, res, next) {
         const {openId, avatar, deviceNo, actId, userName} = req.body;
 
-        console.log(req.body);
+        // console.log(req.body);
         if (!deviceNo || !openId) {
             return res.json({
                 code: 400

@@ -187,7 +187,8 @@ const userController = {
         if (referer && (referer.indexOf('yoho.cn') >= 0)) {
             _.set(req.session, 'user.wechatReferer', referer);
             _.set(req.session, 'user.wechatState', state);
-            console.log(req.session);
+
+            // console.log(req.session);
             res.redirect(WECHAT_LOGIN_URL);
         } else {
             res.json({
@@ -278,7 +279,7 @@ const userController = {
         }
 
 
-        console.log('wechatUserCallBack:', wechatUserInfo);
+        // console.log('wechatUserCallBack:', wechatUserInfo);
         let user_name = '',
             head_img = '',
             union_id = '';

@@ -37,7 +37,7 @@ module.exports = {
     },
     corsAllowOrigin: [
         'http://localhost:8081',
-        'http://localhost:9000',
+        'http://localhost:8888',
         'http://localhost:1234',
         'http://localhost:63342',
         'http://huodong.yoho.cn',
@@ -147,6 +147,7 @@ if (isProduction) {
             'https://ad.yoho.cn',
             'http://feature.yoho.cn',
             'https://feature.yoho.cn',
+            'http://yunhuodong.net',
             'http://huodong.yoho.cn',
             'https://huodong.yoho.cn',
             'http://ad.yhurl.com'