diff --git a/exchange.html b/exchange.html index caf5549..2c667d1 100644 --- a/exchange.html +++ b/exchange.html @@ -295,17 +295,18 @@ if (goodsDetail.available != 1) { return this.openErrorDialog(product_status(goodsDetail.available, goodsDetail)); } + /* 卡密商品直接兑换 */ if (this.goodInfo.product_type === 2 && this.goodInfo.card_show == 2) { - this.maskshow = true; - this.popboxshow = true; - this.popboxtype = '兑换'; - return; - } - - /* 当只有一个卡密商品、为线上查看卡密且只能兑换一次时执行 */ - if (this.goodInfo.product_type === 2 && this.goodInfo.card_show == 2 && !this.backAble && this.goodsDetail.restrict == 1) { - return this.surexchangeBtn(); + /* 当只有一个卡密商品、为线上查看卡密且只能兑换一次时执行 */ + if (!this.backAble && this.goodsDetail.restrict == 1) { + return this.surexchangeBtn(); + } else { + this.maskshow = true; + this.popboxshow = true; + this.popboxtype = '兑换'; + return; + } } /* 京东E卡 */ diff --git a/packkey/exchange.html b/packkey/exchange.html index 758f31a..6227fcf 100644 --- a/packkey/exchange.html +++ b/packkey/exchange.html @@ -346,15 +346,15 @@ /* 卡密商品直接兑换 */ if (this.goodInfo.product_type === 2 && this.goodInfo.card_show == 2) { - this.maskshow = true; - this.popboxshow = true; - this.popboxtype = '兑换'; - return; - } - - /* 当只有一个卡密商品、为线上查看卡密且只能兑换一次时执行 */ - if (this.goodInfo.product_type === 2 && this.goodInfo.card_show == 2 && !this.backAble && this.goodsDetail.restrict == 1) { - return this.surexchangeBtn(); + /* 当只有一个卡密商品、为线上查看卡密且只能兑换一次时执行 */ + if (!this.backAble && this.goodsDetail.restrict == 1) { + return this.surexchangeBtn(); + } else { + this.maskshow = true; + this.popboxshow = true; + this.popboxtype = '兑换'; + return; + } } /* 京东E卡 */