|
@@ -47,7 +47,7 @@ module.exports = class extends global.yoho.BaseModel { |
|
@@ -47,7 +47,7 @@ module.exports = class extends global.yoho.BaseModel { |
47
|
|
47
|
|
48
|
if (isApp) {
|
48
|
if (isApp) {
|
49
|
val.detailUrl = val.detailUrl +
|
49
|
val.detailUrl = val.detailUrl +
|
50
|
- '?openby:yohobuy={"action":"go.h5","params":{"islogin":"N","url":"http://m.yohobuy.com/activity/share-buy/detail","params":{"counum":"' +
|
50
|
+ '&openby:yohobuy={"action":"go.h5","params":{"islogin":"N","url":"http://m.yohobuy.com/activity/share-buy/detail","params":{"counum":"' +
|
51
|
val.couponValue + '","couponType":"' + val.shareCouponType + '","detailDes":"' +
|
51
|
val.couponValue + '","couponType":"' + val.shareCouponType + '","detailDes":"' +
|
52
|
val.detailDes + '","couponId":"' + val.couponId + '"}}}';
|
52
|
val.detailDes + '","couponId":"' + val.couponId + '"}}}';
|
53
|
}
|
53
|
}
|
|
@@ -68,7 +68,7 @@ module.exports = class extends global.yoho.BaseModel { |
|
@@ -68,7 +68,7 @@ module.exports = class extends global.yoho.BaseModel { |
68
|
'?openby:yohobuy={"action":"go.h5","params":{"islogin":"N","url":"http:' + rebeatUrl + '"}}' : rebeatUrl;
|
68
|
'?openby:yohobuy={"action":"go.h5","params":{"islogin":"N","url":"http:' + rebeatUrl + '"}}' : rebeatUrl;
|
69
|
|
69
|
|
70
|
indexData.strategyUrl = isApp ? strategyUrl +
|
70
|
indexData.strategyUrl = isApp ? strategyUrl +
|
71
|
- '?openby:yohobuy={"action":"go.h5","params":{"islogin":"N","url":"' + strategyUrl + '"}}' : strategyUrl;
|
71
|
+ '&openby:yohobuy={"action":"go.h5","params":{"islogin":"N","url":"' + strategyUrl + '"}}' : strategyUrl;
|
72
|
|
72
|
|
73
|
return indexData;
|
73
|
return indexData;
|
74
|
});
|
74
|
});
|
|
@@ -117,19 +117,22 @@ module.exports = class extends global.yoho.BaseModel { |
|
@@ -117,19 +117,22 @@ module.exports = class extends global.yoho.BaseModel { |
117
|
}, {
|
117
|
}, {
|
118
|
code: 200
|
118
|
code: 200
|
119
|
}).then((result) => {
|
119
|
}).then((result) => {
|
|
|
120
|
+ let moreUrl;
|
120
|
|
121
|
|
121
|
if (result && result.code === 200 && result.data) {
|
122
|
if (result && result.code === 200 && result.data) {
|
122
|
result.data = _.assign(result.data, param);
|
123
|
result.data = _.assign(result.data, param);
|
123
|
|
124
|
|
124
|
- result.data.moreUrl = helpers.urlFormat('', {
|
125
|
+ moreUrl = helpers.urlFormat('', {
|
125
|
coupon_code: result.data.couponCode,
|
126
|
coupon_code: result.data.couponCode,
|
126
|
coupon_id: param.couponId,
|
127
|
coupon_id: param.couponId,
|
127
|
title: '优惠活动商品'
|
128
|
title: '优惠活动商品'
|
128
|
}, 'list');
|
129
|
}, 'list');
|
129
|
|
130
|
|
130
|
- result.data = _.assign(result.data, {
|
|
|
131
|
- isApp: isApp ? true : false
|
|
|
132
|
- });
|
131
|
+ result.data.moreUrl = isApp ? moreUrl +
|
|
|
132
|
+ '&openbuy:yohobuy={"action":"go.list","params":{"coupon_code":"' + result.data.couponCode +
|
|
|
133
|
+ '","coupon_id":"' + param.couponId + '","title":"优惠活动商品","actiontype":"1"}}' : moreUrl;
|
|
|
134
|
+
|
|
|
135
|
+ result.data.isApp = isApp ? true : false;
|
133
|
|
136
|
|
134
|
result.data.finish = parseInt(result.data.expiredTime, 10) > 0 ? false : true;
|
137
|
result.data.finish = parseInt(result.data.expiredTime, 10) > 0 ? false : true;
|
135
|
|
138
|
|
|
@@ -168,7 +171,7 @@ module.exports = class extends global.yoho.BaseModel { |
|
@@ -168,7 +171,7 @@ module.exports = class extends global.yoho.BaseModel { |
168
|
});
|
171
|
});
|
169
|
|
172
|
|
170
|
result.data.currencyUrl = isApp ? currencyUrl +
|
173
|
result.data.currencyUrl = isApp ? currencyUrl +
|
171
|
- '?openby:yohobuy={"action":"go.h5","params":{"islogin":"N","url":"http:' +
|
174
|
+ '&openby:yohobuy={"action":"go.h5","params":{"islogin":"N","url":"http:' +
|
172
|
currencyUrl + '"}}' : currencyUrl;
|
175
|
currencyUrl + '"}}' : currencyUrl;
|
173
|
|
176
|
|
174
|
result.data.shareUrl = isApp ? shareUrl +
|
177
|
result.data.shareUrl = isApp ? shareUrl +
|