From 2349faa1bc4b18ddac11503db97d1529888ed456 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Sat, 28 Sep 2024 16:24:57 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E3=80=91=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E=EF=BC=9A=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/goods/point.vue | 493 ++++++++++++++++++++++++++-------------- pages/order/confirm.vue | 2 + sheep/util/const.js | 2 +- 3 files changed, 330 insertions(+), 167 deletions(-) diff --git a/pages/goods/point.vue b/pages/goods/point.vue index ee3707c0..0360766d 100644 --- a/pages/goods/point.vue +++ b/pages/goods/point.vue @@ -1,23 +1,24 @@ + diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue index d090aecd..697f6b1d 100644 --- a/pages/order/confirm.vue +++ b/pages/order/confirm.vue @@ -294,6 +294,7 @@ combinationActivityId: state.orderPayload.combinationActivityId, combinationHeadId: state.orderPayload.combinationHeadId, seckillActivityId: state.orderPayload.seckillActivityId, + pointActivityId: state.orderPayload.pointActivityId, }); if (code !== 0) { return; @@ -324,6 +325,7 @@ combinationActivityId: state.orderPayload.combinationActivityId, combinationHeadId: state.orderPayload.combinationHeadId, seckillActivityId: state.orderPayload.seckillActivityId, + pointActivityId: state.orderPayload.pointActivityId, }); if (code !== 0) { return; diff --git a/sheep/util/const.js b/sheep/util/const.js index 9c22807f..ec6078db 100644 --- a/sheep/util/const.js +++ b/sheep/util/const.js @@ -116,7 +116,7 @@ export const PromotionActivityTypeEnum = { }, POINT: { type: 4, - name: '', + name: '积分商城', }, };