修改

src/pages-user/pages/order/components/price-detail/price-detail.vue

@@ -1,16 +1,15 @@
 <script lang="ts" setup>
 import {useConfigStore} from "@/store";
+import {formatOrderAmount, getPlatformServiceFee} from "@/utils/merchantOrder";
 
 const {t} = useI18n();
 
 const configStore = useConfigStore();
 
-// 用户会员状态是否已开通
-
 const show = ref(false);
-const priceData = ref({})
+const priceData = ref<Record<string, any>>({})
 
-function onOpen(data: any, num: number) {
+function onOpen(data: Record<string, any>) {
   priceData.value = data
   show.value = true;
 }
@@ -19,6 +18,8 @@ function handleClose() {
   show.value = false;
 }
 
+const platformFee = computed(() => getPlatformServiceFee(priceData.value))
+
 defineExpose({
   onOpen,
 });
@@ -32,24 +33,31 @@ defineExpose({
   >
     <view>
       <view class="center h-102rpx bg-#F7F7F7 text-40rpx lh-40rpx font-bold text-#333">
-        {{ t('pages-user.order.checkout.priceDetail.title') }}?
+        {{ t('pages-user.order.checkout.priceDetail.title') }}
       </view>
       <view class="border-bottom text-32rpx lh-32rpx font-500 text-#333 py-36rpx px-30rpx">
         <view class="flex-center-sb mb-20rpx">
-          <view>{{ t('pages-user.order.checkout.priceDetail.serviceFees') }}</view>
-          <view>${{
-              (Number(priceData?.tip) + Number(priceData?.deliveryFee)).toFixed(2)
-            }}
-          </view>
+          <view>{{ t('pages-user.order.checkout.priceDetail.taxation') }}</view>
+          <view>${{ formatOrderAmount(priceData?.tax) }}</view>
+        </view>
+        <view v-if="priceData?.deliveryFeeCharged !== false && Number(priceData?.deliveryFee) > 0"
+              class="flex-center-sb mb-20rpx">
+          <view>{{ t('pages-user.order.checkout.priceDetail.deliveryFee') }}</view>
+          <view>${{ formatOrderAmount(priceData?.deliveryFee) }}</view>
+        </view>
+        <view v-if="priceData?.tipCharged !== false && Number(priceData?.tip) > 0"
+              class="flex-center-sb mb-20rpx">
+          <view>{{ t('pages-user.order.checkout.priceDetail.tip') }}</view>
+          <view>${{ formatOrderAmount(priceData?.tip) }}</view>
+        </view>
+        <view v-if="Number(platformFee) > 0" class="flex-center-sb mb-20rpx text-26rpx text-#999">
+          <view>{{ t('pages-user.order.platformServiceFee') }}</view>
+          <view>${{ platformFee }}</view>
         </view>
         <view class="text-24rpx lh-28rpx text-#9E9E9E">
-          {{ t('pages-user.order.checkout.priceDetail.desc') }}
+          {{ t('pages-user.order.checkout.priceDetail.platformFeeNote') }}
         </view>
       </view>
-      <view class="flex-center-sb border-bottom h-104rpx text-32rpx lh-32rpx font-500 text-#333 px-30rpx">
-        <view>{{ t('pages-user.order.checkout.priceDetail.taxation') }}</view>
-        <view>${{ Number(priceData?.tax) }}</view>
-      </view>
       <view class="px-30rpx pt-40rpx">
         <wd-button
             block
@@ -66,4 +74,4 @@ defineExpose({
 
 <style lang="scss" scoped>
 
-</style>
+</style>