diff --git a/pages/order/aftersale/apply.vue b/pages/order/aftersale/apply.vue index 9e8ee25..8c9752e 100644 --- a/pages/order/aftersale/apply.vue +++ b/pages/order/aftersale/apply.vue @@ -130,7 +130,7 @@ import TradeConfigApi from '@/sheep/api/trade/config'; import { fen2yuan } from '@/sheep/hooks/useGoods'; import AfterSaleApi from '@/sheep/api/trade/afterSale'; - import { SubscribeTemplate } from '@/sheep/util/const'; + import { WxaSubscribeTemplate } from '@/sheep/util/const'; const form = ref(null); const state = reactive({ diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue index 5892a23..834ad04 100644 --- a/pages/order/confirm.vue +++ b/pages/order/confirm.vue @@ -166,7 +166,7 @@ import OrderApi from '@/sheep/api/trade/order'; import CouponApi from '@/sheep/api/promotion/coupon'; import { fen2yuan } from '@/sheep/hooks/useGoods'; - import { SubscribeTemplate } from '@/sheep/util/const'; + import { WxaSubscribeTemplate } from '@/sheep/util/const'; const state = reactive({ orderPayload: {}, diff --git a/pages/pay/recharge.vue b/pages/pay/recharge.vue index e79016d..aa36413 100644 --- a/pages/pay/recharge.vue +++ b/pages/pay/recharge.vue @@ -47,7 +47,7 @@ import { onLoad } from '@dcloudio/uni-app'; import { fen2yuan } from '@/sheep/hooks/useGoods'; import PayWalletApi from '@/sheep/api/pay/wallet'; - import { SubscribeTemplate } from '@/sheep/util/const'; + import { WxaSubscribeTemplate } from '@/sheep/util/const'; const userWallet = computed(() => sheep.$store('user').userWallet); const statusBarHeight = sheep.$platform.device.statusBarHeight * 2; @@ -82,7 +82,7 @@ return; } // #ifdef MP - sheep.$platform.useProvider('wechat').subscribeMessage(SubscribeTemplate.WALLET_RECHARGER_PAID); + sheep.$platform.useProvider('wechat').subscribeMessage(WxaSubscribeTemplate.PAY_WALLET_RECHARGER_SUCCESS); // #endif sheep.$router.go('/pages/pay/index', { id: data.payOrderId, diff --git a/pages/pay/result.vue b/pages/pay/result.vue index 96bbea3..52b8d16 100644 --- a/pages/pay/result.vue +++ b/pages/pay/result.vue @@ -69,7 +69,7 @@ import PayOrderApi from '@/sheep/api/pay/order'; import { fen2yuan } from '@/sheep/hooks/useGoods'; import OrderApi from '@/sheep/api/trade/order'; - import { SubscribeTemplate } from '@/sheep/util/const'; + import { WxaSubscribeTemplate } from '@/sheep/util/const'; const state = reactive({ id: 0, // 支付单号 @@ -159,9 +159,9 @@ const showSubscribeBtn = ref(false) // 默认隐藏 const SUBSCRIBE_BTN_STATUS_STORAGE_KEY = "subscribe_btn_status" function subscribeMessage() { - let event = [SubscribeTemplate.DELIVERY_ORDER]; + let event = [WxaSubscribeTemplate.TRADE_ORDER_DELIVERY]; if (state.tradeOrder.type === 3) { - event.push(SubscribeTemplate.COMBINATION_RESULT); + event.push(WxaSubscribeTemplate.PROMOTION_COMBINATION_SUCCESS); } sheep.$platform.useProvider('wechat').subscribeMessage(event, () => { // 订阅后记录一下订阅状态 diff --git a/sheep/util/const.js b/sheep/util/const.js index 01eec4f..e1d3ee0 100644 --- a/sheep/util/const.js +++ b/sheep/util/const.js @@ -56,14 +56,15 @@ export const TimeStatusEnum = { END: '已结束', } -// TODO 订阅模版枚举 -export const SubscribeTemplate = { - WALLET_RECHARGER_PAID: "充值成功通知", - DELIVERY_ORDER: "订单发货通知", - COMBINATION_RESULT: "拼团结果通知" +/** + * 微信小程序的订阅模版 + */ +export const WxaSubscribeTemplate = { + TRADE_ORDER_DELIVERY: "订单发货通知", + PROMOTION_COMBINATION_SUCCESS: "拼团结果通知", + PAY_WALLET_RECHARGER_SUCCESS: "充值成功通知", } - export const getTimeStatusEnum = (startTime, endTime) => { const now = dayjs(); if (now.isBefore(startTime)) {