From ed75ec40089878d4269f65cfab189d66add8c28b Mon Sep 17 00:00:00 2001
From: kaeery <3491123437@qq.com>
Date: Thu, 13 Mar 2025 11:19:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=88=86=E7=B1=BB=E3=80=91=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D#=20=E6=9C=8D=E5=8A=A1=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service_order/components/order-card.vue   | 12 +++++-
 .../pages/service_order_detail/index.vue      | 13 +++++--
 src/components/price/index.vue                |  5 ++-
 src/pages/category/components/cate-card.vue   | 11 +++++-
 src/pages/goods/index.vue                     | 11 +++++-
 src/pages/order/components/order-card.vue     | 13 ++++++-
 src/pages/order_buy/index.vue                 | 10 ++++-
 src/pages/order_detail/index.vue              | 13 +++++--
 src/utils/util.ts                             | 38 +++++++++++++++++++
 9 files changed, 112 insertions(+), 14 deletions(-)

diff --git a/src/bundle/pages/service_order/components/order-card.vue b/src/bundle/pages/service_order/components/order-card.vue
index 28efa21..f8754cf 100644
--- a/src/bundle/pages/service_order/components/order-card.vue
+++ b/src/bundle/pages/service_order/components/order-card.vue
@@ -21,6 +21,10 @@
                     {{ orderInfo.appointTimeStart }} - {{ orderInfo.appointTimeEnd }}
                 </view>
                 <view class="appointTitle mt-[16rpx]"></view>
+                <view class="mt-[16rpx]">
+                    服务金额:
+                    <text class="text-[#f36161] text-base pl-1.5">¥{{ servicePrice }}</text>
+                </view>
                 <!-- <view class="mt-[16rpx]">
                     实付金额:
                     <text class="text-[#f36161] text-base pl-1.5">
@@ -54,8 +58,10 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, watchEffect } from 'vue'
+import { computed, ref, watchEffect } from 'vue'
 import { apiOrderClose } from '@/api/order'
+import { PriceEnum } from '@/enums/appEnums'
+import { formatString } from '@/utils/util'
 
 const props = withDefaults(
     defineProps<{
@@ -65,6 +71,10 @@ const props = withDefaults(
         orderInfo: {}
     }
 )
+const servicePrice = computed(() => {
+    const { priceType, goodsPrice, priceRange } = props.orderInfo
+    return priceType == PriceEnum.CUSTOMER_PRICE ? goodsPrice : formatString(priceRange)
+})
 
 const timeStamp = ref<number | null>(0)
 watchEffect(() => {
diff --git a/src/bundle/pages/service_order_detail/index.vue b/src/bundle/pages/service_order_detail/index.vue
index e2e252b..ad08c70 100644
--- a/src/bundle/pages/service_order_detail/index.vue
+++ b/src/bundle/pages/service_order_detail/index.vue
@@ -70,8 +70,8 @@
                         </view>
                         <view class="mt-[24rpx]">
                             <price
-                                :goodsData="orderData.orderGoods"
-                                :priceType="orderData.orderGoods.priceType"
+                                :goodsData="orderData"
+                                :priceType="orderData.priceType"
                                 :desc="orderData.orderGoods?.unitName"
                             />
                         </view>
@@ -83,7 +83,8 @@
             <view class="card normal text-base">
                 <view class="flex justify-between">
                     <view>服务金额</view>
-                    <view>¥{{ orderData.orderAmount }}</view>
+                    <!-- <view>¥{{ orderData.orderAmount }}</view> -->
+                    <view>¥{{ servicePrice }}</view>
                 </view>
                 <!-- <view class="mt-[30rpx] flex justify-between" v-if="isUseCoupon">
                     <view>抵扣金额</view>
@@ -172,6 +173,8 @@
 import { apiStaffOrderDetail } from '@/api/order'
 import OrderFooter from '@/components/order-footer/index.vue'
 import Price from '@/components/price/index.vue'
+import { PriceEnum } from '@/enums/appEnums'
+import { formatString } from '@/utils/util'
 import { onLoad } from '@dcloudio/uni-app'
 import { computed, ref, unref } from 'vue'
 
@@ -192,6 +195,10 @@ const initOrderDetail = async (): Promise<void> => {
 }
 /** Methods End **/
 const isUseCoupon = computed(() => unref(orderData.value.couponDetailVo))
+const servicePrice = computed(() => {
+    const { priceType, goodsPrice, priceRange } = orderData.value
+    return priceType == PriceEnum.CUSTOMER_PRICE ? goodsPrice : formatString(priceRange)
+})
 
 /** Life Cycle Start **/
 onLoad(options => {
diff --git a/src/components/price/index.vue b/src/components/price/index.vue
index 4892b87..ecb55b4 100644
--- a/src/components/price/index.vue
+++ b/src/components/price/index.vue
@@ -11,6 +11,7 @@
 <script setup lang="ts">
 import { PriceEnum } from '@/enums/appEnums'
 import { GOODS } from '@/pages/goods/index.vue'
+import { formatString } from '@/utils/util'
 import { computed } from 'vue'
 import { ref, withDefaults } from 'vue'
 
@@ -34,8 +35,8 @@ const props = withDefaults(
 const parsePrice = computed(() => {
     const { priceType, goodsData } = props
     return priceType == PriceEnum.CUSTOMER_PRICE
-        ? goodsData.price
-        : goodsData.minPrice + '-' + goodsData.maxPrice
+        ? goodsData.goodsPrice
+        : formatString(goodsData.priceRange)
 })
 /** Props End **/
 
diff --git a/src/pages/category/components/cate-card.vue b/src/pages/category/components/cate-card.vue
index b89f6a0..851d7b1 100644
--- a/src/pages/category/components/cate-card.vue
+++ b/src/pages/category/components/cate-card.vue
@@ -34,7 +34,7 @@
                         <view class="mt-[20rpx] truncate">{{ item4.name }}</view>
                         <view class="text-primary mt-[10rpx]">
                             <price
-                                :goodsData="item4"
+                                :goodsData="converItem(item4)"
                                 :priceType="item4.priceType"
                                 :desc="item4.unit"
                             ></price>
@@ -57,6 +57,7 @@ import { ref, reactive, watchEffect } from 'vue'
 import { apiGoodsLists } from '@/api/store'
 import Price from '@/components/price/index.vue'
 import { useAppStore } from '@/stores/app'
+import { computed } from 'vue'
 
 const { getImageUrl } = useAppStore()
 /** Interface Start **/
@@ -88,6 +89,14 @@ const props = withDefaults(
 
 /** Data Start **/
 const goodsData = ref<Array<GoodsDataObj> | null | any>([])
+const converItem = computed(() => item => {
+    const { price, minPrice, maxPrice } = item
+    return {
+        ...item,
+        goodsPrice: price,
+        priceRange: `${minPrice}-${maxPrice}`
+    }
+})
 /** Data End **/
 
 /** Methods Start **/
diff --git a/src/pages/goods/index.vue b/src/pages/goods/index.vue
index 611ebc3..dede8a9 100644
--- a/src/pages/goods/index.vue
+++ b/src/pages/goods/index.vue
@@ -37,7 +37,7 @@
             <view class="flex justify-between padding">
                 <view class="text-primary">
                     <price
-                        :goodsData="goodsData"
+                        :goodsData="converItem(goodsData)"
                         :priceType="goodsData.priceType"
                         :desc="goodsData.unit"
                         :scribingPrice="goodsData.scribingPrice"
@@ -332,7 +332,14 @@ const goodsNum = ref(1)
 const footerHeight = ref(0)
 const paging = shallowRef()
 const serviceList = ref<any>([])
-
+const converItem = computed(() => item => {
+    const { price, minPrice, maxPrice } = item
+    return {
+        ...item,
+        goodsPrice: price,
+        priceRange: `${minPrice}-${maxPrice}`
+    }
+})
 // 获取商品详情
 const initGoodaDetail = async (cityId?: number): Promise<void> => {
     if (cityId || appStore.cityInfo.city_id) {
diff --git a/src/pages/order/components/order-card.vue b/src/pages/order/components/order-card.vue
index 640b8c4..4e5fce4 100644
--- a/src/pages/order/components/order-card.vue
+++ b/src/pages/order/components/order-card.vue
@@ -19,6 +19,10 @@
                 <view class="mt-[16rpx]">
                     预约时间: {{ orderInfo.appointTime }} {{ orderInfo.weekDay }}
                 </view>
+                <view class="mt-[16rpx]">
+                    服务金额:
+                    <text class="text-[#f36161] text-base pl-1.5">¥{{ servicePrice }}</text>
+                </view>
                 <!-- <view class="mt-[16rpx]" v-if="orderInfo.orderStatus == 0">
                     待付金额:
                     <text class="text-[#f36161] text-base pl-1.5">
@@ -77,8 +81,10 @@
 </template>
 
 <script lang="ts" setup>
-import { inject, onUnmounted, ref, watch } from 'vue'
+import { computed, inject, onUnmounted, ref, watch } from 'vue'
 import { apiOrderClose } from '@/api/order'
+import { PriceEnum } from '@/enums/appEnums'
+import { formatString } from '@/utils/util'
 
 const props = withDefaults(
     defineProps<{
@@ -89,6 +95,11 @@ const props = withDefaults(
     }
 )
 const emit = defineEmits(['refresh'])
+const servicePrice = computed(() => {
+    const { priceType, goodsPrice, priceRange } = props.orderInfo
+    return priceType == PriceEnum.CUSTOMER_PRICE ? goodsPrice : formatString(priceRange)
+})
+
 const timeStamp = ref<number | null>(0)
 let timeoutId: Timeout | null = null
 // 超时关闭订单
diff --git a/src/pages/order_buy/index.vue b/src/pages/order_buy/index.vue
index c8d5533..0f92825 100644
--- a/src/pages/order_buy/index.vue
+++ b/src/pages/order_buy/index.vue
@@ -62,7 +62,7 @@
                     </view>
                     <view class="mt-[24rpx]">
                         <price
-                            :goodsData="orderData"
+                            :goodsData="converItem(orderData)"
                             :priceType="orderData.priceType"
                             :desc="orderData.unitName"
                         ></price>
@@ -234,6 +234,14 @@ const appoint = computed(() => {
     else
         return `${appointTime.value.date} ${appointTime.value.start_time}-${appointTime.value.end_time}`
 })
+const converItem = computed(() => item => {
+    const { price, minPrice, maxPrice } = item
+    return {
+        ...item,
+        goodsPrice: price,
+        priceRange: `${minPrice}-${maxPrice}`
+    }
+})
 
 /**点击优惠券跳转 */
 const handleNavigateUseCoupon = () => {
diff --git a/src/pages/order_detail/index.vue b/src/pages/order_detail/index.vue
index 3b0bc5c..bb78777 100644
--- a/src/pages/order_detail/index.vue
+++ b/src/pages/order_detail/index.vue
@@ -70,8 +70,8 @@
                         </view>
                         <view class="mt-[24rpx]">
                             <price
-                                :goodsData="orderData.orderGoods"
-                                :priceType="orderData.orderGoods.priceType"
+                                :goodsData="orderData"
+                                :priceType="orderData.priceType"
                                 :desc="orderData.orderGoods?.unitName"
                             ></price>
                         </view>
@@ -114,7 +114,8 @@
             <view class="card normal text-base">
                 <view class="flex justify-between">
                     <view>服务金额</view>
-                    <view>¥{{ orderData.totalAmount }}</view>
+                    <!-- <view>¥{{ orderData.totalAmount }}</view> -->
+                    <view>¥{{ servicePrice }}</view>
                 </view>
                 <!-- <view class="mt-[30rpx] flex justify-between" v-if="orderData.orderStatus == 0">
                     <view>待付金额</view>
@@ -244,6 +245,8 @@ import OrderFooter from '@/components/order-footer/index.vue'
 import Price from '@/components/price/index.vue'
 import qrcode from '@/components/qrcode/index.vue'
 import ContactModal from '@/components/widgets/my-service/components/customer-service.vue'
+import { PriceEnum } from '@/enums/appEnums'
+import { formatString } from '@/utils/util'
 import { onHide, onLoad, onShow, onUnload } from '@dcloudio/uni-app'
 import { computed, reactive, ref, unref } from 'vue'
 
@@ -277,6 +280,10 @@ const setRefuseReasonStyle = computed(() => () => {
     }
     return classNameMap
 })
+const servicePrice = computed(() => {
+    const { priceType, goodsPrice, priceRange } = orderData.value
+    return priceType == PriceEnum.CUSTOMER_PRICE ? goodsPrice : formatString(priceRange)
+})
 
 // 初始化订单详情
 const initOrderDetail = async (): Promise<void> => {
diff --git a/src/utils/util.ts b/src/utils/util.ts
index 79d6390..89940f3 100644
--- a/src/utils/util.ts
+++ b/src/utils/util.ts
@@ -240,3 +240,41 @@ export function formatDate(datetime: string | any) {
         sec = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
     return year + '-' + month + '-' + day + ' ' + hour + ':' + min + ':' + sec
 }
+
+export function formatString(input) {
+    const processNumber = numStr => {
+        if (!numStr.includes('.')) return numStr
+
+        // 分割整数和小数部分（处理 .00 和 20. 等情况）
+        const parts = numStr.split('.', 2)
+        let [intPart, decPart] = parts
+
+        // 处理类似 ".00" 的情况
+        intPart = intPart || '0'
+
+        // 处理小数部分全零或无小数部分的情况
+        if (!decPart || decPart.trimEnd().replace(/^0+$/, '') === '') {
+            return intPart
+        }
+
+        // 去除末尾零并处理格式问题
+        const strippedDec = decPart.trimEnd().replace(/^0+$/, '')
+        const result = `${intPart}.${strippedDec}`
+
+        // 处理特殊情况
+        if (strippedDec === '') return intPart // 123.000 → 123
+        if (result.endsWith('.')) return intPart // 123. → 123
+        if (result.startsWith('.') && strippedDec) return `0${result}` // .55 → 0.55
+
+        return result
+    }
+
+    if (!input) return
+    const parts = input.split('-', 2)
+    if (parts.length !== 2) return input
+
+    const left = processNumber(parts[0])
+    const right = processNumber(parts[1])
+
+    return `${left}-${right}`
+}