Commit 2d8d5a84 authored by Xuguangxing's avatar Xuguangxing

fix

parent 5c6d3c66
...@@ -186,7 +186,8 @@ export default { ...@@ -186,7 +186,8 @@ export default {
payContractInfo: {}, payContractInfo: {},
isCheckAgreement: false, isCheckAgreement: false,
mergePayPretreatmentInfo: {}, mergePayPretreatmentInfo: {},
tradeType: isWechat ? 'JSAPI' : 'MWEB' tradeType: isWechat ? 'JSAPI' : 'MWEB',
amountInfo: {}
}; };
}, },
computed: { computed: {
...@@ -252,7 +253,7 @@ export default { ...@@ -252,7 +253,7 @@ export default {
async queryPayInfo() { async queryPayInfo() {
const [data, error] = await queryPayInfo({ const [data, error] = await queryPayInfo({
orderNo: this.orderNo, orderNo: this.orderNo,
isUsedMergePayMethod: cookies.get('source') !== 'tob' // 是否需要组合支付,true需要。false不需要 isUsedMergePayMethod: false
}); });
if (error && codeArr.indexOf(error?.response?.businessCode) < 0) { if (error && codeArr.indexOf(error?.response?.businessCode) < 0) {
this.payResult('Fail'); this.payResult('Fail');
...@@ -523,7 +524,9 @@ export default { ...@@ -523,7 +524,9 @@ export default {
query: { query: {
reason: error, reason: error,
orderNo: this.orderNo, orderNo: this.orderNo,
payType: this.payType payType: this.payType,
finalAmt: this.amountInfo.finalAmt || '',
freeAmount: this.amountInfo.freeAmount || ''
} }
}); });
}, },
...@@ -620,6 +623,7 @@ export default { ...@@ -620,6 +623,7 @@ export default {
: (orderAmt - faceValue || 0).toFixed(2); : (orderAmt - faceValue || 0).toFixed(2);
const freeAmount = const freeAmount =
!IS_THIRD_PAY(this.payType) && this.showCoupon ? faceValue || '0.00' : '0.00'; !IS_THIRD_PAY(this.payType) && this.showCoupon ? faceValue || '0.00' : '0.00';
this.amountInfo = { finalAmt, freeAmount };
cookies.set('amount', { finalAmt, freeAmount }); cookies.set('amount', { finalAmt, freeAmount });
}, },
async reissueContract() { async reissueContract() {
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<cr-image src="@/assets/images/groupBuy/activity.png" /> <cr-image src="@/assets/images/groupBuy/activity.png" />
</div> </div>
<div v-if="isSuccess && couponList.length" class="coupon-box"> <!-- <div v-if="isSuccess && couponList.length" class="coupon-box">
<p class="coupon-tip">本单已享以下权益</p> <p class="coupon-tip">本单已享以下权益</p>
<div class="coupon-wrap"> <div class="coupon-wrap">
<CouponCard <CouponCard
...@@ -62,13 +62,13 @@ ...@@ -62,13 +62,13 @@
@click="goViewCouponDetail" @click="goViewCouponDetail"
/> />
</div> </div>
</div> </div> -->
<!-- <Goods /> --> <!-- <Goods /> -->
</div> </div>
</template> </template>
<script> <script>
import { goUrlExtends } from './extends'; import { goUrlExtends } from './extends';
import CouponCard from './components/CouponCard.vue'; // import CouponCard from './components/CouponCard.vue';
import { getCouponList } from '@/api/pay.api'; import { getCouponList } from '@/api/pay.api';
import groupBuyApi from '@/api/groupBuy'; import groupBuyApi from '@/api/groupBuy';
// import Goods from '@/components/RecoGoods/RecoGoods.vue'; // import Goods from '@/components/RecoGoods/RecoGoods.vue';
...@@ -77,7 +77,7 @@ import { EventBus } from '@/service/utils.service'; ...@@ -77,7 +77,7 @@ import { EventBus } from '@/service/utils.service';
export default { export default {
components: { components: {
// Goods, // Goods,
CouponCard // CouponCard
}, },
extends: goUrlExtends, extends: goUrlExtends,
data() { data() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment