From bdd525fd73b8186374e6f0aa78f40b7dc3f98ff7 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 5 Sep 2025 13:12:01 +0800
Subject: [PATCH] 1

---
 components/home/homeList.vue                |  16 +--
 pages/tourGuide/tourGuide.vue               | 147 ++++++++++++++++------------
 pages_subpack/category/component/search.vue |   2 +-
 pages_subpack/category/index.vue            |   2 +-
 pages_subpack/detail/index.vue              |  15 +--
 pages_subpack/house/other.vue               |   2 +-
 6 files changed, 105 insertions(+), 79 deletions(-)

diff --git a/components/home/homeList.vue b/components/home/homeList.vue
index dd0e241..44921de 100644
--- a/components/home/homeList.vue
+++ b/components/home/homeList.vue
@@ -3,8 +3,8 @@
 		<view v-if="list.length>0">
 			<view @click="onDetail(item)" class="se-my-10 se-mx-20 se-px-20 se-py-20 se-br-20 se-bgc-white se-flex" v-for="(item,index) in list" :key="index">
 				<view class="se-pos se-w-260 se-h-180">
-					<image v-if="item.iconImage" class="se-a-80 se-pos-lt" :src="item.iconImage" mode=""></image>
-					<image class="se-w-260 se-h-180 se-br-10" :src="item.images[0]" mode=""></image>
+					<image v-if="item.iconImage" class="se-a-80 se-pos-lt" :src="item.iconImage" mode="aspectFill"></image>
+					<image class="se-w-260 se-h-180 se-br-10" :src="item.images[0]" mode="aspectFill"></image>
 				</view>
 				<view class="se-pl-10 se-w-p-100">
 					<view class="se-c-black se-fs-28">
@@ -14,22 +14,24 @@
 						<text>{{item.homeType}}</text>
 						<text>{{item.timeGo}}年</text>
 					</view>
-					<view class="se-flex se-flex-h-sb se-flex-ai-c se-mt-10">
+					<view class="se-flex se-flex-v se-mt-10"
+                    >
 						<template v-if="item.iconTitles.length>0">
-							<view class="se-flex">
-								<view class="se-display-ib se-c-white se-bgc-orange se-fs-22 se-br-8 se-px-10 se-py-5 se-mr-10" v-for="(items,indexs) in item.iconTitles" :key="indexs">
+							<view class="se-flex se-flex-wrap"
+                            style="flex-wrap: wrap;">
+								<view class="se-display-ib se-c-white se-bgc-orange se-fs-22 se-br-8 se-px-10 se-py-5 se-mr-10 se-mb-10" v-for="(items,indexs) in item.iconTitles" :key="indexs">
 									{{items}}
 								</view>
 							</view>
 						</template>
 						<template v-else><view></view></template>
-						<view class="se-c-66 se-flex se-flex-ai-c">
+						<view class="se-c-66 se-flex se-flex-ai-c se-mt-10">
 							<uv-icon name="eye"></uv-icon>
 							<text class="se-ml-5 se-fs-18">{{item.num}}</text>
 						</view>
 					</view>
 					<view class="se-flex  se-flex-h-sb se-flex-ai-c se-mt-10">
-						<text class="se-c-red se-fs-24 se-fw-6 se-toe-1">￥{{item.price}}元/{{item.unit}}</text>
+						<text class="se-c-red se-fs-24 se-fw-6 se-toe-1">￥{{item.price}}{{item.unit}}</text>
 						<text class="se-c-66 se-fs-22 se-toe-1">{{item.address}}</text>
 					</view>
 				</view>
diff --git a/pages/tourGuide/tourGuide.vue b/pages/tourGuide/tourGuide.vue
index f762bbc..2663b62 100644
--- a/pages/tourGuide/tourGuide.vue
+++ b/pages/tourGuide/tourGuide.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="Locations">
 
-        <map style="width: 100%;height: 60vh" 
+        <map style="width: 100%;height: 60vh;pointer-events: auto;" 
             :layer-style='5' 
             :show-location='true' 
             :latitude="position.latitude"
@@ -24,7 +24,7 @@
         <!-- 搜索功能 -->
         <view class="search-container">
             <view class="se-bgc-white se-pb-20 se-pt-30 se-px-40">
-                <uv-search @search="onSearch()" placeholder="搜索租房信息" :showAction="false" v-model="keyword"></uv-search>
+                <uv-search @search="onSearch" placeholder="搜索租房信息" :showAction="false" v-model="keyword" :disabled="false"></uv-search>
             </view>
             <view class="se-pb-10 se-px-40 se-bgc-white">
                 <uv-drop-down ref="dropDown" sign="dropDown_1" text-active-color="#1EC77A"
@@ -46,55 +46,10 @@
             </view>
         </view>
 
-        <uv-tabs :list="houseTypeList" :activeStyle="{ color: '#1EC77A', fontWeight: 600 }" lineColor="#1EC77A"
-            lineHeight="8rpx" lineWidth="50rpx" keyName="title" :current="currentHouseType"
-            @click="onClickHouseType"></uv-tabs>
-
 
         <view class="Locations-list">
             <!-- 房源列表 -->
-            <view v-if="list.length > 0">
-                <view @click="onDetail(item)" class="se-my-10 se-mx-20 se-px-20 se-py-20 se-br-20 se-bgc-white se-flex"
-                    v-for="(item, index) in list" :key="index">
-                    <view class="se-pos se-w-260 se-h-180">
-                        <image v-if="item.iconImage" class="se-a-80 se-pos-lt" :src="item.iconImage" mode=""></image>
-                        <image class="se-w-260 se-h-180 se-br-10" :src="item.images[0]" mode=""></image>
-                    </view>
-                    <view class="se-pl-10 se-w-p-100">
-                        <view class="se-c-black se-fs-28">
-                            {{ item.title }}
-                        </view>
-                        <view class="se-flex se-flex-h-sb se-flex-ai-c se-fs-24 se-mt-10 se-c-66">
-                            <text>{{ item.homeType }}</text>
-                            <text>{{ item.timeGo }}年</text>
-                        </view>
-                        <view class="se-flex se-flex-h-sb se-flex-ai-c se-mt-10">
-                            <template v-if="item.iconTitles.length > 0">
-                                <view class="se-flex">
-                                    <view
-                                        class="se-display-ib se-c-white se-bgc-orange se-fs-22 se-br-8 se-px-10 se-py-5 se-mr-10"
-                                        v-for="(items, indexs) in item.iconTitles" :key="indexs">
-                                        {{ items }}
-                                    </view>
-                                </view>
-                            </template>
-                            <template v-else>
-                                <view></view>
-                            </template>
-                            <view class="se-c-66 se-flex se-flex-ai-c">
-                                <uv-icon name="eye"></uv-icon>
-                                <text class="se-ml-5 se-fs-18">{{ item.num }}</text>
-                            </view>
-                        </view>
-                        <view class="se-flex se-flex-h-sb se-flex-ai-c se-mt-10">
-                            <text class="se-c-red se-fs-24 se-fw-6 se-toe-1">￥{{ item.price }}元/{{ item.unit }}</text>
-                            <text class="se-c-66 se-fs-22 se-toe-1">{{ item.address }}</text>
-                        </view>
-                    </view>
-                </view>
-            </view>
-
-            <uv-empty v-else text="没有哦" textSize="30rpx" iconSize="200rpx" icon="list"></uv-empty>
+            <homeList :list="list"></homeList>
         </view>
 
 
@@ -104,7 +59,11 @@
 <script>
 import { housePageList, houseType, houseArea, houseIconClass, housePrice, houseYear } from "@/common/api.js"
 import { getInfo } from "@/common/api.js"
+import homeList from "@/components/home/homeList.vue"
 export default {
+    components: {
+        homeList
+    },
     data() {
         return {
             scale: 12, //缩放级别
@@ -166,7 +125,7 @@ export default {
             activeName: 'region',
             // 筛选条件
             priceId: null,
-            typeId: null,
+            classId: null,
             yearId: null
         }
     },
@@ -447,7 +406,7 @@ export default {
                 title: that.keyword, // 关键词搜索
                 areaId: that.areaId, // 区域筛选
                 priceId: that.priceId, // 租金筛选
-                typeId: that.typeId, // 类型筛选
+                classId: that.classId, // 类型筛选
                 yearId: that.yearId // 年限筛选
             }
 
@@ -531,7 +490,11 @@ export default {
         },
         
         // 处理搜索
-        onSearch() {
+        onSearch(value) {
+            // 如果传入了搜索值，使用传入的值，否则使用当前keyword
+            if (value !== undefined) {
+                this.keyword = value;
+            }
             console.info('搜索关键词:', this.keyword)
             this.pageNo = 1
             this.list = []
@@ -539,19 +502,59 @@ export default {
         },
         
         // 选择筛选菜单
-        selectMenu(name) {
+        selectMenu(e) {
+            const { name, active, type } = e;
             this.activeName = name;
+            // type 等于1 的需要特殊处理：type不等于1可以忽略
+            if (type == 1) {
+                this.clickItem({
+                    name: 'vip_type',
+                    label: 'VIP文档',
+                    value: e.active ? 1 : 0
+                });
+            } else {
+                const find = this.result.find(item => item.name == this.activeName);
+                if (find) {
+                    const findIndex = this[this.activeName].child.findIndex(item => item.label == find.label && item.value == find.value);
+                    this[this.activeName].activeIndex = findIndex;
+                } else {
+                    this[this.activeName].activeIndex = 0;
+                }
+            }
         },
         
         // 点击筛选项
-        clickItem(item) {
-            console.log('选择筛选项：', item);
-            // 更新对应的筛选值
-            this[this.activeName].label = item.label;
-            this[this.activeName].value = item.value;
+        clickItem(e) {
+            let { label, value } = e;
+            
+            // 处理筛选结果数组
+            const findIndex = this.result.findIndex(item => item.name == this.activeName);
+            if (this.defaultValue.indexOf(value) > -1 && this[this.activeName].label) {
+                label = this[this.activeName].label;
+            }
+            
+            // 已经存在筛选项
+            if (findIndex > -1) {
+                this.$set(this.result, findIndex, {
+                    name: this.activeName,
+                    label,
+                    value
+                });
+            } else {
+                this.result.push({
+                    name: this.activeName,
+                    label,
+                    value
+                });
+            }
+            
+            // 过滤掉默认值
+            this.result = this.result.filter(item => this.defaultValue.indexOf(item.value) == -1);
+            
+            console.log('筛选结果：', this.result);
             
             // 处理筛选逻辑
-            this.handleFilter(item);
+            this.handleFilter({ label, value });
         },
         
         // 处理筛选
@@ -565,7 +568,7 @@ export default {
             } else if (this.activeName === 'rent') {
                 this.priceId = item.value === 'all' ? null : item.value
             } else if (this.activeName === 'type') {
-                this.typeId = item.value === 'all' ? null : item.value
+                this.classId = item.value === 'all' ? null : item.value
             } else if (this.activeName === 'duration') {
                 this.yearId = item.value === 'all' ? null : item.value
             }
@@ -585,7 +588,7 @@ export default {
             houseArea({}).then(response => {
                 let arr = [
                     {
-                        label: '全部区域',
+                        label: '全部',
                         value: 'all'
                     }
                 ]
@@ -609,7 +612,7 @@ export default {
                 console.info('类型数据', response.result)
                 let arr = [
                     {
-                        label: '全部类型',
+                        label: '全部',
                         value: 'all'
                     }
                 ]
@@ -631,7 +634,7 @@ export default {
             housePrice({}).then(response => {
                 let arr = [
                     {
-                        label: '全部价格',
+                        label: '全部',
                         value: 'all'
                     }
                 ]
@@ -654,7 +657,7 @@ export default {
                 console.info('年限数据', response.result)
                 let arr = [
                     {
-                        label: '全部年限',
+                        label: '全部',
                         value: 'all'
                     }
                 ]
@@ -697,7 +700,25 @@ export default {
 .Locations {
     
     .search-container {
+        position: relative;
         background-color: #fff;
+        z-index: 100;
+        
+        // 确保搜索框可以正常点击
+        .se-bgc-white {
+            position: relative;
+            z-index: 101;
+        }
+        
+        // 确保下拉菜单可以正常显示和点击
+        /deep/ .uv-drop-down {
+            position: relative;
+            z-index: 102;
+        }
+        
+        /deep/ .uv-drop-down-popup {
+            z-index: 103 !important;
+        }
         border-bottom: 1rpx solid #f0f0f0;
     }
 
diff --git a/pages_subpack/category/component/search.vue b/pages_subpack/category/component/search.vue
index 60e804c..d9c51e4 100644
--- a/pages_subpack/category/component/search.vue
+++ b/pages_subpack/category/component/search.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="se-bgc-white se-pb-20 se-pt-30 se-px-40">
-			<uv-search @search="onSearch()" placeholder="搜索租房信息" :showAction="false" v-model="keyword"></uv-search>
+			<uv-search @search="onSearch" placeholder="搜索租房信息" :showAction="false" v-model="keyword"></uv-search>
 		</view>
 		<view class="se-pb-10 se-px-40 se-bgc-white">
 			<uv-drop-down ref="dropDown" sign="dropDown_1" text-active-color="#20CD7D"
diff --git a/pages_subpack/category/index.vue b/pages_subpack/category/index.vue
index f9fe359..8b0d64f 100644
--- a/pages_subpack/category/index.vue
+++ b/pages_subpack/category/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="uv-page">
-		<searchVue @onSearch="onSearch($event)" @onParent="onDropDown($event)" />
+		<searchVue @onSearch="onSearch" @onParent="onDropDown" />
 		<!-- <view class="se-pb-200">
 			<view v-if="list.length>0">
 				<view @click="onDetail(item)" class="se-my-10 se-mx-20 se-px-20 se-py-20 se-br-20 se-bgc-white se-flex" v-for="(item,index) in list" :key="index">
diff --git a/pages_subpack/detail/index.vue b/pages_subpack/detail/index.vue
index f1da384..4f51a30 100644
--- a/pages_subpack/detail/index.vue
+++ b/pages_subpack/detail/index.vue
@@ -23,9 +23,9 @@
 			<view class="se-flex-1 se-flex-v-sa">
 				<text class="se-c-66 se-fw-5">价格</text>
 				<text class="se-c-red se-fw-6 se-mt-20">
-                    {{detail.price}}
+                    {{detail.price}}{{ detail.unit }}
 
-                    <template v-if="detail.commonClass=='1860388156800077826'">
+                    <!-- <template v-if="detail.commonClass=='1860388156800077826'">
                         <text class="price-unit" v-if="detail.homeType.includes('出租')">元/亩/年</text>
                         <text class="price-unit" v-else-if="detail.homeType.includes('流转') 
                         && detail.homeType.includes('让')">万元/亩</text>
@@ -38,7 +38,7 @@
                     </template>
                     <template v-else>
                         <text class="price-unit">元</text>
-                    </template>
+                    </template> -->
 
                 </text>
 			</view>
@@ -98,7 +98,7 @@
 			</view>
 			<view class="se-flex se-fs-24" v-if="detail.homeBian">
 				<view class="se-flex-2 se-py-20">
-					<text class="se-c-66 se-mr-20">房屋周边</text>
+					<text class="se-c-66 se-mr-20">房屋亮点</text>
 					<text class="se-c-black se-fw-6">{{detail.homeBian}}</text>
 				</view>
 			</view>
@@ -235,7 +235,7 @@
 			<view class="se-flex se-flex-ai-c se-pb-10">
 				<view class="line-green"></view>
 				<view class="se-ml-10 se-fs-32 se-c-black se-fw-6">
-					房东评价
+					用户评价
 				</view>
 			</view>
 			<view v-if="rateList.length>0">
@@ -446,7 +446,10 @@
 						userHead:uni.getStorageSync('userInfo').headImage,
 						userName:uni.getStorageSync('userInfo').nickName,
 						userValue: that.userValue,
-						userImage:that.userImages.map(item => item.url).join(','),
+					}
+					// 只有当有图片时才添加userImage字段
+					if(that.userImages.length > 0){
+						params.userImage = that.userImages.map(item => item.url).join(',')
 					}
 					saveComment(params).then(response=>{
 						that.show = false
diff --git a/pages_subpack/house/other.vue b/pages_subpack/house/other.vue
index 1c05a65..f249b53 100644
--- a/pages_subpack/house/other.vue
+++ b/pages_subpack/house/other.vue
@@ -392,7 +392,7 @@
 						price: this.form.price, // 价格
 						timeGo: "", // 年限 - 其他资源无此字段
 						title: `${this.form.type === 'rent' ? '出租' : '流转'}-其他农村资源-${this.form.address.split('市')[1] || this.form.address}`, // 标题 - 自动生成
-						unit: "", // 单位 - 其他资源价格单位灵活
+						unit: "元", // 单位 - 其他资源价格单位灵活
 						image: this.form.images.map(item => item.url).join(','), // 图片 - 使用资源照片
 						iconImage: "", // 左上角图标
 						homeImage: "", // 产权证照片 - 其他资源可能无产权证