Authored by 郭成尧

Merge branch 'feature/h5mnprblmwbvw' into release/6.5.2

@@ -97,7 +97,7 @@ exports.couponSend = (req, res, next) => { @@ -97,7 +97,7 @@ exports.couponSend = (req, res, next) => {
97 }, 97 },
98 sessionKey: app.session_key, 98 sessionKey: app.session_key,
99 appVersion: isMiniApp ? _.get(global, 'yoho.config.appVersion') : app.app_version, 99 appVersion: isMiniApp ? _.get(global, 'yoho.config.appVersion') : app.app_version,
100 - appSessionType: isMiniApp ? 'h5' : app.client_type 100 + appSessionType: app.client_type
101 }; 101 };
102 } 102 }
103 } 103 }
@@ -725,18 +725,12 @@ var cookies = { @@ -725,18 +725,12 @@ var cookies = {
725 // 1. 优惠券领取 725 // 1. 优惠券领取
726 // 2. YOHO币领取 726 // 2. YOHO币领取
727 727
728 -var baseUrl = '//activity.yoho.cn';  
729 -  
730 -if (location.hostname === 'm.yohobuy.com') {  
731 - baseUrl = '//m.yohobuy.com/activity';  
732 -}  
733 -  
734 var _getCoin = function _getCoin(data) { 728 var _getCoin = function _getCoin(data) {
735 data.app = utils.queryString(); 729 data.app = utils.queryString();
736 data.app.uid = data.uid; 730 data.app.uid = data.uid;
737 731
738 jsonp({ 732 jsonp({
739 - url: baseUrl + '/coin/sendCoin?callback=?', 733 + url: '//m.yohobuy.com/activity/coin/sendCoin?callback=?',
740 data: data 734 data: data
741 }).then(function (res) { 735 }).then(function (res) {
742 if (res.code === 200 && res.data) { 736 if (res.code === 200 && res.data) {
@@ -810,7 +804,7 @@ var _getCoupon = function _getCoupon(data) { @@ -810,7 +804,7 @@ var _getCoupon = function _getCoupon(data) {
810 data.app.session_key = cookies.cookie('app_session_key') || data.app.session_key; 804 data.app.session_key = cookies.cookie('app_session_key') || data.app.session_key;
811 805
812 jsonp({ 806 jsonp({
813 - url: baseUrl + '/feature/couponSend?callback=?', 807 + url: '//m.yohobuy.com/activity/feature/couponSend?callback=?',
814 data: data 808 data: data
815 }).then(function (res) { 809 }).then(function (res) {
816 if (res.code === 200) { 810 if (res.code === 200) {