diff --git a/src/utils/datas.ts b/src/utils/datas.ts index 3d639ca..8707b7f 100644 --- a/src/utils/datas.ts +++ b/src/utils/datas.ts @@ -1,7 +1,7 @@ /** * 商品公共状态 err_code */ -export const { iconMap, btnMap, btnHighLight, receivingCode, btnPoll } = { +export const { iconMap, btnMap, btnHighLight, btnPoll, successCode } = { iconMap: new Map([ [12006, 'https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSystem/image/front/jijiangkaishi.png'], // 即将开始 [14001, 'https://lsxdmgoss.oss-cn-chengdu.aliyuncs.com/MarketingSystem/image/front/yiduiwan.png'], // 已兑完 @@ -16,11 +16,11 @@ export const { iconMap, btnMap, btnHighLight, receivingCode, btnPoll } = { [14001, '已兑完'], [14003, '领取中'], // 已兑换,充值中 (隐藏轮询) [14004, '重新领取'], // 已兑换,充值失败(暂时直接轮询) // todo 清空授权逻辑 - [14005, '立即兑换'], // 已兑换,充值成功(非"已兑完"-继续领取) + [14005, '继续兑换'], // 已兑换,充值成功(非"已兑完"-继续领取) ]), btnHighLight: [14004, 14005], // 高亮按钮,点击不提示 - receivingCode: 14003, // 已兑换,充值中 btnPoll: [14004], // 直接轮询code + successCode: [14001, 14005], // 成功code }; diff --git a/src/views/pages/comProduct/index.vue b/src/views/pages/comProduct/index.vue index 87d6d2a..be919f7 100644 --- a/src/views/pages/comProduct/index.vue +++ b/src/views/pages/comProduct/index.vue @@ -14,7 +14,12 @@
一键领取 >
{{ i.goods.reson }}
++ {{ i.goods.reson }} +
{{ listCss.get(item)?.text }}
@@ -37,13 +42,7 @@ @click.stop="receiveAll('one', [i], item, j)" > {{ - i.goods.type === 3 - ? - btnMap.get(i.goods.err_code) - ? (i.info.send_num > 1) ? `${btnMap.get(i.goods.err_code)} ${(i.goods.exchange_times || 0)}/${i.info.send_num || 0}` : btnMap.get(i.goods.err_code) - : (i.info.send_num > 1) ? `立即兑换 ${(i.goods.exchange_times || 0)}/${i.info.send_num || 0}` : '立即兑换' - : - btnMap.get(i.goods.err_code) ? btnMap.get(i.goods.err_code) : '立即兑换' + btnMap.get(i.goods.err_code) ? btnMap.get(i.goods.err_code) : '立即兑换' }}
@@ -100,7 +99,7 @@