Merge branch 'hotfix/activity' into 'gray'

get-app-info



See merge request !1111

@@ -85,18 +85,18 @@ exports.couponSend = (req, res, next) => {
     }
     }
 
 
     // 接口要加 session 校验，跨域异步请求未添加相关参数
     // 接口要加 session 校验，跨域异步请求未添加相关参数
-    // if (req.yoho.isApp) {
-    //     if (app.app_version && app.client_type && app.session_key && app.uid) {
-    //         uid = {
-    //             toString: () => {
-    //                 return _.parseInt(app.uid);
-    //             },
-    //             sessionKey: app.session_key,
-    //             appVersion: app.app_version,
-    //             appSessionType: app.client_type
-    //         };
-    //     }
-    // }
+    if (req.yoho.isApp) {
+        if (app.app_version && app.client_type && app.session_key && app.uid) {
+            uid = {
+                toString: () => {
+                    return _.parseInt(app.uid);
+                },
+                sessionKey: app.session_key,
+                appVersion: app.app_version,
+                appSessionType: app.client_type
+            };
+        }
+    }
 
 
     model.couponSend(uid, token, app).then(result => {
     model.couponSend(uid, token, app).then(result => {
         res.set({
         res.set({

 'use strict';
 'use strict';
 const moment = require('moment');
 const moment = require('moment');
+const _ = require('lodash');
 const model = require('../models/individuation');
 const model = require('../models/individuation');
 const channels = {
 const channels = {
     boys: 1,
     boys: 1,
@@ -73,6 +74,18 @@ exports.productLst = function(req, res, next) {
 exports.coupon = function(req, res, next) {
 exports.coupon = function(req, res, next) {
     let activity_template_id = req.query.activity_id;
     let activity_template_id = req.query.activity_id;
     let uid = req.user.uid || req.query.uid;
     let uid = req.user.uid || req.query.uid;
+    let app = req.query.app;
+
+    if (app && app.app_version && app.client_type && app.session_key && app.uid) {
+        uid = {
+            toString: () => {
+                return _.parseInt(app.uid);
+            },
+            sessionKey: app.session_key,
+            appVersion: app.app_version,
+            appSessionType: app.client_type
+        };
+    }
 
 
     if (!uid || !activity_template_id) {
     if (!uid || !activity_template_id) {
         return res.jsonp({
         return res.jsonp({

@@ -109,7 +109,7 @@ module.exports = {
     maxQps: 1200,
     maxQps: 1200,
     maxQps10m: 2500,
     maxQps10m: 2500,
     geetestJs: '//static.geetest.com/static/tools/gt.js',
     geetestJs: '//static.geetest.com/static/tools/gt.js',
-    jsSdk: '//cdn.yoho.cn/js-sdk/1.2.7/jssdk.js',
+    jsSdk: '//cdn.yoho.cn/js-sdk/1.2.8/jssdk.js',
     redis: {
     redis: {
         connect: {
         connect: {
             host: '127.0.0.1',
             host: '127.0.0.1',

@@ -2,6 +2,8 @@ var $ = require('yoho-jquery');
 var lazyLoad = require('yoho-jquery-lazyload');
 var lazyLoad = require('yoho-jquery-lazyload');
 var Swiper = require('yoho-swiper');
 var Swiper = require('yoho-swiper');
 var yoho = require('../yoho-app');
 var yoho = require('../yoho-app');
+const qs = require('yoho-qs');
+const cookie = require('yoho-cookie');
 
 
 global.jQuery = $;
 global.jQuery = $;
 
 
@@ -218,10 +220,14 @@ function persenalCouponInit() {
     let data = {
     let data = {
         activity_id: $('.feature-page').data('id')
         activity_id: $('.feature-page').data('id')
     };
     };
-    let href = '//activity.yoho.cn/individuation/coupon';
 
 
-    if (location.hostname === 'm.yohobuy.com') {
-        href = '//m.yohobuy.com/activity/individuation/coupon';
+    if (yoho.isApp) {
+        data.app = {
+            uid: cookie.get('app_uid') || qs.uid,
+            app_version: cookie.get('app_version') || qs.app_version,
+            client_type: cookie.get('app_client_type') || qs.client_type,
+            session_key: cookie.get('app_session_key') || qs.session_key
+        };
     }
     }
 
 
     $('.yoho-conpon').each(function() {
     $('.yoho-conpon').each(function() {
@@ -229,7 +235,7 @@ function persenalCouponInit() {
 
 
         if ($this.data('persenal-enable')) {
         if ($this.data('persenal-enable')) {
             $.ajax({
             $.ajax({
-                url: href,
+                url: '//m.yohobuy.com/activity/individuation/coupon',
                 dataType: 'jsonp',
                 dataType: 'jsonp',
                 data: data,
                 data: data,
                 success: function(res) {
                 success: function(res) {