Commit dfd2f3116f9427ce3d3022d810e9e0cc1c2a88f4

Authored by 后端研发-苏明海
2 parents b3751cf3 6e5a3052

Merge branch 'test' into 'qa'

Test

See merge request !371
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";