Commit 1542c27aee065c41f13346ba4ece4fd05423e737

Authored by 后端研发-苏明海
2 parents 23f564f0 5643f3d2

Merge branch 'dev' into 'test'

积分购普通购买,参加全场优惠活动

See merge request !1175
pages/goods/goodsInfo/goodsInfo.js
... ... @@ -7273,7 +7273,7 @@ Page({
7273 7273 //普通购买不在界面显示
7274 7274 if(is_nor){
7275 7275 th.data.collocationGoods=r_data.collocationPromList;
7276   - th.data.prom_goods=r_data.prom_goods;
  7276 + th.data.prom_goods=r_data.promGoodsLists;
7277 7277 }else{
7278 7278 th.setData({
7279 7279 order_prom: r_data.promOrder,
... ...