diff --git a/frontend/src/views/admin/Settings.vue b/frontend/src/views/admin/Settings.vue index 250e7bb..e530ac0 100644 --- a/frontend/src/views/admin/Settings.vue +++ b/frontend/src/views/admin/Settings.vue @@ -7,6 +7,8 @@ + + 保存 @@ -36,6 +38,8 @@ const settings = reactive>({ payment_channel_fee_rate: 0, service_fee_rate: 0, tax_rate: 0, + packaging_fee: 0, + international_fee_rate: 0, invite_credit_reward: 0 }) const verifyEnabled = ref('true') diff --git a/frontend/src/views/user/Cart.vue b/frontend/src/views/user/Cart.vue index b9b7000..02f82c6 100644 --- a/frontend/src/views/user/Cart.vue +++ b/frontend/src/views/user/Cart.vue @@ -216,6 +216,16 @@ ¥{{ channelFee.toFixed(2) }} +
+ 包装费 + ¥{{ packagingFee.toFixed(2) }} +
+ +
+ 国际计算手续费 ({{ settings.international_fee_rate || 0 }}%) + ¥{{ internationalFee.toFixed(2) }} +
+
@@ -435,8 +445,17 @@ const channelFee = computed(() => { return selectedTotal.value * rate / 100 }) +const packagingFee = computed(() => { + return parseFloat(settings.value.packaging_fee || '0') +}) + +const internationalFee = computed(() => { + const rate = parseFloat(settings.value.international_fee_rate || '0') + return selectedTotal.value * rate / 100 +}) + const grandTotal = computed(() => { - return selectedTotal.value + shippingFee.value + serviceFee.value + taxFee.value + channelFee.value + return selectedTotal.value + shippingFee.value + serviceFee.value + taxFee.value + channelFee.value + packagingFee.value + internationalFee.value }) const canCheckout = computed(() => {