From d4728b489ab67b07d08ae5de9870786711cf78ab Mon Sep 17 00:00:00 2001
From: kaeery <3491123437@qq.com>
Date: Fri, 14 Mar 2025 10:30:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=A6=96=E9=A1=B5=E3=80=91=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D#=20=E4=BB=B7=E6=A0=BC=E6=98=BE=E7=A4=BANAN?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/comp/category-datalist.vue | 26 +++++++++++++++++-----
 src/pages/index/comp/sticky-category.vue   | 22 ++++++++++++++++--
 src/pages/index/index.vue                  |  2 +-
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/pages/index/comp/category-datalist.vue b/src/pages/index/comp/category-datalist.vue
index 95fb361..f98a9b9 100644
--- a/src/pages/index/comp/category-datalist.vue
+++ b/src/pages/index/comp/category-datalist.vue
@@ -2,7 +2,7 @@
     <view v-if="content.data.length && content.enabled">
         <CategoryCard :title="item.name" v-for="(item, index) in pageData" :key="index">
             <view class="goods">
-                <block v-for="(item1, idx) in item.data" :key="item1.id">
+                <block v-for="(item1, idx) in converItem(item.data)" :key="item1.id">
                     <view class="goods-item" @click="goPage(`/pages/goods/index?id=${item1.id}`)">
                         <view class="info-img mr-3">
                             <u-image
@@ -28,10 +28,7 @@
                                 <view>
                                     <view style="color: #d41313">
                                         ¥
-                                        <span class="price">
-                                            {{ numFilter(item1.price)[0] }}
-                                        </span>
-                                        <span>.{{ numFilter(item1.price)[1] }}</span>
+                                        <span class="price">{{ servicePrice(item1) }}</span>
                                         <span class="unit pl-1">{{ item1.unit }}</span>
                                     </view>
                                     <view class="text-sm normal mt-1" style="color: #b0aeae">
@@ -59,11 +56,13 @@
 
 <script lang="ts" setup>
 import CategoryCard from './category-card.vue'
-import { ref, nextTick } from 'vue'
+import { ref, nextTick, computed } from 'vue'
 import { apiGoodsLists } from '@/api/store'
 import cloudIcon from '@/static/images/home/cloud.png'
 import waveIcon from '@/static/images/home/wave.png'
 import { useAppStore } from '@/stores/app'
+import { PriceEnum } from '@/enums/appEnums'
+import { formatString } from '@/utils/util'
 
 const { getImageUrl } = useAppStore()
 
@@ -81,6 +80,21 @@ interface CardItem {
     listBgimage: string
 }
 const pageData = ref<CardItem[]>([])
+const converItem = computed(() => data => {
+    if (!data) return
+    return data.map(item => {
+        const { price, minPrice, maxPrice } = item
+        return {
+            ...item,
+            goodsPrice: price,
+            priceRange: `${minPrice}-${maxPrice}`
+        }
+    })
+})
+const servicePrice = computed(() => item => {
+    const { priceType, goodsPrice, priceRange } = item
+    return priceType == PriceEnum.CUSTOMER_PRICE ? goodsPrice : formatString(priceRange)
+})
 
 const intPageData = async () => {
     if (props.content && props.content.data?.length > 0) {
diff --git a/src/pages/index/comp/sticky-category.vue b/src/pages/index/comp/sticky-category.vue
index cfc29b4..6114461 100644
--- a/src/pages/index/comp/sticky-category.vue
+++ b/src/pages/index/comp/sticky-category.vue
@@ -33,7 +33,7 @@
                         {{ item.categoryName }}
                     </view> -->
                     <div class="goods">
-                        <block v-for="(item1, idx) in item.data" :key="item1.id">
+                        <block v-for="(item1, idx) in converItem(item.data)" :key="item1.id">
                             <view
                                 class="goods-item"
                                 @click="goPage(`/pages/goods/index?id=${item1.id}`)"
@@ -60,7 +60,7 @@
                                     <view class="flex justify-between items-center mt-[20rpx]">
                                         <view class="price-wrap text-lg">
                                             ¥
-                                            <span class="price">{{ numFilter(item1.price) }}</span>
+                                            <span class="price">{{ servicePrice(item1) }}</span>
                                         </view>
                                         <view class="text-sm normal" style="color: #b0aeae">
                                             <text class="font-bold">{{ item1.orderNum }}</text>
@@ -80,6 +80,8 @@
 <script setup lang="ts">
 import { ref, watch, nextTick, onMounted, getCurrentInstance, computed } from 'vue'
 import { apiGoodsLists } from '@/api/store'
+import { PriceEnum } from '@/enums/appEnums'
+import { formatString } from '@/utils/util'
 const props = withDefaults(
     defineProps<{
         top: number
@@ -95,6 +97,22 @@ const props = withDefaults(
 const instance = getCurrentInstance() // 获取组件实例
 const emit = defineEmits(['tabChange', 'backRefresh'])
 const topheight = ref(0)
+const converItem = computed(() => data => {
+    if (!data) return
+    return data.map(item => {
+        const { price, minPrice, maxPrice } = item
+        return {
+            ...item,
+            goodsPrice: price,
+            priceRange: `${minPrice}-${maxPrice}`
+        }
+    })
+})
+const servicePrice = computed(() => item => {
+    const { priceType, goodsPrice, priceRange } = item
+    return priceType == PriceEnum.CUSTOMER_PRICE ? goodsPrice : formatString(priceRange)
+})
+
 const handleChange = async (e: any) => {
     emit('tabChange', topInstance.value[e] - 150)
 }
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 043489f..75a16ec 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -20,7 +20,7 @@
                             lineHeight: navHeight + 'px'
                         }"
                     >
-                        {{ titleImageObj[0]?.content?.title ?? '福源建筑生活' }}
+                        {{ titleImageObj[0]?.content?.title ?? '思缘生活' }}
                     </view>
                     <template v-if="searchList">
                         <w-search