diff --git a/src/router/api.ts b/src/router/api.ts index 49e6d6f..2607da7 100644 --- a/src/router/api.ts +++ b/src/router/api.ts @@ -1,4 +1,5 @@ import request from "@/utils/request"; +import { isWx } from "@/utils/datas"; export enum Api { // 登录 @@ -30,7 +31,7 @@ export const GET_SMS = (data?: any) => request.post(Api.GET_SMS, data); export const GET_WXSCHEMA = (data?: any) => request.post(Api.GET_WXSCHEMA, data); -export const EXCHANGE = (data?: any) => request.post(Api.EXCHANGE, data); +export const EXCHANGE = (data?: any) => request.post(Api.EXCHANGE, { ...data, channel: isWx ? 2 : 3 }); // 1 小程序 2 公众号 3 其他 export const DETAIL_QUERY = (data?: any) => request.get(Api.DETAIL_QUERY, data); diff --git a/src/views/pages/comProduct/index.vue b/src/views/pages/comProduct/index.vue index 285c96e..d0eba3f 100644 --- a/src/views/pages/comProduct/index.vue +++ b/src/views/pages/comProduct/index.vue @@ -478,7 +478,7 @@ export default { } }) if (data.length) { - this.dialogText = `${ errMsg ? '部分兑换成功' : '兑换成功' }`; + // this.dialogText = `${ errMsg ? '部分兑换成功' : '兑换成功' }`; return await this.getData(''); } else { showToast(errMsg); diff --git a/src/views/templates/cmsCash/index.vue b/src/views/templates/cmsCash/index.vue index b1a87f3..9399295 100644 --- a/src/views/templates/cmsCash/index.vue +++ b/src/views/templates/cmsCash/index.vue @@ -38,10 +38,14 @@

您可在{{ getInputText }}的个人信息中查看【{{ getInputText }}账号】

- {{ goods && btnMap.get(goods.err_code) ? btnMap.get(goods.err_code) : '立即兑换' }} + {{ + pollStatus + ? '领取中' + : goods && btnMap.get(goods.err_code) ? btnMap.get(goods.err_code) : '立即兑换' + }}
@@ -214,7 +218,7 @@ export default { this.overlayLoad = false; if (res && res.code === 200 && res.data) { if (res.data[0].code === 200) { - this.dialogText = '兑换成功'; + // this.dialogText = '兑换成功'; this.pollStatus = true; return await this.orderPolling(); } else { diff --git a/src/views/templates/cmsDetail/index.vue b/src/views/templates/cmsDetail/index.vue index 1d5dc45..890d6f3 100644 --- a/src/views/templates/cmsDetail/index.vue +++ b/src/views/templates/cmsDetail/index.vue @@ -264,7 +264,7 @@ export default { this.overlayLoad = false; if (res && res.code === 200 && res.data) { if (res.data[0].code === 200) { - this.dialogText = '兑换成功'; + // this.dialogText = '兑换成功'; this.pollStatus = true; return await this.orderPolling(); } else { diff --git a/src/views/templates/cmsVoucher/index.vue b/src/views/templates/cmsVoucher/index.vue index 7a0b82e..0c2aaa2 100644 --- a/src/views/templates/cmsVoucher/index.vue +++ b/src/views/templates/cmsVoucher/index.vue @@ -209,7 +209,7 @@ export default { this.overlayLoad = false; if (res && res.code === 200 && res.data) { if (res.data[0].code === 200) { - this.dialogText = '兑换成功'; + // this.dialogText = '兑换成功'; this.pollStatus = true; return await this.orderPolling(); } else {