diff --git a/src/views/pages/comProduct/index.vue b/src/views/pages/comProduct/index.vue index e19fbfe..cc85bb2 100644 --- a/src/views/pages/comProduct/index.vue +++ b/src/views/pages/comProduct/index.vue @@ -454,6 +454,10 @@ export default { codes.push(btnHighLight.includes(item.goods.err_code) ? 0 : item.goods.err_code || 0); orderData.push({ key: this.key, goods_id: item.goods.id }); }) + let first = list[0]; + if (first.goods.key_code) { + return showToast(first.goods.reson || '活动异常'); + } if (new Set(modes).size !== 1) { return showToast('不同类型或领取方式不支持一键领取'); } @@ -461,12 +465,8 @@ export default { if (codes.length !== 1) { return showToast('不同状态商品不支持一键领取'); } else { // 包含 正常商品 0 - let obj = list[0]; - if (obj.goods.key_code) { - return showToast(obj.goods.reson || '活动异常'); - } - if (obj.goods.err_code && !this.btnHighLight.includes(obj.goods.err_code)) { - return showToast(obj.goods.reson || '商品异常'); + if (first.goods.err_code && !this.btnHighLight.includes(first.goods.err_code)) { + return showToast(first.goods.reson || '商品异常'); } if (this.btnPoll.includes(codes[0])) { if (type === 'one') { @@ -661,7 +661,7 @@ export default { res.data.forEach((item: any) => { statusList.push(item.status); }) - // 状态 1 待充值 2 充值中 3 充值成功 4 充值失败 5 已过期 6 已作废 + // 状态 1 待充值 2 充值中 3 充值成功 4 充值失败 5 已过期 6 已作废 7 核销成功 8 核销失败 let receiveLength = statusList.filter((e: number) => ![1, 2].includes(e)).length; if (receiveLength) { // 存在 成功/失败状态 return await this.getData(''); diff --git a/src/views/pages/orderDetail/index.vue b/src/views/pages/orderDetail/index.vue index 34c7477..4e0d477 100644 --- a/src/views/pages/orderDetail/index.vue +++ b/src/views/pages/orderDetail/index.vue @@ -58,7 +58,7 @@ export default { orderNo: this.$route.query.orderNo, proType: 1, // 1 直充 2 卡密 orderData: { - status: 1 // 状态 1 待充值(充值中) 2 充值中 3 充值成功 4 充值失败 5 已过期 6 已作废 + status: 1 // 状态 1 待充值(充值中) 2 充值中 3 充值成功 4 充值失败 5 已过期 6 已作废 7 核销成功 8 核销失败 } as any, dialogType: '', diff --git a/src/views/pages/orderList/index.vue b/src/views/pages/orderList/index.vue index dc91b8d..e7a4531 100644 --- a/src/views/pages/orderList/index.vue +++ b/src/views/pages/orderList/index.vue @@ -16,7 +16,13 @@
{{ item.create_time }}
-{{ statusObj[`${item.type}`][item.status] || '' }}
+{{ statusObj[`${item.type}`][item.status] || ''}}