Authored by 郭成尧

Merge branch 'feature/h5mnprblmwbvw' into release/6.5.2

... ... @@ -97,7 +97,7 @@ exports.couponSend = (req, res, next) => {
},
sessionKey: app.session_key,
appVersion: isMiniApp ? _.get(global, 'yoho.config.appVersion') : app.app_version,
appSessionType: isMiniApp ? 'h5' : app.client_type
appSessionType: app.client_type
};
}
}
... ...
... ... @@ -725,18 +725,12 @@ var cookies = {
// 1. 优惠券领取
// 2. YOHO币领取
var baseUrl = '//activity.yoho.cn';
if (location.hostname === 'm.yohobuy.com') {
baseUrl = '//m.yohobuy.com/activity';
}
var _getCoin = function _getCoin(data) {
data.app = utils.queryString();
data.app.uid = data.uid;
jsonp({
url: baseUrl + '/coin/sendCoin?callback=?',
url: '//m.yohobuy.com/activity/coin/sendCoin?callback=?',
data: data
}).then(function (res) {
if (res.code === 200 && res.data) {
... ... @@ -810,7 +804,7 @@ var _getCoupon = function _getCoupon(data) {
data.app.session_key = cookies.cookie('app_session_key') || data.app.session_key;
jsonp({
url: baseUrl + '/feature/couponSend?callback=?',
url: '//m.yohobuy.com/activity/feature/couponSend?callback=?',
data: data
}).then(function (res) {
if (res.code === 200) {
... ...