diff --git a/common/api.js b/common/api.js
index 3eb7bda..f261296 100644
--- a/common/api.js
+++ b/common/api.js
@@ -26,7 +26,10 @@ export const UpdateInfo = (data) => http.post('/houserent-admin/info_common/upda
 // 根据租房分类信息获取租房带分页列表信息
 export const housePageList = (params) => http.get('/houserent-admin/common_index/getHousePageList', {params,params})
 
-// 根据租房分类信息获取租房带分页列表信息
+// 根据租房详情id获取房源详情
+export const houseDetail = (params) => http.get('/houserent-admin/common_index/getHouseDetail', {params,params})
+
+// 获取租房分类类型
 export const houseType = (params) => http.get('/houserent-admin/common_index/getHouseType', {params,params})
 
 // 获取通知公告
@@ -46,3 +49,12 @@ export const saveOrUpdateHouse = (data) => http.post('/houserent-admin/common_in
 export const commonIndexFindPageList = (params) => http.get('/houserent-admin/common_index/getFindPageList', {params,params})
 // 获取发现列表详情
 export const commonIndexFindDetail = (params) => http.get('/houserent-admin/common_index/getFindDetail', {params,params})
+// 获取首页图标的接口
+export const commonIndexIndexIcon = (params) => http.get('/houserent-admin/common_index/getIndexIcon', {params,params})
+
+// 房东中心
+export const MyHousePageList = (params) => http.get('/houserent-admin/common_index/getMyHousePageList', {params,params})
+// 经纪人中心
+export const MyVipPageList = (params) => http.get('/houserent-admin/common_index/getMyVipPageList', {params,params})
+// 删除
+export const deleteHouse = (params) => http.get('/houserent-admin/common_index/deleteHouse', {params,params})
diff --git a/manifest.json b/manifest.json
index e619ed4..f37dbac 100644
--- a/manifest.json
+++ b/manifest.json
@@ -77,6 +77,12 @@
     "quickapp" : {},
     "mp-weixin" : {
         "appid" : "wxecec2f505129f162",
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "将获取你的具体位置信息，用于帮助用户浏览所在位置的零活信息"
+            }
+        },
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
         "setting" : {
             "urlCheck" : false,
             "es6" : true,
@@ -103,5 +109,11 @@
             "mode" : "history"
         },
         "title" : "tenancy"
+    },
+    "plugins" : {
+        "qqmap" : {
+            "version" : "1.0.0",
+            "provider" : "qqmap"
+        }
     }
 }
diff --git a/pages.json b/pages.json
index a52c473..9e0b1ba 100644
--- a/pages.json
+++ b/pages.json
@@ -18,7 +18,14 @@
 		{
 			"path": "pages/login/index",
 			"style": {
-				"navigationStyle":"custom"
+				"navigationStyle":"default"
+			}
+		},
+		{
+			"path": "pages/discover-detail/index",
+			"style": {
+				"navigationBarTitleText": "发现详情",
+				"navigationStyle":"default"
 			}
 		},
 		{
@@ -132,6 +139,30 @@
 						"navigationBarBackgroundColor": "#ffffff",
 						"navigationBarTextStyle": "black"
 					}
+				},
+				{
+					"path": "version/index",
+					"style": {
+						"navigationBarTitleText": "提示",
+						"navigationBarBackgroundColor": "#ffffff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "broker-center/index",
+					"style": {
+						"navigationBarTitleText": "经纪人中心",
+						"navigationBarBackgroundColor": "#ffffff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "landlord-center/index",
+					"style": {
+						"navigationBarTitleText": "房东中心",
+						"navigationBarBackgroundColor": "#ffffff",
+						"navigationBarTextStyle": "black"
+					}
 				}
 			]
 		}
diff --git a/pages/auth/index.vue b/pages/auth/index.vue
index f5f5b71..b34d51b 100644
--- a/pages/auth/index.vue
+++ b/pages/auth/index.vue
@@ -33,9 +33,9 @@
 				</view>
 				<view class="se-lh-40 se-mt-40 se-fs-24 se-c-99">
 					<text>请您务必审慎阅读、充分理解用户协议和隐私政策各条款，包括但不限于用户注意事项、用户行为规范以及为了向你提供服务而收集、使用、存储你个人信息的情况等。你可阅读</text>
-					<text class="se-c-black se-fw-6" @click="handleOpenPrivacyContract()">《租房小程序用户服务协议》</text>
+					<text class="se-c-black se-fw-6" @click="handleOpenPrivacyContract()">《{{userXyObj.keyValue}}》</text>
 					<text>和</text>
-					<text class="se-c-black se-fw-6" @click="handleOpenPrivacyContract()">《租房小程序平台隐私权政策》</text>
+					<text class="se-c-black se-fw-6" @click="handleOpenPrivacyContract()">《{{userYsObj.keyValue}}》</text>
 					<text>了解详细信息。如你同意，请点击下方按钮开始接受我们的服务。</text>
 				</view>
 				<view class="se-flex se-flex-h-sb se-mt-40">
@@ -60,11 +60,14 @@
 				logo:"../../static/image/logo.png",
 				name:"租房小程序",
 				checked:[],
-				show:false
+				show:false,
+				userXyObj:{},
+				userYsObj:{}
 			}
 		},
 		mounted() {
-			this.$store.commit('initConfig')
+			this.userXyObj = this.$utils.getkeyContent('user_xy')
+			this.userYsObj = this.$utils.getkeyContent('user_ys')
 		},
 		methods: {
 			open(){
@@ -118,15 +121,16 @@
 							// that.commit('setUserInfo',{userInfo:response.result.userInfo,token:response.result.token})
 							getInfo({}).then(result=>{
 								// console.info('resultresult',result)
-								if(result.result.nickName){
-									uni.switchTab({
-										url:"/pages/home/index"
-									})
-								}else{
-									uni.navigateTo({
-										url:"/pages/login/index"
-									})
-								}
+								uni.navigateTo({
+									url:"/pages/login/index"
+								})
+								// if(result.result.nickName){
+								// 	uni.switchTab({
+								// 		url:"/pages/home/index"
+								// 	})
+								// }else{
+									
+								// }
 							}).catch(err=>{
 								
 							})
diff --git a/pages/discover-detail/index.vue b/pages/discover-detail/index.vue
new file mode 100644
index 0000000..2e3e832
--- /dev/null
+++ b/pages/discover-detail/index.vue
@@ -0,0 +1,76 @@
+<template>
+	<view>
+		<view class="se-w-vw-100 se-h-500">
+			<!-- <uv-swiper :radius="0" :list="list" :height="250" keyName="url" :autoplay="false"></uv-swiper> -->
+			<image class="se-w-p-100 se-h-500" :src="detail.image" mode="aspectFill"></image>
+		</view>
+		<view class="se-py-20 se-flex se-bgc-white">
+			<view class="se-w-vw-100 se-pl-30">
+				<view class=" se-c-black se-fw-6 se-fs-32">
+					{{detail.title}}
+				</view>
+				<!-- <view class="se-display-ib se-c-white se-bgc-orange se-fs-22 se-br-8 se-px-10 se-py-5">
+					{{detail.iconTitle}}
+				</view> -->
+			</view>
+		</view>
+		<view class="se-flex se-fs-24 se-px-30">
+			<view class="se-flex-1 se-py-20">
+				<text class="se-c-66 se-mr-20">发布时间</text>
+				<text class="se-c-black">{{detail.createTime}}</text>
+			</view>
+		</view>
+		<view class="se-flex se-fs-24 se-px-30">
+			<view class="se-flex-1 se-py-20">
+				<text class="se-c-66 se-mr-20">详细内容</text>
+			</view>
+		</view>
+		<view class="se-c-black se-pb-120 se-fs-26 se-lh-50 se-px-30 se-lh-40 se-pt-5">
+			<uv-parse :content="detail.details"></uv-parse>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { commonIndexFindDetail } from "@/common/api.js"
+	export default{
+		data(){
+			return{
+				id:null,
+				detail:{},
+				// list: [{
+				// 	url: 'https://cdn.uviewui.com/uview/resources/video.mp4',
+				// 	title: '昨夜星辰昨夜风，画楼西畔桂堂东',
+				// 	poster: 'https://cdn.uviewui.com/uview/swiper/swiper1.png'
+				// }, {
+				// 	url: 'https://cdn.uviewui.com/uview/swiper/swiper2.png',
+				// 	title: '身无彩凤双飞翼，心有灵犀一点通'
+				// }, {
+				// 	url: 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
+				// 	title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
+				// }]
+			}
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.onCommonFindDetail()
+		},
+		methods:{
+			onCommonFindDetail(){
+				let that = this
+				commonIndexFindDetail({houseId:that.id}).then(response=>{
+					console.info('response',response)
+					that.detail = response.result
+				}).catch(error=>{
+					
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #f5f5f5;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/discover/index.vue b/pages/discover/index.vue
index d31e3e0..397478f 100644
--- a/pages/discover/index.vue
+++ b/pages/discover/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="se-p-20">
-		<view class="se-p-20 se-bgc-white se-br-20 se-mb-20" v-for="(items,indexs) in list" :key="indexs">
+		<view class="se-p-20 se-bgc-white se-br-20 se-mb-20" v-for="(items,indexs) in list" :key="indexs" @click="onDetail(items)">
 			<view class="se-flex se-flex-h">
 				<image class="se-a-80" src="../../static/image/6588.png" mode=""></image>
 				<view class="se-flex se-flex-v se-ml-30">
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-	import { commonIndexFindPageList,commonIndexFindDetail } from "@/common/api.js"
+	import { commonIndexFindPageList,commonIndexFindDetail,getInfo } from "@/common/api.js"
 	export default{
 		data(){
 			return{
@@ -56,9 +56,25 @@
 			that.onCommonIndexFindPageList()
 		},
 		methods:{
-			onNavigator(){
+			onDetail(event){
 				uni.navigateTo({
-					url:"/pages_subpack/release/index"
+					url:"/pages/discover-detail/index?id="+event.id
+				})
+			},
+			onNavigator(){
+				let token =  uni.getStorageSync('token');
+				if(!token){
+					uni.navigateTo({
+						url:"/pages/auth/index"
+					})
+					return ;
+				}
+				getInfo({}).then(result=>{
+					uni.navigateTo({
+						url:"/pages_subpack/release/index"
+					})
+				}).catch(err=>{
+					
 				})
 			},
 			onCommonIndexFindPageList(){
diff --git a/pages/home/index.vue b/pages/home/index.vue
index b9305d0..10cfe89 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -3,7 +3,7 @@
 		<view class="se-px-40 se-py-20">
 			<view class="se-bgc-white se-br-50 se-c-black se-px-20 se-py-5 se-flex se-flex-h-sb se-fs-26">
 				<view class="se-b-r se-pl-10 se-pr-20 se-flex se-flex-h se-h-40 se-lh-40 " @click="handleAreaChange()">
-					<text class="se-pr-20 nobreak">{{city}}</text>
+					<text class="se-pr-20 nobreak">{{city?city:'未知'}}</text>
 					<uv-icon name="arrow-down-fill"></uv-icon>
 				</view>
 				<view class="se-ml-20"  @click="onLogin()">
@@ -16,14 +16,14 @@
 			<image class="se-w-vw-100 se-h-400" src="@/static/image/banner.png" mode=""></image>
 		</view>
 		<view class="se-grid se-bgc-white se-py-30 se-mt-300">
-			<navigator url="/pages_subpack/category/index" v-for="(item, index) in nav" :key="index" class="se-flex-v-c se-mb-20">
+			<!-- <navigator url="/pages_subpack/category/index" v-for="(item, index) in nav" :key="index" class="se-flex-v-c se-mb-20">
 				<image class="se-a-100 se-br-20" :src="item.img" mode=""></image>
 				<text class="se-w-150 se-h-60 se-lh-30 se-c-black se-fs-22 se-ta-c se-mt-10 se-toe-2">{{item.name}}</text>
+			</navigator> -->
+			<navigator :url="item.url+`?id=`+item.id+`&title=`+item.title" v-for="(item, index) in nav" :key="index" class="se-flex-v-c se-mb-20">
+				<image class="se-a-100 se-br-20" :src="item.image" mode=""></image>
+				<text class="se-w-150 se-h-60 se-lh-30 se-c-black se-fs-22 se-ta-c se-mt-10 se-toe-2">{{item.title}}</text>
 			</navigator>
-			<!-- <view v-for="(item, index) in nav" :key="index" class="se-flex-v-c se-mb-20" @click="onNav">
-				<image class="se-a-100 se-br-20" :src="item.img" mode=""></image>
-				<text class="se-w-150 se-h-60 se-lh-30 se-c-black se-fs-22 se-ta-c se-mt-10 se-toe-2">{{item.name}}</text>
-			</view> -->
 		</view>
 		<view class="se-mt-20 se-bgc-white se-px-20 se-py-10 se-ta-l se-c-orange se-flex se-flex-ai-c se-fs-24" @click="toNotice">
 			<image class="se-a-80" src="@/static/image/aed60x.png" mode=""></image>
@@ -78,53 +78,52 @@
 </template>
 
 <script>
-	import { housePageList,houseType,noticeObjApi,getConfig } from "@/common/api.js"
-	
+	import { housePageList,houseType,noticeObjApi,getConfig,commonIndexIndexIcon } from "@/common/api.js"
 	import citySelect from "@/components/cityselect/index.vue"
 	const lineBg = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAANCAYAAAC3mX7tAAAAAXNSR0IArs4c6QAAAbxJREFUOE+lk0FrE1EUhc+ZDOhMigjZdNcWdCPJqNCdlkZw4TKL2mVwkKLQ/gAFRcEu/AEKuumDrEopNEsXSlNoV+2iTYIbBdNdNwGpmRmFyVx5oQk6mYSpvt1799z7zTnvDQPlBAJcRGxZOLXotn7Gz8ftZePaROCZP+IaEh36a04LxFS8mMmgcKFcb54H9Kvi5LtdNIZ6BMf0lVMDMD88UJ7abuP1eUDeWuEZyVcJPZ/oKeclgRcJxRMrG17l4udOGthZbF8ATMb1IvKcXiU/y66xnziM2LQf1O+nAfnq+hYgpSStCeMmdcFXzi6AWyMGrlvZcGmUs54T31QQLIzo37Pd+u0eKFD5osDYHvPlJyLyNopYnbgUtrSuc2pOG4aUSC4nxTWYFXHOfni02wPp5anCO4KP0sSUViOQ91m38VjrByDZLprBt/ZHkAkvMO3oP3QiO9ZM7i7v1MK/QHoj6sblQLrV/4ZpCDMluoff++iBo/6Bdua32m/+NUYdlz2dW+k7GQnqF84eyOqY1xjPcw8Rn+iLTwp6yFFcpP8zhLxHsgjBFRrI9WKO0AbxVURqMOVDttw8GHeTvwFKoZ4cmcUYJAAAAABJRU5ErkJggg==";
+	import QQMapWX from "@/util/qqmap-wx-jssdk.min.js"
 	export default{
 		components:{
 			citySelect
 		},
 		data(){
 			return{
-				city:"长沙市",
+				city:"",
 				keyword:"",
 				lineBg: lineBg,
-				
 				nav:[
-					{
-						img:"../../static/image/nav1.png",
-						name:"闲置散居农房"
-					},
-					{
-						img:"../../static/image/nav2.png",
-						name:"集体建设用地"
-					},
-					{
-						img:"../../static/image/nav3.png",
-						name:"鱼塘"
-					},
-					{
-						img:"../../static/image/nav4.png",
-						name:"林地"
-					},
-					{
-						img:"../../static/image/nav5.png",
-						name:"经营性建设用地"
-					},
-					{
-						img:"../../static/image/nav6.png",
-						name:"耕地"
-					},
-					{
-						img:"../../static/image/nav7.png",
-						name:"出租房"
-					},
-					{
-						img:"../../static/image/nav8.png",
-						name:"二手房"
-					}
+					// {
+					// 	img:"../../static/image/nav1.png",
+					// 	name:"闲置散居农房"
+					// },
+					// {
+					// 	img:"../../static/image/nav2.png",
+					// 	name:"集体建设用地"
+					// },
+					// {
+					// 	img:"../../static/image/nav3.png",
+					// 	name:"鱼塘"
+					// },
+					// {
+					// 	img:"../../static/image/nav4.png",
+					// 	name:"林地"
+					// },
+					// {
+					// 	img:"../../static/image/nav5.png",
+					// 	name:"经营性建设用地"
+					// },
+					// {
+					// 	img:"../../static/image/nav6.png",
+					// 	name:"耕地"
+					// },
+					// {
+					// 	img:"../../static/image/nav7.png",
+					// 	name:"出租房"
+					// },
+					// {
+					// 	img:"../../static/image/nav8.png",
+					// 	name:"二手房"
+					// }
 				],
 				noticeObj:{},
 				houseTypeList:[],
@@ -135,6 +134,13 @@
 			}
 		},
 		mounted() {
+			uni.chooseAddress({
+				success(res) {
+					console.info(res)
+				}
+			})
+			this.getLocation()
+			this.onCommonIndexIndexIcon()
 			this.onNotice();
 			this.onHousePageList();
 			this.onHouseType();
@@ -153,21 +159,47 @@
 			that.onHousePageList()
 		},
 		methods:{
+			getLocation(){
+			    const that = this;
+			    wx.getLocation({
+			        type: 'wgs84',
+					success: function (res) {
+						console.log('当前位置的经度：' + res.longitude);
+						console.log('当前位置的纬度：' + res.latitude);
+						const qqmapsdk = new QQMapWX({
+						    key: 'TT7BZ-Z3LW4-KOAUB-KWHOA-SBJJ6-Y5B6R' // 必填
+						});
+						qqmapsdk.reverseGeocoder({
+						    location: {
+						        latitude: res.latitude,
+						        longitude: res.longitude
+						    },
+						    success: function(res) {
+								that.city = res.result.ad_info.city
+						        console.log('逆地理编码结果：', res);
+						    },
+						    fail: function(error) {
+						        console.error('逆地理编码失败：', error);
+						    }
+						});
+					}
+				})
+			},
+			onCommonIndexIndexIcon(){
+				let that = this
+				commonIndexIndexIcon({}).then(response=>{
+					console.info('onCommonIndexIndexIcon',response)
+					that.nav = response.result
+				}).catch(error=>{
+					
+				})
+			},
 			onLogin(){
 				console.info("onLogin")
 					uni.navigateTo({
 						url:"/pages/auth/index"
 					})
 			},
-			onGetConfig(){
-				console.log('App Show')
-				getConfig({}).then(response=>{
-					console.info(response)
-					// that.commit('setUserInfo',{userInfo:response.result.userInfo,token:response.result.token})
-				}).catch(error=>{
-					
-				})
-			},
 			
 			onNotice(){
 				noticeObjApi({}).then(response=>{
@@ -229,7 +261,12 @@
 			},
 			
 			handleAreaChange(){
-				this.$refs.citySelectRef.open()
+				uni.chooseAddress({
+					success(res) {
+						console.info(res)
+					}
+				})
+				// this.$refs.citySelectRef.open()
 			},
 			handleCityChange(e) {
 				console.info(e)
@@ -238,7 +275,7 @@
 			},
 			onDetail(event){
 				uni.navigateTo({
-					url:"/pages_subpack/detail/index"
+					url:"/pages_subpack/detail/index?id="+event.id
 				})
 			},
 			toNotice(){
diff --git a/pages/login/index.vue b/pages/login/index.vue
index b911240..8383669 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -38,8 +38,8 @@
 		name : 'Login',
 		data() {
 			return {
-				nameUser:"奋斗不息、肖先生🧨 ²⁰²⁴",
-				imagUrl:"https://tennis-oss.xzaiyp.top/2024-12-03/5fda77f9-8a71-4794-851c-95f6efddc5b9.jpeg"
+				nameUser:"",
+				imagUrl:""
 			}
 		},
 		methods: {
@@ -58,13 +58,22 @@
 					avatarUrl:that.imagUrl,
 					nickName:that.nameUser
 				}
-				UpdateInfo(params).then((response) => {
-					uni.switchTab({
-						url:"/pages/home/index"
-					})
-				}).catch((error) =>{
+				if(that.imagUrl&&that.nameUser){
 					
-				})
+					UpdateInfo(params).then((response) => {
+						uni.switchTab({
+							url:"/pages/home/index"
+						})
+					}).catch((error) =>{
+						
+					})
+				}else{
+					return uni.showToast({
+						icon:"none",
+						title:"头像和昵称不能为空！"
+					})
+				}
+				
 			}
 			
 		}
diff --git a/pages/user/index.vue b/pages/user/index.vue
index f29ee2b..9cfdc93 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,23 +1,23 @@
 <template>
 	<view class="u-page">
-		<view class="se-pt-30 se-pb-120 se-px-40 se-bgc-green se-c-white se-pos">
+		<view class="se-pt-30 se-pb-60 se-px-40 se-bgc-green se-c-white se-pos">
 			<view class="se-flex">
-				<image src="@/static/image/header.png" class="se-br-p-50 se-w-120 se-h-120" mode=""></image>
+				<image :src="user.headImage" class="se-br-p-50 se-bgc-f9 se-w-120 se-h-120" mode=""></image>
 				<view class="se-ml-20 se-flex se-flex-v-sa se-flex-ai-fs">
 					<view class="se-flex">
-						<text class="se-fw-6 se-fs-30">热心小肖</text>
+						<text class="se-fw-6 se-fs-30">{{user.nickName?user.nickName:'暂无昵称'}}</text>
 						<!-- <view class="se-flex se-flex-ai-c se-ml-20">
 							<image class="se-a-25 se-mr-10" src="@/static/image/pencil.png" mode=""></image>
 							<text class="se-fs-22">修改资料</text>
 						</view> -->
 					</view>
-					<view class="se-fs-24 se-display-ib">
+					<view class="se-fs-24 se-display-ib" v-if="user.phone">
 						<text>手机号:</text>
-						<text class="se-ml-20">13189698114</text>
+						<text class="se-ml-20">{{user.phone}}</text>
 					</view>
 				</view>
 			</view>
-			<view class="se-pos-cb se-flex se-flex-h-sb se-w-vw-82 se-br-10 se-bgc-white se-py-30 se-px-20"
+			<!-- <view class="se-pos-cb se-flex se-flex-h-sb se-w-vw-82 se-br-10 se-bgc-white se-py-30 se-px-20"
 				style="bottom: -90rpx;">
 				<view class="se-flex se-flex-v-c  se-flex-1">
 					<image src="@/static/image/46892@2x.png" class="se-a-80" mode=""></image>
@@ -43,10 +43,10 @@
 						需求发布
 					</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
-		<view class="se-m-30 se-mt-120 se-pl-30 se-pr-20 se-br-20 se-bgc-white">
-			<view class="se-py-30 se-px-20 se-flex se-flex-h-sb se-b-b">
+		<view class="se-m-30 se-mt-30 se-pl-30 se-pr-20 se-br-20 se-bgc-white">
+			<view class="se-py-30 se-px-20 se-flex se-flex-h-sb se-b-b" @click="onLandlord">
 				<view class="se-flex se-flex-ai-c">
 					<image class="se-a-30" src="@/static/image/home4734.png" mode=""></image>
 					<text class="se-ml-20 se-fs-24 se-fw-5">房东中心</text>
@@ -55,7 +55,7 @@
 					<uv-icon name="arrow-right"></uv-icon>
 				</view>
 			</view>
-			<view class="se-py-30 se-px-20 se-flex se-flex-h-sb se-b-b">
+			<view class="se-py-30 se-px-20 se-flex se-flex-h-sb se-b-b" @click="onBrokerCenter">
 				<view class="se-flex se-flex-ai-c">
 					<image class="se-a-30" src="@/static/image/47100.png" mode=""></image>
 					<text class="se-ml-20 se-fs-24 se-fw-5">经纪人中心</text>
@@ -73,7 +73,7 @@
 					<uv-icon name="arrow-right"></uv-icon>
 				</view>
 			</view>
-			<view class="se-py-30 se-px-20 se-flex se-flex-h-sb">
+			<view class="se-py-30 se-px-20 se-flex se-flex-h-sb" @click="onVersion">
 				<view class="se-flex se-flex-ai-c">
 					<image class="se-a-30" src="@/static/image/47186.png" mode=""></image>
 					<text class="se-ml-20 se-fs-24 se-fw-5">关于我们</text>
@@ -87,26 +87,61 @@
 </template>
 
 <script>
+	import { getInfo } from "@/common/api.js"
 	export default {
 		data() {
 			return {
-				
+				user:{}
 			}
 		},
-		methods: {
+		onLoad() {
 			
+		},
+		onShow() {
+			this.onInfo()
+		},
+		methods: {
+			onInfo(){
+				let that = this
+				getInfo({}).then(response=>{
+					that.user = response.result
+					console.info('response',response)
+				}).catch(error=>{
+					
+				})
+			},
+			onLandlord(){
+				uni.navigateTo({
+					url:"/pages_subpack/landlord-center/index"
+				})
+			},
+			onBrokerCenter(){
+				uni.navigateTo({
+					url:"/pages_subpack/broker-center/index"
+				})
+			},
+			onVersion(){
+				uni.navigateTo({
+					url:"/pages_subpack/version/index"
+				})
+			},
 			onCustomerService(){
-				uni.showModal({
-					title: '联系客服',
-					content: '确定拨打客服电话？',
-					success: function (res) {
-						if (res.confirm) {
-							console.log('用户点击确定');
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
+				let that = this
+				let obj = that.$utils.getkeyContent('phone')
+				if (uni.canIUse('makePhoneCall')) {
+					uni.makePhoneCall({
+					  phoneNumber: obj.keyContent, // 电话号码
+					  success: function () {
+						console.log('拨打电话成功');
+					  },
+					  fail: function () {
+						console.log('拨打电话失败');
+					  }
+					});
+				} else {
+					console.log('你的设备不支持拨打电话功能');
+				}
+				
 			}
 		}
 	}
diff --git a/pages_subpack/broker-center/index.vue b/pages_subpack/broker-center/index.vue
new file mode 100644
index 0000000..0da4e53
--- /dev/null
+++ b/pages_subpack/broker-center/index.vue
@@ -0,0 +1,149 @@
+<template>
+	<view>
+		<view class="se-pb-200">
+			<view v-if="list.length>0">
+				<view class="se-my-20 se-mx-20 se-px-20  se-py-20 se-br-20 se-bgc-white se-flex se-flex-v"  v-for="(item,index) in list" :key="index">
+					<view @click="onDetail(item)" class="  se-flex">
+						<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 class="se-flex se-fs-24">
+						<view class="se-flex-1 se-py-10">
+							<text class="se-c-99 se-mr-20">编辑</text>
+						</view>
+						<view class="se-flex-1 se-py-10 se-flex se-flex-h-fe">
+							<text class="se-c-red se-mr-20" @click="onDelete(item)">删除</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view v-else>
+				<uv-empty mode="list" ></uv-empty>
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	import { MyVipPageList ,deleteHouse} from "@/common/api.js"
+	export default {
+		data(){
+			return{
+				pageNo:1,
+				pageSize:10,
+				list:[]
+			}
+		},
+		onLoad(options) {
+			this.onMyVipPageList()
+		},
+		onPullDownRefresh() {
+			let that = this
+			that.pageNo =  1
+			that.list = []
+			that.onMyVipPageList()
+		},
+		onReachBottom() {
+			let that = this
+			that.pageNo = that.pageNo + 1
+			that.onMyVipPageList()
+		},
+		methods:{
+			onMyHousePageList(){
+				let that = this
+				let params={
+					iconClass:that.id,
+					pageNo:that.pageNo,
+					pageSize:that.pageSize
+				}
+				MyVipPageList(params).then((response) => {
+					console.info("responseindexsindexsindexs",response.result.records)
+					response.result.records.forEach((items,indexs)=>{
+						if(items.image){
+							items.images = items.image.split(',')
+						}else{
+							items.images = []
+						}
+						if(items.homeImage){
+							items.homeImages = items.homeImage.split(',')
+						}else{
+							items.homeImages = []
+						}
+						if(items.iconTitle){
+							items.iconTitles = items.iconTitle.split(',')
+						}else{
+							items.iconTitles = []
+						}
+						
+					})
+					console.info('response.resultindexsindexsindexs',response.result.records)
+					that.list = that.list.concat(response.result.records) 
+				}).catch((error) =>{
+					
+				})
+			},
+			onDetail(event){
+				uni.navigateTo({
+					url:"/pages_subpack/detail/index?id="+event.id
+				})
+			},
+			onDelete(event){
+				let that = this;
+				uni.showModal({
+					title: '温馨提示',
+					content: '确定是否删除该数据？',
+					success: function (res) {
+						if (res.confirm) {
+							console.log('用户点击确定');
+							console.info('event',event)
+							deleteHouse({houseId:event.id}).then(response=>{
+								uni.showToast({
+									icon:"none",
+									title:"删除成功"
+								})
+								that.onMyHousePageList()
+							}).catch(error=>{
+								
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages_subpack/category/index.vue b/pages_subpack/category/index.vue
index fd6b0b5..85e2ee6 100644
--- a/pages_subpack/category/index.vue
+++ b/pages_subpack/category/index.vue
@@ -1,7 +1,47 @@
 <template>
 	<view class="uv-page">
-		<searchVue @onSearch="onSearch($event)" @onParent="onDropDown($event)" />
-		<view 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 20" :key="index">
+		<!-- <searchVue @onSearch="onSearch($event)" @onParent="onDropDown($event)" /> -->
+		<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">
+					<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>
+			<view v-else>
+				<uv-empty mode="list" ></uv-empty>
+			</view>
+		</view>
+		<!-- <view 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 20" :key="index">
 			<view class="se-pos se-w-260 se-h-180">
 				<image class="se-a-80 se-pos-lt" src="../../static/image/2x.png" mode=""></image>
 				<image class="se-w-260 se-h-180 se-br-10" src="https://cdn.uviewui.com/uview/swiper/swiper1.png" mode=""></image>
@@ -28,12 +68,13 @@
 					<text class="se-c-66 se-fs-22">四季峰景四期</text>
 				</view>
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 
 <script>
 	import searchVue from './component/search.vue'
+	import { housePageList } from "@/common/api.js"
 	export default{
 		components:{
 			searchVue
@@ -41,14 +82,74 @@
 		data(){
 			return{
 				keyword:"",
+				id:null,
+				pageNo:1,
+				pageSize:10,
+				list:[]
 			}
 		},
+		onLoad(options) {
+			this.id = options.id
+			uni.setNavigationBarTitle({
+			  title: options.title
+			})
+			this.onHousePageList()
+		},
+		onPullDownRefresh() {
+			let that = this
+			that.pageNo =  1
+			that.list = []
+			that.onHousePageList()
+		},
+		onReachBottom() {
+			let that = this
+			that.pageNo = that.pageNo + 1
+			that.onHousePageList()
+		},
 		methods:{
+			onHousePageList(){
+				let that = this
+				let params={
+					iconClass:that.id,
+					pageNo:that.pageNo,
+					pageSize:that.pageSize
+				}
+				housePageList(params).then((response) => {
+					console.info("responseindexsindexsindexs",response.result.records)
+					response.result.records.forEach((items,indexs)=>{
+						if(items.image){
+							items.images = items.image.split(',')
+						}else{
+							items.images = []
+						}
+						if(items.homeImage){
+							items.homeImages = items.homeImage.split(',')
+						}else{
+							items.homeImages = []
+						}
+						if(items.iconTitle){
+							items.iconTitles = items.iconTitle.split(',')
+						}else{
+							items.iconTitles = []
+						}
+						
+					})
+					console.info('response.resultindexsindexsindexs',response.result.records)
+					that.list = that.list.concat(response.result.records) 
+				}).catch((error) =>{
+					
+				})
+			},
 			onSearch(event){
 				console.info(event)
 			},
 			onDropDown(event){
 				console.info(event[0].value)
+			},
+			onDetail(event){
+				uni.navigateTo({
+					url:"/pages_subpack/detail/index?id="+event.id
+				})
 			}
 		}
 	}
diff --git a/pages_subpack/detail/index.vue b/pages_subpack/detail/index.vue
index c9192fe..2bbcdbc 100644
--- a/pages_subpack/detail/index.vue
+++ b/pages_subpack/detail/index.vue
@@ -6,10 +6,10 @@
 		<view class="se-py-20 se-flex se-bgc-white">
 			<view class="se-w-vw-90 se-pl-30">
 				<view class=" se-c-black se-fw-6 se-fs-32">
-					整租·四季峰景四期·2室1厅1卫整租·四季峰景四期·2室1厅1卫整租·四季峰景四期·2室1厅1卫
+					{{detail.title}}
 				</view>
 				<view class="se-display-ib se-c-white se-bgc-orange se-fs-22 se-br-8 se-px-10 se-py-5">
-					全新首租
+					{{detail.iconTitle}}
 				</view>
 			</view>
 			<view class="se-w-vw-10 se-pr-30 se-flex se-flex-v-c">
@@ -20,15 +20,15 @@
 		<view class="se-mt-30 se-bgc-white se-py-30 se-flex se-flex-h-fs">
 			<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">2000元/月</text>
+				<text class="se-c-red se-fw-6 se-mt-20">{{detail.price}}元/月</text>
 			</view>
 			<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">2000元/月</text>
+				<text class="se-c-red se-fw-6 se-mt-20">{{detail.homeType}}</text>
 			</view>
 			<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">90平方米</text>
+				<text class="se-c-red se-fw-6 se-mt-20">{{detail.homeMi}}平方米</text>
 			</view>
 		</view>
 		<view class="se-mt-30 se-p-40 se-bgc-white">
@@ -41,23 +41,23 @@
 			<view class="se-flex se-fs-24">
 				<view class="se-flex-1 se-py-20">
 					<text class="se-c-66 se-mr-20">编号</text>
-					<text class="se-c-black">232355214</text>
+					<text class="se-c-black">{{detail.classId}}</text>
 				</view>
 				<view class="se-flex-1 se-py-20 se-flex se-flex-h-fe">
 					<text class="se-c-66 se-mr-20">房屋结构</text>
-					<text class="se-c-black">两室一厅</text>
+					<text class="se-c-black">{{detail.homeJg}}</text>
 				</view>
 			</view>
 			<view class="se-flex se-fs-24">
 				<view class="se-flex-2 se-py-20">
 					<text class="se-c-66 se-mr-20">房屋地址</text>
-					<text class="se-c-black se-fw-6">湖南省长沙市天心区芙蓉街道四季峰景四期</text>
+					<text class="se-c-black se-fw-6">{{detail.address}}</text>
 				</view>
 			</view>
-			<view class="se-flex bgc-active-lg se-py-20 se-br-10">
+			<!-- <view class="se-flex bgc-active-lg se-py-20 se-br-10">
 				<view class="se-w-p-85 se-pl-30">
 					<view class=" se-c-black se-fw-6 se-fs-24">
-						具体地址：长沙市天心区桂花坪街道231号
+						具体地址：{{detail.address}}
 					</view>
 					<view class="se-fs-22 se-py-5">
 						距离你1.4km  骑行9分钟 步行18分钟
@@ -67,121 +67,121 @@
 					<uv-icon name="photo"></uv-icon>
 					<text class="se-c-black se-fs-20 se-mt-10">导航</text>
 				</view>
-			</view>
+			</view> -->
 			<view class="se-flex se-fs-24">
 				<view class="se-flex-2 se-py-20">
 					<text class="se-c-66 se-mr-20">房屋周边</text>
-					<text class="se-c-black se-fw-6">超市·幼儿园·医院·学校·小吃街等</text>
+					<text class="se-c-black se-fw-6">{{detail.homeBian}}</text>
 				</view>
 			</view>
 			<view class="se-flex se-fs-24">
 				<view class="se-flex-1 se-py-20">
 					<text class="se-c-66 se-mr-20">房间数量</text>
-					<text class="se-c-black">2</text>
+					<text class="se-c-black">{{detail.homeNum}}</text>
 				</view>
 				<view class="se-flex-1 se-py-20 se-flex se-flex-h-fe">
 					<text class="se-c-66 se-mr-20">菜地</text>
-					<text class="se-c-black">40㎡</text>
+					<text class="se-c-black">{{detail.homeCai}}</text>
 				</view>
 			</view>
 			<view class="se-flex se-fs-24">
 				<view class="se-flex-1 se-py-20">
 					<text class="se-c-66 se-mr-20">距离场镇距离</text>
-					<text class="se-c-black">2km</text>
+					<text class="se-c-black">{{detail.homeJl}}km</text>
 				</view>
 				<view class="se-flex-1 se-py-20 se-flex se-flex-h-fe">
 					<text class="se-c-66 se-mr-20">距离成都西三环</text>
-					<text class="se-c-black">2km</text>
+					<text class="se-c-black">{{detail.homeShjl}}km</text>
 				</view>
 			</view>
 			<view class="se-flex se-fs-24">
 				<view class="se-flex-1 se-py-20">
 					<text class="se-c-66 se-mr-20">房屋主体是否改造</text>
-					<text class="se-c-black">否</text>
+					<text class="se-c-black">{{detail.homeGz}}</text>
 				</view>
 				<view class="se-flex-1 se-py-20 se-flex se-flex-h-fe">
 					<text class="se-c-66 se-mr-20">房屋面积</text>
-					<text class="se-c-black">90㎡</text>
+					<text class="se-c-black">{{detail.homeMj}}㎡</text>
 				</view>
 			</view>
 			<view class="se-flex se-fs-24">
 				<view class="se-flex-1 se-py-20">
 					<text class="se-c-66 se-mr-20">院子总面积</text>
-					<text class="se-c-black">30㎡</text>
+					<text class="se-c-black">{{detail.homeYzmj}}㎡</text>
 				</view>
 				<view class="se-flex-2 se-py-20 se-flex se-flex-h-fe">
 					<text class="se-c-66 se-mr-20">房屋朝向及海拔</text>
-					<text class="se-c-black">90坐南朝北 600</text>
+					<text class="se-c-black">{{detail.homeHb}}</text>
 				</view>
 			</view>
 			<view class="se-flex se-fs-24">
 				<view class="se-flex-1 se-py-20">
 					<text class="se-c-66 se-mr-20">是否经过安置</text>
-					<text class="se-c-black">是</text>
+					<text class="se-c-black">{{detail.homeAz}}</text>
 				</view>
 				<view class="se-flex-1 se-py-20 se-flex se-flex-h-fe">
 					<text class="se-c-66 se-mr-20">交通</text>
-					<text class="se-c-black">交通便利</text>
+					<text class="se-c-black">{{detail.homeJt}}</text>
 				</view>
 			</view>
 			<view class="se-flex se-fs-24">
 				<view class="se-flex-1 se-py-20">
 					<text class="se-c-66 se-mr-20">坟包及电塔 工厂噪音</text>
-					<text class="se-c-black">无</text>
+					<text class="se-c-black">{{detail.homeZy}}</text>
 				</view>
 				<view class="se-flex-1 se-py-20 se-flex se-flex-h-fe">
 					<text class="se-c-66 se-mr-20">水电气网</text>
-					<text class="se-c-black">正常</text>
+					<text class="se-c-black">{{detail.homeSd}}</text>
 				</view>
 			</view>
 			<view class="se-flex se-fs-24">
 				<view class="se-flex-1 se-py-20">
 					<text class="se-c-66 se-mr-20">停车</text>
-					<text class="se-c-black">100元/月</text>
+					<text class="se-c-black">{{detail.homeCat}}</text>
 				</view>
 				<view class="se-flex-2 se-py-20 se-flex se-flex-h-fe">
 					<text class="se-c-66 se-mr-20">付款方式及押金</text>
-					<text class="se-c-black">押一付三(押金￥2000)</text>
+					<text class="se-c-black">{{detail.homePay}}</text>
 				</view>
 			</view>
 			<view class="se-flex se-fs-24">
 				<view class="se-flex-1 se-py-20">
 					<text class="se-c-66 se-mr-20">租期</text>
-					<text class="se-c-black">1年</text>
+					<text class="se-c-black">{{detail.homeTime}}</text>
 				</view>
 				<view class="se-flex-1 se-py-20 se-flex se-flex-h-fe">
 					<text class="se-c-66 se-mr-20">非正常死亡</text>
-					<text class="se-c-black">无</text>
+					<text class="se-c-black">{{detail.homeSw}}</text>
 				</view>
 			</view>
 			<view class="se-flex se-fs-24">
 				<view class="se-flex-1 se-py-20">
 					<text class="se-c-66 se-mr-20">邻居对房东评价</text>
-					<text class="se-c-black">为人和善</text>
+					<text class="se-c-black">{{detail.homePj}}</text>
 				</view>
 				<view class="se-flex-1 se-py-20 se-flex se-flex-h-fe">
 					<text class="se-c-66 se-mr-20">佣金</text>
-					<text class="se-c-black">200</text>
+					<text class="se-c-black">{{detail.homeMoney}}</text>
 				</view>
 			</view>
 			<view class="se-flex se-fs-24">
 				<view class="se-flex-1 se-py-20">
 					<text class="se-c-66 se-mr-20">钥匙</text>
-					<text class="se-c-black">2</text>
+					<text class="se-c-black">{{detail.homeYs}}</text>
 				</view>
 				<view class="se-flex-1 se-py-20 se-flex se-flex-h-fe">
 					<text class="se-c-66 se-mr-20">户主家庭职业</text>
-					<text class="se-c-black">医生</text>
+					<text class="se-c-black">{{detail.homeJtzy}}</text>
 				</view>
 			</view>
 			<view class="se-flex se-fs-24">
 				<view class="se-flex-1 se-py-20">
 					<text class="se-c-66 se-mr-20">报建手续</text>
-					<text class="se-c-black">完整</text>
+					<text class="se-c-black">{{detail.homeBjsx}}</text>
 				</view>
 				<view class="se-flex-1 se-py-20 se-flex se-flex-h-fe">
 					<text class="se-c-66 se-mr-20">户主年龄</text>
-					<text class="se-c-black">40岁</text>
+					<text class="se-c-black">{{detail.homeAge}}岁</text>
 				</view>
 			</view>
 		</view>
@@ -193,18 +193,18 @@
 				</view>
 			</view>
 			<view class="se-flex se-mt-20">
-				<image class="se-w-320 se-h-180 se-br-5" src="../../static/image/logo.png" mode=""></image>
-				<image class="se-w-320 se-h-180 se-br-5 se-ml-10" src="../../static/image/logo.png" mode=""></image>
+				<image class="se-w-320 se-h-180 se-br-5" :src="detail.homeTf" mode=""></image>
+				<image class="se-w-320 se-h-180 se-br-5 se-ml-10" :src="detail.image" mode=""></image>
 			</view>
 		</view>
-		<view class="se-mt-30 se-p-40 se-bgc-white">
+		<!-- <view class="se-mt-30 se-p-40 se-bgc-white">
 			<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 class="se-mt-30" v-for="(items,indexs) in 5" :key="indexs">
+			<view class="se-mt-30" v-for="(items,indexs) in 1" :key="indexs">
 				<view class="se-flex se-w-p-100">
 					<view class="se-flex se-flex-1">
 						<image class="se-a-80 se-br-p-50" src="../../static/image/6588.png" mode=""></image>
@@ -221,28 +221,59 @@
 					房东人很不错，当时疫情没在房子里面住，直接给我免了一个月房租，真的很感动，平时有什么需要维修的地方联系他也会很快处理☺☺☺
 				</view>
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 
 <script>
+	import { houseDetail } from "@/common/api.js"
+	
 	export default{
 		data(){
 			return{
+				id:null,
+				detail:{},
 				rate:3,
-				list: [{
-					url: 'https://cdn.uviewui.com/uview/resources/video.mp4',
-					title: '昨夜星辰昨夜风，画楼西畔桂堂东',
-					poster: 'https://cdn.uviewui.com/uview/swiper/swiper1.png'
-				}, {
-					url: 'https://cdn.uviewui.com/uview/swiper/swiper2.png',
-					title: '身无彩凤双飞翼，心有灵犀一点通'
-				}, {
-					url: 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
-					title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
-				}]
+				list:[],
+				// list: [{
+				// 	url: 'https://cdn.uviewui.com/uview/resources/video.mp4',
+				// 	title: '昨夜星辰昨夜风，画楼西畔桂堂东',
+				// 	poster: 'https://cdn.uviewui.com/uview/swiper/swiper1.png'
+				// }, {
+				// 	url: 'https://cdn.uviewui.com/uview/swiper/swiper2.png',
+				// 	title: '身无彩凤双飞翼，心有灵犀一点通'
+				// }, {
+				// 	url: 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
+				// 	title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
+				// }]
 			}
 		},
+		onLoad(options) {
+			this.id = options.id;
+			this.onHouseDetail()
+		},
+		methods:{
+			onHouseDetail(){
+				let that = this
+				houseDetail({houseId:that.id}).then(response=>{
+					let items = response.result
+					console.info('response',response.result)
+					if(items.image){
+						console.info('items.image.split()',items.image.split(','))
+						items.image.split(',').forEach(items=>{
+							that.list.push({
+								url: items
+							})
+						})
+					}
+					
+					
+					that.detail = items
+				}).catch(error=>{
+					
+				})
+			}
+		}
 	}
 </script>
 
diff --git a/pages_subpack/house/index.vue b/pages_subpack/house/index.vue
index 5c4b6db..5e136d7 100644
--- a/pages_subpack/house/index.vue
+++ b/pages_subpack/house/index.vue
@@ -14,7 +14,7 @@
 				<uv-input v-model="form.proportion" type="text" placeholder="请输入面积" customStyle="border-radius: 5px;margin-top:5px;background-color: #f5f5f5;padding:5px 10px;"></uv-input>
 			</uv-form-item>
 			<uv-form-item label="所属位置" prop="address" @click="handleAreaChange()">
-				<uv-input v-model="form.address" @click="handleAreaChange()" disabled disabledColor="#ffffff" placeholder="所属位置" border="none">
+				<uv-input v-model="form.address" @click="handleAreaChange()" disabled disabledColor="#ffffff" placeholder="选择所在位置" border="none">
 				</uv-input>
 				<template v-slot:right>
 					<uv-icon name="arrow-right"></uv-icon>
@@ -114,6 +114,7 @@
 <script>
 	import { saveOrUpdateHouse } from "@/common/api.js"
 	import citySelect from "@/components/cityselect/index.vue"
+	import QQMapWX from "@/util/qqmap-wx-jssdk.min.js"
 	export default{
 		components:{
 			citySelect
@@ -437,7 +438,36 @@
 				})
 			},
 			handleAreaChange(){
-				this.$refs.citySelectRef.open()
+				const that = this;
+				wx.chooseLocation({
+					// type: 'wgs84',
+					success: function (res) {
+						console.log('当前位置的经度：' + res.longitude);
+						console.log('当前位置的纬度：' + res.latitude);
+						const qqmapsdk = new QQMapWX({
+							key: 'TT7BZ-Z3LW4-KOAUB-KWHOA-SBJJ6-Y5B6R' // 必填
+						});
+						uni.showLoading({
+							title:"获取中...."
+						})
+						qqmapsdk.reverseGeocoder({
+							location: {
+								latitude: res.latitude,
+								longitude: res.longitude
+							},
+							success: function(res) {
+								uni.hideLoading()
+								that.form.address = res.result.address
+								console.log('逆地理编码结果：', res);
+							},
+							fail: function(error) {
+								uni.hideLoading()
+								console.error('逆地理编码失败：', error);
+							}
+						});
+					}
+				})
+				// this.$refs.citySelectRef.open()
 			},
 			handleCityChange(e) {
 				this.form.address = e.province.label + '-' + e.city.label + '-' + e.area.label;
@@ -481,7 +511,7 @@
 						homeAge:"",//户主年龄
 						homeAz:"",//是否经过安置
 						
-						homeBian:"",//房屋周边
+						homeBian:that.form.perimeter,//房屋周边
 						homeBjsx:"",//报建手续
 						homeCai:"",//菜地
 						homeCat:that.form.park,//停车
diff --git a/pages_subpack/landlord-center/index.vue b/pages_subpack/landlord-center/index.vue
new file mode 100644
index 0000000..a66ac21
--- /dev/null
+++ b/pages_subpack/landlord-center/index.vue
@@ -0,0 +1,148 @@
+<template>
+	<view>
+		<view class="se-pb-200">
+			<view v-if="list.length>0">
+				<view class="se-my-20 se-mx-20 se-px-20  se-py-20 se-br-20 se-bgc-white se-flex se-flex-v"  v-for="(item,index) in list" :key="index">
+					<view @click="onDetail(item)" class="  se-flex">
+						<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 class="se-flex se-fs-24">
+						<view class="se-flex-1 se-py-20">
+							<text class="se-c-99 se-mr-20">编辑</text>
+						</view>
+						<view class="se-flex-1 se-py-20 se-flex se-flex-h-fe">
+							<text class="se-c-red se-mr-20" @click="onDelete(item)">删除</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view v-else>
+				<uv-empty mode="list" ></uv-empty>
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	import { MyHousePageList,deleteHouse } from "@/common/api.js"
+	export default {
+		data(){
+			return{
+				pageNo:1,
+				pageSize:10,
+				list:[]
+			}
+		},
+		onLoad(options) {
+			this.onMyHousePageList()
+		},
+		onPullDownRefresh() {
+			let that = this
+			that.pageNo =  1
+			that.list = []
+			that.onMyHousePageList()
+		},
+		onReachBottom() {
+			let that = this
+			that.pageNo = that.pageNo + 1
+			that.onMyHousePageList()
+		},
+		methods:{
+			onMyHousePageList(){
+				let that = this
+				let params={
+					pageNo:that.pageNo,
+					pageSize:that.pageSize
+				}
+				MyHousePageList(params).then((response) => {
+					console.info("responseindexsindexsindexs",response.result.records)
+					response.result.records.forEach((items,indexs)=>{
+						if(items.image){
+							items.images = items.image.split(',')
+						}else{
+							items.images = []
+						}
+						if(items.homeImage){
+							items.homeImages = items.homeImage.split(',')
+						}else{
+							items.homeImages = []
+						}
+						if(items.iconTitle){
+							items.iconTitles = items.iconTitle.split(',')
+						}else{
+							items.iconTitles = []
+						}
+						
+					})
+					console.info('response.resultindexsindexsindexs',response.result.records)
+					that.list = that.list.concat(response.result.records) 
+				}).catch((error) =>{
+					
+				})
+			},
+			onDetail(event){
+				uni.navigateTo({
+					url:"/pages_subpack/detail/index?id="+event.id
+				})
+			},
+			onDelete(event){
+				let that = this;
+				uni.showModal({
+					title: '温馨提示',
+					content: '确定是否删除该数据？',
+					success: function (res) {
+						if (res.confirm) {
+							console.log('用户点击确定');
+							console.info('event',event)
+							deleteHouse({houseId:event.id}).then(response=>{
+								uni.showToast({
+									icon:"none",
+									title:"删除成功"
+								})
+								that.onMyHousePageList()
+							}).catch(error=>{
+								
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages_subpack/version/index.vue b/pages_subpack/version/index.vue
new file mode 100644
index 0000000..0bf9a30
--- /dev/null
+++ b/pages_subpack/version/index.vue
@@ -0,0 +1,17 @@
+<template>
+	<view>
+		<view class="se-flex se-flex-v-c se-pt-180">
+			<image class="se-a-150" src="@/static/image/logo.png" mode=""></image>
+			<text class="se-c-black se-fs-28 se-pt-30">1.0.0</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/static/image/nav1.png b/static/image/nav1.png
deleted file mode 100644
index b2d7ed1..0000000
Binary files a/static/image/nav1.png and /dev/null differ
diff --git a/static/image/nav2.png b/static/image/nav2.png
deleted file mode 100644
index e5af2eb..0000000
Binary files a/static/image/nav2.png and /dev/null differ
diff --git a/static/image/nav3.png b/static/image/nav3.png
deleted file mode 100644
index 28a748f..0000000
Binary files a/static/image/nav3.png and /dev/null differ
diff --git a/static/image/nav4.png b/static/image/nav4.png
deleted file mode 100644
index 460b780..0000000
Binary files a/static/image/nav4.png and /dev/null differ
diff --git a/static/image/nav5.png b/static/image/nav5.png
deleted file mode 100644
index e59272c..0000000
Binary files a/static/image/nav5.png and /dev/null differ
diff --git a/static/image/nav6.png b/static/image/nav6.png
deleted file mode 100644
index 66ee0bd..0000000
Binary files a/static/image/nav6.png and /dev/null differ
diff --git a/static/image/nav7.png b/static/image/nav7.png
deleted file mode 100644
index d8346f2..0000000
Binary files a/static/image/nav7.png and /dev/null differ
diff --git a/static/image/nav8.png b/static/image/nav8.png
deleted file mode 100644
index dd1f4ea..0000000
Binary files a/static/image/nav8.png and /dev/null differ
diff --git a/util/qqmap-wx-jssdk.min.js b/util/qqmap-wx-jssdk.min.js
new file mode 100644
index 0000000..8fa1477
--- /dev/null
+++ b/util/qqmap-wx-jssdk.min.js
@@ -0,0 +1 @@
+var ERROR_CONF = { KEY_ERR: 311, KEY_ERR_MSG: 'key格式错误', PARAM_ERR: 310, PARAM_ERR_MSG: '请求参数信息有误', SYSTEM_ERR: 600, SYSTEM_ERR_MSG: '系统错误', WX_ERR_CODE: 1000, WX_OK_CODE: 200 }; var BASE_URL = 'https://apis.map.qq.com/ws/'; var URL_SEARCH = BASE_URL + 'place/v1/search'; var URL_SUGGESTION = BASE_URL + 'place/v1/suggestion'; var URL_GET_GEOCODER = BASE_URL + 'geocoder/v1/'; var URL_CITY_LIST = BASE_URL + 'district/v1/list'; var URL_AREA_LIST = BASE_URL + 'district/v1/getchildren'; var URL_DISTANCE = BASE_URL + 'distance/v1/'; var URL_DIRECTION = BASE_URL + 'direction/v1/'; var MODE = { driving: 'driving', transit: 'transit' }; var EARTH_RADIUS = 6378136.49; var Utils = { safeAdd(x, y) { var lsw = (x & 0xffff) + (y & 0xffff); var msw = (x >> 16) + (y >> 16) + (lsw >> 16); return (msw << 16) | (lsw & 0xffff) }, bitRotateLeft(num, cnt) { return (num << cnt) | (num >>> (32 - cnt)) }, md5cmn(q, a, b, x, s, t) { return this.safeAdd(this.bitRotateLeft(this.safeAdd(this.safeAdd(a, q), this.safeAdd(x, t)), s), b) }, md5ff(a, b, c, d, x, s, t) { return this.md5cmn((b & c) | (~b & d), a, b, x, s, t) }, md5gg(a, b, c, d, x, s, t) { return this.md5cmn((b & d) | (c & ~d), a, b, x, s, t) }, md5hh(a, b, c, d, x, s, t) { return this.md5cmn(b ^ c ^ d, a, b, x, s, t) }, md5ii(a, b, c, d, x, s, t) { return this.md5cmn(c ^ (b | ~d), a, b, x, s, t) }, binlMD5(x, len) { x[len >> 5] |= 0x80 << (len % 32); x[((len + 64) >>> 9 << 4) + 14] = len; var i; var olda; var oldb; var oldc; var oldd; var a = 1732584193; var b = -271733879; var c = -1732584194; var d = 271733878; for (i = 0; i < x.length; i += 16) { olda = a; oldb = b; oldc = c; oldd = d; a = this.md5ff(a, b, c, d, x[i], 7, -680876936); d = this.md5ff(d, a, b, c, x[i + 1], 12, -389564586); c = this.md5ff(c, d, a, b, x[i + 2], 17, 606105819); b = this.md5ff(b, c, d, a, x[i + 3], 22, -1044525330); a = this.md5ff(a, b, c, d, x[i + 4], 7, -176418897); d = this.md5ff(d, a, b, c, x[i + 5], 12, 1200080426); c = this.md5ff(c, d, a, b, x[i + 6], 17, -1473231341); b = this.md5ff(b, c, d, a, x[i + 7], 22, -45705983); a = this.md5ff(a, b, c, d, x[i + 8], 7, 1770035416); d = this.md5ff(d, a, b, c, x[i + 9], 12, -1958414417); c = this.md5ff(c, d, a, b, x[i + 10], 17, -42063); b = this.md5ff(b, c, d, a, x[i + 11], 22, -1990404162); a = this.md5ff(a, b, c, d, x[i + 12], 7, 1804603682); d = this.md5ff(d, a, b, c, x[i + 13], 12, -40341101); c = this.md5ff(c, d, a, b, x[i + 14], 17, -1502002290); b = this.md5ff(b, c, d, a, x[i + 15], 22, 1236535329); a = this.md5gg(a, b, c, d, x[i + 1], 5, -165796510); d = this.md5gg(d, a, b, c, x[i + 6], 9, -1069501632); c = this.md5gg(c, d, a, b, x[i + 11], 14, 643717713); b = this.md5gg(b, c, d, a, x[i], 20, -373897302); a = this.md5gg(a, b, c, d, x[i + 5], 5, -701558691); d = this.md5gg(d, a, b, c, x[i + 10], 9, 38016083); c = this.md5gg(c, d, a, b, x[i + 15], 14, -660478335); b = this.md5gg(b, c, d, a, x[i + 4], 20, -405537848); a = this.md5gg(a, b, c, d, x[i + 9], 5, 568446438); d = this.md5gg(d, a, b, c, x[i + 14], 9, -1019803690); c = this.md5gg(c, d, a, b, x[i + 3], 14, -187363961); b = this.md5gg(b, c, d, a, x[i + 8], 20, 1163531501); a = this.md5gg(a, b, c, d, x[i + 13], 5, -1444681467); d = this.md5gg(d, a, b, c, x[i + 2], 9, -51403784); c = this.md5gg(c, d, a, b, x[i + 7], 14, 1735328473); b = this.md5gg(b, c, d, a, x[i + 12], 20, -1926607734); a = this.md5hh(a, b, c, d, x[i + 5], 4, -378558); d = this.md5hh(d, a, b, c, x[i + 8], 11, -2022574463); c = this.md5hh(c, d, a, b, x[i + 11], 16, 1839030562); b = this.md5hh(b, c, d, a, x[i + 14], 23, -35309556); a = this.md5hh(a, b, c, d, x[i + 1], 4, -1530992060); d = this.md5hh(d, a, b, c, x[i + 4], 11, 1272893353); c = this.md5hh(c, d, a, b, x[i + 7], 16, -155497632); b = this.md5hh(b, c, d, a, x[i + 10], 23, -1094730640); a = this.md5hh(a, b, c, d, x[i + 13], 4, 681279174); d = this.md5hh(d, a, b, c, x[i], 11, -358537222); c = this.md5hh(c, d, a, b, x[i + 3], 16, -722521979); b = this.md5hh(b, c, d, a, x[i + 6], 23, 76029189); a = this.md5hh(a, b, c, d, x[i + 9], 4, -640364487); d = this.md5hh(d, a, b, c, x[i + 12], 11, -421815835); c = this.md5hh(c, d, a, b, x[i + 15], 16, 530742520); b = this.md5hh(b, c, d, a, x[i + 2], 23, -995338651); a = this.md5ii(a, b, c, d, x[i], 6, -198630844); d = this.md5ii(d, a, b, c, x[i + 7], 10, 1126891415); c = this.md5ii(c, d, a, b, x[i + 14], 15, -1416354905); b = this.md5ii(b, c, d, a, x[i + 5], 21, -57434055); a = this.md5ii(a, b, c, d, x[i + 12], 6, 1700485571); d = this.md5ii(d, a, b, c, x[i + 3], 10, -1894986606); c = this.md5ii(c, d, a, b, x[i + 10], 15, -1051523); b = this.md5ii(b, c, d, a, x[i + 1], 21, -2054922799); a = this.md5ii(a, b, c, d, x[i + 8], 6, 1873313359); d = this.md5ii(d, a, b, c, x[i + 15], 10, -30611744); c = this.md5ii(c, d, a, b, x[i + 6], 15, -1560198380); b = this.md5ii(b, c, d, a, x[i + 13], 21, 1309151649); a = this.md5ii(a, b, c, d, x[i + 4], 6, -145523070); d = this.md5ii(d, a, b, c, x[i + 11], 10, -1120210379); c = this.md5ii(c, d, a, b, x[i + 2], 15, 718787259); b = this.md5ii(b, c, d, a, x[i + 9], 21, -343485551); a = this.safeAdd(a, olda); b = this.safeAdd(b, oldb); c = this.safeAdd(c, oldc); d = this.safeAdd(d, oldd) } return [a, b, c, d] }, binl2rstr(input) { var i; var output = ''; var length32 = input.length * 32; for (i = 0; i < length32; i += 8) { output += String.fromCharCode((input[i >> 5] >>> (i % 32)) & 0xff) } return output }, rstr2binl(input) { var i; var output = []; output[(input.length >> 2) - 1] = undefined; for (i = 0; i < output.length; i += 1) { output[i] = 0 } var length8 = input.length * 8; for (i = 0; i < length8; i += 8) { output[i >> 5] |= (input.charCodeAt(i / 8) & 0xff) << (i % 32) } return output }, rstrMD5(s) { return this.binl2rstr(this.binlMD5(this.rstr2binl(s), s.length * 8)) }, rstrHMACMD5(key, data) { var i; var bkey = this.rstr2binl(key); var ipad = []; var opad = []; var hash; ipad[15] = opad[15] = undefined; if (bkey.length > 16) { bkey = this.binlMD5(bkey, key.length * 8) } for (i = 0; i < 16; i += 1) { ipad[i] = bkey[i] ^ 0x36363636; opad[i] = bkey[i] ^ 0x5c5c5c5c } hash = this.binlMD5(ipad.concat(this.rstr2binl(data)), 512 + data.length * 8); return this.binl2rstr(this.binlMD5(opad.concat(hash), 512 + 128)) }, rstr2hex(input) { var hexTab = '0123456789abcdef'; var output = ''; var x; var i; for (i = 0; i < input.length; i += 1) { x = input.charCodeAt(i); output += hexTab.charAt((x >>> 4) & 0x0f) + hexTab.charAt(x & 0x0f) } return output }, str2rstrUTF8(input) { return unescape(encodeURIComponent(input)) }, rawMD5(s) { return this.rstrMD5(this.str2rstrUTF8(s)) }, hexMD5(s) { return this.rstr2hex(this.rawMD5(s)) }, rawHMACMD5(k, d) { return this.rstrHMACMD5(this.str2rstrUTF8(k), str2rstrUTF8(d)) }, hexHMACMD5(k, d) { return this.rstr2hex(this.rawHMACMD5(k, d)) }, md5(string, key, raw) { if (!key) { if (!raw) { return this.hexMD5(string) } return this.rawMD5(string) } if (!raw) { return this.hexHMACMD5(key, string) } return this.rawHMACMD5(key, string) }, getSig(requestParam, sk, feature, mode) { var sig = null; var requestArr = []; Object.keys(requestParam).sort().forEach(function (key) { requestArr.push(key + '=' + requestParam[key]) }); if (feature == 'search') { sig = '/ws/place/v1/search?' + requestArr.join('&') + sk } if (feature == 'suggest') { sig = '/ws/place/v1/suggestion?' + requestArr.join('&') + sk } if (feature == 'reverseGeocoder') { sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk } if (feature == 'geocoder') { sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk } if (feature == 'getCityList') { sig = '/ws/district/v1/list?' + requestArr.join('&') + sk } if (feature == 'getDistrictByCityId') { sig = '/ws/district/v1/getchildren?' + requestArr.join('&') + sk } if (feature == 'calculateDistance') { sig = '/ws/distance/v1/?' + requestArr.join('&') + sk } if (feature == 'direction') { sig = '/ws/direction/v1/' + mode + '?' + requestArr.join('&') + sk } sig = this.md5(sig); return sig }, location2query(data) { if (typeof data == 'string') { return data } var query = ''; for (var i = 0; i < data.length; i++) { var d = data[i]; if (!!query) { query += ';' } if (d.location) { query = query + d.location.lat + ',' + d.location.lng } if (d.latitude && d.longitude) { query = query + d.latitude + ',' + d.longitude } } return query }, rad(d) { return d * Math.PI / 180.0 }, getEndLocation(location) { var to = location.split(';'); var endLocation = []; for (var i = 0; i < to.length; i++) { endLocation.push({ lat: parseFloat(to[i].split(',')[0]), lng: parseFloat(to[i].split(',')[1]) }) } return endLocation }, getDistance(latFrom, lngFrom, latTo, lngTo) { var radLatFrom = this.rad(latFrom); var radLatTo = this.rad(latTo); var a = radLatFrom - radLatTo; var b = this.rad(lngFrom) - this.rad(lngTo); var distance = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLatFrom) * Math.cos(radLatTo) * Math.pow(Math.sin(b / 2), 2))); distance = distance * EARTH_RADIUS; distance = Math.round(distance * 10000) / 10000; return parseFloat(distance.toFixed(0)) }, getWXLocation(success, fail, complete) { wx.getLocation({ type: 'gcj02', success: success, fail: fail, complete: complete }) }, getLocationParam(location) { if (typeof location == 'string') { var locationArr = location.split(','); if (locationArr.length === 2) { location = { latitude: location.split(',')[0], longitude: location.split(',')[1] } } else { location = {} } } return location }, polyfillParam(param) { param.success = param.success || function () { }; param.fail = param.fail || function () { }; param.complete = param.complete || function () { } }, checkParamKeyEmpty(param, key) { if (!param[key]) { var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + key + '参数格式有误'); param.fail(errconf); param.complete(errconf); return true } return false }, checkKeyword(param) { return !this.checkParamKeyEmpty(param, 'keyword') }, checkLocation(param) { var location = this.getLocationParam(param.location); if (!location || !location.latitude || !location.longitude) { var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + ' location参数格式有误'); param.fail(errconf); param.complete(errconf); return false } return true }, buildErrorConfig(errCode, errMsg) { return { status: errCode, message: errMsg } }, handleData(param, data, feature) { if (feature == 'search') { var searchResult = data.data; var searchSimplify = []; for (var i = 0; i < searchResult.length; i++) { searchSimplify.push({ id: searchResult[i].id || null, title: searchResult[i].title || null, latitude: searchResult[i].location && searchResult[i].location.lat || null, longitude: searchResult[i].location && searchResult[i].location.lng || null, address: searchResult[i].address || null, category: searchResult[i].category || null, tel: searchResult[i].tel || null, adcode: searchResult[i].ad_info && searchResult[i].ad_info.adcode || null, city: searchResult[i].ad_info && searchResult[i].ad_info.city || null, district: searchResult[i].ad_info && searchResult[i].ad_info.district || null, province: searchResult[i].ad_info && searchResult[i].ad_info.province || null }) } param.success(data, { searchResult: searchResult, searchSimplify: searchSimplify }) } else if (feature == 'suggest') { var suggestResult = data.data; var suggestSimplify = []; for (var i = 0; i < suggestResult.length; i++) { suggestSimplify.push({ adcode: suggestResult[i].adcode || null, address: suggestResult[i].address || null, category: suggestResult[i].category || null, city: suggestResult[i].city || null, district: suggestResult[i].district || null, id: suggestResult[i].id || null, latitude: suggestResult[i].location && suggestResult[i].location.lat || null, longitude: suggestResult[i].location && suggestResult[i].location.lng || null, province: suggestResult[i].province || null, title: suggestResult[i].title || null, type: suggestResult[i].type || null }) } param.success(data, { suggestResult: suggestResult, suggestSimplify: suggestSimplify }) } else if (feature == 'reverseGeocoder') { var reverseGeocoderResult = data.result; var reverseGeocoderSimplify = { address: reverseGeocoderResult.address || null, latitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lat || null, longitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lng || null, adcode: reverseGeocoderResult.ad_info && reverseGeocoderResult.ad_info.adcode || null, city: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.city || null, district: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.district || null, nation: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.nation || null, province: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.province || null, street: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street || null, street_number: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street_number || null, recommend: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.recommend || null, rough: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.rough || null }; if (reverseGeocoderResult.pois) { var pois = reverseGeocoderResult.pois; var poisSimplify = []; for (var i = 0; i < pois.length; i++) { poisSimplify.push({ id: pois[i].id || null, title: pois[i].title || null, latitude: pois[i].location && pois[i].location.lat || null, longitude: pois[i].location && pois[i].location.lng || null, address: pois[i].address || null, category: pois[i].category || null, adcode: pois[i].ad_info && pois[i].ad_info.adcode || null, city: pois[i].ad_info && pois[i].ad_info.city || null, district: pois[i].ad_info && pois[i].ad_info.district || null, province: pois[i].ad_info && pois[i].ad_info.province || null }) } param.success(data, { reverseGeocoderResult: reverseGeocoderResult, reverseGeocoderSimplify: reverseGeocoderSimplify, pois: pois, poisSimplify: poisSimplify }) } else { param.success(data, { reverseGeocoderResult: reverseGeocoderResult, reverseGeocoderSimplify: reverseGeocoderSimplify }) } } else if (feature == 'geocoder') { var geocoderResult = data.result; var geocoderSimplify = { title: geocoderResult.title || null, latitude: geocoderResult.location && geocoderResult.location.lat || null, longitude: geocoderResult.location && geocoderResult.location.lng || null, adcode: geocoderResult.ad_info && geocoderResult.ad_info.adcode || null, province: geocoderResult.address_components && geocoderResult.address_components.province || null, city: geocoderResult.address_components && geocoderResult.address_components.city || null, district: geocoderResult.address_components && geocoderResult.address_components.district || null, street: geocoderResult.address_components && geocoderResult.address_components.street || null, street_number: geocoderResult.address_components && geocoderResult.address_components.street_number || null, level: geocoderResult.level || null }; param.success(data, { geocoderResult: geocoderResult, geocoderSimplify: geocoderSimplify }) } else if (feature == 'getCityList') { var provinceResult = data.result[0]; var cityResult = data.result[1]; var districtResult = data.result[2]; param.success(data, { provinceResult: provinceResult, cityResult: cityResult, districtResult: districtResult }) } else if (feature == 'getDistrictByCityId') { var districtByCity = data.result[0]; param.success(data, districtByCity) } else if (feature == 'calculateDistance') { var calculateDistanceResult = data.result.elements; var distance = []; for (var i = 0; i < calculateDistanceResult.length; i++) { distance.push(calculateDistanceResult[i].distance) } param.success(data, { calculateDistanceResult: calculateDistanceResult, distance: distance }) } else if (feature == 'direction') { var direction = data.result.routes; param.success(data, direction) } else { param.success(data) } }, buildWxRequestConfig(param, options, feature) { var that = this; options.header = { "content-type": "application/json" }; options.method = 'GET'; options.success = function (res) { var data = res.data; if (data.status === 0) { that.handleData(param, data, feature) } else { param.fail(data) } }; options.fail = function (res) { res.statusCode = ERROR_CONF.WX_ERR_CODE; param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) }; options.complete = function (res) { var statusCode = +res.statusCode; switch (statusCode) { case ERROR_CONF.WX_ERR_CODE: { param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)); break } case ERROR_CONF.WX_OK_CODE: { var data = res.data; if (data.status === 0) { param.complete(data) } else { param.complete(that.buildErrorConfig(data.status, data.message)) } break } default: { param.complete(that.buildErrorConfig(ERROR_CONF.SYSTEM_ERR, ERROR_CONF.SYSTEM_ERR_MSG)) } } }; return options }, locationProcess(param, locationsuccess, locationfail, locationcomplete) { var that = this; locationfail = locationfail || function (res) { res.statusCode = ERROR_CONF.WX_ERR_CODE; param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) }; locationcomplete = locationcomplete || function (res) { if (res.statusCode == ERROR_CONF.WX_ERR_CODE) { param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) } }; if (!param.location) { that.getWXLocation(locationsuccess, locationfail, locationcomplete) } else if (that.checkLocation(param)) { var location = Utils.getLocationParam(param.location); locationsuccess(location) } } }; class QQMapWX { constructor(options) { if (!options.key) { throw Error('key值不能为空') } this.key = options.key }; search(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (!Utils.checkKeyword(options)) { return } var requestParam = { keyword: options.keyword, orderby: options.orderby || '_distance', page_size: options.page_size || 10, page_index: options.page_index || 1, output: 'json', key: that.key }; if (options.address_format) { requestParam.address_format = options.address_format } if (options.filter) { requestParam.filter = options.filter } var distance = options.distance || "1000"; var auto_extend = options.auto_extend || 1; var region = null; var rectangle = null; if (options.region) { region = options.region } if (options.rectangle) { rectangle = options.rectangle } var locationsuccess = function (result) { if (region && !rectangle) { requestParam.boundary = "region(" + region + "," + auto_extend + "," + result.latitude + "," + result.longitude + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } else if (rectangle && !region) { requestParam.boundary = "rectangle(" + rectangle + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } else { requestParam.boundary = "nearby(" + result.latitude + "," + result.longitude + "," + distance + "," + auto_extend + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SEARCH, data: requestParam }, 'search')) }; Utils.locationProcess(options, locationsuccess) }; getSuggestion(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (!Utils.checkKeyword(options)) { return } var requestParam = { keyword: options.keyword, region: options.region || '全国', region_fix: options.region_fix || 0, policy: options.policy || 0, page_size: options.page_size || 10, page_index: options.page_index || 1, get_subpois: options.get_subpois || 0, output: 'json', key: that.key }; if (options.address_format) { requestParam.address_format = options.address_format } if (options.filter) { requestParam.filter = options.filter } if (options.location) { var locationsuccess = function (result) { requestParam.location = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SUGGESTION, data: requestParam }, "suggest")) }; Utils.locationProcess(options, locationsuccess) } else { if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SUGGESTION, data: requestParam }, "suggest")) } }; reverseGeocoder(options) { var that = this; options = options || {}; Utils.polyfillParam(options); var requestParam = { coord_type: options.coord_type || 5, get_poi: options.get_poi || 0, output: 'json', key: that.key }; if (options.poi_options) { requestParam.poi_options = options.poi_options } var locationsuccess = function (result) { requestParam.location = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'reverseGeocoder') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_GET_GEOCODER, data: requestParam }, 'reverseGeocoder')) }; Utils.locationProcess(options, locationsuccess) }; geocoder(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'address')) { return } var requestParam = { address: options.address, output: 'json', key: that.key }; if (options.region) { requestParam.region = options.region } if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'geocoder') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_GET_GEOCODER, data: requestParam }, 'geocoder')) }; getCityList(options) { var that = this; options = options || {}; Utils.polyfillParam(options); var requestParam = { output: 'json', key: that.key }; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'getCityList') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_CITY_LIST, data: requestParam }, 'getCityList')) }; getDistrictByCityId(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'id')) { return } var requestParam = { id: options.id || '', output: 'json', key: that.key }; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'getDistrictByCityId') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_AREA_LIST, data: requestParam }, 'getDistrictByCityId')) }; calculateDistance(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'to')) { return } var requestParam = { mode: options.mode || 'walking', to: Utils.location2query(options.to), output: 'json', key: that.key }; if (options.from) { options.location = options.from } if (requestParam.mode == 'straight') { var locationsuccess = function (result) { var locationTo = Utils.getEndLocation(requestParam.to); var data = { message: "query ok", result: { elements: [] }, status: 0 }; for (var i = 0; i < locationTo.length; i++) { data.result.elements.push({ distance: Utils.getDistance(result.latitude, result.longitude, locationTo[i].lat, locationTo[i].lng), duration: 0, from: { lat: result.latitude, lng: result.longitude }, to: { lat: locationTo[i].lat, lng: locationTo[i].lng } }) } var calculateResult = data.result.elements; var distanceResult = []; for (var i = 0; i < calculateResult.length; i++) { distanceResult.push(calculateResult[i].distance) } return options.success(data, { calculateResult: calculateResult, distanceResult: distanceResult }) }; Utils.locationProcess(options, locationsuccess) } else { var locationsuccess = function (result) { requestParam.from = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'calculateDistance') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_DISTANCE, data: requestParam }, 'calculateDistance')) }; Utils.locationProcess(options, locationsuccess) } }; direction(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'to')) { return } var requestParam = { output: 'json', key: that.key }; if (typeof options.to == 'string') { requestParam.to = options.to } else { requestParam.to = options.to.latitude + ',' + options.to.longitude } var SET_URL_DIRECTION = null; options.mode = options.mode || MODE.driving; SET_URL_DIRECTION = URL_DIRECTION + options.mode; if (options.from) { options.location = options.from } if (options.mode == MODE.driving) { if (options.from_poi) { requestParam.from_poi = options.from_poi } if (options.heading) { requestParam.heading = options.heading } if (options.speed) { requestParam.speed = options.speed } if (options.accuracy) { requestParam.accuracy = options.accuracy } if (options.road_type) { requestParam.road_type = options.road_type } if (options.to_poi) { requestParam.to_poi = options.to_poi } if (options.from_track) { requestParam.from_track = options.from_track } if (options.waypoints) { requestParam.waypoints = options.waypoints } if (options.policy) { requestParam.policy = options.policy } if (options.plate_number) { requestParam.plate_number = options.plate_number } } if (options.mode == MODE.transit) { if (options.departure_time) { requestParam.departure_time = options.departure_time } if (options.policy) { requestParam.policy = options.policy } } var locationsuccess = function (result) { requestParam.from = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'direction', options.mode) } wx.request(Utils.buildWxRequestConfig(options, { url: SET_URL_DIRECTION, data: requestParam }, 'direction')) }; Utils.locationProcess(options, locationsuccess) } }; module.exports = QQMapWX;
\ No newline at end of file
diff --git a/util/request/responseInterceptors.js b/util/request/responseInterceptors.js
index 1e7a947..cc0d7fc 100644
--- a/util/request/responseInterceptors.js
+++ b/util/request/responseInterceptors.js
@@ -5,11 +5,18 @@
 export const responseInterceptors = (vm) => {
     uni.$uv.http.interceptors.response.use((response) => { /* 对响应成功做点什么 可使用async await 做异步操作*/
         const data = response.data
-		if (data.code !== 200) { // 服务端返回的状态码不等于200，则reject()
-		    uni.$uv.toast(data.message)
+		if (data.code == 200) {
+			return Promise.resolve(data);
+		}else if(data.code === 500){
+			uni.navigateTo({
+				url:"/pages/auth/index"
+			})
+			return;
+		}else{
+			uni.$uv.toast(data.message)
 			return Promise.reject(data)
 		}
-        return Promise.resolve(data);
+        
     }, (response) => { /*  对响应错误做点什么 （statusCode !== 200）*/
 	
 		console.info('interceptors.response---------',data)
diff --git a/utils/utils.js b/utils/utils.js
index 65ef9ef..5dbb288 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -152,6 +152,15 @@ export function redirectTo(...args){
 	uni.redirectTo(params(...args))
 }
 
+export function getkeyContent(key){
+	if(!key){
+		return ""
+	}
+	let configList = uni.getStorageSync('configList')
+	let index = configList.findIndex(items => items.keyName === key);
+	return configList[index];
+}
+
 export default {
 	toArray,
 	generateUUID,
@@ -165,5 +174,6 @@ export default {
 	navigateBack,
 	redirectTo,
 	copyText,
-	stringFormatHtml
+	stringFormatHtml,
+	getkeyContent
 }
\ No newline at end of file