Merge branch 'master' of http://git.gxwebsoft.com/gxwebsoft/anshangjia-uniapp

2024-01-27 13:38:45 +08:00
parent eaff58094c 9510d3534b
commit 7365db4e3d
9 changed files with 146 additions and 412 deletions
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -2,6 +2,10 @@
  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
    "version": "0.0",
    "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "local"
+     	},
     	"default" : 
     	{
     		"launchtype" : "local"
--- a/pages.json
+++ b/pages.json
@@ -16,18 +16,6 @@
 				"selectedIconPath": "static/tabbar/house-active.png",
 				"text": "找房"
 			},
-			// {
-			// 	"pagePath": "pages/love/love",
-			// 	"iconPath": "static/tabbar/love.png",
-			// 	"selectedIconPath": "static/tabbar/love-active.png",
-			// 	"text": "恋爱圈"
-			// },
-			// {
-			// 	"pagePath": "pages/notice/notice",
-			// 	"iconPath": "static/tabbar/notice.png",
-			// 	"selectedIconPath": "static/tabbar/notice-active.png",
-			// 	"text": "消息"
-			// },
 			{
 				"pagePath": "pages/user/user",
 				"iconPath": "static/tabbar/user.png",
@@ -38,226 +26,24 @@
 	},
 	"subPackages": [{
 		"root": "sub_pages",
-		"pages": [{
-				"path": "user/personal/index",
-				"style": {
-					"navigationBarTitleText": "个人资料"
-				}
-			},
-			{
-				"path": "user/bind/index",
-				"style": {
-					"navigationBarTitleText": "绑定手机"
-				}
-			}, {
-				"path": "user/buy/buy",
-				"style": {
-					"navigationBarTitleText": "购买",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "user/grade/grade",
-				"style": {
-					"navigationBarTitleText": "我的会员",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "user/poster/poster",
-				"style": {
-					"navigationBarTitleText": "分享海报",
-					"enablePullDownRefresh": false,
-					"navigationStyle": "custom"
-				}
+		"pages": [

-			}, {
-				"path": "user/poster/poster2",
-				"style": {
-					"navigationBarTitleText": "分享海报",
-					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#730070",
-					"navigationBarTextStyle": "white",
-					"navigationStyle": "custom"
-				}
-
-			}, {
-				"path": "love/release/release",
-				"style": {
-					"navigationBarTitleText": "发布",
-					"enablePullDownRefresh": false
-				}
-			},
-			{
-				"path": "certification/certification",
-				"style": {
-					"navigationBarTitleText": "我的认证",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "certification/id-card/id-card",
-				"style": {
-					"navigationBarTitleText": "身份认证",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "certification/education/education",
-				"style": {
-					"navigationBarTitleText": "学历认证",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "certification/car/car",
-				"style": {
-					"navigationBarTitleText": "车辆认证",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "dealer/dealer",
-				"style": {
-					"navigationBarTitleText": "婚介中心",
-					"enablePullDownRefresh": true,
-					"navigationStyle": "custom"
-				}
-			}, {
-				"path": "dealer/grade/grade",
-				"style": {
-					"navigationBarTitleText": "开通线上门店",
-					"enablePullDownRefresh": false
-				}
-			},
 			{
 				"path": "checkout/checkout",
 				"style": {
 					"navigationBarTitleText": "预约看房",
 					"enablePullDownRefresh": false
 				}
-			}, {
-				"path": "dealer/team/team",
-				"style": {
-					"navigationBarTitleText": "单身团",
-					"enablePullDownRefresh": true
-				}
-			}, {
+			}, 
+	
+			{
 				"path": "contact/contact",
 				"style": {
 					"navigationBarTitleText": "联系客服",
 					"enablePullDownRefresh": false
 				}
-			}, {
-				"path": "dealer/qrcode/qrcode",
-				"style": {
-					"navigationBarTitleText": "识别二维码",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "profit/profit",
-				"style": {
-					"navigationBarTitleText": "收益明细",
-					"enablePullDownRefresh": true
-				}
-			}, {
-				"path": "dealer/offline/offline",
-				"style": {
-					"navigationBarTitleText": "单身团",
-					"enablePullDownRefresh": false
-				}
+			}, 
 		
-			}, {
-				"path": "goods/list",
-				"style": {
-					"navigationBarTitleText": "商品列表",
-					"enablePullDownRefresh": true
-				}
-			},
-			{
-				"path": "wallet/balance/log",
-				"style": {
-					"navigationBarTitleText": "我的钱包"
-				}
-			}, {
-				"path": "wallet/gift/gift",
-				"style": {
-					"navigationBarTitleText": "我的礼物",
-					"enablePullDownRefresh": false
-				}
-			},
-			{
-				"path": "wallet/recharge/index",
-				"style": {
-					"navigationBarTitleText": "充值中心"
-				}
-			},
-			{
-				"path": "wallet/recharge/order",
-				"style": {
-					"navigationBarTitleText": "充值记录"
-				}
-			},
-			{
-				"path": "goods/detail",
-				"style": {
-					"navigationBarTitleText": "商品详情页"
-				}
-			}, {
-				"path": "dealer/merchant/merchant",
-				"style": {
-					"navigationBarTitleText": "我的门店",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "member/member",
-				"style": {
-					"navigationBarTitleText": "会员列表",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "member/detail/detail",
-				"style": {
-					"navigationBarTitleText": "会员详情",
-					"enablePullDownRefresh": false
-				}
-			},
-			{
-				"path": "order/detail",
-				"style": {
-					"navigationBarTitleText": "订单详情",
-					"navigationBarTextStyle": "white"
-				}
-			}, {
-				"path": "order/get-food/get-food",
-				"style": {
-					"navigationBarTitleText": "领餐列表",
-					"enablePullDownRefresh": false,
-					"navigationStyle": "custom"
-				}
-			}, {
-				"path": "notice/fans",
-				"style": {
-					"navigationBarTitleText": "喜欢我"
-				}
-			}, {
-				"path": "notice/like",
-				"style": {
-					"navigationBarTitleText": "我喜欢"
-				}
-			}, {
-				"path": "notice/comment",
-				"style": {
-					"navigationBarTitleText": "评论"
-				}
-			}, {
-				"path": "notice/look",
-				"style": {
-					"navigationBarTitleText": "看过我"
-				}
-			}, {
-				"path": "love/comment/comment",
-				"style": {
-					"navigationBarTitleText": "评论详情",
-					"enablePullDownRefresh": false
-				}
-
-			},
 			 {
 				"path": "feedback/feedback",
 				"style": {
@@ -265,38 +51,9 @@
 					"enablePullDownRefresh": false
 				}

-			}, {
-				"path": "wallet/profit/profit",
-				"style": {
-					"navigationBarTitleText": "收益明细",
-					"enablePullDownRefresh": false
-				}
+			}, 
 			
-			}, {
-				"path": "withdraw/withdraw",
-				"style": {
-					"navigationBarTitleText": "申请提现",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "withdraw/log/log",
-				"style": {
-					"navigationBarTitleText": "打款进度",
-					"enablePullDownRefresh": false
-				}
-
-			}, {
-				"path": "dealer/poster/poster",
-				"style": {
-					"navigationBarTitleText": "分享海报",
-					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#730070",
-					"navigationBarTextStyle": "white",
-					"navigationStyle": "custom"
-				}
-
-			}, {
+			{
 				"path": "house/house",
 				"style": {
 					"navigationBarTitleText": "房源管理",
@@ -332,7 +89,8 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "爱尚家",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -368,114 +126,21 @@
 				"navigationBarTitleText": "租赁服务协议与隐私协议"
 			}
 		},
+		
 		{
-			"path": "pages/comment/index",
-			"style": {
-				"navigationBarTitleText": "商品评价页"
-			}
-		},
-		{
-			"path": "pages/checkout/checkout",
-			"style": {
-				"navigationBarTitleText": "订单确认"
-			}
-		},
-		{
-			"path": "pages/checkout/cashier/index",
-			"style": {
-				"navigationBarTitleText": "支付订单"
-			}
-		},
-		{
-			"path": "pages/order/index",
-			"style": {
-				"navigationBarTitleText": "订单列表",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shop/extract",
-			"style": {
-				"navigationBarTitleText": "选择自提门店"
-			}
-		},
-		{
-			"path": "pages/shop/detail",
-			"style": {
-				"navigationBarTitleText": "门店详情"
-			}
-		},
-		{
-			"path": "uni_modules/uni-pay/pages/success/success",
-			"style": {
-				"backgroundColor": "#F8F8F8",
-				"navigationBarTitleText": "支付成功"
-			}
-		}, {
 			"path": "uni_modules/uni-pay/pages/ad-interactive-webview/ad-interactive-webview",
 			"style": {
 				"backgroundColor": "#F8F8F8",
 				"navigationBarTitleText": "ad"
 			}
-		}, {
+		}, 
+		{
 			"path": "pages/user/password/password",
 			"style": {
 				"navigationBarTitleText": "修改密码",
 				"enablePullDownRefresh": false
 			}

-		}, {
-			"path": "pages/zone/zone",
-			"style": {
-				"navigationBarTitleText": "专区"
-			}
-		}, {
-			"path": "pages/zone/member/member",
-			"style": {
-				"navigationBarTitleText": "专区列表",
-				"enablePullDownRefresh": true
-			}
-		}, {
-			"path": "pages/love/love",
-			"style": {
-				"navigationBarTitleText": "恋爱圈",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
-			}
-		}, {
-			"path": "pages/love/category",
-			"style": {
-				"navigationBarTitleText": "话题",
-				"enablePullDownRefresh": true
-			}
-		}, {
-			"path": "pages/pair/pair",
-			"style": {
-				"navigationBarTitleText": "配对",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/chat/chat",
-			"style": {
-				"navigationBarTitleText": "聊天",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/article/article",
-			"style": {
-				"navigationBarTitleText": "情感课堂",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/article/detail/detail",
-			"style": {
-				"navigationBarTitleText": "文章详情",
-				"enablePullDownRefresh": false
-			}
-
 		}, 
 		{
 			"path": "pages/house/house",
--- a/pages/flash/index.vue
+++ b/pages/flash/index.vue
@@ -2,7 +2,7 @@
 	<view class="page-wrap">
 		<view class="main">
 			<view class="logo">
-				<image src="https://file.wsdns.cn/20230801/84480e0c65b044ebb869f8f2754bc0b1.png" mode="widthFix"></image>
+				<image src="@/static/logo-chang.png" mode="widthFix"></image>
 				<!-- <image src="https://oss.jimeigroup.cn/static/flash-logo-text.png" mode="widthFix"></image> -->
 				<!-- <text class="logo-name">
 					爱尚家找房
--- a/pages/house/house.vue
+++ b/pages/house/house.vue
@@ -9,16 +9,18 @@
 		</view>
 		<view class="search-tools">
 			<view class="region">
-				<uni-data-select class="select-width" v-model="where.region" :localdata="region" placeholder="区域"
+				<uni-data-select class="select-width" v-model="where.keywords" :localdata="houseArea" placeholder="区域"
 					@change="onSearch"></uni-data-select>
 			</view>
 			<view class="region">
-				<uni-data-select class="select-width" v-model="where.priceScene" :localdata="price" placeholder="价格区间"
-					@change="onSearch"></uni-data-select>
+				<u--input class="where-input" v-model="where.priceScene" type="text" @confirm="onSearch" placeholder="价格区间" clearable  border="none" :customStyle="{height: '35px'}"/>
+				<!-- <uni-data-select class="select-width" v-model="where.priceScene" :localdata="price" placeholder="价格区间"
+					@change="onSearch"></uni-data-select> -->
 			</view>
 			<view class="region">
-				<uni-data-select class="select-width" v-model="where.extentScene" :localdata="extent" placeholder="面积"
-					@change="onSearch"></uni-data-select>
+				<u--input class="where-input" v-model="where.extentScene" type="text" @confirm="onSearch" placeholder="面积m²" clearable border="none" :customStyle="{height: '35px'}"/>
+				<!-- <uni-data-select class="select-width" v-model="where.extentScene" :localdata="extent" placeholder="面积"
+					@change="onSearch"></uni-data-select> -->
 			</view>
 			<view class="region">
 				<uni-data-select class="select-width" v-model="where.sortScene" :localdata="sort" placeholder="排序"
@@ -125,7 +127,9 @@
 				loadMore: true,
 				status: '加载更多',
 				page: 1,
-				where: {},
+				where: {
+					status: 0
+				},
 				dict: null,
 				cityList: [],
 				// 控制onShow事件是否刷新订单列表
@@ -137,6 +141,7 @@
 				],
 				menu,
 				region,
+				houseArea:[],
 				price,
 				extent,
 				sort,
@@ -234,6 +239,14 @@
 						}
 					})
 					
+					app.houseArea = res.data.house_area[0].map(d => {
+						console.log('d: ', d);
+						return {
+							value: d,
+							text: d
+						}
+					})
+
 					uni.request({
 						url: 'https://file.wsdns.cn/json/city.js',
 						success(res) {
@@ -394,4 +407,9 @@
 			}
 		}
 	}
+	.where-input{
+		height: 100%;
+		width: 100%;
+		text-align: center;
+	}
 </style>
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,14 @@
 <template>
 	<view class="page">
+		<u-navbar placeholder fixed>
+			<template slot="left">
+				<view style="display: flex;align-items: center;height: 44px;">
+					<image style="height: 30px;" src="@/static/logo-chang.png" mode="heightFix"></image>
+				</view>
+			</template>
+		</u-navbar>
 		<!-- 搜索 -->
-		<u-sticky offset-top="5" zIndex="999">
+		<u-sticky :offset-top="stickyTop" zIndex="999">
 			<view class="search-fix fixed" v-if="scrollTop < 30">
 				<view class="search">
 					<u-notice-bar bgColor="#ffffff" direction="column" :text="hotKeywords" speed="250" @click="onNoticeBar"></u-notice-bar>
@@ -25,7 +32,7 @@
 		</u-sticky>
 		<!-- 幻灯片 -->
 		<view class="swiper">
-			<u-swiper :list="swiperList" :height="180" :radius="0" @change="change" @click="click"></u-swiper>
+			<u-swiper :list="swiperList" :height="180" :radius="0"  @click="click"></u-swiper>
 		</view>
 		<!-- 选项卡 -->
 		<view class="tabs">
@@ -119,7 +126,8 @@
 				status: '加载更多',
 				page: 1,
 				where: {
-					recommend: 1
+					recommend: 1,
+					status: 0
 				},
 				region: [],
 				// 控制onShow事件是否刷新订单列表
@@ -137,7 +145,8 @@
 				scrollTop: 0,
 				old: {
 					scrollTop: 0
-				}
+				},
+				stickyTop: 60
 			};

 		},
@@ -148,6 +157,12 @@
 			uni.$u.mpShare = {
 				title: '爱尚家找房'
 			}
+			
+			uni.getSystemInfo({
+				success: (res) => {
+					this.stickyTop = res.statusBarHeight  + 44 + 20
+				}
+			})
 		},
 		onShow() {},
 		onBackPress() {},
@@ -209,9 +224,11 @@
 				this.where = {}
 				if(index == 0){
 					this.where.recommend = 1
+					this.where.status = 0
 				}
 				if(index == 1){
 					this.where.mustSee = 1
+					this.where.status = 0
 				}
 				this.onSearch()
 			},
--- a/static/logo-chang.png
+++ b/static/logo-chang.png
--- a/static/logo.png
+++ b/static/logo.png
--- a/sub_pages/house/add.vue
+++ b/sub_pages/house/add.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<u--form :model="form" ref="uForm" :rules="rules" labelPosition="top" :labelStyle="{paddingLeft: '10rpx'}"
-			label-width="200rpx" >
+			label-width="200rpx">
 			<!-- 表单组件 -->

 			<view class="his-head">
@@ -17,8 +17,9 @@
 					</u-form-item>
 					<u-form-item prop="area">
 						<u-cell title="城市" @click="onArea" :isLink="true">
-							<u-input :disabled="true" disabledColor="#FFFFFF" slot="value" class="input" v-model="form.city" inputAlign="right" maxlength="30"
-								:border="false" placeholder="请选择所在城市" />
+							<u-input :disabled="true" disabledColor="#FFFFFF" slot="value" class="input"
+								v-model="form.city" inputAlign="right" maxlength="30" :border="false"
+								placeholder="请选择所在城市" />
 						</u-cell>
 					</u-form-item>
 					<!-- <u-form-item prop="address">
@@ -31,17 +32,18 @@
 						<view class="his-head">
 							<text class="title">详细地址</text>
 						</view>
-						<view class="form-wrapper"  @click="openMap">
+						<view class="form-wrapper" @click="openMap">
 							<view class="textarea">
-								<u--textarea v-model="form.address" placeholder="请输入详细地址"
-									maxlength="200" :disabled="true" disabledColor="#FFFFFF"></u--textarea>
+								<u--textarea v-model="form.address" placeholder="请输入详细地址" maxlength="200"
+									:disabled="true" disabledColor="#FFFFFF"></u--textarea>
 							</view>
 						</view>
 					</u-form-item>
 					<u-form-item prop="houseType">
 						<u-cell title="户型" :isLink="true" @click="showHouseType = true">
 							<u-input slot="value" class="input" v-model="form.houseType" inputAlign="right"
-								maxlength="30" :border="false" placeholder="请选择房子户型" :disabled="true" disabledColor="#FFFFFF" />
+								maxlength="30" :border="false" placeholder="请选择房子户型" :disabled="true"
+								disabledColor="#FFFFFF" />
 						</u-cell>
 					</u-form-item>
 					<u-form-item prop="extent">
@@ -53,25 +55,26 @@
 					<u-form-item prop="leaseMethod">
 						<u-cell title="租赁方式" :isLink="true" @click="showLeaseMethod = true">
 							<u-input slot="value" class="input" v-model="form.leaseMethod" inputAlign="right"
-								maxlength="30" :border="false" placeholder="请选择租赁方式"  :disabled="true" disabledColor="#FFFFFF"/>
+								maxlength="30" :border="false" placeholder="请选择租赁方式" :disabled="true"
+								disabledColor="#FFFFFF" />
 						</u-cell>
 					</u-form-item>
 					<u-form-item prop="rent">
 						<u-cell title="租金(元/m²)" :isLink="false">
-							<u-input type="digit" slot="value" class="input" v-model="form.rent" inputAlign="right" maxlength="30"
-								:border="false" placeholder="请输入租金" />
+							<u-input type="digit" slot="value" class="input" v-model="form.rent" inputAlign="right"
+								maxlength="30" :border="false" placeholder="请输入租金" />
 						</u-cell>
 					</u-form-item>
 					<u-form-item prop="monthlyRent">
 						<u-cell title="月租金(每月)" :isLink="false">
-							<u-input type="digit" slot="value" class="input" v-model="form.monthlyRent" inputAlign="right"
-								maxlength="30" :border="false" placeholder="请输入月租金" />
+							<u-input type="digit" slot="value" class="input" :value="monthlyRent" inputAlign="right"
+								disabled-color="#FFFFFF" maxlength="30" :border="false" placeholder="请输入月租金" disabled />
 						</u-cell>
 					</u-form-item>
 					<u-form-item prop="propertyFees">
 						<u-cell title="物业费" :isLink="false">
-							<u-input type="digit" slot="value" class="input" v-model="form.propertyFees" inputAlign="right"
-								maxlength="30" :border="false" placeholder="请输入物业费" />
+							<u-input type="digit" slot="value" class="input" v-model="form.propertyFees"
+								inputAlign="right" maxlength="30" :border="false" placeholder="请输入物业费" />
 						</u-cell>
 					</u-form-item>
 					<u-form-item prop="tenancy">
@@ -82,8 +85,8 @@
 					</u-form-item>
 					<u-form-item prop="commission">
 						<u-cell title="佣金" :isLink="false">
-							<u-input type="digit" slot="value" class="input" v-model="form.commission" inputAlign="right" maxlength="30"
-								:border="false" placeholder="请输入佣金" />
+							<u-input type="digit" slot="value" class="input" v-model="form.commission"
+								inputAlign="right" maxlength="30" :border="false" placeholder="请输入佣金" />
 						</u-cell>
 					</u-form-item>
 					<u-form-item prop="premium">
@@ -95,7 +98,7 @@
 					<u-form-item prop="floor">
 						<u-cell title="楼层" :isLink="true" @click="showFloor = true">
 							<u-input slot="value" class="input" v-model="form.floor" inputAlign="right" maxlength="30"
-								:border="false" placeholder="请选择楼层"  :disabled="true" disabledColor="#FFFFFF"/>
+								:border="false" placeholder="请选择楼层" :disabled="true" disabledColor="#FFFFFF" />
 						</u-cell>
 					</u-form-item>
 					<u-form-item prop="roomNumber">
@@ -119,7 +122,7 @@
 					<u-form-item prop="toward">
 						<u-cell title="朝向" :isLink="true" @click="showToward = true">
 							<u-input slot="value" class="input" v-model="form.toward" inputAlign="right" maxlength="30"
-								:border="false" placeholder="请选择房源朝向"  :disabled="true" disabledColor="#FFFFFF"/>
+								:border="false" placeholder="请选择房源朝向" :disabled="true" disabledColor="#FFFFFF" />
 						</u-cell>
 					</u-form-item>
 				</u-cell-group>
@@ -211,8 +214,8 @@
 				<u-picker :show="showToward" :columns="dict.toward" @confirm="confirmToward" @cancel="closeToward"
 					:closeOnClickOverlay="true" @close="closeToward">
 				</u-picker>
-				<u-picker :show="showPremium" :columns="[['是','否']]" @confirm="confirmPremium" @cancel="showPremium = false"
-					:closeOnClickOverlay="true" @close="showPremium = false">
+				<u-picker :show="showPremium" :columns="[['是','否']]" @confirm="confirmPremium"
+					@cancel="showPremium = false" :closeOnClickOverlay="true" @close="showPremium = false">
 				</u-picker>


@@ -242,7 +245,11 @@
 		dateFormat
 	} from '@/utils/util.js'
 	import * as UserApi from '@/api/user'
-	import { updateHouseInfo,getHouseInfo,addHouseInfo } from '@/api/house-info.js'
+	import {
+		updateHouseInfo,
+		getHouseInfo,
+		addHouseInfo
+	} from '@/api/house-info.js'
 	import * as UploadApi from '@/api/upload'
 	import * as DictApi from '@/api/dict.js'

@@ -258,7 +265,7 @@
 	export default {
 		data() {
 			return {
-				selectId : 0,
+				selectId: 0,
 				tabs,
 				tabIndex: 10,
 				dict: null,
@@ -317,12 +324,25 @@
 				},
 			}
 		},
+		computed: {
+			monthlyRent() {
+				const {
+					extent,
+					rent
+				} = this.form
+				let monthlyRent = 0
+				if (extent && rent) {
+					monthlyRent = (extent * rent).toFixed(2)
+				}
+				return monthlyRent;
+			}
+		},

 		/**
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad(options) {
-			if(options.id > 0){
+			if (options.id > 0) {
 				uni.setNavigationBarTitle({
 					title: '编辑房源'
 				})
@@ -351,11 +371,11 @@
 				})

 			},
-			getHouse(id){
+			getHouse(id) {
 				const app = this
-				console.log('id: ',id);
+				console.log('id: ', id);
 				getHouseInfo(id).then(res => {
-					console.log('res: ',res);
+					console.log('res: ', res);
 					app.form = res.data
 					app.houseLabel = JSON.parse(app.form.houseLabel) || []
 					app.fileList1 = JSON.parse(app.form.files) || []
@@ -477,24 +497,23 @@
 				const app = this
 				if (app.disabled === true) return
 				console.log("app.tempFile: ", app.tempFile);
-				const supporting = this.supportingData.filter(item=>item.checked)
 				this.$refs.uForm.validate().then(() => {
 					app.disabled = true
 					app.form.houseLabel = JSON.stringify(app.houseLabel)
 					app.form.files = JSON.stringify(app.fileList1)
-					app.form.videoUrl = app.fileList2[0]?app.fileList2[0].url: null
-					app.form.supporting = JSON.stringify(supporting)
+					app.form.videoUrl = app.fileList2[0] ? app.fileList2[0].url : null
+					app.form.monthlyRent = app.monthlyRent
 					const saveOrUpdate = app.selectId > 0 ? updateHouseInfo : addHouseInfo;
 					saveOrUpdate(app.form).then(result => {
 						app.$toast('保存成功')
 						setTimeout(() => {
 							uni.navigateBack()
-						},1000)
+						}, 1000)
 					}).catch(err => {
 						uni.$u.toast(err)
 					})
 				}).catch(errors => {
-					console.log('errors: ',errors);
+					console.log('errors: ', errors);
 					uni.$u.toast('校验失败')
 				})

@@ -597,7 +616,7 @@
 				this.form.city = data[1].label
 				this.form.region = data[2].label
 				this.form.area = `${data[0].label} ${data[1].label} ${data[2].label}`
-				console.log("this.form.area: ",this.form.area);
+				console.log("this.form.area: ", this.form.area);
 			},
 			changeHandler(e) {
 				console.log("e: ", e);
@@ -687,7 +706,7 @@
 					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
 						status: 'success',
 						message: '',
-						url: event.name == 2 ?result.path: result.url,
+						url: event.name == 2 ? result.path : result.url,
 						thumb: result.thumbUrl
 					}))
 					fileListLen++
@@ -751,6 +770,7 @@
 		background-color: #0d0119;
 		opacity: .3;
 	}
+
 	.page-title {
 		width: 94%;
 		margin: 0 auto;
--- a/sub_pages/house/detail.vue
+++ b/sub_pages/house/detail.vue
@@ -36,7 +36,7 @@
 				</scroll-view>
 				<view class="dict">
 					<view class="dict-item">
-						<text class="title">{{ form.videoUrl.monthlyRent || 0 }}元/月</text>
+						<text class="title">{{ form.monthlyRent || 0 }}元/月</text>
 						<text class="desc">月租</text>
 					</view>
 					<view class="dict-item">
@@ -93,8 +93,8 @@
 		</view>

 		<!-- 办公室配套 -->
-		<u-gap></u-gap>
-		<view class="house-card">
+		<u-gap v-if="form.supporting"></u-gap>
+		<view v-if="form.supporting" class="house-card">
 			<view class="title">
 				办公室配套
 			</view>
@@ -155,7 +155,7 @@
 			<view class="item" @click="$push('sub_pages/checkout/checkout?id=' + form.houseId)">
 				<u-button icon="map" type="error" text="预约看房"></u-button>
 			</view>
-			<view class="item" @click="onCall(form.phone)">
+			<view class="item" @click="onCall()">
 				<u-button icon="phone" type="primary" text="电话咨询"></u-button>
 			</view>
 		</view>
@@ -167,6 +167,7 @@
 	import store from '@/store'
 	import storage from '@/utils/storage'
 	import * as HouseInfoApi from '@/api/house-info.js'
+	import * as DictApi from '@/api/dict.js'
 	import {
 		getAgentUser,
 		getUser
@@ -310,7 +311,8 @@
 					iconPath: 'https://oss.wsdns.cn/20230803/49fe9c001370488caf29c3decb34f6c7.png?x-oss-process=image/resize,w_750/quality,Q_90'
 				}],
 				agentUser: {},
-				isManager: false
+				isManager: false,
+				phone: ''
 			};

 		},
@@ -322,12 +324,20 @@
 				getAgentUser(options.user_id).then(res => {
 					this.agentUser = res.data
 				})
+			}else {
+				DictApi.getDictionaryOptions({
+					dictCode: 'service'
+				}).then(res => {
+					this.phone = res.data[0].dictDataCode
+				})
 			}
 			getUser().then(res=>{
 				this.isManager =  res.data.gradeId == 16
 			}).catch((err)=>{
 				console.log(err);
 			})
+			
+			
 		},
 		onShow() {},
 		onBackPress() {},
@@ -376,14 +386,14 @@
 					app.form.liked = res.data
 				})
 			},
-			onCall(phone) {
+			onCall() {
 				if (this.agentUser && this.agentUser.phone) {
 					uni.makePhoneCall({
 						phoneNumber: this.agentUser.phone
 					})
-				}else if(phone) {
+				}else if(this.phone) {
 					uni.makePhoneCall({
-						phoneNumber: phone
+						phoneNumber: this.phone
 					})
 				}