Commit 6e5a30527f7e9c54ef8745a8084a1eeada0b3d5f

Authored by 后端研发-苏明海
2 parents e8713e63 2fbf11ce

Merge branch 'dev' into 'test'

礼包详情也,立即兑换也要加buyFrom参数

See merge request !370
pages/giftpack/giftpacklist/giftpacklist.js
@@ -132,6 +132,7 @@ Page({ @@ -132,6 +132,7 @@ Page({
132 "giftBagId": that.getGiftID, //礼包Id 132 "giftBagId": that.getGiftID, //礼包Id
133 "storeId": a.stoid, //商家ID 133 "storeId": a.stoid, //商家ID
134 "userId": d.user_id, //用户ID 134 "userId": d.user_id, //用户ID
  135 + "buyFrom":2
135 }; 136 };
136 var data = JSON.stringify(json); 137 var data = JSON.stringify(json);
137 var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; 138 var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";