diff --git a/src/utils/serviceFee.ts b/src/utils/serviceFee.ts index 1143a8e..2d3345a 100644 --- a/src/utils/serviceFee.ts +++ b/src/utils/serviceFee.ts @@ -98,8 +98,10 @@ export function calcPayablePriceRial( targetRialCash?: number | null ) { if (feeDeductFromGold.value) { + if (targetRialCash != null && Number(targetRialCash) > 0) { + return Number(targetRialCash) + } if (isBuy) return finalPriceRial + feeInRial - if (targetRialCash != null && Number(targetRialCash) > 0) return Number(targetRialCash) return finalPriceRial } return isBuy ? finalPriceRial : Math.max(0, finalPriceRial - feeInRial) diff --git a/src/views/base/gold/index.vue b/src/views/base/gold/index.vue index 3d5fe87..0587d00 100644 --- a/src/views/base/gold/index.vue +++ b/src/views/base/gold/index.vue @@ -466,7 +466,7 @@ const payablePrice = computed(() => finalPrice.value, feeInRial.value, isBuy.value, - !isBuy.value && inputLock.value === 'rial' ? form.value?.goldCash : undefined + inputLock.value === 'rial' ? form.value?.goldCash : undefined ) ) const sellGoldDebit = computed(() => calcSellGoldDebit(orderGoldAmount.value, feeInGrams.value))