diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..7a73a41
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/common/config.js b/common/config.js
index b446adc..a6f0024 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,8 +1,9 @@
 // 全局配置文件
-// let baseUrl = 'https://sourcebyte.vip';
-// let staticUrl = 'https://sourcebyte.vip';
-let baseUrl = 'http://localhost:8089';
-let staticUrl = 'http://localhost:8089';
+// let baseUrl = 'http://219.138.32.164:8089';
+// let baseUrl = 'http://localhost:3000/api';
+// let staticUrl = 'http://localhost:3000';
+let baseUrl = 'https://www.wujiaguotou.com/api';
+let staticUrl = 'https://www.wujiaguotou.com';
 // 版本号 用于更新
 let version = 1;
 // vuex_version版本号 用于显示
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 44ca65f..650f7d1 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -5,16 +5,23 @@ const install = (Vue, vm) => {
 	Vue.prototype.$u.http.setConfig({
 		// baseUrl打包app时放开，h5模式下会和vue.config.js代理冲突，导致失效
 		baseUrl: config.baseUrl,
-		
+		originalData:true,
+		timeout: 10000,
 	});
 	// 请求拦截，配置Token等参数
 	Vue.prototype.$u.http.interceptor.request = (config) => {
 		// config.header.Token = '5d33018e653d897fc259b42cf022c1b3';
 		// 方式一，存放在vuex的token，假设使用了uView封装的vuex方式，见：https://uviewui.com/components/globalVariable.html
 		// 自定义token头
+		// 1️⃣ 获取本地 userInfo
+		const userInfo = uni.getStorageSync('userInfo') || {};
+		
+		// 2️⃣ 提取 userType
+		 const userType = userInfo.userType;
 		   config.header = {
 		        ...config.header,  // ⭐ 保留你外部传入的 header
-		        'content-type': 'application/json'
+		        'content-type': 'application/json',
+				...(userType ? { 'USERTYPE': userType } : {}) // 有 userType 才加
 		    }
 		    return config;
 	};
@@ -22,25 +29,25 @@ const install = (Vue, vm) => {
 	Vue.prototype.$u.http.interceptor.response = (res) => {
 		// 如果把originalData设置为了true，这里得到将会是服务器返回的所有的原始数据
 		// 判断可能变成了res.statueCode，或者res.data.code之类的，请打印查看结果
-		if(res.code == 200) {
-			return res;  
-		} else if(res.code == 301) {
+		if(res.statusCode == 200) {
+			return res.data;  
+		} else if(res.statusCode == 301) {
 			vm.$u.toast('警告：' + res.msg);
 			return false;
-		} else if(res.code == 401) {
-			uni.reLaunch({
-				url:'../login/login'
+		} else if(res.statusCode == 401) {
+			uni.navigateTo({
+				url:'/pages-biz/login/login'
 			})
 			vm.$u.toast('认证失败,请重新登录')
 			return false;
-		} else if(res.code == 403) {
-			uni.reLaunch({
-				url:'../login/login'
+		} else if(res.statusCode == 403) {
+			uni.navigateTo({
+				url:'/pages-biz/login/login'
 			})
 			vm.$u.toast('认证失败,请重新登录')
 			return false;
-		} else if(res.code == 500) {
-			vm.$u.toast('错误：' + res.msg);
+		} else if(res.statusCode == 500) {
+			vm.$u.toast('请求错误：' + res.msg);
 			return false;
 		} else {
 			// 其他情况都认为是不合法的
@@ -48,6 +55,20 @@ const install = (Vue, vm) => {
 			return false;
 		}
 	};
+
+
+   Vue.prototype.$u.http.interceptor.responseError = (err) => {
+     // err 是 uni.request 的 fail 对象
+     // 超时一般是 err.errMsg 包含 timeout
+   
+     if (err.errMsg && err.errMsg.includes('timeout')) {
+       vm.$u.toast('请求超时，请稍后重试');
+     } else {
+       vm.$u.toast('网络异常，请检查网络');
+     }
+   
+     return Promise.reject(err);
+   };
 }
 
 export default {
diff --git a/common/utils/auth.js b/common/utils/auth.js
new file mode 100644
index 0000000..bdea0e6
--- /dev/null
+++ b/common/utils/auth.js
@@ -0,0 +1,38 @@
+export function getToken() {
+	const lifeData = uni.getStorageSync('lifeData') || {}
+	const token = lifeData.vuex_token
+	return token;
+}
+
+export function checkToken(token) {
+  if (!token || (typeof token === 'object' && Object.keys(token).length === 0)) {
+    uni.reLaunch({
+      url: '/pages-biz/login/login'
+    })
+    return Promise.reject('no token')
+  }
+
+  return new Promise((resolve, reject) => {
+    uni.$u.get('/login/checkExpiration', {}, {
+      WT: token
+    }).then(res => {
+      if (res.data) {
+        uni.reLaunch({
+          url: '/pages-biz/login/login'
+        })
+        reject('token expired')
+      } else {
+        resolve(true)
+      }
+    }).catch(err => {
+      uni.reLaunch({
+        url: '/pages-biz/login/login'
+      })
+    })
+  })
+}
+
+export function getUserType(){
+	let userInfo = uni.getStorageSync('userInfo')
+	return userInfo.userType
+}
\ No newline at end of file
diff --git a/common/utils/ras.js b/common/utils/ras.js
new file mode 100644
index 0000000..2b307b2
--- /dev/null
+++ b/common/utils/ras.js
@@ -0,0 +1,13 @@
+import JSEncrypt from 'jsencrypt'
+
+const PUBLIC_KEY = `
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk6Kvq4tCfQJFO3xqMN86ra6YPKEGgDJGVNAo8HAb9ZxL8fgckaHN4wpI8D8D0HDP/Xn8ZrS7wZFSAecUmWBtyBjZdMOdSMZm1LdX036+XpyGVktsrE15n85KG9+P4H4he9ZbiPPMGYvmkn/zaxMxUagSHhPpvrwRMovA8onKzSL67CFOWl95HXxhJ1GhlKIQVBz9R5OsHhwZFfPu2xtajCtiGtF2zjF3ojwpLNca+ADC6mZufRV/MD1+gMMS5GcwG5xALDyG+Aqv4xHto30SGks3FJ9k9bAwA8vyOU8SBeG8fW8lbO9XrtbupmxUm5RnSEtNUy/iUuO1hEmpSqQfBQIDAQAB
+-----END PUBLIC KEY-----
+`
+
+export function rsaEncrypt(text) {
+  const encryptor = new JSEncrypt()
+  encryptor.setPublicKey(PUBLIC_KEY)
+  return encryptor.encrypt(text)
+}
diff --git a/common/utils/searchData.js b/common/utils/searchData.js
index 99c1643..6eaa167 100644
--- a/common/utils/searchData.js
+++ b/common/utils/searchData.js
@@ -16,6 +16,16 @@ export default [{
 			"value": ""
         },
 	]
+},
+{
+    "name": '街道',
+    "type": 'hierarchy',
+    "submenu": [
+		{
+			"name": "不限",
+			"value": ""
+        },
+	]
 },
     {
         "name": '方式',
diff --git a/common/utils/text.js b/common/utils/text.js
new file mode 100644
index 0000000..7cbf2f6
--- /dev/null
+++ b/common/utils/text.js
@@ -0,0 +1,16 @@
+/**
+ * 文本省略处理
+ * @param {String} text 原始文本
+ * @param {Number} maxLen 最大显示字数
+ * @param {String} suffix 省略后缀，默认 ...
+ * @returns {String}
+ */
+function ellipsisText(text, maxLen = 20, suffix = '...') {
+  if (!text) return '';
+  if (text.length <= maxLen) return text;
+  return text.slice(0, maxLen) + suffix;
+}
+
+module.exports = {
+  ellipsisText
+};
\ No newline at end of file
diff --git a/components/Carousel/Carousel.vue b/components/Carousel/Carousel.vue
new file mode 100644
index 0000000..0c7d78b
--- /dev/null
+++ b/components/Carousel/Carousel.vue
@@ -0,0 +1,402 @@
+<template>
+	<view class="carousel" :style="{width:boxWidth,height:boxHeight}" @touchstart="touchStart" @touchmove="touchMove"
+		@touchend="touchEnd">
+		<!-- 轮播轨道 -->
+		<view class="track" :style="trackStyle">
+			<view class="slide" v-for="(item, index) in normalizedList" :key="index">
+				<!-- 图片 -->
+				<image v-if="item.mediaType === 'image'" :src="item.src" mode="aspectFill" />
+
+				<!-- 视频 -->
+				<view v-else-if="item.mediaType === 'video'" class="video-wrapper" @click.stop="playVideo(index)">
+					<video :id="'video-' + index" :src="item.src" :poster="item.poster"
+						:controls="playingIndex === index" :show-center-play-btn="false" object-fit="cover"
+						@play="onVideoPlay" @pause="onVideoPause" />
+					<view v-if="playingIndex !== index" class="play-btn">▶</view>
+				</view>
+
+				<!-- VR -->
+				<view v-else-if="item.mediaType === 'vr'" class="vr-wrapper">
+					<image class="vr-cover" :src="item.src" mode="aspectFill" />
+					<image class="vr-icon"  mode="aspectFit" :src="vrIcon" @tap.stop="enterVR()" />
+				</view>
+			</view>
+		</view>
+
+		<!-- 点指示器 -->
+		<view v-if="indicator === 'dot'" class="dots">
+			<view v-for="(item, index) in normalizedList" :key="index" class="dot"
+				:class="{ active: index === current }" />
+		</view>
+
+		<!-- 箭头指示器 -->
+		<view v-if="indicator === 'arrow'" class="arrow left" @click.stop="prev">‹</view>
+		<view v-if="indicator === 'arrow'" class="arrow right" @click.stop="next">›</view>
+
+		<!-- 底部分区长条指示器（固定分区长度，跳动游标） -->
+		<view v-if="autoTypeIndicateList.length" class="type-bar">
+			<view v-for="(item, index) in autoTypeIndicateList" :key="index" class="type-segment"
+				:class="{ active: current >= item.startIndex && current <= item.endIndex }"
+				:style="{ width: getSegmentWidth + '%' }" @click.stop="jumpToType(item)">
+				{{ item.name }}
+			</view>
+		</view>
+		<!-- 右下角索引 -->
+		<view class="index-display">
+			{{ current + 1 }} / {{ normalizedList.length }}
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'Carousel',
+		props: {
+			list: {
+				type: Array,
+				required: true
+			}, // [{src:'',type:''}]
+			indicator: {
+				type: String,
+				default: 'dot'
+			}, // dot | arrow | none
+			autoplay: {
+				type: Boolean,
+				default: false
+			},
+			interval: {
+				type: Number,
+				default: 3000
+			},
+			vrIcon: {
+				type: String,
+				default: ''
+			},
+			boxWidth: {
+				type: String,
+				default: '100%'
+			},
+			boxHeight: {
+				type: String,
+				default: '500rpx'
+			},
+			vrViewPage: {
+				type: String,
+				default: ''
+			},
+			vrList:{
+				type: Array,
+				default: []
+			}
+		},
+		data() {
+			return {
+				current: 0,
+				containerWidth: 0,
+				startX: 0,
+				offsetX: 0,
+				timer: null,
+				playingIndex: null
+			}
+		},
+		computed: {
+			/* VR 永远在最前 */
+			normalizedList() {
+				const vr = []
+				const other = []
+				this.list.forEach(item => {
+					item.mediaType === 'vr' ? vr.push(item) : other.push(item)
+				})
+				return [...vr, ...other]
+			},
+
+			trackStyle() {
+				return `width:${this.normalizedList.length * this.containerWidth}px;
+		transform: translate3d(${-this.current * this.containerWidth + this.offsetX}px,0,0);
+        transition:${this.offsetX === 0 ? 'transform .3s' : 'none'};`
+			},
+
+			/* 自动生成分区指示 */
+			autoTypeIndicateList() {
+				const list = this.normalizedList
+				if (!list.length) return []
+
+				const result = []
+				let startIndex = 0
+				let bizType = list[0].bizType
+				for (let i = 1; i <= list.length; i++) {
+					if (i === list.length || list[i].bizType !== bizType) {
+						result.push({
+							type: bizType,
+							name: bizType,
+							startIndex,
+							endIndex: i - 1
+						})
+						startIndex = i
+						bizType = list[i] && list[i].bizType
+					}
+				}
+				return result
+			},
+			getSegmentWidth() {
+				if (!this.autoTypeIndicateList.length) return 100
+				return 100 / this.autoTypeIndicateList.length
+			}
+		},
+		mounted() {
+			this.$nextTick(this.calcWidth)
+			this.start()
+		},
+		beforeUnmount() {
+			this.stop()
+		},
+		onLoad() {
+		   this.fillVrList();
+		},
+		watch: {
+			normalizedList(list) {
+				if (this.current >= list.length) this.current = 0
+			},
+			current() {
+				this.stopVideo()
+			}
+		},
+		methods: {
+			calcWidth() {
+				uni.createSelectorQuery()
+					.in(this)
+					.select('.carousel')
+					.boundingClientRect(rect => {
+						if (rect) this.containerWidth = rect.width
+					})
+					.exec()
+			},
+
+			start() {
+				if (!this.autoplay) return
+				this.stop()
+				this.timer = setInterval(this.next, this.interval)
+			},
+			stop() {
+				this.timer && clearInterval(this.timer)
+				this.timer = null
+			},
+			next() {
+				this.current = (this.current + 1) % this.normalizedList.length
+			},
+			prev() {
+				this.current = (this.current - 1 + this.normalizedList.length) % this.normalizedList.length
+			},
+
+			touchStart(e) {
+				this.stop()
+				this.startX = e.touches[0].clientX
+			},
+			touchMove(e) {
+				this.offsetX = e.touches[0].clientX - this.startX
+			},
+			touchEnd() {
+				if (Math.abs(this.offsetX) > this.containerWidth / 4) {
+					this.offsetX > 0 ? this.prev() : this.next()
+				}
+				this.offsetX = 0
+				this.start()
+			},
+
+			/* 视频 */
+			playVideo(index) {
+				if (this.playingIndex === index) return
+				this.stopVideo()
+				this.playingIndex = index
+				this.stop()
+				this.$nextTick(() => {
+					uni.createVideoContext('video-' + index, this).play()
+				})
+			},
+			stopVideo() {
+				if (this.playingIndex !== null) {
+					uni.createVideoContext('video-' + this.playingIndex, this).pause()
+					this.playingIndex = null
+				}
+			},
+			onVideoPlay() {
+				this.stop()
+			},
+			onVideoPause() {
+				this.start()
+			},
+
+			/* VR */
+			enterVR() {
+				this.stop()
+				this.stopVideo()
+				if(this.vrList.length > 0) {
+                 console.log(this.vrViewPage)
+					// this.$u.route({
+					// 	url: this.vrViewPage,
+					// 	params: {
+					// 		title:"vr看资产",
+					// 		vrList: this.vrList
+					// 	}
+					// })
+				}
+			},
+
+			/* 分区跳转 */
+			jumpToType(item) {
+				this.stop()
+				this.stopVideo()
+				this.current = item.startIndex
+				this.$nextTick(this.start)
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.carousel {
+		overflow: hidden;
+		position: relative;
+	}
+
+	.track {
+		display: flex;
+		height: 100%;
+	}
+
+	.slide {
+		width: 100%;
+		flex-shrink: 0;
+	}
+
+	.slide image,
+	.video-wrapper,
+	.vr-wrapper,
+	video {
+		width: 100%;
+		height: 100%;
+	}
+
+	/* dots */
+	.dots {
+		position: absolute;
+		bottom: 20rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		display: flex;
+	}
+
+	.dot {
+		width: 12rpx;
+		height: 12rpx;
+		border-radius: 50%;
+		background: rgba(255, 255, 255, .5);
+		margin: 0 6rpx;
+	}
+
+	.dot.active {
+		background: #fff;
+	}
+
+	/* arrows */
+	.arrow {
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		width: 60rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		text-align: center;
+		background: rgba(0, 0, 0, .4);
+		color: #fff;
+		font-size: 40rpx;
+		border-radius: 50%;
+	}
+
+	.arrow.left {
+		left: 20rpx;
+	}
+
+	.arrow.right {
+		right: 20rpx;
+	}
+
+	/* video */
+	.video-wrapper {
+		position: relative;
+	}
+
+	.play-btn {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: 80rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		border-radius: 50%;
+		background: rgba(0, 0, 0, .5);
+		color: #fff;
+		font-size: 40rpx;
+	}
+
+	/* vr */
+	.vr-wrapper {
+		position: relative;
+	}
+
+	.vr-icon {
+	  position: absolute;
+	  top: 50%;
+	  left: 12%;
+	  transform: translate(-50%, -50%);
+	  width: 100rpx !important;
+	  height: 100rpx !important;
+	  background: rgba(80, 80,80,0.45);
+	  border-radius: 50%;
+	  padding: 12rpx;
+	}
+
+	.type-bar {
+		position: absolute;
+		bottom: 80rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		height: 40rpx;
+		display: flex;
+		background: rgba(0, 0, 0, 0.4);
+		overflow: hidden;
+		min-width: 300rpx;
+	}
+
+
+	.type-segment {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #fff;
+		/* 保持文字白色 */
+		font-size: 20rpx;
+		cursor: pointer;
+		padding: 0 10rpx;
+		transition: background 0.3s;
+	}
+
+	.type-segment.active {
+		background: rgba(255, 47, 49, 0.6);
+		/* 仅背景高亮，不覆盖文字 */
+	}
+
+	.index-display {
+		position: absolute;
+		bottom: 80rpx;
+		right: 20rpx;
+		padding: 6rpx 12rpx;
+		background: rgba(0, 0, 0, 0.5);
+		color: #fff;
+		font-size: 24rpx;
+		border-radius: 12rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/components/asset/assetList.vue b/components/asset/assetList.vue
index c8bb65a..45338f8 100644
--- a/components/asset/assetList.vue
+++ b/components/asset/assetList.vue
@@ -2,23 +2,21 @@
   <view class="asset-list">
     <view
       v-for="item in list"
-      :key="item.id"
+      :key="item.assetsNo"
       class="asset-card"
       @click="onClick(item)"
     >
-      <image class="cover" :src="item.cover || '/static/images/default-cover.png'" mode="aspectFill" />
+      <image class="cover" :src="'https://www.wujiaguotou.com' + item.coverImgUrl" mode="aspectFill" />
 
       <view class="info">
-        <text class="name">{{ item.name }}</text>
-        <text class="address">{{ item.address }}</text>
-        <text class="status">{{ item.statusText }}</text>
+        <text class="name">{{ item.assetsName }}</text>
+        <text class="address">{{ item.assetsAddress }}</text>
       </view>
 
       <u-icon name="arrow-right" size="28" color="#999" class="arrow" />
     </view>
 
-    <u-loadmore v-if="showLoadmore" :status="loadStatus" />
-    <u-empty v-else-if="list.length === 0" mode="list" text="暂无资产数据" />
+     <u-empty v-if="list.length === 0" mode="list" text="暂无资产数据" />
   </view>
 </template>
 
@@ -29,17 +27,11 @@ export default {
     list: {
       type: Array,
       default: () => [],
-    },
-    showLoadmore: {
-      type: Boolean,
-      default: true,
-    },
-    loadStatus: {
-      type: String,
-      default: "loadmore",
-    },
+    }
   },
   emits: ["click"],
+  onLoad(options) {
+  },
   methods: {
     onClick(item) {
       this.$emit("click", item);
diff --git a/components/bottom/assetBottomBar.vue b/components/bottom/assetBottomBar.vue
index 4dfc14f..d9626b7 100644
--- a/components/bottom/assetBottomBar.vue
+++ b/components/bottom/assetBottomBar.vue
@@ -11,10 +11,10 @@
       </view>
     </view>
 
-    <view class="main-btn" @tap="onReserve">
-      <text class="label">预约看房</text>
+    <view class="main-btn" @tap="onReserve" :style="{backgroundColor: btnColor}">
+      <text class="label">{{btnTitle || '加载错误'}}</text>
     </view>
-    <share ref="share" :assetId="assetId" />
+    <share ref="share" :assetId="assetId" :title="shareBtnTitle" :btnColor="btnColor"/>
   </view>
 </template>
 
@@ -25,7 +25,51 @@ import share from '../share/share.vue';
 export default {
   name: 'assetBottomBar',
   components: { share },
-  props: { assetId: [String, Number], phone: String },
+  props: { 
+	  assetId: [String, Number], 
+	  phone: String ,
+	  btnTitle:  {
+      type: String,
+      default: ''
+    },
+	shareBtnTitle:  {
+	  type: String,
+	  default: ''
+	},
+	/** 小程序页面路径 */
+	pagePath: {
+	  type: String,
+	  required: true
+	},
+	
+	/** H5 页面路径 */
+	h5Path: {
+	  type: String,
+	  required: true
+	},
+	
+	/** 分享参数（id / code 等） */
+	query: {
+	  type: Object,
+	  default: () => ({})
+	},
+	
+	/** 小程序码接口 */
+	minicodeApi: {
+	  type: String,
+	  default: ''
+	},
+	
+	/** H5 基础域名（可选） */
+	baseUrl: {
+	  type: String,
+	  default: ''
+	},
+	btnColor: {
+	  type: String,
+	  default: ''
+	}
+	  },
   methods: {
     onShare() {
         console.log("调用分享")
@@ -92,18 +136,15 @@ export default {
   font-size: 22rpx;
 }
 
-/* 蓝色描边主按钮（完全居中） */
 .main-btn {
   flex-shrink: 0;
   width: 340rpx;
   height: 88rpx;
-  border: 2rpx solid #FF2F31;
   border-radius: 44rpx;
-  background-color: #ffffff;
   display: flex;
   align-items: center;
   justify-content: center;
-  color: #FF2F31;
+  color: #ffffff;
   font-size: 30rpx;
   font-weight: 500;
   transition: all 0.2s;
diff --git a/components/card/mycard.vue b/components/card/mycard.vue
deleted file mode 100644
index fa39038..0000000
--- a/components/card/mycard.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<template>
-  <view :class="['my-card', customClass]" :style="cardStyle">
-    <!-- 标题 -->
-    <view v-if="title" class="my-card__header">
-      {{ title }}
-    </view>
-
-    <!-- 内容 -->
-    <view class="my-card__body">
-      <slot></slot>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  name: 'mycard',
-  props: {
-    title: {
-      type: String,
-      default: ''
-    },
-    margin: {           // 外边距
-      type: String,
-      default: '20rpx'
-    },
-    borderRadius: {     // 圆角
-      type: String,
-      default: '12rpx'
-    },
-    shadow: {           // 是否显示阴影
-      type: Boolean,
-      default: true
-    },
-    customClass: {      // 自定义类名
-      type: String,
-      default: ''
-    }
-  },
-  computed: {
-    cardStyle() {
-      return {
-        margin: this.margin,
-        borderRadius: this.borderRadius,
-        boxShadow: this.shadow ? '0 4rpx 10rpx rgba(0,0,0,0.05)' : 'none',
-        backgroundColor: '#fff',
-        overflow: 'hidden'
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.my-card__header {
-  padding: 20rpx;
-  font-size: 32rpx;
-  font-weight: bold;
-  border-bottom: 1rpx solid #f0f0f0;
-}
-
-.my-card__body {
-  padding: 20rpx;
-}
-</style>
\ No newline at end of file
diff --git a/components/gallery/AssetGallery.vue b/components/gallery/AssetGallery.vue
deleted file mode 100644
index 09e33a6..0000000
--- a/components/gallery/AssetGallery.vue
+++ /dev/null
@@ -1,295 +0,0 @@
-<template>
-  <view class="house-gallery">
-    <!-- 图片轮播 -->
-    <u-swiper
-      :list="swiperList"
-      :current="current"
-      height="1200rpx"
-    >
-      <template #default="{ item, index }">
-        <view class="slide-item">
-          <image :src="item.url" mode="aspectFill" class="slide-img" />
-
-          <!-- VR 按钮 -->
-          <view v-if="item.type === 'vr'" class="vr-btn" @click.stop="openVR">
-            VR
-          </view>
-
-          <!-- 视频按钮 -->
-          <view v-if="item.type === 'video'" class="video-btn" @click.stop="playVideo">
-            ▶
-          </view>
-
-          <!-- 图片索引 -->
-          <view class="slide-index">{{ index + 1 }}/{{ swiperList.length }}</view>
-        </view>
-      </template>
-    </u-swiper>
-
-    <!-- 广告遮罩栏 -->
-    <view v-if="adVisible && adImage" class="ad-mask" @click="onAdClick">
-      <image :src="adImage" mode="aspectFill" class="ad-img" />
-      <view class="ad-close" @click.stop="adVisible = false">×</view>
-    </view>
-
-    <!-- 底部 Tab -->
-    <view class="gallery-tab">
-      <view
-        class="gallery-tab-item"
-        v-for="(item, i) in tabs"
-        :key="i"
-        :id="'tab-' + i"
-        :class="{ active: activeTab === i }"
-        @click="onTabClick(i)"
-      >
-        {{ item.label }}
-        <text v-if="item.count">({{ item.count }})</text>
-      </view>
-
-      <!-- 滑块动画 -->
-      <view
-        class="tab-line"
-        :style="{ width: lineStyle.width + 'px', left: lineStyle.left + 'px' }"
-      ></view>
-    </view>
-
-    <!-- 视频弹窗 -->
-    <u-popup v-model="videoVisible" mode="center" border-radius="20">
-      <video
-        :src="videoUrl"
-        autoplay
-        controls
-        style="width: 600rpx; height: 400rpx;"
-      ></video>
-    </u-popup>
-  </view>
-</template>
-
-<script>
-export default {
-  name: "AssetGallery",
-  props: {
-    vrImage: String,
-    videoCover: String,
-    videoUrl: String,
-    insideImages: Array,
-    planImages: Array,
-    adImage: String
-  },
-
-  data() {
-    return {
-      current: 0,
-      videoVisible: false,
-      adVisible: true,
-      tabs: [],
-      indexMap: [],
-      lineStyle: { width: 0, left: 0 }
-    };
-  },
-
-  mounted() {
-    this.$nextTick(() => {
-      setTimeout(() => this.updateTabLine(), 50);
-    });
-  },
-
-  watch: {
-    activeTab() {
-      this.$nextTick(() => this.updateTabLine());
-    }
-  },
-
-  computed: {
-    swiperList() {
-      let list = [];
-      this.tabs = [];
-      this.indexMap = [];
-      let idx = 0;
-
-      if (this.vrImage) {
-        this.tabs.push({ key: "vr", label: "VR", count: 1 });
-        this.indexMap.push(idx);
-        list.push({ type: "vr", url: this.vrImage });
-        idx++;
-      }
-
-      if (this.videoCover) {
-        this.tabs.push({ key: "video", label: "视频", count: 1 });
-        this.indexMap.push(idx);
-        list.push({ type: "video", url: this.videoCover });
-        idx++;
-      }
-
-      if (this.insideImages?.length > 0) {
-        this.tabs.push({ key: "inside", label: "内部图", count: this.insideImages.length });
-        this.indexMap.push(idx);
-        list.push(...this.insideImages.map((img) => ({ type: "inside", img })));
-        idx += this.insideImages.length;
-      }
-
-      if (this.planImages?.length > 0) {
-        this.tabs.push({ key: "plan", label: "平面图", count: this.planImages.length });
-        this.indexMap.push(idx);
-        list.push(...this.planImages.map((url) => ({ type: "plan", url })));
-        idx += this.planImages.length;
-      }
-
-      return list;
-    },
-
-    activeTab() {
-      for (let i = 0; i < this.indexMap.length; i++) {
-        const start = this.indexMap[i];
-        const end = this.indexMap[i + 1] ?? 99999;
-        if (this.current >= start && this.current < end) return i;
-      }
-      return 0;
-    }
-  },
-
-  methods: {
-    onAdClick() {
-      this.$emit("ad-click");
-    },
-
-    onSwiperChange(e) {
-      this.current = e.detail.current;
-    },
-
-    onTabClick(i) {
-      this.current = this.indexMap[i];
-    },
-
-    openVR() {
-      this.$emit("open-vr");
-    },
-
-    playVideo() {
-      this.videoVisible = true;
-    },
-
-    updateTabLine() {
-      const index = this.activeTab;
-      if (this.tabs.length === 0) return;
-
-      const id = `#tab-${index}`;
-      uni.createSelectorQuery()
-        .in(this)
-        .select(id)
-        .boundingClientRect((rect) => {
-          if (!rect) return;
-          this.lineStyle = { width: rect.width, left: rect.left };
-        })
-        .exec();
-    }
-  }
-};
-</script>
-
-<style scoped>
-.house-gallery {
-  width: 100%;
-  position: relative;
-}
-
-/* 轮播 */
-.slide-item {
-  width: 100%;
-  height: 1200rpx;
-  position: relative;
-}
-.slide-img {
-  width: 100%;
-  height: 100%;
-  border-radius: 0;
-}
-.vr-btn,
-.video-btn {
-  position: absolute;
-  bottom: 40rpx;
-  right: 40rpx;
-  width: 100rpx;
-  height: 100rpx;
-  border-radius: 50%;
-  background: rgba(0, 0, 0, 0.6);
-  color: #fff;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: 30rpx;
-}
-.video-btn {
-  font-size: 50rpx;
-}
-.slide-index {
-  position: absolute;
-  bottom: 20rpx;
-  right: 20rpx;
-  padding: 4rpx 8rpx;
-  background: rgba(0,0,0,0.5);
-  color: #fff;
-  font-size: 24rpx;
-  border-radius: 10rpx;
-}
-
-/* 广告遮罩 */
-.ad-mask {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 120rpx;
-  background: rgba(0,0,0,0.35);
-  padding: 0 20rpx;
-  z-index: 9;
-}
-.ad-img {
-  width: 100%;
-  height: 100%;
-  border-radius: 12rpx;
-}
-.ad-close {
-  position: absolute;
-  right: 20rpx;
-  top: 20rpx;
-  width: 40rpx;
-  height: 40rpx;
-  border-radius: 50%;
-  background: rgba(0,0,0,0.55);
-  color: #fff;
-  text-align: center;
-  line-height: 40rpx;
-  font-size: 30rpx;
-}
-
-/* Tab bar */
-.gallery-tab {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  display: flex;
-  background: rgba(255,255,255,0.9);
-  border-top: 1rpx solid #eee;
-  height: 90rpx;
-  align-items: center;
-  justify-content: space-around;
-  z-index: 10;
-}
-.gallery-tab-item {
-  padding: 20rpx 0;
-  font-size: 28rpx;
-  color: #666;
-}
-.gallery-tab-item.active {
-  color: #2979ff;
-  font-weight: bold;
-}
-.tab-line {
-  position: absolute;
-  bottom: 0;
-  height: 4rpx;
-  background: #2979ff;
-  transition: all 0.25s ease;
-}
-</style>
diff --git a/components/navbar/customNavbar.vue b/components/navbar/customNavbar.vue
index b7dc9f1..d0771d1 100644
--- a/components/navbar/customNavbar.vue
+++ b/components/navbar/customNavbar.vue
@@ -12,20 +12,18 @@
     <view class="nav-content">
       <!-- 左侧返回 -->
       <view class="nav-left">
-        <u-icon 
-          name="arrow-left" 
-          size="44" 
-          :color="textColor" 
-          @click="onBack" 
-          v-if="showBack"
-        ></u-icon>
-        <u-icon 
-          name="home" 
-          size="44" 
-          :color="textColor" 
-          @click="goHome" 
-          v-if="showHome"
-        ></u-icon>
+		 <view class="icon-btn"  @click="onBack" v-if="showBack">
+		   <u-icon
+		     name="arrow-left" 
+		     size="44" 
+		     :color="textColor" 
+		    
+		   ></u-icon>
+		 </view>
+     
+        <view class="icon-btn"  @click="goHome" v-if="showHome" :style="{marginLeft: 10 + 'rpx'}">
+          <u-icon name="home" size="44" :color="textColor" />
+        </view>
       </view>
 
       <!-- 中间标题 -->
@@ -106,7 +104,7 @@ export default {
     },
     showHome: {
       type: Boolean,
-      default: false // 回首页按钮默认不显示
+      default: true // 回首页按钮默认不显示
     }
   },
   data() {
@@ -155,15 +153,18 @@ export default {
     },
     
     onBack() {
-      if (this.back) {
-        this.back();
-      } else {
+	  const pages = getCurrentPages();
+      if (pages.length > 1) {
         uni.navigateBack();
+      } else {
+        uni.switchTab({
+        		url:'/pages/index/index'
+        	})
       }
     },
     goHome(){
-        	uni.reLaunch({
-					url:'../index/index'
+        	uni.switchTab({
+					url:'/pages/index/index'
 				})
     },
     onExtraIconClick(index) {
@@ -186,30 +187,41 @@ export default {
   .nav-content {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    position: relative;
     height: 100%;
     padding: 0 24rpx;
   }
 
-  .nav-left {
-    width: 50rpx;
-    display: flex;
-    align-items: center;
-  }
-
-  .nav-title {
-    flex: 1;
-    text-align: center;
-    font-size: 32rpx;
-  }
-
-  .nav-right {
-    display: flex;
-    align-items: center;
-    .nav-btn {
-      margin-left: 20rpx;
-    }
-  }
+.nav-left{
+	width: 120rpx;
+}
+.nav-left,
+.nav-right {
+  display: flex;
+  align-items: center;
+  z-index: 2;
+}
+.nav-title {
+ pointer-events: none;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  max-width: 60%;
+  text-align: center;
+  font-size: 32rpx;
+  font-weight: 500;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  z-index: 1;
+}
+  // .nav-right {
+  //   display: flex;
+  //   align-items: center;
+  //   .nav-btn {
+  //     margin-left: 20rpx;
+  //   }
+  // }
   
   // 透明状态样式
   &.transparent {
diff --git a/components/navbar/indexNavbar.vue b/components/navbar/indexNavbar.vue
index 60ece24..3dac966 100644
--- a/components/navbar/indexNavbar.vue
+++ b/components/navbar/indexNavbar.vue
@@ -87,11 +87,14 @@ export default {
   },
   methods: {
     onBack() {
-      if (this.back) {
-        this.back();
-      } else {
-        uni.navigateBack();
-      }
+     const pages = getCurrentPages();
+     if (pages > 1) {
+       uni.navigateBack();
+     } else {
+       uni.switchTab({
+       		url:'/pages/index/index'
+       	})
+     }
     },
     goHome(){
        	uni.reLaunch({
diff --git a/components/share/share.vue b/components/share/share.vue
index 6a2fec2..ff3662b 100644
--- a/components/share/share.vue
+++ b/components/share/share.vue
@@ -1,15 +1,29 @@
 <template>
   <u-popup v-model="show" mode="bottom" border-radius="16" closeable>
     <view class="popup-content">
-      <view class="popup-title">分享房源</view>
+      <view class="popup-title">{{ title }}</view>
 
       <u-cell-group>
-        <!-- <u-cell-item title="📤 分享给微信好友" @click="shareToWeChat" /> -->
-       <button open-type="share" class="share-btn">
-            📤 分享给好友
-       </button>
-        <u-cell-item  title="🔗 生成外部分享链接" @click="copyLink" />
-        <u-cell-item  title="📱 生成二维码分享" @click="generateQrcode" />
+        <!-- 微信小程序：官方分享 -->
+        <!-- #ifdef MP-WEIXIN -->
+        <button open-type="share" class="share-btn" :style="{backgroundColor: btnColor}">
+          📤 分享给好友
+        </button>
+        <!-- #endif -->
+
+        <!-- 非小程序：外部链接 -->
+        <!-- #ifndef MP-WEIXIN -->
+        <u-cell-item
+          title="🔗 复制网页分享链接"
+          @click="copyLink"
+        />
+        <!-- #endif -->
+
+        <!-- 全平台 -->
+        <!-- <u-cell-item
+          title="📱 生成二维码分享"
+          @click="generateQrcode"
+        /> -->
       </u-cell-group>
 
       <view class="cancel-btn" @click="show = false">取消</view>
@@ -18,8 +32,8 @@
     <!-- 二维码弹窗 -->
     <u-popup v-model="showQrcode" mode="center" border-radius="12">
       <view class="qrcode-box">
-        <image :src="qrcodeUrl" mode="widthFix" style="width: 300rpx;" />
-        <view class="tips">扫一扫查看房源</view>
+        <image v-if="qrcodeUrl" :src="qrcodeUrl" class="qrcode-img" />
+        <view class="tips">扫一扫打开</view>
       </view>
     </u-popup>
   </u-popup>
@@ -29,10 +43,55 @@
 import QRCode from 'qrcode'
 
 export default {
-  name: 'share',
+  name: 'SharePopup',
   props: {
-    assetId: [String, Number]
+    /** 弹窗标题 */
+    title: {
+      type: String,
+      default: '分享'
+    },
+
+    /** 微信分享标题 */
+    shareTitle: {
+      type: String,
+      default: ''
+    },
+
+    /** 小程序页面路径 */
+    pagePath: {
+      type: String,
+      required: true
+    },
+
+    /** H5 页面路径 */
+    h5Path: {
+      type: String,
+      required: true
+    },
+
+    /** 分享参数（id / code 等） */
+    query: {
+      type: Object,
+      default: () => ({})
+    },
+
+    /** 小程序码接口 */
+    minicodeApi: {
+      type: String,
+      default: ''
+    },
+
+    /** H5 基础域名（可选） */
+    baseUrl: {
+      type: String,
+      default: ''
+    },
+	btnColor: {
+	  type: String,
+	  default: ''
+	}
   },
+
   data() {
     return {
       show: false,
@@ -40,70 +99,127 @@ export default {
       qrcodeUrl: ''
     }
   },
+
+  computed: {
+    queryString() {
+        const query = this.query || {}
+        return Object.keys(query)
+          .filter(key => query[key] !== undefined && query[key] !== null)
+          .map(key => `${key}=${encodeURIComponent(query[key])}`)
+          .join('&')
+      }
+  },
+
   methods: {
     open() {
-      console.log()
       this.show = true
     },
-    shareToWeChat() {
-      this.show = false
-      // #ifdef MP-WEIXIN
-      uni.showToast({ title: '请使用右上角“···”转发好友或群', icon: 'none' })
-      uni.showShareMenu({
-        withShareTicket: true,
-        menus: ['shareAppMessage', 'shareTimeline']
-      })
-      // #endif
 
-      // #ifdef H5
-      uni.showToast({ title: '请在微信内使用原生分享功能', icon: 'none' })
-      // #endif
-    },
+    /** 复制网页链接 */
     copyLink() {
       this.show = false
-      const shareUrl = `${window.location.origin}/#/pages/detail/assetsDetail?id=${this.assetId}`
+
+      let url = ''
+
+      // #ifdef H5
+      url = `${window.location.origin}/#/${this.h5Path}?${this.queryString}`
+      // #endif
+
+      // #ifndef H5
+      url = `${this.baseUrl}/#/${this.h5Path}?${this.queryString}`
+      // #endif
+
       uni.setClipboardData({
-        data: shareUrl,
+        data: url,
         success: () => {
-          uni.showToast({ title: '分享链接已复制', icon: 'success' })
+          uni.showToast({ title: '链接已复制', icon: 'success' })
         }
       })
     },
+
+    /** 生成二维码 / 小程序码 */
     async generateQrcode() {
       this.show = false
-      const shareUrl = `${window.location.origin}/#/pages/detail/assetsDetail?id=${this.assetId}`
       this.showQrcode = true
-      this.qrcodeUrl = await QRCode.toDataURL(shareUrl)
+      this.qrcodeUrl = ''
+
+      // ========== 小程序 ==========
+      // #ifdef MP-WEIXIN
+      if (!this.minicodeApi) {
+        uni.showToast({ title: '未配置小程序码接口', icon: 'none' })
+        this.showQrcode = false
+        return
+      }
+
+      const res = await uni.request({
+        url: this.minicodeApi,
+        method: 'POST',
+        data: {
+          page: this.pagePath,
+          scene: this.queryString
+        }
+      })
+
+      this.qrcodeUrl = res.data.url
+      // #endif
+
+      // ========== H5 / App ==========
+      // #ifndef MP-WEIXIN
+      let url = ''
+
+      // #ifdef H5
+      url = `${window.location.origin}/#/${this.h5Path}?${this.queryString}`
+      // #endif
+
+      // #ifndef H5
+      url = `${this.baseUrl}/#/${this.h5Path}?${this.queryString}`
+      // #endif
+
+      this.qrcodeUrl = await QRCode.toDataURL(url, {
+        width: 300,
+        margin: 2
+      })
+      // #endif
+    }
+  },
+
+  // #ifdef MP-WEIXIN
+  onShareAppMessage() {
+    return {
+      title: this.shareTitle || this.title,
+      path: `/${this.pagePath}?${this.queryString}`
     }
   }
+  // #endif
 }
 </script>
 
 <style scoped lang="scss">
 .popup-content {
   padding: 30rpx;
-  .popup-title {
-    text-align: center;
-    font-size: 32rpx;
-    font-weight: bold;
-    margin-bottom: 20rpx;
-  }
+}
+.popup-title {
+  text-align: center;
+  font-size: 32rpx;
+  font-weight: bold;
+  margin-bottom: 20rpx;
+}
+.share-btn {
+  margin: 10rpx 30rpx;
+  padding: 20rpx;
+  border-radius: 12rpx;
+  color: #fff;
 }
 .cancel-btn {
   text-align: center;
-  font-size: 30rpx;
   color: #666;
   margin-top: 20rpx;
 }
 .qrcode-box {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
   padding: 40rpx;
-  .tips {
-    margin-top: 20rpx;
-    color: #666;
-    font-size: 26rpx;
-  }
+  text-align: center;
+}
+.qrcode-img {
+  width: 300rpx;
 }
 </style>
diff --git a/components/ucellitem/UCellItemPlus.vue b/components/ucellitem/UCellItemPlus.vue
deleted file mode 100644
index 1fa6af9..0000000
--- a/components/ucellitem/UCellItemPlus.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-<template>
-  <view class="u-cell-item-plus" @click="$emit('click')">
-    <!-- 左侧图标区域 -->
-    <view class="u-cell-icon">
-      <!-- 如果传入的是插槽，优先渲染插槽 -->
-      <slot name="icon">
-        <!-- 否则判断是图片还是内置图标 -->
-        <template v-if="isImage(icon)">
-          <image :src="icon" class="icon-img" mode="aspectFit"></image>
-        </template>
-        <template v-else-if="icon">
-          <u-icon :name="icon" size="40"></u-icon>
-        </template>
-      </slot>
-    </view>
-
-    <!-- 标题文字 -->
-    <view class="u-cell-title">{{ title }}</view>
-
-    <!-- 右箭头 -->
-    <view class="u-cell-arrow" v-if="arrow">
-      <u-icon name="arrow-right"></u-icon>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  name: "UCellItemPlus",
-  props: {
-    title: String,
-    icon: String,
-    arrow: Boolean,
-  },
-  methods: {
-    isImage(src) {
-      return src && (src.startsWith("http") || src.endsWith(".png") || src.endsWith(".jpg") || src.endsWith(".jpeg") || src.endsWith(".svg"));
-    },
-  },
-};
-</script>
-
-<style scoped>
-.u-cell-item-plus {
-  display: flex;
-  align-items: center;
-  padding: 24rpx 32rpx;
-  border-bottom: 1rpx solid #f5f5f5;
-  background-color: #fff;
-}
-
-.u-cell-icon {
-  width: 60rpx;
-  height: 60rpx;
-  margin-right: 20rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.icon-img {
-  width: 48rpx;
-  height: 48rpx;
-  border-radius: 8rpx;
-}
-
-.u-cell-title {
-  flex: 1;
-  font-size: 30rpx;
-  color: #333;
-}
-
-.u-cell-arrow {
-  color: #999;
-}
-</style>
diff --git a/main.js b/main.js
index e375279..3253d8d 100644
--- a/main.js
+++ b/main.js
@@ -3,6 +3,7 @@ import App from './App'
 import customNavbar from '@/components/navbar/customNavbar.vue'
 import AuthLogin from "@/components/AuthPopup/AuthLogin.vue"
 import PhoneSelect from "@/components/AuthPopup/PhoneSelect.vue"
+import { ellipsisText } from '@/common/utils/text';
 
 Vue.config.productionTip = false
 
@@ -37,7 +38,13 @@ import httpInterceptor from '@/common/http.interceptor.js';
 
 Vue.use(httpInterceptor, app);
 // 封装自定义提示框
-import $mytip from 'common/utils/tip.js'
+import $mytip from '@/common/utils/tip.js'
+import config from "@/common/config.js"
+import { checkToken,getToken,getUserType } from '@/common/utils/auth.js'
 Vue.prototype.$mytip = $mytip
-
+Vue.prototype.$ellipsis = ellipsisText
+Vue.prototype.$config = config
+Vue.prototype.$checkToken = checkToken
+Vue.prototype.$getToken = getToken
+Vue.prototype.$getUserType = getUserType
 app.$mount()
diff --git a/manifest.json b/manifest.json
index ce8d401..fb6fc83 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
-    "name" : "租房小程序",
-    "appid" : "__UNI__2CDE30A",
+    "name" : "伍家国投",
+    "appid" : "__UNI__DA751C9",
     "description" : "",
     "versionName" : "1.0.1",
     "versionCode" : 1,
@@ -112,7 +112,8 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx76702d2488f3d3f0",
+        "appid" : "wx1c9e1d0b916674dc",
+        "lazyCodeLoading" : "requiredComponents",
         "setting" : {
             "urlCheck" : false,
             "minified" : true
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index fcade5e..4c2f125 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -500,6 +500,11 @@
         "node": ">=8"
       }
     },
+    "node_modules/jsencrypt": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.5.4.tgz",
+      "integrity": "sha512-kNjfYEMNASxrDGsmcSQh/rUTmcoRfSUkxnAz+MMywM8jtGu+fFEZ3nJjHM58zscVnwR0fYmG9sGkTDjqUdpiwA=="
+    },
     "node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
@@ -801,6 +806,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/three": {
+      "version": "0.182.0",
+      "resolved": "https://registry.npmmirror.com/three/-/three-0.182.0.tgz",
+      "integrity": "sha512-GbHabT+Irv+ihI1/f5kIIsZ+Ef9Sl5A1Y7imvS5RQjWgtTPfPnZ43JmlYI7NtCRDK9zir20lQpfg8/9Yd02OvQ=="
+    },
     "node_modules/urijs": {
       "version": "1.19.11",
       "resolved": "https://registry.npmmirror.com/urijs/-/urijs-1.19.11.tgz",
diff --git a/package-lock.json b/package-lock.json
index b6296ec..c128a00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,9 @@
         "axios": "1.7.3",
         "axios-miniprogram-adapter": "^0.3.5",
         "date-fns": "3.6.0",
+        "jsencrypt": "^3.5.4",
         "qrcode": "^1.5.4",
+        "three": "^0.182.0",
         "vue": "2.6.14"
       },
       "devDependencies": {
@@ -854,6 +856,11 @@
         "node": ">=8"
       }
     },
+    "node_modules/jsencrypt": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.5.4.tgz",
+      "integrity": "sha512-kNjfYEMNASxrDGsmcSQh/rUTmcoRfSUkxnAz+MMywM8jtGu+fFEZ3nJjHM58zscVnwR0fYmG9sGkTDjqUdpiwA=="
+    },
     "node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
@@ -1155,6 +1162,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/three": {
+      "version": "0.182.0",
+      "resolved": "https://registry.npmmirror.com/three/-/three-0.182.0.tgz",
+      "integrity": "sha512-GbHabT+Irv+ihI1/f5kIIsZ+Ef9Sl5A1Y7imvS5RQjWgtTPfPnZ43JmlYI7NtCRDK9zir20lQpfg8/9Yd02OvQ=="
+    },
     "node_modules/urijs": {
       "version": "1.19.11",
       "resolved": "https://registry.npmmirror.com/urijs/-/urijs-1.19.11.tgz",
diff --git a/package.json b/package.json
index f19d2f8..28fb3f6 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,9 @@
     "axios": "1.7.3",
     "axios-miniprogram-adapter": "^0.3.5",
     "date-fns": "3.6.0",
+    "jsencrypt": "^3.5.4",
     "qrcode": "^1.5.4",
+    "three": "^0.182.0",
     "vue": "2.6.14"
   },
   "devDependencies": {
diff --git a/pages/detail/assetsDetail.vue b/pages-assets/assets/assetsDetail.vue
similarity index 63%
rename from pages/detail/assetsDetail.vue
rename to pages-assets/assets/assetsDetail.vue
index 53cf72f..5ad0c5a 100644
--- a/pages/detail/assetsDetail.vue
+++ b/pages-assets/assets/assetsDetail.vue
@@ -14,42 +14,34 @@
 
 		<!-- 图片展示区 -->
 		<view class="image-section" :style="{ paddingTop: navTotalHeight + 'px' }">
-			<image src="/static/30091712.jpg"></image>
-			<!-- <AssetGallery
-	  :insideImages="asset.images"
-	  :vrImage="asset.vrImage"
-	  :vrSrc="asset.vr"
-	  :videos="asset.videos"
-	  :plans="asset.plans"
-	  :adImage="asset.adImage"
-	  @vr-click="viewVR"
-	  @video-play="playVideo"
-	  @ad-click="onAdClick"
-	/> -->
+			<Carousel :list="swiperList" boxHeight="740rpx" 
+			:vrIcon="staticHost + '/public/static/icon/vr.png'"
+			 vrViewPage="/pages-biz/vr/vr"
+			 :vr-list="vrList"/>
 		</view>
 
 		<!-- 资产基本信息 -->
 		<view class="container">
 			<view class="basic-info">
 				<view class="info-header">
-					<view class="category-tag">{{ asset.category }}</view>
-					<view class="asset-name">{{ asset.name }}</view>
+					<view class="category-tag">{{ asset.category || '未知' }}</view>
+					<view class="asset-name">{{ asset.name || '未知'}}</view>
 				</view>
-				<view class="rent-price">¥1500/月</view>
+				<view class="rent-price">{{asset.rent || '未知'}}/月</view>
 				<view class="community-info">
 					<text class="label">所属小区：</text>
-					<text>{{ asset.community }}</text>
+					<text>{{ asset.community || '暂无'}}</text>
 				</view>
 				<view class="address-info">
 					<text class="label">地址：</text>
-					<text>{{ asset.address }}</text>
+					<text>{{ asset.address || '未知'}}</text>
 				</view>
-				<button class="vr-btn" @click="viewVR">查看VR图</button>
+				
 			</view>
 
 			<!-- 地图位置 -->
 			<view class="map-container">
-				<map :latitude="asset.lat" :longitude="asset.lng" :markers="markers"
+				<map :latitude="asset.lat||'0'" :longitude="asset.lng|| '0'" :markers="markers"
 					style="width: 92%; height: 300rpx;"></map>
 			</view>
 
@@ -60,27 +52,27 @@
 					<view class="table-row">
 						<view class="row-item">
 							<view class="item-label">编号</view>
-							<view class="item-value">{{ asset.code }}</view>
+							<view class="item-value">{{ asset.code || '未知'}}</view>
 						</view>
 						<view class="row-item">
 							<view class="item-label">面积</view>
-							<view class="item-value">105㎡</view>
+							<view class="item-value">{{asset.area || '未知'}}㎡</view>
 						</view>
 					</view>
 					<view class="table-row">
 						<view class="row-item">
 							<view class="item-label">类别</view>
-							<view class="item-value">{{ asset.category }}</view>
+							<view class="item-value">{{ asset.category || '未知'}}</view>
 						</view>
 						<view class="row-item">
 							<view class="item-label">价值</view>
-							<view class="item-value">¥{{ formatMoney(asset.value) }}</view>
+							<view class="item-value">¥{{ formatMoney((asset && asset.value) || 0) }}</view>
 						</view>
 					</view>
 					<view class="table-row">
 						<view class="row-item full-width">
 							<view class="item-label">权属</view>
-							<view class="item-value">{{ asset.owner }}</view>
+							<view class="item-value">{{ asset.owner || '未知'}}</view>
 						</view>
 					</view>
 				</view>
@@ -90,7 +82,7 @@
 		<!-- 预约弹窗 -->
 		<u-popup v-model="showReserve" mode="bottom" border-radius="20">
 			<view class="popup-content">
-				<text class="popup-title">预约看房</text>
+				<text class="popup-title">预约看资产</text>
 				<u-input v-model="reserveName" placeholder="请输入姓名" />
 				<u-input v-model="reservePhone" placeholder="请输入电话" />
 				<u-button type="primary" @click="submitReserve">提交预约</u-button>
@@ -98,22 +90,29 @@
 		</u-popup>
 
 		<!-- 底部导航栏 -->
-		<assetBottomBar v-if="asset.status === 0" :phone="asset.contact" @reserve="showReserve = true" />
+		<assetBottomBar v-if="asset.status === '闲置中'" 
+		:assetId="assetId" 
+		:phone="managerPhone" 
+		@reserve="showReserve = true"
+		 btn-title="预约看资产"
+		 shareBtnTitle="分享资产"
+		 page-path="/pages-assets/assets/detail/assetsDetail"
+		 minicode-api="/pages-assets/assets/detail/assetsDetail"
+		 btnColor="#FF2F31"
+		 :query="assetId"
+		 />
 	</view>
 </template>
 
 <script>
-	import mycard from '../../components/card/mycard.vue';
 	import assetBottomBar from '../../components/bottom/assetBottomBar.vue';
-	import AssetGallery from '../../components/gallery/AssetGallery.vue'
+	import CarouselVue from '../../components/Carousel/Carousel.vue';
 	export default {
 		components: {
-			mycard,
 			assetBottomBar,
-			AssetGallery
+			CarouselVue
 		},
 		data() {
-			// 静态资产数据
 			const staticAsset = {
 				name: '',
 				community: '',
@@ -137,7 +136,6 @@
 				status: 0,
 				contact: ''
 			};
-
 			return {
 				// 控制预约弹窗显示
 				showReserve: false,
@@ -147,14 +145,16 @@
 				reservePhone: '',
 				assetId: null,
 				// 直接使用静态数据
-				asset: staticAsset,
+				asset: null,
+				managerPhone:null,
 				// 根据静态数据初始化标记
+				vrList:[],
 				markers: [{
 					id: 1,
 					latitude: staticAsset.lat,
 					longitude: staticAsset.lng,
 					title: staticAsset.name,
-				}, ],
+				}],
 				background: {
 					backgroundColor: '#ffffff',
 					// 渐变色
@@ -175,10 +175,10 @@
 			};
 		},
 		onLoad(options) {
-			this.assetId = options.id || 'A001';
+			this.assetId = options.assetsNo;
 			// 静态数据初始化
 			this.loadAssetDetail();
-			// this.recordView();
+			this.recordView();
 		},
 		mounted() {
 			const navbar = this.$refs.navbar;
@@ -190,6 +190,44 @@
 			// 计算导航栏透明度和样式
 			this.updateNavbarStyle(e.scrollTop);
 		},
+		computed: {
+		staticHost() {
+			return this.$config.staticUrl
+			},
+			swiperList(){
+				let list = [];
+				if(this.asset && this.asset.vrImgs && this.asset.vrImgs.length > 0) {
+					this.asset.vrImgs.forEach(img=> {
+						list.push({
+							src: this.$config.staticUrl + img,
+							mediaType:'vr',
+							bizType:'vr'
+						})
+					})
+				}
+				// if(this.asset && this.asset.detailImgs && this.asset.detailImgs.length > 0) {
+				// 	this.asset.detailImgs.forEach(img=> {
+				// 		list.push({
+				// 			src: this.$config.staticUrl + img,
+				// 			mediaType:'vr',
+				// 			bizType:'vr'
+				// 		})
+				// 		this.vrList.push(this.$config.staticUrl + img)
+				// 	})
+				// }
+				
+				if(this.asset && this.asset.detailImgs && this.asset.detailImgs.length > 0) {
+					this.asset.detailImgs.forEach(img=> {
+						list.push({
+							src: this.$config.staticUrl + img,
+							mediaType:'image',
+							bizType:'详细图片'
+						})
+					})
+				}
+			   return list;
+			}
+		},	
 		methods: {
 			// 根据滚动距离更新导航栏样式
 			updateNavbarStyle(scrollTop) {
@@ -213,30 +251,31 @@
 			
 			// 模拟接口请求
 			loadAssetDetail() {
-				setTimeout(() => {
-					console.log("fork数据")
+				let url = `/assets/detail?id=${this.assetId}`
+				this.$u.get(url).then(result => {
+					const data = result.data
+					console.log(data)
 					this.asset = {
-						name: '广州市中心写字楼A栋',
-						community: '天河国际商务区',
-						code: 'GDZC2025001',
-						category: '商业用房',
-						area: 1250.5,
-						value: 28000000,
-						rent: 88000,
-						owner: '广州市国资委',
-						address: '广州市天河区体育西路88号',
-						lat: 23.135,
-						lng: 113.327,
-						images: [
-							{
-								image:'/static/img/index/swiper/swiper3.jpg'
-							}
-								
-						],
-						remark: '该资产目前用于办公出租，维护状态良好。',
-						isFavorite: false,
-						status: 0
+						name: data.assetsName,
+						community: data.community,
+						code: data.assetsNo,
+						category: data.assetsType,
+						area: data.footPrint,
+						value: data.assetsValue,
+						rent: data.rentFee,
+						owner: data.owner,
+						address: data.assetsAddress,
+						lat: data.latitude,
+						lng: data.longitude,
+						roomNo: data.roomNo,
+						floorNo: data.floorNo,
+					    description: data.assetsDesc,
+						detailImgs: data.detailImgs,
+						vrImgs: data.vrImgs,
+						remark: data.assetsDesc,
+						status: data.assetsStatus
 					};
+					this.managerPhone = data.managerPhone
 					this.markers = [
 						{
 							id: 1,
@@ -245,7 +284,9 @@
 							title: this.asset.name,
 						},
 					];
-				}, 300);
+				}).catch(err => {
+					console.log("获取资产信息失败：", err)
+				})
 			},
 			formatMoney(num) {
 				return Number(num).toLocaleString();
@@ -257,31 +298,52 @@
 					icon: 'success',
 				});
 			},
-			contactManager() {
-				uni.makePhoneCall({
-					phoneNumber: '400-123-4567',
-				});
-			},
-			viewVR() {
-				uni.showToast({
-					title: '打开卫星图...',
-					icon: 'none',
-				});
-				// 可扩展：跳转到 VR 页面或调用地图 API
+			validatePhoneNumber(phone) {
+			    const regex = /^1[3-9]\d{9}$/;
+			    return regex.test(phone);
 			},
 			submitReserve() {
 				console.log('提交预约看房申请')
+				// 身份证校验
+				if (this.validatePhoneNumber(this.reservePhone)) {
+					uni.showToast({
+						title: '手机号格式不正确',
+						icon: 'none'
+					});
+					return;
+				}
+				let url = '/reservate/submit'
+				this.$u.post(url,{
+					reserveName: this.reserveName,
+					assetsNo: this.assetId,
+					assetsName: this.asset.name,
+					phone: this.reservePhone
+				},{
+					WT: this.$getToken()
+				}).then(res=>{
+					if(res.flag) {
+						this.$mytip.toast('提交预约成功成功')
+					}else{
+						
+						this.$mytip.toast('预约提交失败，请重试')
+					}
+				})
 				this.showReserve = false;
 			},
 			recordView(assetId) {
-				let lifeData = uni.getStorageSync('lifeData');
-				let token = lifeData.vuex_token
-				let url = "/assets/viewRecord";
-				this.$u.get(url, {}, {
-					'WT': token
+				let token = this.$getToken()
+				if(token){
+					let url = "/potential/add";
+				this.$u.get(url, {
+					assetId: this.assetId
+				}, {
+					'WT': this.$getToken()
 				}).then(obj => {
 
-				});
+				}).catch(err => {
+					console.log("记录客户浏览记录失败", err)
+				})
+				}
 			},
 		},
 	};
@@ -363,16 +425,6 @@
 		margin-right: 10rpx;
 	}
 
-	.vr-btn {
-		background-color: #F34038;
-		color: #fff;
-		border: none;
-		padding: 0 14rpx;
-		border-radius: 6rpx;
-		font-size: 24rpx;
-		margin-top: -90rpx;
-		float: right;
-	}
 
 	/* 地图容器 */
 	.map-container {
diff --git a/pages-assets/discharge/leaseCancel.vue b/pages-assets/discharge/leaseCancel.vue
new file mode 100644
index 0000000..1317a52
--- /dev/null
+++ b/pages-assets/discharge/leaseCancel.vue
@@ -0,0 +1,268 @@
+<template>
+	<view class="lease-cancel-page">
+		<!-- 顶部自定义导航栏 -->
+		<customNavbar title="退租申请" />
+
+		<!-- 表单内容 -->
+		<view class="form-section">
+			<!-- 关联合同 -->
+			<view class="form-item">
+				<text class="label">关联合同</text>
+				<picker :range="contracts" range-key="name" @change="onContractChange">
+					<view class="picker-value">
+						{{ selectedContract ? selectedContract.name : '请选择合同' }}
+					</view>
+				</picker>
+			</view>
+
+			<!-- 关联资产 -->
+			<view class="form-item">
+				<text class="label">关联资产</text>
+				<view class="picker-value" @click="openAssetsPopup">
+					{{ selectedAssetsList.length
+            ? selectedAssetsList.map(a => a.name).join('，')
+            : '请选择资产' }}
+					<text v-if="selectedAssetsList.length">（{{ selectedAssetsList.length }}）</text>
+				</view>
+			</view>
+
+			<!-- 退租日期 -->
+			<view class="form-item">
+				<text class="label">退租日期</text>
+				<picker mode="date" @change="onDateChange">
+					<view class="picker-value">
+						{{ cancelDate || '请选择退租日期' }}
+					</view>
+				</picker>
+			</view>
+
+			<!-- 退租原因 -->
+			<view class="form-item">
+				<text class="label">退租原因</text>
+				<textarea v-model="reason" placeholder="请输入退租原因" class="textarea" />
+			</view>
+		</view>
+
+		<!-- 提交按钮 -->
+		<view class="bottom-bar">
+			<button class="submit-btn" @click="submitForm">提交申请</button>
+		</view>
+
+		<!-- 弹窗多选资产 -->
+		<u-popup v-model="showAssetsPopup" mode="bottom">
+			<view class="popup-header">
+				<input v-model="assetSearch" placeholder="搜索资产" class="search-input" />
+			</view>
+			<scroll-view scroll-y style="height:500rpx;">
+				<checkbox-group v-model="selectedAssetsKeys">
+					<label v-for="asset in filteredAssets" :key="asset.assetsNo"
+						style="display:block;padding:12rpx 20rpx;border-bottom:1rpx solid #f0f0f0;">
+						<checkbox :value="asset.assetsNo" /> {{ asset.name }}
+					</label>
+				</checkbox-group>
+			</scroll-view>
+			<button class="popup-btn" @click="confirmAssets">确定</button>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				contracts: [],
+				selectedContract: null,
+				assetsList: [],
+				assetSearch: '',
+				showAssetsPopup: false,
+				selectedAssetsKeys: [], // 存储选中的资产编号
+				selectedAssetsList: [], // 存储选中的资产对象
+				cancelDate: '',
+				reason: '',
+			};
+		},
+		onLoad() {
+			this.fetchContractList();
+		},
+		onShow() {
+			this.$checkToken(this.$getToken());
+		},
+		computed: {
+			filteredAssets() {
+				if (!this.assetSearch) return this.assetsList;
+				return this.assetsList.filter(a =>
+					a.name.toLowerCase().includes(this.assetSearch.toLowerCase())
+				);
+			},
+		},
+		methods: {
+			onContractChange(e) {
+				const index = e.detail.value;
+				this.selectedContract = this.contracts[index];
+				this.assetsList = this.contracts[index].assets || [];
+				// 清空之前选择
+				this.selectedAssetsKeys = [];
+				this.selectedAssetsList = [];
+			},
+			openAssetsPopup() {
+				if (!this.selectedContract) {
+					uni.showToast({
+						title: '请先选择合同',
+						icon: 'none'
+					});
+					return;
+				}
+				this.showAssetsPopup = true;
+			},
+			confirmAssets() {
+				this.selectedAssetsList = this.assetsList.filter(a =>
+					this.selectedAssetsKeys.includes(a.assetsNo)
+				);
+				this.showAssetsPopup = false;
+			},
+			onDateChange(e) {
+				this.cancelDate = e.detail.value;
+			},
+			fetchContractList() {
+				const url = '/contract/queryAll';
+				this.$u.get(
+						url, {
+						}, {
+							WT: this.$getToken()
+						}
+					)
+					.then(res => {
+						this.contracts = res.data;
+					})
+					.catch(err => {
+						console.error('获取合同信息失败：', err);
+					});
+			},
+			submitForm() {
+				if (
+					!this.selectedContract ||
+					!this.cancelDate ||
+					!this.reason ||
+					!this.selectedAssetsList.length
+				) {
+					uni.showToast({
+						title: '请填写完整信息',
+						icon: 'none'
+					});
+					return;
+				}
+
+				const data = {
+					contractNo: this.selectedContract.contractNo,
+					cancelDate: this.cancelDate,
+					reason: this.reason,
+					assetsNoList: this.selectedAssetsList.map(a => a.assetsNo),
+				};
+
+				this.$u.post('/discharge/apply', data, {
+						WT: this.$getToken()
+					})
+					.then((res) => {
+						if (res.flag) {
+							this.$mytip.toast('提交退租申请成功')
+							const pages = getCurrentPages();
+							if (pages.length > 1) {
+							  uni.navigateBack();
+							} else {
+							  uni.switchTab({
+							  		url:'/pages/index/index'
+							  	})
+							}
+						} else {
+							this.$mytip.toast('提交退租申请失败')
+						}
+					})
+					.catch(err => {
+						this.$mytip.toast('提交退租申请失败')
+						console.error('提交退租申请失败：', err);
+					});
+			},
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.lease-cancel-page {
+		background-color: #f6f8fa;
+		height: 100vh;
+		display: flex;
+		padding-top: 160rpx;
+		padding-bottom: 120rpx;
+		flex-direction: column;
+	}
+
+	.form-section {
+		padding: 20rpx;
+	}
+
+	.form-item {
+		margin-bottom: 24rpx;
+	}
+
+	.label {
+		font-size: 28rpx;
+		margin-bottom: 10rpx;
+		display: block;
+	}
+
+	.picker-value {
+		padding: 14rpx 20rpx;
+		background: #fff;
+		border-radius: 8rpx;
+		color: #333;
+	}
+
+	.textarea {
+		width: 100%;
+		min-height: 120rpx;
+		padding: 14rpx 20rpx;
+		border-radius: 8rpx;
+		background: #fff;
+		color: #333;
+	}
+
+	.bottom-bar {
+		padding: 20rpx;
+		background: #fff;
+	}
+
+	.submit-btn {
+		width: 100%;
+		height: 80rpx;
+		background: linear-gradient(90deg, #FF6F63 0%, #FB392A 100%);
+		border-radius: 10rpx;
+		color: #ffffff;
+		font-size: 32rpx;
+		border: none;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	/* 弹窗样式 */
+	.popup-header {
+		padding: 20rpx;
+		border-bottom: 1rpx solid #eee;
+	}
+
+	.search-input {
+		width: 100%;
+		padding: 10rpx;
+		border: 1rpx solid #ccc;
+		border-radius: 8rpx;
+	}
+
+	.popup-btn {
+		margin: 20rpx;
+		height: 60rpx;
+		background: #007aff;
+		color: #fff;
+		border-radius: 8rpx;
+		font-size: 28rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages-assets/discharge/leaseCancelList.vue b/pages-assets/discharge/leaseCancelList.vue
new file mode 100644
index 0000000..d49003e
--- /dev/null
+++ b/pages-assets/discharge/leaseCancelList.vue
@@ -0,0 +1,255 @@
+<template>
+	<view class="reserve-records">
+
+		<!-- 顶部导航栏 -->
+		<customNavbar title="退租申请" :is-transparent="navbarStyle.isTransparent" :bg-color="navbarStyle.bgColor"
+			:text-color="navbarStyle.textColor" :opacity="navbarStyle.opacity" :show-home="true" />
+		<!-- 内容部分 -->
+		<scroll-view scroll-y class="scroll-content" @scrolltolower="loadMore" @refresherrefresh="refresh"
+			:refresher-enabled="true" :refresher-triggered="isRefreshing">
+			<view v-if="flowList.length > 0" class="record-list">
+				<view v-for="item in flowList" :key="item.id" class="record-card" @click="goDetail(item)">
+					<!-- 合同名称和状态 -->
+					<view class="card-header">
+						<text class="contract-name">{{ item.contractName }}</text>
+						<text :class="['record-status', item.status]">
+							{{ statusText(item.status) }}
+						</text>
+					</view>
+
+					<!-- 内容部分 -->
+					<view class="card-content">
+						<!-- 预约时间 -->
+						<view class="info-item">
+							<text class="info-label">申请时间：</text>
+							<text class="info-value"> {{item.applyTime}} </text>
+						</view>
+						<view class="info-item">
+							<text class="info-label">退租资产：</text>
+							<text class="info-value"> {{item.dischargeItem}} </text>
+						</view>
+
+					</view>
+				</view>
+
+				<u-loadmore :status="loadStatus" />
+			</view>
+
+			<view v-else class="empty">
+				<u-empty mode="list" text="暂无退租申请记录" />
+			</view>
+		</scroll-view>
+		<!-- 底部新增留言按钮 -->
+		<view class="add-btn-container">
+			<button class="add-btn" @click="toApply()">新增退租申请</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pageNo: 1,
+				pageSize: 10,
+				flowList: [],
+				loadStatus: 'loadmore',
+				isRefreshing: false
+			};
+		},
+		methods: {
+			statusText(status) {
+				switch (status) {
+					case 'pending':
+						return '待确认';
+					case 'done':
+						return '已完成';
+					default:
+						return '未知';
+				}
+			},
+			formatDate(dateStr) {
+				// 格式化日期，例如：2025-11-10 周五 09:00
+				const date = new Date(dateStr);
+				const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+				const year = date.getFullYear();
+				const month = String(date.getMonth() + 1).padStart(2, '0');
+				const day = String(date.getDate()).padStart(2, '0');
+				const weekday = weekdays[date.getDay()];
+				const hours = String(date.getHours()).padStart(2, '0');
+				const minutes = String(date.getMinutes()).padStart(2, '0');
+
+				return `${year}-${month}-${day} ${weekday} ${hours}:${minutes}`;
+			},
+			fetchApplys() {
+				if (this.loadStatus !== 'loadmore') return;
+				this.loadStatus = 'loading';
+				let url = '/discharge/queryPage'
+				this.$u.post(url, {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize
+				}, {
+					WT: this.$getToken()
+				}).then(res => {
+					const rows = res.data.result || [];
+					console.log(rows)
+					if (this.pageNo === 1) this.flowList = [];
+					this.flowList = this.flowList.concat(rows);
+					if (rows.length < this.pageSize) {
+						this.loadStatus = 'nomore';
+					} else {
+						this.pageNo++;
+						this.loadStatus = 'loadmore';
+					}
+				}).catch(err => {
+					console.log("获取退租申请信息失败：", err)
+					this.loadStatus = 'loadmore';
+				})
+			},
+			toApply() {
+				this.$u.route({
+					url: '/pages-assets/discharge/leaseCancel'
+				})
+			},
+			viewLocation(item) {
+				uni.openLocation({
+					latitude: item.lat,
+					longitude: item.lng,
+					name: item.assetName,
+					address: item.assetAddress
+				});
+			},
+			callManager(phone) {
+				if (!phone) return;
+				uni.makePhoneCall({
+					phoneNumber: phone
+				});
+			},
+			loadMore() {
+				this.fetchApplys();
+			},
+			refresh() {
+				this.isRefreshing = true;
+				setTimeout(() => {
+					this.isRefreshing = false;
+				}, 1000);
+			}
+		},
+		onShow() {
+			this.$checkToken(this.$getToken())
+			this.refresh()
+		},
+		onLoad() {
+			this.fetchApplys()
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.reserve-records {
+		background: #f5f5f5;
+		min-height: 100vh;
+		padding-top: 175rpx;
+		/* 给导航栏留空间 */
+	}
+
+	.scroll-content {
+		height: calc(100vh - 120rpx);
+	}
+
+	.record-list {
+		padding: 30rpx 40rpx;
+	}
+
+	.record-card {
+		background: #fff;
+		border-radius: 12rpx;
+		padding: 32rpx;
+		margin-bottom: 30rpx;
+		box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.card-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 24rpx;
+	}
+
+	.contract-name {
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #2D2B2C;
+	}
+
+	.record-status {
+		font-size: 26rpx;
+		padding: 10rpx 15rpx;
+		border-radius: 4rpx;
+
+		&.done {
+			background: #FCE5E0;
+			color: #ED7748;
+		}
+
+		&.pending {
+			background: #F2F3F7;
+			color: #86868C;
+		}
+	}
+
+	.card-content {
+		margin-bottom: 32rpx;
+	}
+
+	.info-item {
+		display: flex;
+		align-items: flex-start;
+	}
+
+	.info-item:last-child {
+		margin-bottom: 0;
+	}
+
+	.info-label {
+		font-size: 24rpx;
+		color: #666;
+		width: 120rpx;
+		flex-shrink: 0;
+		line-height: 44rpx;
+	}
+
+	.info-value {
+		font-size: 24rpx;
+		color: #333;
+		flex: 1;
+		line-height: 44rpx;
+	}
+
+	.add-btn-container {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: 30rpx 40rpx;
+		background-color: #f5f5f5;
+		box-shadow: 0 -2rpx 12rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.add-btn {
+		width: 100%;
+		height: 80rpx;
+		background: linear-gradient(90deg, #FF6F63 0%, #FB392A 100%);
+		border-radius: 10rpx;
+		color: #ffffff;
+		font-size: 32rpx;
+		border: none;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.empty {
+		margin-top: 200rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/message/guestbook.vue b/pages-assets/fallback/fallback.vue
similarity index 51%
rename from pages/message/guestbook.vue
rename to pages-assets/fallback/fallback.vue
index d85b96e..366c733 100644
--- a/pages/message/guestbook.vue
+++ b/pages-assets/fallback/fallback.vue
@@ -2,12 +2,12 @@
 	<view class="page-view">
 		<!-- 顶部导航栏 -->
 		<customNavbar title="留言板" :is-transparent="navbarStyle.isTransparent" :bg-color="navbarStyle.bgColor"
-			:text-color="navbarStyle.textColor" :opacity="navbarStyle.opacity" :extra-icons="navbarStyle.extraIcons"
-			:show-home="false" />
+			:text-color="navbarStyle.textColor" :opacity="navbarStyle.opacity" :show-home="true" />
 
 		<!-- 留言列表 -->
-		<scroll-view scroll-y="true" class="scroll-view">
-			<view class="message-item" v-for="(item, index) in messageList" :key="index" @click="navigateToDetail(item)">
+		<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="loadMore" @refresherrefresh="refresh"
+			:refresher-enabled="true" :refresher-triggered="isRefreshing">
+			<view class="message-item" v-for="(item, index) in flowList" :key="index" @click="navigateToDetail(item)">
 				<view class="message-header">
 					<text :class="['status-tag', item.status]">{{ item.statusText }}</text>
 					<text class="message-title">留言内容</text>
@@ -16,15 +16,22 @@
 					<text class="content-text">{{ item.content }}</text>
 				</view>
 				<view class="message-footer">
-					<text class="message-time">留言时间：{{ item.time }}</text>
+					<text class="message-time">留言时间：{{ item.summitDate }}</text>
 				</view>
 			</view>
 		</scroll-view>
 
 		<!-- 底部新增留言按钮 -->
 		<view class="add-btn-container">
-			<button class="add-btn" @click="addMessage">新增留言</button>
+			<button class="add-btn" @click="goToSubmit()">新增留言</button>
 		</view>
+		<!-- 新增留言弹窗 -->
+		<u-popup v-model="showAddPopup" mode="center" length="60%">
+			<view class="popup-content">
+				<textarea v-model="newMessageContent" placeholder="请输入留言内容" class="textarea" />
+				<button class="popup-btn" @click="addFallback()">提交留言</button>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -32,36 +39,18 @@
 	export default {
 		data() {
 			return {
-				messageList: [{
-						id: 1,
-						status: 'processed',
-						statusText: '已处理',
-						content: '留言内容摘要留言内容摘要留言内容摘要留言内容摘要留言内容摘要留言内容摘要',
-						time: '2024-02-02'
-					},
-					{
-						id: 2,
-						status: 'processing',
-						statusText: '处理中',
-						content: '留言内容摘要留言内容摘要留言内容摘要留言内容摘要留言内容摘要留言内容摘要',
-						time: '2024-02-02'
-					},
-					{
-						id: 3,
-						status: 'pending',
-						statusText: '待处理',
-						content: '留言内容摘要留言内容摘要留言内容摘要留言内容摘要留言内容摘要留言内容摘要',
-						time: '2024-02-02'
-					}
-				],
+				showAddPopup: false,
+				newMessageContent: '',
+				flowList: [],
 				// 导航栏样式控制
 				navbarStyle: {
 					isTransparent: true,
 					bgColor: '#ffffff',
 					textColor: '#000000',
-					opacity: 0,
-					extraIcons: ['ellipsis', 'eye'] // 右侧额外图标
+					opacity: 0
 				},
+				loadStatus: 'loadmore',
+				isRefreshing: false,
 				// 滚动距离
 				scrollTop: 0
 			}
@@ -71,47 +60,120 @@
 			// 计算导航栏透明度和样式
 			this.updateNavbarStyle(e.scrollTop);
 		},
+		onShow() {
+			this.$checkToken(this.$getToken())
+		},
+		onLoad() {
+			this.fetchFallback();
+		},
 		methods: {
 			// 点击留言项跳转到详情页
 			navigateToDetail(item) {
 				uni.navigateTo({
-					url: `/pages/detail/guestbookDetail?id=${item.id}`,
+					url: `/pages-assets/fallback/fallbackDetail?id=${item.id}`,
 				});
 			},
-			addMessage() {
-				// 新增留言逻辑
-				uni.showToast({
-					title: '新增留言',
-					icon: 'none'
-				});
+			fetchFallback() {
+				if (this.loadStatus !== 'loadmore') return;
+				this.loadStatus = 'loading';
+				let token = this.$getToken()
+				let url = '/fallback/queryPage'
+				this.$u.post(url, {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize
+				}, {
+					WT: token
+				}).then(res => {
+					const rows = res.data.result || [];
+					console.log(rows)
+					if (this.pageNo === 1) this.flowList = [];
+					this.flowList = this.flowList.concat(rows)
+					if (rows.length < this.pageSize) {
+						this.loadStatus = 'nomore';
+					} else {
+						this.pageNo++;
+						this.loadStatus = 'loadmore';
+					}
+				}).catch(err => {
+					console.log("获取留言信息失败：", err)
+					this.loadStatus = 'loadmore';
+				})
+			},
+			loadMore() {
+				// 只有在 loadStatus 为 'loadmore' 时才触发
+				if (this.loadStatus !== 'loadmore') return;
+				this.fetchReserve()
+			},
+			goToSubmit() {
+				this.showAddPopup = true;
+			},
+			addFallback() {
+				const content = this.newMessageContent.trim();
+				if (!content) {
+					uni.showToast({
+						title: '请输入留言内容',
+						icon: 'none'
+					});
+					return;
+				}
+				const token = this.$getToken();
+				this.$u.post('/fallback/submit', {
+						content
+					}, {
+						WT: token
+					})
+					.then(res => {
+						uni.showToast({
+							title: '留言成功',
+							icon: 'success'
+						});
+						this.showAddPopup = false;
+						this.newMessageContent = '';
+						this.refresh();
+					})
+					.catch(err => {
+						console.error('新增留言失败：', err);
+						uni.showToast({
+							title: '留言失败',
+							icon: 'none'
+						});
+							this.showAddPopup = false;
+					});
+			},
+			refresh() {
+				this.isRefreshing = true;
+				setTimeout(() => {
+					this.isRefreshing = false;
+				}, 1000);
 			},
 			// 根据滚动距离更新导航栏样式
 			updateNavbarStyle(scrollTop) {
 				// 定义滚动阈值，超过此值导航栏变为不透明
 				const threshold = 200;
-
+			
 				// 计算透明度
 				let opacity = scrollTop / threshold;
 				opacity = Math.min(opacity, 1);
 				opacity = Math.max(opacity, 0);
-
+			
 				// 更新导航栏样式
 				this.navbarStyle.opacity = opacity;
-
+			
 				if (opacity > 0.5) {
 					this.navbarStyle.isTransparent = false;
 				} else {
 					this.navbarStyle.isTransparent = true;
 				}
-			},
+			}
 		}
+		
 	}
 </script>
 
 <style scoped>
 	.page-view {
 		/* 给导航栏留空间 */
-		padding-top: 120rpx;
+		padding-top: 175rpx;
 		min-height: 100vh;
 		position: relative;
 		background: linear-gradient(0deg, #F3F1ED 43%, #F5E9DB 100%);
@@ -119,7 +181,7 @@
 
 	.scroll-view {
 		height: calc(100vh - 120rpx - 120rpx);
-		padding: 20rpx 0;
+		padding: 5% 0;
 	}
 
 	.message-item {
@@ -206,4 +268,29 @@
 		align-items: center;
 		justify-content: center;
 	}
+
+	/* 弹窗样式 */
+	.popup-content {
+		border-radius: 8rpx;
+		padding: 20rpx;
+	}
+
+	.popup-content .textarea {
+		width: 100%;
+		min-height: 400rpx;
+		padding: 14rpx 20rpx;
+		border-radius: 8rpx;
+		background: #fff;
+		color: #333;
+	}
+
+	.popup-btn {
+		margin-top: 20rpx;
+		width: 100%;
+		height: 60rpx;
+		background: #FF6F63;
+		color: #fff;
+		border-radius: 8rpx;
+		font-size: 30rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/detail/guestbookDetail.vue b/pages-assets/fallback/fallbackDetail.vue
similarity index 80%
rename from pages/detail/guestbookDetail.vue
rename to pages-assets/fallback/fallbackDetail.vue
index cf2221d..4bc3ee2 100644
--- a/pages/detail/guestbookDetail.vue
+++ b/pages-assets/fallback/fallbackDetail.vue
@@ -9,11 +9,11 @@
 		<view class="detail-container">
 			<view class="detail-card">
 				<!-- 反馈内容标题 -->
-				<view class="content-title">反馈内容</view>
+				<view class="content-title">{{messageDetail.title}}</view>
 				
 				<!-- 反馈内容文本 -->
 				<view class="content-text">
-					反馈内容反馈内容反馈内容反馈内容反馈内容反馈内容反馈内容反馈内容反馈内容反馈内容反馈内容...
+				  {{messageDetail.content}}
 				</view>
 				
 				<!-- 底部信息：时间和状态 -->
@@ -34,6 +34,7 @@
 		data() {
 			return {
 				// 导航栏样式控制
+				id: null,
 				navbarStyle: {
 					isTransparent: true,
 					bgColor: '#ffffff',
@@ -44,7 +45,7 @@
 				// 滚动距离
 				scrollTop: 0,
 				// 留言详情数据
-				messageDetail: {}
+				messageDetail: null
 			}
 		},
 		onPageScroll(e) {
@@ -52,33 +53,26 @@
 			// 计算导航栏透明度和样式
 			this.updateNavbarStyle(e.scrollTop);
 		},
+		onShow(){
+			this.$checkToken(this.$getToken())
+		},
 		onLoad(options) {
 			// 从路由参数中获取留言ID
-			this.messageId = options.id;
+			this.id = options.id;
 			// 调用接口获取留言详情
-			// this.getGuestbookDetail();
+			this.getFallbackDetail();
 		},
 		methods: {
-			// 调用接口获取留言详情
-			getGuestbookDetail() {
-				uni.request({
-					url: '/guestbook/detail',
-					method: 'GET',
-					data: {
-						id: this.messageId
-					},
-					success: (res) => {
-						if (res.statusCode === 200) {
-							// 成功获取留言详情，更新页面数据
-							this.messageDetail = res.data;
-						} else {
-							uni.showToast({
-								title: '获取留言详情失败',
-								icon: 'none'
-							});
-						}
-					}
-				});
+			getFallbackDetail() {
+				let token = this.$getToken();
+				let url = `/fallback/detail?id=${this.id}`
+				this.$u.get(url,{}, {
+					WT: token
+				}).then(result => {
+					this.messageDetail = result.data;
+				}).catch(err => {
+					console.log("获取留言详情信息失败：", err)
+				})
 			},
 			// 根据滚动距离更新导航栏样式
 			updateNavbarStyle(scrollTop) {
@@ -106,7 +100,7 @@
 <style scoped>
 	.page-view {
 		/* 给导航栏留空间 */
-		padding-top: 120rpx;
+		padding-top: 175rpx;
 		min-height: 100vh;
 		position: relative;
 		background: linear-gradient(0deg, #F3F1ED 43%, #F5E9DB 100%);
diff --git a/pages/bill/bill.vue b/pages-biz/bill/bill.vue
similarity index 73%
rename from pages/bill/bill.vue
rename to pages-biz/bill/bill.vue
index d5ef4fe..5ba7bb0 100644
--- a/pages/bill/bill.vue
+++ b/pages-biz/bill/bill.vue
@@ -28,33 +28,24 @@
 					</view>
 				</view>
 			</u-popup>
-
-			<!-- 支出/收入切换 -->
-			<view class="tab-bar">
-				<view class="tab-item" :class="{ active: currentTab === 'out' }" @click="switchTab('out')">
-					支出
-				</view>
-				<view class="tab-item" :class="{ active: currentTab === 'in' }" @click="switchTab('in')">
-					收入
-				</view>
-			</view>
 		</view>
 
 		<!-- 账单列表 -->
 		<scroll-view scroll-y class="scroll-content" :scroll-top="0" :refresher-enabled="true"
 			:refresher-triggered="isRefreshing" @refresherrefresh="refresh" @scrolltolower="loadMore">
-			<view v-if="bills.length > 0">
-				<view class="bill-item" v-for="item in bills" :key="item.id" @click="goDetail(item)">
+			<view v-if="flowList.length > 0">
+				<view class="bill-item" v-for="item in flowList" :key="item.id" @click="goDetail(item)">
 					<!-- 左侧信息 -->
 					<view class="bill-left">
-						<text class="bill-name">{{ item.feeName }}</text>
+						<text class="bill-name">{{ item.billName }}</text>
 						<text class="bill-date" v-if="item.payTime">支付时间：{{ item.payTime }}</text>
-						<text class="bill-status" v-if="currentTab === 'out'">{{ item.status }}</text>
+						<text class="bill-date" v-if="!item.payTime">账单截止日期: {{ item.billEndDate }}</text>
+						<text :class="['bill-status', (item.billStatus === '待缴费' ? 'unpay' : paid)]" >{{ item.billStatus }}</text>
 					</view>
 
 					<!-- 右侧金额 + 箭头 -->
 					<view class="bill-right">
-						<text class="amount">{{ formatMoney(item.amount) }}</text>
+						<text class="amount">{{ formatMoney(item.billAmount) }}</text>
 						<u-icon name="arrow-right" size="28" color="#ccc" />
 					</view>
 				</view>
@@ -73,26 +64,37 @@
 	export default {
 		data() {
 			return {
-				currentTab: 'out', // in 收 / out 支
 				bills: [],
+				flowList: [],
 				isRefreshing: false,
 				loadStatus: 'more', // u-loadmore 状态
 				// 年份筛选相关
-				currentYear: 2025,
-				years: [2025, 2024, 2023, 2022, 2021],
+				currentYear: null,
+				years: [],
+				pageNo: 1,
+				pageSize: 10,
 				showYearPicker: false
 			};
 		},
 		onLoad(options) {
 			// 可以从 options 获取用户ID或合同ID
+			let year = new Date().getFullYear();
+			this.currentYear = year;
+			this.years = [];
+			for (let i = 5; i >= 1; i--) {
+				this.years.push(year - i);
+			}
 			this.loadBills();
 		},
+		onReachBottom() {
+			this.loadStatus = 'loading';
+			// 获取数据
+			this.loadBills();
+		},
+		onShow(){
+			this.$checkToken(this.$getToken())
+		},
 		methods: {
-			switchTab(tab) {
-				this.currentTab = tab;
-				this.loadBills();
-			},
-
 			// 切换年份选择器显示
 			toggleYearPicker() {
 				this.showYearPicker = !this.showYearPicker;
@@ -107,40 +109,25 @@
 			},
 
 			loadBills() {
-				// 模拟数据加载
-				if (this.currentTab === 'in') {
-					this.bills = [{
-							id: 'b101',
-							feeName: '第一期（2024.12.01-2024.12.31）',
-							payTime: '2024-12-05',
-							amount: 3000,
-							status: '已收',
-						},
-						{
-							id: 'b102',
-							feeName: '第二期（2025.01.01-2025.01.31）',
-							payTime: '',
-							amount: 3000,
-							status: '未收',
-						},
-					];
-				} else {
-					this.bills = [{
-							id: 'b201',
-							feeName: '第一期租金（2024.12.01-2024.12.31）',
-							payTime: '2024-12-05',
-							amount: 3000,
-							status: '已支付',
-						},
-						{
-							id: 'b202',
-							feeName: '第二期租金（2025.01.01-2025.01.31）',
-							payTime: '',
-							amount: 3000,
-							status: '待支付',
-						},
-					];
-				}
+				let url = '/bill/pageQueryContractBill'
+				this.$u.post(url, {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					year: this.currentYear,
+					billStatus: '已缴费'
+				},{
+					WT: this.$getToken()
+				}).then(result => {
+					const data = result.data.result;
+					this.bills = data;
+					for (let i = 0; i < this.bills.length; i++) {
+						let item = this.bills[i]
+						this.flowList.push(item);
+					}
+					++this.pageNo
+				}).catch(err => {
+					console.log("获取合同账单信息失败：", err)
+				})
 			},
 
 			refresh() {
@@ -163,7 +150,7 @@
 
 			goDetail(item) {
 				uni.navigateTo({
-					url: `/pages/bill/billDetail?id=${item.id}`,
+					url: `/pages-biz/bill/billDetail?id=${item.id}`,
 				});
 			},
 		},
@@ -174,7 +161,7 @@
 	.bill-list-page {
 		background: #f7f8fa;
 		min-height: 100vh;
-		padding-top: 120rpx;
+		padding-top: 160rpx;
 		/* 给导航栏留空间 */
 	}
 
@@ -291,10 +278,19 @@
 			font-weight: 500;
 		}
 
+        .bill-status{
+			font-size: 30rpx;
+			font-weight: 800;
+			&.paid {
+				color: red;
+			}
+				
+			&.unpay {
+				color: green;
+			}
+		}
 		.bill-date,
 		.bill-status {
-			font-size: 24rpx;
-			color: #ADADB1;
 			margin-top: 18rpx;
 		}
 	}
diff --git a/pages/bill/billDetail.vue b/pages-biz/bill/billDetail.vue
similarity index 96%
rename from pages/bill/billDetail.vue
rename to pages-biz/bill/billDetail.vue
index dc28dee..d09c75a 100644
--- a/pages/bill/billDetail.vue
+++ b/pages-biz/bill/billDetail.vue
@@ -54,6 +54,9 @@ export default {
     const { id } = options; // 列表页传过来的账单ID
     this.loadBillDetail(id);
   },
+  onShow() {
+  	this.$checkToken(this.$getToken())
+  },
   methods: {
     loadBillDetail(id) {
       // 模拟请求接口
@@ -73,7 +76,7 @@ export default {
     },
     goDetail(contractId) {
       uni.navigateTo({
-        url: `/pages/contract/contractDetail?id=${contractId}`,
+        url: `/pages-biz/contract/contractDetail?id=${contractId}`,
       });
     },
   },
diff --git a/pages/bill/payHistory.vue b/pages-biz/bill/payHistory.vue
similarity index 67%
rename from pages/bill/payHistory.vue
rename to pages-biz/bill/payHistory.vue
index c3886e4..1db0285 100644
--- a/pages/bill/payHistory.vue
+++ b/pages-biz/bill/payHistory.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="pay-history-page">
-		<customNavbar title="缴费记录" />
+		<customNavbar title="账单" />
 
 		<!-- 筛选栏 -->
 		<view class="filter-bar">
@@ -37,19 +37,19 @@
 		</view>
 
 		<!-- 收支记录列表 -->
-		<scroll-view scroll-y class="scroll-content">
-			<view v-if="filteredRecords.length > 0" class="record-list">
-				<view v-for="(item, index) in filteredRecords" :key="index" class="record-item" @click="goDetail(item)">
+		<scroll-view scroll-y class="scroll-content" @scrolltolower="loadMore">
+			<view v-if="flowList.length > 0" class="record-list">
+				<view v-for="(item, index) in flowList" :key="index" class="record-item" @click="goDetail(item)">
 					<!-- 左侧信息 -->
 					<view class="left">
-						<view class="title">{{ item.feeName }}</view>
-						<view class="sub">{{ item.timeLabel }}：{{ item.time || '—' }}</view>
+						<view class="title">{{ item.itemName }}</view>
+						<view class="sub">{{ item.payDate || item.inDate || '未知'}}</view>
 					</view>
 
 					<!-- 右侧金额 + 图标 -->
 					<view class="right">
-						<view class="amount" :class="item.type === 'income' ? 'income' : 'expense'">
-							{{ item.type === 'income' ? '+' : '-' }}{{ item.amount.toFixed(2) }}
+						<view class="amount" :class="item.inOutType === '收' ? 'income' : 'expense'">
+							{{ item.inOutType === '收' ? '+' : '-' }}{{ item.itemAmount.toFixed(2) }}
 						</view>
 						<u-icon name="arrow-right" size="32" color="#ccc"></u-icon>
 					</view>
@@ -67,53 +67,75 @@
 	export default {
 		data() {
 			return {
-				activeTab: 'income', // 默认显示“收”
+				pageNo: 1,
+				pageSize:10,
+				flowList: [],
+				loadStatus: 'loadmore',
+				activeTab: 'in', // 默认显示“收”
 				tabs: [{
 						label: '收入',
-						value: 'income'
+						value: 'in'
 					},
 					{
 						label: '支出',
-						value: 'expense'
-					},
-				],
-				records: [{
-						id: 1,
-						type: 'income', // 收
-						feeName: '第一期租金（2024.01.01 - 2024.03.31）',
-						time: '2024-01-05',
-						timeLabel: '收款时间',
-						amount: 8500,
-					},
-					{
-						id: 2,
-						type: 'expense', // 支
-						feeName: '押金缴纳',
-						time: '2024-01-03',
-						timeLabel: '支付时间',
-						amount: 5000,
-					},
-					{
-						id: 3,
-						type: 'expense',
-						feeName: '第二期租金（2024.04.01 - 2024.06.30）',
-						time: '',
-						timeLabel: '支付时间',
-						amount: 8500,
+						value: 'out'
 					},
 				],
 				// 年份筛选相关
-				currentYear: 2025,
-				years: [2025, 2024, 2023, 2022, 2021],
+				currentYear: null,
+				years: [],
 				showYearPicker: false
 			};
 		},
+		onLoad(options) {
+			let year = new Date().getFullYear();
+			this.currentYear = year;
+			this.years = [];
+			for (let i = 5; i >= 1; i--) {
+				this.years.push(year - i);
+			}
+			this.fetchPayRecord();
+		},
+		onShow() {
+			this.$checkToken(this.$getToken())
+		},
+		watch: {
+			activeTab(newVal, oldVal) {
+				if (newVal !== oldVal) {
+						this.resetAndLoad()
+				}
+			}
+		},
 		computed: {
-			filteredRecords() {
-				return this.records.filter((r) => r.type === this.activeTab);
-			},
 		},
 		methods: {
+			fetchPayRecord() {
+				if (this.loadStatus !== 'loadmore') return;
+				   this.loadStatus = 'loading';
+				let url = '/bill/pageQueryPayRecord'
+				this.$u.post(url, {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					year: this.currentYear,
+					leType: this.activeTab
+				},{
+					WT:this.$getToken()
+				}).then(res => {
+					const rows = res.data.result || [];
+					console.log(rows)
+					if (this.pageNo === 1) this.flowList = [];
+					this.flowList = this.flowList.concat(rows);
+					if (rows.length < this.pageSize) {
+					  this.loadStatus = 'nomore';
+					} else {
+					  this.pageNo++;
+					  this.loadStatus = 'loadmore';
+					}
+				}).catch(err => {
+					console.log("获取账单记录失败：", err)
+					this.loadStatus = 'loadmore';
+				})
+			},
 			// 切换年份选择器显示
 			toggleYearPicker() {
 				this.showYearPicker = !this.showYearPicker;
@@ -122,21 +144,22 @@
 			selectYear(year) {
 				this.currentYear = year;
 				this.showYearPicker = false;
-				// 重新加载数据
-				// this.load();
+				this.resetAndLoad();
 			},
-			statusText(status) {
-				const map = {
-					paid: '已支付 / 已收款',
-					unpaid: '待支付',
-					pending: '处理中',
-				};
-				return map[status] || '未知状态';
+			resetAndLoad(){
+				// 重新加载数据
+				this.pageNo = 1;
+				this.flowList = [];
+				this.fetchPayRecord();
+			},
+			loadMore() {
+				// 只有在 loadStatus 为 'loadmore' 时才触发
+				if (this.loadStatus !== 'loadmore') return;
+				// 调用接口获取下一页
+				this.fetchPayRecord();
 			},
 			goDetail(item) {
-				uni.navigateTo({
-					url: `/pages/bill/detail?id=${item.id}`,
-				});
+			
 			},
 		},
 	};
@@ -146,7 +169,7 @@
 	.pay-history-page {
 		background: #f8f8f8;
 		min-height: 100vh;
-		padding-top: 120rpx;
+		padding-top: 175rpx;
 		.filter-bar {
 			display: flex;
 			justify-content: space-between;
diff --git a/pages/chooseAddress/cityList.vue b/pages-biz/chooseAddress/cityList.vue
similarity index 97%
rename from pages/chooseAddress/cityList.vue
rename to pages-biz/chooseAddress/cityList.vue
index 5c03bee..365088c 100644
--- a/pages/chooseAddress/cityList.vue
+++ b/pages-biz/chooseAddress/cityList.vue
@@ -77,7 +77,13 @@
 				const prePage = (pages[pages.length - 2]).$vm;
 				prePage.city = item.label;
 				prePage.searchList();
-				uni.navigateBack();
+				if (pages.length > 1) {
+				  uni.navigateBack();
+				} else {
+				  uni.switchTab({
+				  		url:'/pages/index/index'
+				  	})
+				}
 			},
 			//初始化列表
 			initList() {
diff --git a/pages/chooseAddress/index.vue b/pages-biz/chooseAddress/index.vue
similarity index 98%
rename from pages/chooseAddress/index.vue
rename to pages-biz/chooseAddress/index.vue
index 9982ea7..9e0b201 100644
--- a/pages/chooseAddress/index.vue
+++ b/pages-biz/chooseAddress/index.vue
@@ -117,7 +117,14 @@
 				// 	ad_info, address, location, title,room
 				// }));
 				uni.$emit('changeAddressConfig', address,location.lng,location.lat);
-				uni.navigateBack();
+				const pages = getCurrentPages();
+				if (pages.length > 1) {
+				  uni.navigateBack();
+				} else {
+				  uni.switchTab({
+				  		url:'/pages/index/index'
+				  	})
+				}
 			},
 			//获取poi列表  
 			getAddressList(s = 0) {
diff --git a/pages/chooseAddress/js/city.js b/pages-biz/chooseAddress/js/city.js
similarity index 100%
rename from pages/chooseAddress/js/city.js
rename to pages-biz/chooseAddress/js/city.js
diff --git a/pages/chooseAddress/js/getFirstLetter.js b/pages-biz/chooseAddress/js/getFirstLetter.js
similarity index 100%
rename from pages/chooseAddress/js/getFirstLetter.js
rename to pages-biz/chooseAddress/js/getFirstLetter.js
diff --git a/pages/chooseAddress/js/qqmap-wx-jssdk.min.js b/pages-biz/chooseAddress/js/qqmap-wx-jssdk.min.js
similarity index 100%
rename from pages/chooseAddress/js/qqmap-wx-jssdk.min.js
rename to pages-biz/chooseAddress/js/qqmap-wx-jssdk.min.js
diff --git a/pages/chooseAddress/search.vue b/pages-biz/chooseAddress/search.vue
similarity index 100%
rename from pages/chooseAddress/search.vue
rename to pages-biz/chooseAddress/search.vue
diff --git a/pages/center/contract.vue b/pages-biz/contract/contract.vue
similarity index 64%
rename from pages/center/contract.vue
rename to pages-biz/contract/contract.vue
index 53d4212..c81e74e 100644
--- a/pages/center/contract.vue
+++ b/pages-biz/contract/contract.vue
@@ -2,7 +2,7 @@
 
 	<view class="contract-page">
 		<!-- 顶部导航栏 -->
-		<customNavbar title="我的合同" />
+		<customNavbar title="我的合同"  :showHome = "true"/>
 
 		<!-- Tabs -->
 		<view class="tab-wrapper">
@@ -17,19 +17,19 @@
 		<scroll-view scroll-y class="scroll-content" @scrolltolower="loadMore" :refresher-enabled="true"
 			:refresher-triggered="isRefreshing" @refresherrefresh="refresh">
 			<view v-if="contracts.length > 0" class="contract-list">
-				<view class="contract-card" v-for="item in contracts" :key="item.id" @click="goDetail(item)">
-					<image class="contract-cover" :src="item.coverUrl || defaultCover" mode="aspectFill" />
+				<view class="contract-card" v-for="item in contracts" :key="item.contractNo" @click="goDetail(item)">
+					<image class="contract-cover" :src="staticHost + (item.coverImgUrl || defaultCover)" mode="aspectFill" />
 
 					<view class="contract-info">
 						<view class="top-row">
-							<text class="asset-name">{{ item.assetName }}</text>
+							<text class="asset-name">{{ $ellipsis(item.assetName,12) }}</text>
 							<u-icon name="arrow-right" size="28" color="#ccc" />
 						</view>
-						<view class="asset-room">{{ item.assetRoom || "—" }}</view>
+						<!-- <view class="asset-room">{{ item.assetRoom || "—" }}</view> -->
 						<view class="date-range">{{ item.startDate }} ~ {{ item.endDate }}</view>
 
-						<view :class="['status-tag', item.status]">
-							{{ getStatusText(item.status) }}
+						<view :class="['status-tag', item.signStatus]">
+							{{ getStatusText(item.signStatus) }}
 						</view>
 					</view>
 				</view>
@@ -74,7 +74,6 @@ export default {
 
 			currentTab: 0,
 			statusFilter: "all",
-
 			// --- 时间筛选 ---
 			startDate: "",
 			endDate: "",
@@ -87,14 +86,21 @@ export default {
 			total: 0,
 			loadStatus: "loadmore",
 			isRefreshing: false,
-			defaultCover: "/static/img/index/swiper/swiper3.jpg",
+			defaultCover: "/public/static/assets.jpg",
 		};
 	},
 
-	onLoad() {
-		this.loadContracts(true);
+	onLoad(options) {
+		this.loadContracts();
+	},
+    onShow() {
+        this.$checkToken(this.$getToken())
+    },
+	computed: {
+	staticHost() {
+		return this.$config.staticUrl
+	}	
 	},
-
 	methods: {
 		onTabChange(index) {
 			this.currentTab = index;
@@ -115,81 +121,52 @@ export default {
 		resetAndLoad() {
 			this.pageNo = 1;
 			this.contracts = [];
-			this.loadStatus = "loading";
-			this.loadContracts(true);
+			this.loadStatus = "loadmore";
+			this.loadContracts();
 		},
 
 		/** 你的 loadContracts() 保持不变，只需加：按时间筛选 */
-		loadContracts(isInit = false) {
-			this.loadStatus = "loading";
-
-			setTimeout(() => {
-				let mockAll = [{
-					id: 1,
-					assetName: '金辉大厦',
-					assetRoom: '502',
-					coverUrl: '',
-					status: 'pending',
-					startDate: '2025-01-01',
-					endDate: '2025-12-31'
-				},
-				{
-					id: 2,
-					assetName: '东方广场',
-					assetRoom: '',
-					status: 'signed',
-					startDate: '2024-03-01',
-					endDate: '2025-03-01'
-				},
-				{
-					id: 3,
-					assetName: '海景公寓',
-					assetRoom: 'A-1201',
-					status: 'expired',
-					startDate: '2023-01-01',
-					endDate: '2024-01-01'
-				},
-				{
-					id: 4,
-					assetName: '富力中心',
-					assetRoom: '1699',
-					status: 'pending',
-					startDate: '2024-10-01',
-					endDate: '2025-10-01'
-				},
-				{
-					id: 5,
-					assetName: '财富大厦',
-					assetRoom: '2308',
-					status: 'signed',
-					startDate: '2023-06-01',
-					endDate: '2024-06-01'
-				}
-				];
-
-				// 状态过滤
-				if (this.statusFilter !== "all") {
-					mockAll = mockAll.filter(i => i.status === this.statusFilter);
-				}
-
-				// 时间过滤
-				if (this.startDate) mockAll = mockAll.filter(i => i.startDate >= this.startDate);
-				if (this.endDate) mockAll = mockAll.filter(i => i.endDate <= this.endDate);
-
-				// 分页
-				this.total = mockAll.length;
-				const start = (this.pageNo - 1) * this.pageSize;
-				const pageList = mockAll.slice(start, start + this.pageSize);
-
-				if (this.pageNo === 1) {
-					this.contracts = pageList;
-				} else {
-					this.contracts = [...this.contracts, ...pageList];
-				}
-
-				this.loadStatus = this.contracts.length >= this.total ? "nomore" : "loadmore";
-				this.isRefreshing = false;
-			}, 400);
+		loadContracts() {
+			  if (this.loadStatus !== 'loadmore') return;
+			
+			  this.loadStatus = 'loading';
+			
+			  this.$u.post('/contract/queryPage', {
+			    pageNo: this.pageNo,
+			    pageSize: this.pageSize,
+			    startTime: this.startDate,
+			    endTime: this.endDate,
+			    signStatus: this.statusFilter
+			  }, {
+			    WT: this.$getToken()
+			  }).then(result => {
+			
+			    const rows = result.data.result || [];
+			
+			    // 第一页 & 无数据
+			    if (this.pageNo === 1 && rows.length === 0) {
+			      this.contracts = [];
+			      this.loadStatus = 'nomore';
+			      return;
+			    }
+			
+			    // 追加数据
+			    this.contracts = this.contracts.concat(rows);
+			
+			    // 是否还有下一页（核心判断）
+			    if (rows.length < this.pageSize) {
+			      this.loadStatus = 'nomore';
+			    } else {
+			      this.pageNo++;              // ✅ 只有这里才能 +1
+			      this.loadStatus = 'loadmore';
+			    }
+			
+			  }).catch(err => {
+			    console.log("获取合同信息失败：", err);
+			    this.loadStatus = 'loadmore';
+			  }).finally(() => {
+			    this.isRefreshing = false;
+			  });
 		},
 
 		refresh() {
@@ -198,14 +175,13 @@ export default {
 		},
 
 		loadMore() {
-			if (this.loadStatus !== "loadmore") return;
-			this.pageNo++;
-			this.loadContracts();
+			 if (this.loadStatus !== "loadmore") return;
+			  this.loadContracts();
 		},
 
 		goDetail(item) {
 			uni.navigateTo({
-				url: `/pages/detail/contractDetail?id=${item.id}`,
+				url: `/pages-biz/contract/contractDetail?contractNo=${item.contractNo}`,
 			});
 		},
 
@@ -226,7 +202,7 @@ export default {
 <style lang="scss" scoped>
 .contract-page {
 	background-color: #f8f8f8;
-	padding-top: 120rpx;
+	padding-top: 170rpx;
 	/* 给导航栏留空间 */
 	min-height: 100vh;
 }
diff --git a/pages-biz/contract/contractDetail.vue b/pages-biz/contract/contractDetail.vue
new file mode 100644
index 0000000..8cbe447
--- /dev/null
+++ b/pages-biz/contract/contractDetail.vue
@@ -0,0 +1,341 @@
+<template>
+  <view class="contract-detail-page">
+    <customNavbar title="我的合同"></customNavbar>
+
+    <!-- 合同基本信息 -->
+    <view class="section">
+      <view class="section-title">合同基本信息</view>
+      <view
+        class="info-item"
+        v-for="(item, index) in baseInfo"
+        :key="index"
+        @click="item.hasArrow && handleClick(item)"
+      >
+        <text class="label">{{ item.label }}</text>
+        <view class="value-box">
+          <text class="value">{{ item.value }}</text>
+          <u-icon v-if="item.hasArrow" name="arrow-right" size="30" color="#ccc" />
+        </view>
+      </view>
+    </view>
+
+  
+<!--  该部分仍保留 -->
+  <!--  <view
+      v-for="(asset, index) in assetList"
+      :key="index"
+      class="asset-block"
+    >
+      <view class="asset-header" @click="toggleAsset(index)">
+        <view class="left">
+          <image
+            class="cover"
+            :src="asset.coverUrl || '/static/default-cover.png'"
+            mode="aspectFill"
+          />
+          <view class="info">
+            <text class="name">{{ asset.assetName }}</text>
+            <text class="room">{{ asset.assetRoom || '—' }}</text>
+          </view>
+        </view>
+        <u-icon
+          :name="asset.expanded ? 'arrow-up' : 'arrow-down'"
+          size="28"
+          color="#999"
+        />
+      </view>
+
+      <view v-show="asset.expanded">
+        <view class="section">
+          <view class="section-title">费用信息</view>
+          <view
+            class="info-item"
+            v-for="(item, i) in feeItems(asset)"
+            :key="i"
+          >
+            <text class="label">{{ item.label }}</text>
+            <text class="value">{{ item.value }}</text>
+          </view>
+        </view>
+      </view>
+    </view> -->
+
+ <!--   <view
+      v-if="hasMoreAssets"
+      class="load-more"
+      @click="loadMoreAssets"
+    > -->
+   <!--   <text v-if="!loadingAsset">加载更多资产</text>
+      <text v-else>加载中...</text>
+    </view> -->
+
+    <!-- 底部操作栏（完全保留原逻辑和样式） -->
+    <view v-if="contract.signStatus === '待签署'" class="bottom-bar">
+      <u-button class="sign-btn" @click="goSign">
+        去签署
+      </u-button>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      contractNo: null,
+      contract: {},
+      assetList: [],
+      assetPageNo: 1,
+      assetPageSize: 1,
+      hasMoreAssets: true,
+      loadingAsset: false
+    }
+  },
+
+  onShow() {
+    this.$checkToken(this.$getToken())
+	this.getContractDetail()
+  },
+
+  onLoad(options) {
+    this.contractNo = options.contractNo
+  },
+
+  onReachBottom() {
+    this.loadMoreAssets()
+  },
+
+  computed: {
+    baseInfo() {
+      return [
+		{ label: '合同名称', value: this.contract.contractName || '—' },
+        { label: '签约状态', value: this.contract.signStatus || '—' },
+        {
+          label: '合同生效期',
+          value: this.contract.startDate
+            ? `${this.contract.startDate} 至 ${this.contract.endDate}`
+            : '—'
+        },
+        {
+          label: '电子合同',
+          value: '查看',
+          hasArrow: true
+        }
+      ]
+    }
+  },
+
+  methods: {
+    /** 合同详情 + 第一条资产 */
+    getContractDetail() {
+      this.$u.get(`/contract/detail?contractNo=${this.contractNo}`, {},{
+        WT: this.$getToken()
+      }).then(res => {
+		  console.log(res)
+        this.contract = res.data || {}
+
+        // this.assetList = (res.assetsInfos.assets || []).map((item, index) => ({
+        //   ...item,
+        //   expanded: index === 0
+        // }))
+
+        // this.hasMoreAssets =
+        //   this.assetList.length < (res.totalAssets || 0)
+      })
+    },
+
+    /** 加载更多资产 */
+    loadMoreAssets() {
+      if (this.loadingAsset || !this.hasMoreAssets) return
+
+      this.loadingAsset = true
+      this.assetPageNo += 1
+
+      this.$u.get('/contract/assets', {
+        contractNo: this.contractNo,
+        pageNo: this.assetPageNo,
+        pageSize: this.assetPageSize,
+        WT: this.$getToken()
+      }).then(res => {
+        const list = (res.assets || []).map(item => ({
+          ...item,
+          expanded: false
+        }))
+
+        this.assetList = this.assetList.concat(list)
+        this.hasMoreAssets = list.length === this.assetPageSize
+      }).finally(() => {
+        this.loadingAsset = false
+      })
+    },
+
+    /** 折叠 / 展开（手风琴效果） */
+    toggleAsset(index) {
+      this.assetList.forEach((item, i) => {
+        item.expanded = i === index ? !item.expanded : false
+      })
+    },
+
+    feeItems(asset) {
+      return [
+        { label: '押金/保证金', value: asset.fee?.deposit || '—' },
+        { label: '租金', value: asset.fee?.rent || '—' },
+        { label: '电费', value: asset.fee?.electricity || '—' },
+        { label: '水费', value: asset.fee?.water || '—' },
+        { label: '物业/增值服务', value: asset.fee?.property || '—' }
+      ]
+    },
+
+    handleClick(item) {
+      if (item.label === '电子合同') {
+      uni.downloadFile({
+        url: this.$config.staticUrl + this.contract.eContractUrl,
+        header: {
+          'X-Token': this.$getToken(),
+		  'USERTYPE': this.$getUserType()
+        },
+        success: res => {
+          uni.openDocument({
+            filePath: res.tempFilePath,
+            fileType: 'pdf'
+          })
+        }
+      })
+      }
+    },
+
+    goSign() {
+	 let url = `/contract/getSignLink?eFlowId=${this.contract.eContractFlowId}`
+	 let signLink
+	 this.$u.get(url,{},{
+		 WT: this.$getToken()
+	 }).then(res=>{
+		 if(res.flag) {
+			 signLink = res.data
+			  // 开发者微信小程序内通过WebView打开e签宝的认证授权/签署页面
+			     // 场景二：当前小程序内打开H5页面操作认证授权/签署
+			     wx.navigateTo({
+			       url: '/pages-biz/webview/webview?url=' + encodeURIComponent(signLink),
+			     })
+
+		 }
+	 })	 
+    }
+  }
+}
+
+</script>
+
+<style lang="scss" scoped>
+.contract-detail-page {
+  background: #f7f8fa;
+  min-height: 100vh;
+  padding-top: 175rpx;
+  padding-bottom: 150rpx;
+}
+
+.asset-block {
+  background: #fff;
+  border-radius: 12rpx;
+  margin: 20rpx;
+  overflow: hidden;
+}
+
+.asset-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 24rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+
+  .left {
+    display: flex;
+    align-items: center;
+  }
+
+  .cover {
+    width: 120rpx;
+    height: 96rpx;
+    border-radius: 8rpx;
+    margin-right: 20rpx;
+  }
+
+  .name {
+    font-size: 30rpx;
+    font-weight: 500;
+    color: #333;
+  }
+
+  .room {
+    font-size: 26rpx;
+    color: #999;
+  }
+}
+
+.section {
+  background: #fff;
+  border-radius: 12rpx;
+  margin: 20rpx;
+  padding: 20rpx 24rpx;
+
+  .section-title {
+    font-weight: 500;
+    font-size: 40rpx;
+    margin-bottom: 12rpx;
+    color: #212121;
+  }
+
+  .info-item {
+    display: flex;
+    justify-content: space-between;
+    padding: 40rpx 0;
+    border-bottom: 1rpx solid #f0f0f0;
+
+    &:last-child {
+      border-bottom: none;
+    }
+
+    .label {
+      font-size: 30rpx;
+      color: #86868c;
+    }
+
+    .value {
+      font-size: 30rpx;
+      color: #222;
+    }
+  }
+}
+
+.load-more {
+  text-align: center;
+  padding: 30rpx;
+  font-size: 28rpx;
+  color: #999;
+}
+
+/* 底部按钮样式保持不变 */
+.bottom-bar {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: #fff;
+  padding: 35rpx;
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.06);
+  z-index: 99;
+
+  .sign-btn {
+    width: 100%;
+    height: 88rpx;
+  }
+
+  &::v-deep .u-btn {
+    font-size: 30rpx;
+    color: #fff;
+    background: linear-gradient(90deg, #ff6f63 0%, #fb392a 100%);
+    border-radius: 10rpx;
+  }
+}
+
+</style>
diff --git a/pages-biz/face/faceAuth.vue b/pages-biz/face/faceAuth.vue
new file mode 100644
index 0000000..bd3175e
--- /dev/null
+++ b/pages-biz/face/faceAuth.vue
@@ -0,0 +1,134 @@
+<template>
+	<view class="container">
+	  <view class="loading-content">
+	    <view class="image-content">
+	      <image :src="staticHost + '/public' + '/static/loading.svg'" class="image"></image>
+	    </view>
+	    <view class="loading-tect-content">
+	      <text class="loading-text">加载中</text>
+	    </view>
+	  </view>
+	  <view class="btn-content">
+	    <text>如未成功跳转，</text>
+	    <text class="btn-click" bindtap="goFaceAuth">点击此处</text>
+	    <text>手动跳转</text>
+	  </view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+	  data() {
+	    return {
+	      bizToken: '',
+	      redirectUrl: '',
+	      goFaceDone: false // 是否已跳转至公证签做人脸
+	    }
+	  },
+	
+	  onLoad(e) {
+	    console.log('---middle onLoad', e)
+	
+	    this.bizToken = e.bizToken || ''
+	    this.redirectUrl = e.redirectUrl
+	      ? decodeURIComponent(e.redirectUrl)
+	      : ''
+	
+	    this.goFaceAuth()
+	  },
+	computed: {
+		staticHost() {
+			return this.$config.staticUrl
+		}
+	},
+	  methods: {
+	    goFaceAuth() {
+	      const { bizToken } = this
+	
+	      // ⚠️ 只有微信小程序支持
+	      // #ifdef MP-WEIXIN
+	      wx.navigateToMiniProgram({
+	        appId: 'wx1c9e1d0b916674dc', // 公证签小程序 APPID
+	        path: `/pages-biz/face/faceAuth?bizToken=${bizToken}`,
+	        success: () => {
+	          this.goFaceDone = true
+	        }
+	      })
+	      // #endif
+	    }
+	  },
+	
+	  onShow() {
+	    console.log('---middle onShow')
+	
+	    const { goFaceDone, redirectUrl } = this
+	
+	    // 防止首次进入直接触发
+	    if (!goFaceDone) return
+	
+	    // 重置状态
+	    this.goFaceDone = false
+	
+	    // ⚠️ 微信小程序专有
+	    // #ifdef MP-WEIXIN
+	    if (!wx.getEnterOptionsSync) return
+	
+	    const options = wx.getEnterOptionsSync()
+	    console.log('---options', options)
+	
+	    // scene === 1038：从其他小程序返回
+	    if (
+	      options.scene === 1038 &&
+	      options.referrerInfo &&
+	      options.referrerInfo.extraData &&
+	      options.referrerInfo.extraData.faceResult
+	    ) {
+	      const pages = getCurrentPages()
+	      const pre = pages[pages.length - 2]
+	
+	      // 调用上一个页面的 reloadPage 方法
+	      if (pre && typeof pre.reloadPage === 'function') {
+	        pre.reloadPage(
+	          `${redirectUrl}&timeStamp=${Date.now()}`
+	        )
+	
+	        wx.navigateBack({
+	          delta: 1
+	        })
+	      }
+	    }
+	    // #endif
+	  }
+	}
+</script>
+
+<style>
+	.container {
+	  width: 100%;
+	  height: 100%;
+	}
+	.loading-content {
+	  text-align: center;
+	  width: 100%;
+	}
+	.image {
+	  width: 172rpx;
+	  height: 186rpx;
+	}
+	.loading-tect-content {
+	  font-size: 28rpx;
+	  margin-top: 48rpx;
+	  color: #333;
+	}
+	
+	.btn-content {
+	  font-size: 28rpx;
+	  color: #333;
+	  margin-top: 24rpx;
+	}
+	.btn-click {
+	  color: #F34038;
+	}
+
+</style>
\ No newline at end of file
diff --git a/pages/location/location.vue b/pages-biz/location/location.vue
similarity index 89%
rename from pages/location/location.vue
rename to pages-biz/location/location.vue
index 4137b49..605f484 100644
--- a/pages/location/location.vue
+++ b/pages-biz/location/location.vue
@@ -4,7 +4,7 @@
 		<view class="selected" >
 			<view class="title">
 				已选 : 
-				<text style="color: #2979ff;margin-left: 12rpx;">
+				<text style="color: #FF2F31;margin-left: 12rpx;">
 					{{vuex_city==''?'请选择城市':vuex_city}}
 				</text>
 			</view>
@@ -33,7 +33,7 @@
 		data() {
 			return {
 				locationCity:'',
-				hotList:['杭州市','郑州市','北京市','上海市','广州市','深圳市']
+				hotList:['杭州市','郑州市','北京市','上海市','广州市','深圳市','武汉市']
 			}
 		},
 		onLoad() {
@@ -42,20 +42,30 @@
 		methods: {
 			clickCity(item){
 				this.$u.vuex('vuex_city', item);
-				return uni.reLaunch({
-					url:'../index/index'
-				})
+				const pages = getCurrentPages();
+				if (pages.length > 1) {
+				  uni.navigateBack();
+				} else {
+				  uni.switchTab({
+				  		url:'/pages/index/index'
+				  	})
+				}
 			},
 			setLocation(){
 				this.$u.vuex('vuex_city', this.locationCity);
-				return uni.reLaunch({
-					url:'../index/index'
-				})
+				const pages = getCurrentPages();
+				if (pages.length > 1) {
+				  uni.navigateBack();
+				} else {
+				  uni.switchTab({
+				  		url:'/pages/index/index'
+				  	})
+				}
 			},
 			findLocation(){
 				let that = this
 				uni.showLoading({title:"定位中....",mask:true})
-				this.$u.get("/api/profile/getRealCity").then(obj => {
+				this.$u.get("/location/getRealCity").then(obj => {
 					let cityName = obj.msg
 					if(cityName){
 						this.locationCity = cityName
@@ -67,7 +77,7 @@
 						uni.hideLoading();
 					}else{
 						uni.request({
-							// url:'https://pv.sohu.com/cityjson?ie=utf-8',
+							//获取真实IP
 							url:'https://tianqiapi.com/ip?version=v9&appid=23035354&appsecret=8YvlPNrz',
 							success(resp) {
 								let ip = resp.data.ip
@@ -155,7 +165,7 @@
 				}
 			}
 			.right{
-				color: #2979ff;
+				color: #FF2F31;
 				font-weight: 600;
 				margin-right: 10rpx;
 			};
diff --git a/pages-biz/login/login.vue b/pages-biz/login/login.vue
new file mode 100644
index 0000000..ded43a3
--- /dev/null
+++ b/pages-biz/login/login.vue
@@ -0,0 +1,308 @@
+<template>
+	<view class="login-container">
+		<!-- 顶部状态栏 -->
+		<view class="status-bar"> <u-icon :name="btn.icon" :color="btn.color || '#333'" :size="btn.size || 40"></u-icon>
+		</view>
+
+		<!-- 主体内容区 -->
+		<view class="content">
+			<!-- 标题区域 -->
+			<view class="title">登录</view>
+
+			<!-- 登录插图区域 -->
+			<view class="illustration">
+				<image :src="staticHost + '/public/static/login/bg.png'" mode="aspectFit" />
+			</view>
+
+			<!-- 登录按钮 -->
+			<button class="login-btn" open-type="getPhoneNumber" @getphonenumber="onGetPhone">
+				使用微信授权登录
+			</button>
+
+			<!-- 用户类型选择 -->
+			<view class="user-type" shape="square">
+				<u-radio-group v-model="loginType" active-color="#EA414A" shape="square">
+					<u-radio name="0">个人</u-radio>
+					<u-radio name="1">企业</u-radio>
+				</u-radio-group>
+			</view>
+
+			<!-- 协议勾选 -->
+			<view class="agreement">
+				<u-checkbox v-model="agreeProtocol" shape="square" active-color="#EA414A">
+					<text class="agreement-text">
+						我已阅读并同意
+						<text class="link" @tap.stop="goPrivacy('user')">《用户协议》</text>
+						和
+						<text class="link" @tap.stop="goPrivacy('privacy')">《隐私政策》</text>
+					</text>
+				</u-checkbox>
+			</view>
+		</view>
+	</view>
+</template>
+
+
+<script>
+	export default {
+		data() {
+			return {
+				designWidth: 750,
+				screenWidth: 0,
+				scale: 1,
+				loginType: "0",
+				agreeProtocol: false
+			}
+		},
+
+		onLoad() {
+			wx.getWindowInfo({
+				success: (res) => {
+					this.screenWidth = res.windowWidth
+					this.scale = this.screenWidth / this.designWidth
+				}
+			})
+		},
+
+		onUnload() {
+			
+		},
+		computed: {
+			// title 样式
+			titleStyle() {
+				const s = this.scale;
+				return {
+					width: `${93 * s}rpx`,
+					height: `${45 * s}rpx`,
+					fontSize: `${48 * s}rpx`,
+					lineHeight: `${40 * s}rpx`,
+					fontWeight: 500,
+					color: '#222222',
+					fontFamily: 'Noto Sans S Chinese',
+					textAlign: 'center'
+				}
+			},
+			staticHost() {
+				return this.$config.staticUrl
+			},
+			headerStyle() {
+				const s = this.scale;
+				return {
+					marginTop: `${214 * s}rpx`,
+					flex: 1,
+					display: 'flex',
+					flexDirection: 'column',
+					alignItems: 'center', // 水平居中
+					justifyContent: 'flex-start' // 从顶部开始
+				}
+			},
+			// cover 样式
+			coverStyle() {
+				const s = this.scale;
+				return {
+					width: `${428 * s}rpx`,
+					height: `${608 * s}rpx`
+				}
+			}
+		},
+		methods: {
+
+			/** 微信手机号授权 */
+			onGetPhone(e) {
+				const {
+					code
+				} = e.detail;
+
+				if (!code) {
+					this.$mytip.toast("授权失败");
+					return;
+				}
+				this.doLogin(code);
+			},
+
+			/** 执行登录逻辑 */
+			async doLogin(phoneGetCode) {
+				if (!this.agreeProtocol) {
+					this.$mytip.toast('请先阅读并同意用户协议和隐私政策')
+					return
+				}
+				uni.showLoading({
+					title: "登录中...",
+					mask: true
+				});
+
+				try {
+					// 微信登录
+					const loginRes = await new Promise((resolve, reject) => {
+						uni.login({
+							provider: 'weixin',
+							success: resolve,
+							fail: reject
+						});
+					});
+
+					// 调用后端登录接口
+				    const authRes = await this.$u.post(`/login/weChatLogin`, {
+					  	phoneGetCode: phoneGetCode,
+					  	loginCode: loginRes.code,
+					    loginType: this.loginType
+					     });
+					
+					// let tempToken = 'asd5646'
+					// 保存token
+					let token = authRes.data;
+					this.$u.vuex('vuex_token', token);
+					// this.$u.vuex('vuex_token', tempToken);
+					uni.hideLoading();
+					this.getUserOtherInfo(this.loginType,token)
+					// 跳转首页
+					uni.switchTab({
+						url: '/pages/index/index'
+					});
+
+				} catch (err) {
+					uni.hideLoading();
+					this.$mytip.toast("登录失败");
+					console.error('Login failed:', err);
+				}
+			},
+			getUserOtherInfo(loginType, token) {
+				let url = `/login/userInfo`;
+				this.$u.get(url, {}, {
+					'WT': token,
+					'USERTYPE': loginType
+				}).then(obj => {
+					if(obj.flag){
+						uni.setStorageSync('userInfo', {
+						  userType: obj.data.userType,
+						  oaAuth: obj.data.oaAuth,
+						  cusNo: obj.data.cusNo,
+						  userName: obj.data.userName,
+						  openId: obj.data.openId
+						})
+					}
+				});
+				// let tempUser = {
+				// 	userType: '0',
+				// 	oaAuth: '1',
+				// 	cusNo: 'cus0001',
+				// 	openId: '65456asd'
+				// }
+				// uni.setStorageSync('userInfo', tempUser)
+				
+			},
+			/** 触发手机号选择（子组件 → 父组件） */
+			showPhoneSelector(phoneList, openid) {
+				this.$emit("choosePhone", {
+					phoneList,
+					openid
+				});
+			},
+			/** 查看协议 */
+			goPrivacy(type) {
+				console.log(type)
+				const url = type === 'user' ?
+					'/pages-biz/privacy/userAgreement' :
+					'/pages-biz/privacy/privacyPolicy';
+
+				uni.navigateTo({
+					url
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.login-container {
+		height: 100vh;
+		background-color: #fff;
+		overflow: hidden;
+
+		.status-bar {
+			margin-top: 7.56%;
+			height: var(--status-bar-height);
+		}
+
+		.content {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			height: calc(100vh - var(--status-bar-height));
+			margin-top: 12.8%;
+		}
+
+		.title {
+			height: 45rpx;
+			font-family: Noto Sans S Chinese;
+			font-weight: 500;
+			font-size: 48rpx;
+			color: #222222;
+			line-height: 40rpx;
+		}
+
+		.illustration {
+			width: 100%;
+			height: 44.6%;
+			padding: 0 21.47%;
+			margin-bottom: 6%;
+		}
+
+		.illustration image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.login-btn {
+			width: 78.6%;
+			height: 7.12%;
+			background: linear-gradient(90deg, #FF2F31 0%, #FF9379 100%);
+			border-radius: 49rpx;
+			font-size: 36rpx;
+			color: #ffffff;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-bottom: 40rpx;
+		}
+
+		.user-type {
+			display: flex; justify-content: center; 
+			gap: 40rpx; 
+			margin-bottom: 20rpx;
+		}
+
+		.agreement {
+			margin-top: 6.24%;
+			padding: 0 40rpx;
+		}
+
+		.agreement-text {
+			font-size: 26rpx;
+			color: #cecece;
+		}
+
+		.link {
+			color: #334254;
+		}
+	}
+
+
+
+	/* 响应式适配 */
+	@media (max-width: 320rpx) {
+		.title {
+			font-size: 42rpx;
+			margin-bottom: 100rpx;
+		}
+
+		.illustration {
+			height: 360rpx;
+		}
+
+		.login-btn {
+			height: 80rpx;
+			font-size: 30rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages-biz/message/message.vue b/pages-biz/message/message.vue
new file mode 100644
index 0000000..ad0d78b
--- /dev/null
+++ b/pages-biz/message/message.vue
@@ -0,0 +1,168 @@
+<template>
+	<view class="message-page">
+
+		<!-- 顶部导航栏 -->
+		<u-navbar title="消息中心" bg-color="#fff" title-color="#111" :border-bottom="true" @leftClick="goBack">
+			<view slot="left">
+				<u-icon name="arrow-left" size="44" color="#111"></u-icon>
+			</view>
+		</u-navbar>
+
+		<!-- 消息列表 -->
+		<scroll-view scroll-y class="message-list" @scrolltolower="loadMore" @refresherrefresh="refresh"
+			:refresher-enabled="true" :refresher-triggered="isRefreshing">
+			<view v-for="(msg,index) in flowList" :key="index" class="msg-item u-flex u-row-between" @click="viewMessage(msg)">
+				<view class="u-flex">
+					<image :src="staticHost + '/public' + msg.icon"></image>
+					<view class="msg-content u-m-l-20">
+						<view class="msg-title u-font-16">{{ msg.title }}</view>
+						<view class="msg-desc u-tips-color u-font-12 u-line-2">{{ msg.desc }}</view>
+					</view>
+				</view>
+				<view class="msg-right u-text-right">
+					<view class="msg-time u-font-12 u-tips-color">{{ msg.time }}</view>
+					<view v-if="!msg.read" class="unread-dot"></view>
+				</view>
+			</view>
+
+			<u-loadmore :status="loadStatus" :loading-text="'加载中...'" :nomore-text="'没有更多消息了'"></u-loadmore>
+		</scroll-view>
+
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			flowList: [],
+			pageNo:1,
+			pageSize:10,
+			isRefreshing: false,
+			loadStatus: 'loadmore'
+		}
+	},
+	onShow() {
+		this.$checkToken(this.$getToken())
+	},
+	onload(){
+		this.loadMore();
+	},
+	methods: {
+		goBack() {
+			const pages = getCurrentPages();
+			if (pages.length > 1) {
+			  uni.navigateBack();
+			} else {
+			  uni.switchTab({
+			  		url:'/pages/index/index'
+			  	})
+			}
+		},
+		getIconUrl(type) {
+			if(type === 'BILL') {
+				return  this.$config.staticUrl + '/static/icon/msg-1.png'
+			}
+			if(type === 'SIGN') {
+				return this.$config.baseUrl + '/static/icon/msg-2.png'
+			}
+		},
+		fetchMessageList(){
+			if (this.loadStatus !== 'loadmore') return;
+			this.loadStatus = 'loading';
+			let url = '/message/queryPage'
+			this.$u.post(url, {
+				pageNo: this.pageNo,
+				pageSize: this.pageSize
+			}, {
+				WT: this.$getToken()
+			}).then(res => {
+				const rows = res.data.result || [];
+				console.log(rows)
+				if (this.pageNo === 1) this.flowList = [];
+				this.flowList = this.flowList.concat(rows);
+				if (rows.length < this.pageSize) {
+					this.loadStatus = 'nomore';
+				} else {
+					this.pageNo++;
+					this.loadStatus = 'loadmore';
+				}
+			}).catch(err => {
+				console.log("获取消息列表失败：", err)
+				this.loadStatus = 'loadmore';
+			})
+		},
+		loadMore() {
+			// 只有在 loadStatus 为 'loadmore' 时才触发
+			if (this.loadStatus !== 'loadmore') return;
+			this.fetchMessageList()
+		},
+		viewMessage(msg) {
+			this.$u.route({url:'/pages-biz/message/messageDetail',params:{
+				id: msg.id,
+				read: msg.read
+			}});
+		},
+		refresh() {
+			this.isRefreshing = true;
+			setTimeout(() => {
+				this.isRefreshing = false;
+			}, 1000);
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.message-page {
+	background-color: #ffffff;
+	min-height: 100vh;
+}
+
+.message-list {
+	padding: 20rpx;
+	box-sizing: border-box;
+}
+
+.msg-item {
+	padding: 20rpx;
+	margin-bottom: 20rpx;
+	align-items: flex-start;
+	position: relative;
+	border-bottom: 1px solid #E6E6E6;
+	
+	image{
+		width: 88rpx;
+		height: 88rpx;
+	}
+}
+
+.msg-content {
+	width: 500rpx;
+}
+
+.msg-title {
+	font-weight: bold;
+	color: #111;
+	margin-bottom: 10rpx;
+}
+
+.msg-right {
+	align-items: flex-end;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
+.msg-time{
+	position: absolute;
+}
+
+.unread-dot {
+	width: 14rpx;
+	height: 14rpx;
+	background-color: #ff4d4f;
+	border-radius: 50%;
+	margin-top: 50rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/message/messageDetail.vue b/pages-biz/message/messageDetail.vue
similarity index 56%
rename from pages/message/messageDetail.vue
rename to pages-biz/message/messageDetail.vue
index 868e362..ebb5176 100644
--- a/pages/message/messageDetail.vue
+++ b/pages-biz/message/messageDetail.vue
@@ -17,17 +17,43 @@
 export default {
 	data() {
 		return {
+			id:null,
 			title: '',
 			desc: ''
 		}
 	},
+	onShow() {
+		this.$checkToken(this.$getToken())
+	},
 	onLoad(e) {
-		this.title = decodeURIComponent(e.title || '')
-		this.desc = decodeURIComponent(e.desc || '')
+	   this.id = e.id
+	   this.getDetail()
 	},
 	methods: {
+		getDetail(){
+			this.$u.get(`/message/detail?id=${this.id}`,{},{
+				WT: this.$getToken()
+			}).then(res=>{
+				if(res.flag) {
+					this.title = res.data.title;
+					this.desc = res.data.messageContent;
+				}
+			})
+		},
+		read(){
+			this.$u.get(`/message/read?id=${this.id}`,{},{
+				WT: this.$getToken()
+			})
+		},
 		goBack() {
-			uni.navigateBack()
+			const pages = getCurrentPages();
+			if (pages.length > 1) {
+			  uni.navigateBack();
+			} else {
+			  uni.switchTab({
+			  		url:'/pages/index/index'
+			  	})
+			}
 		}
 	}
 }
diff --git a/pages-biz/myrent/myLease.vue b/pages-biz/myrent/myLease.vue
new file mode 100644
index 0000000..c05fb54
--- /dev/null
+++ b/pages-biz/myrent/myLease.vue
@@ -0,0 +1,129 @@
+<template>
+  <view class="page">
+    <!-- 顶部自定义导航栏 -->
+    <customNavbar title="我的租赁资产" />
+
+    <!-- 筛选栏 -->
+
+
+    <!-- 租赁资产列表组件 -->
+    <scroll-view
+      scroll-y
+      class="scroll-content"
+      @scrolltolower="loadMore"
+    >
+      <asset-list
+        :list="assetList"
+        @click="goDetail"
+      />
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import AssetList from '@/components/asset/assetList.vue'
+export default {
+  name: 'MyLease',
+  components: { AssetList},
+  data() {
+    return {
+      assetList: [],
+      pageNo: 1,
+      pageSize: 10,
+      loadStatus: 'loadmore',
+    };
+  },
+  onLoad(options) {
+	this.cusNo = options.cusNo;  
+    this.loadAssets();
+  },
+  onShow() {
+  	this.$checkToken(this.$getToken())
+  },
+  staticHost() {
+  	return this.$config.staticUrl
+  },
+  methods: {
+    changeFilter(value) {
+      if (this.currentFilter === value) return;
+      this.currentFilter = value;
+      this.pageNo = 1;
+      this.assetList = [];
+      this.loadAssets();
+    },
+
+    loadAssets() {
+      if (this.loadStatus !== 'loadmore') return;
+         this.loadStatus = 'loading';
+     
+         this.$u.post('/assets/getMyAssetsList', {
+           pageNo: this.pageNo,
+           pageSize: this.pageSize
+         },{
+			 WT: this.$getToken()
+		 }).then(res => {
+           const rows = res.data.result || [];
+     
+           if (this.pageNo === 1) this.assetList = [];
+     
+           this.assetList = this.assetList.concat(rows);
+     
+           if (rows.length < this.pageSize) {
+             this.loadStatus = 'nomore';
+           } else {
+             this.pageNo++;
+             this.loadStatus = 'loadmore';
+           }
+         }).catch(err => {
+           console.error(err);
+           this.loadStatus = 'loadmore';
+         });
+    },
+
+    loadMore() {
+      this.loadAssets();
+    },
+
+    goDetail(item) {
+      uni.navigateTo({
+        url: `/pages-assets/assets/assetsDetail?assetsNo=${item.assetsNo}`,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  background: #f7f8fa;
+  padding-top: 175rpx;
+}
+
+.filter-bar {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  background-color: #fff;
+  padding: 20rpx 0;
+  margin-top: var(--custom-navbar-height);
+  border-bottom: 1rpx solid #f0f0f0;
+
+  .filter-btn {
+    min-width: 150rpx;
+    text-align: center;
+    font-size: 26rpx;
+    height: 60rpx;
+    line-height: 60rpx;
+    border-radius: 40rpx;
+    margin: 0 8rpx;
+  }
+}
+
+.scroll-content {
+  flex: 1;
+  height: calc(100vh - 200rpx);
+}
+</style>
\ No newline at end of file
diff --git a/pages/notice/notice.vue b/pages-biz/notice/notice.vue
similarity index 50%
rename from pages/notice/notice.vue
rename to pages-biz/notice/notice.vue
index c04e2f6..6634d96 100644
--- a/pages/notice/notice.vue
+++ b/pages-biz/notice/notice.vue
@@ -4,15 +4,15 @@
 		<view class="wrap">
 			<scroll-view scroll-y style="height: 100%;width: 100%;">
 				<view class="page-box">
-					<view class="tabSwiper" v-for="(item, index) in dataList" :key="item.id" @click="clickContent(item)">
+					<view class="tabSwiper" v-for="(item, index) in flowList" :key="item.noticeId" @click="clickContent(item)">
 						<u-icon name="bell" :size="35" color="#FF2F31" class="bell-icon"></u-icon>
 						<view class="content-wrapper">
 							<view class="top">
-								<view class="title">{{ item.title }}</view>
-								<view class="date">{{ item.date }}</view>
+								<view class="title">{{ item.noticeTitle }}</view>
+								<view class="date">{{ item.createTime }}</view>
 							</view>
 							<view class="item">
-								<view class="content u-line-2">{{ item.content }}</view>
+								<view class="content u-line-2">{{ item.noticeContent }}</view>
 							</view>
 						</view>
 						<u-icon name="arrow-right" color="rgb(203,203,203)" :size="26" class="arrow-icon"></u-icon>
@@ -27,60 +27,51 @@
 export default {
 	data() {
 		// 静态公告数据
-		const staticNoticeList = [
-			{
-				id: 1,
-				title: '关于开展2025年度招商工作的通知',
-				date: '2025-01-15',
-				content: '为进一步推进我市招商引资工作，优化营商环境，现就开展2025年度招商工作有关事项通知如下：一、工作目标；二、重点领域；三、保障措施...'
-			},
-			{
-				id: 2,
-				title: '2024年度招商成果通报',
-				date: '2025-01-10',
-				content: '2024年，我市招商引资工作取得显著成效，共引进各类项目120个，总投资达500亿元，现将具体成果通报如下：一、总体情况；二、主要特点；三、下一步计划...'
-			},
-			{
-				id: 3,
-				title: '关于举办2025年春季招商推介会的通知',
-				date: '2025-01-05',
-				content: '为搭建投资合作平台，展示我市投资环境和发展机遇，定于2025年3月15日举办春季招商推介会，诚邀各界企业家参会...'
-			},
-			{
-				id: 4,
-				title: '关于印发《市招商引资优惠政策实施细则》的通知',
-				date: '2024-12-28',
-				content: '为进一步规范招商引资优惠政策的实施，经市政府同意，现将《市招商引资优惠政策实施细则》印发给你们，请认真贯彻执行...'
-			},
-			{
-				id: 5,
-				title: '关于认定2024年度市重点招商引资项目的通知',
-				date: '2024-12-20',
-				content: '根据《市重点招商引资项目认定管理办法》，经评审，认定以下30个项目为2024年度市重点招商引资项目，现予以公布...'
-			}
-		];
+		const staticNoticeList = [];
 		return {
-			pageNum: 1,
-			pageSize: 50,
-			dataList: staticNoticeList,
+			pageNo: 1,
+			pageSize: 20,
+			flowList: [],
+			loadStatus: 'loadmore',
+			isRefreshing: false
 		};
 	},
 	onLoad() {
 		// 静态数据已在data中初始化，无需调用接口
-		// this.getNoticecList();
+		this.getNoticecList();
 	},
 	methods: {
 		clickContent(item) {
-			if (item.id) {
-				this.$u.route('/pages/notice/noticeDetail', {
-					id: item.id
+			if (item.noticeId) {
+				this.$u.route({
+					url: '/pages-biz/notice/noticeDetail',
+					params: {
+						id: item.noticeId
+					}
 				});
 			}
 		},
 		getNoticecList() {
-			// 静态数据已在data中初始化，无需调用接口
-			// 保留此方法以保持兼容性
-			return;
+			if (this.loadStatus !== 'loadmore') return;
+			   this.loadStatus = 'loading';
+			let url = "/notice/pageQuery";
+			this.$u.post(url, {
+				pageNo: this.pageNo,
+				pageSize: this.pageSize
+			}).then(res => {
+				const rows = res.data.result || [];
+				console.log(rows)
+				if (this.pageNo === 1) this.flowList = [];
+				this.flowList = this.flowList.concat(rows)
+				if (rows.length < this.pageSize) {
+				  this.loadStatus = 'nomore';
+				} else {
+				  this.pageNo++;
+				  this.loadStatus = 'loadmore';
+				}
+			}).catch(err => {
+				console.log("获取招商公告失败：", err)
+			});
 		}
 	}
 };
diff --git a/pages/notice/noticeDetail.vue b/pages-biz/notice/noticeDetail.vue
similarity index 67%
rename from pages/notice/noticeDetail.vue
rename to pages-biz/notice/noticeDetail.vue
index fd18c39..3c1b0e5 100644
--- a/pages/notice/noticeDetail.vue
+++ b/pages-biz/notice/noticeDetail.vue
@@ -14,18 +14,27 @@
 	export default {
 		data() {
 			return {
+				id:null,
 				title:'资讯',
 				content: ``
 			}
 		},
 		onLoad(option) {
-			let id = option.id
-			let url = "/api/notice/getNotice/"+id;
-			this.$u.get(url).then(res => {
-				this.title = res.data.noticeTitle
-				this.content = res.data.noticeContent
-			});
+			this.id = option.id
+			this.getDetail()
 		},
+		methods:{
+			getDetail(){
+				this.$u.get(`/notice/detail?id=${this.id}`,{},{
+					WT: this.$getToken()
+				}).then(res=>{
+					if(res.flag) {
+						this.title = res.data.noticeTitle;
+						this.content = res.data.noticeContent;
+					}
+				})
+			}
+		}
 	}
 </script>
 
diff --git a/pages-biz/privacy/privacyPolicy.vue b/pages-biz/privacy/privacyPolicy.vue
new file mode 100644
index 0000000..bea4671
--- /dev/null
+++ b/pages-biz/privacy/privacyPolicy.vue
@@ -0,0 +1,120 @@
+<template>
+  <view class="container">
+    <view class="header">
+      <view class="back" @click="goBack">
+        <u-icon name="arrow-left" size="36" color="#333" />
+      </view>
+      <text class="title">隐私协议</text>
+    </view>
+
+    <scroll-view class="content" scroll-y>
+      <view class="text">
+        <text class="section-title">一、我们如何收集信息</text>
+        <text class="paragraph">
+          在您使用本应用过程中，我们可能会收集与您相关的必要信息，
+          包括但不限于设备信息、日志信息以及您主动提供的信息。
+        </text>
+
+        <text class="section-title">二、信息的使用方式</text>
+        <text class="paragraph">
+          我们收集的信息仅用于提供和优化服务、保障账号与系统安全、
+          以及履行法律法规规定的义务。
+        </text>
+
+        <text class="section-title">三、信息的存储与保护</text>
+        <text class="paragraph">
+          我们将采取合理的技术与管理措施，保护您的个人信息不被泄露、
+          篡改或非法访问。
+        </text>
+
+        <text class="section-title">四、信息的共享与披露</text>
+        <text class="paragraph">
+          未经您的明确同意，我们不会向第三方共享或披露您的个人信息，
+          法律法规另有规定的除外。
+        </text>
+
+        <text class="section-title">五、您的权利</text>
+        <text class="paragraph">
+          您有权依法查询、更正或删除您的个人信息，并可随时联系我们行使相关权利。
+        </text>
+
+        <text class="section-title">六、政策变更</text>
+        <text class="paragraph">
+          本隐私政策如有更新，我们将以合理方式向您告知。
+        </text>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+ export default {
+   methods: {
+     goBack() {
+       const pages = getCurrentPages();
+       if (pages.length > 1) {
+         uni.navigateBack();
+       } else {
+         uni.navigateTo({
+         		url:'/pages-biz/login/login'
+         	})
+       }
+     }
+   }
+ }
+</script>
+
+<style scoped>
+.container {
+  height: 100vh;
+  padding-top:120rpx;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+}
+
+.header {
+  position: relative;
+  height: 88rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-bottom: 1px solid #eee;
+}
+
+.back {
+  position: absolute;
+  left: 30rpx;
+}
+
+.title {
+  font-size: 34rpx;
+  font-weight: 600;
+  color: #333;
+}
+
+.content {
+  flex: 1;
+  padding: 30rpx;
+}
+
+.text {
+  font-size: 28rpx;
+  color: #555;
+  line-height: 1.8;
+}
+
+.section-title {
+  display: block;
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #333;
+  margin-top: 30rpx;
+  margin-bottom: 10rpx;
+}
+
+.paragraph {
+  display: block;
+  margin-bottom: 16rpx;
+}
+</style>
diff --git a/pages-biz/privacy/userAgreement.vue b/pages-biz/privacy/userAgreement.vue
new file mode 100644
index 0000000..ba079d5
--- /dev/null
+++ b/pages-biz/privacy/userAgreement.vue
@@ -0,0 +1,119 @@
+<template>
+  <view class="container">
+    <view class="header">
+         <view class="back" @click="goBack">
+           <u-icon name="arrow-left" size="36" color="#333" />
+         </view>
+         <text class="title">用户协议</text>
+       </view>
+
+    <scroll-view class="content" scroll-y>
+      <view class="text">
+        <text class="section-title">一、协议说明</text>
+        <text class="paragraph">
+          欢迎您使用本应用。请您在使用本应用前，认真阅读并充分理解本《用户协议》。
+          一旦您开始使用本应用，即视为您已阅读、理解并同意本协议的全部内容。
+        </text>
+
+        <text class="section-title">二、用户行为规范</text>
+        <text class="paragraph">
+          1. 用户应遵守中华人民共和国相关法律法规，不得利用本应用从事任何违法活动。
+        </text>
+        <text class="paragraph">
+          2. 不得发布、传播违法、侵权、虚假、骚扰性或其他不当信息。
+        </text>
+        <text class="paragraph">
+          3. 不得以任何形式干扰本应用的正常运行。
+        </text>
+
+        <text class="section-title">三、服务变更与中断</text>
+        <text class="paragraph">
+          本应用有权根据业务发展需要，对服务内容进行调整、中断或终止，
+          并尽可能提前向用户告知。
+        </text>
+
+        <text class="section-title">四、免责声明</text>
+        <text class="paragraph">
+          因不可抗力或非本应用原因造成的服务中断或数据损失，本应用不承担责任。
+        </text>
+
+        <text class="section-title">五、其他</text>
+        <text class="paragraph">
+          本协议的解释权及修改权归本应用所有。
+        </text>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+export default {
+  methods: {
+    goBack() {
+      const pages = getCurrentPages();
+      if (pages.length > 1) {
+        uni.navigateBack();
+      } else {
+        uni.navigateTo({
+        		url:'/pages-biz/login/login'
+        	})
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.container {
+  height: 100vh;
+    padding-top:120rpx;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+}
+
+.header {
+  position: relative;
+  height: 88rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-bottom: 1px solid #eee;
+}
+
+.back {
+  position: absolute;
+  left: 30rpx;
+}
+
+.title {
+  font-size: 34rpx;
+  font-weight: 600;
+  color: #333;
+}
+
+.content {
+  flex: 1;
+  padding: 30rpx;
+}
+
+.text {
+  font-size: 28rpx;
+  color: #555;
+  line-height: 1.8;
+}
+
+.section-title {
+  display: block;
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #333;
+  margin-top: 30rpx;
+  margin-bottom: 10rpx;
+}
+
+.paragraph {
+  display: block;
+  margin-bottom: 16rpx;
+}
+</style>
diff --git a/pages-biz/profile/profile.vue b/pages-biz/profile/profile.vue
new file mode 100644
index 0000000..0885155
--- /dev/null
+++ b/pages-biz/profile/profile.vue
@@ -0,0 +1,180 @@
+<template>
+	<view class="u-m-20">
+		<u-navbar :is-back="true" title="账号实名信息" :border-bottom="false"></u-navbar>
+		<view>
+			<!-- 	<u-cell-group>
+				<u-cell-item title="头像" :arrow="false" hover-class="none" @click="updateAvatar">
+					<u-avatar :src="pic" size="100"></u-avatar>
+				</u-cell-item>
+			</u-cell-group> -->
+			<!-- 	<u-cell-group>
+				<u-cell-item title="昵称" :arrow="false" hover-class="none" @click="updateName">
+					{{vuex_user.user.nickName}}
+				</u-cell-item>
+			</u-cell-group> -->
+			<u-cell-group>
+				<u-cell-item :title="getTitle" :arrow="false" hover-class="none" @click="updateName">
+					{{(cardNo == null ? orgNo : cardNo) || ''}}
+				</u-cell-item>
+			</u-cell-group>
+		</view>
+
+		<u-modal v-model="showModel" @confirm="confirmAuthCode" ref="uModal" :async-close="true"
+			:title="'设置' + getTitle">
+			<view class="slot-content">
+				<u-input v-model="authCode" type="text" :border="false" :placeholder="'请输入' + getTitle" />
+			</view>
+		</u-modal>
+
+		<!-- <view class="u-m-t-20">
+			<u-button type="primary" @click="subProfile">提交</u-button>
+		</view> -->
+
+		<!-- 如果是微信登录小程序，则获取用户的昵称与头像 -->
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- <u-button type="default">使用微信头像与昵称</u-button> -->
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import config from "@/common/config.js" // 全局配置文件
+	import {
+		rsaEncrypt
+	} from "@/common/utils/ras.js"
+	export default {
+		data() {
+			return {
+				user: {
+					userType: null,
+					oaAuth: null,
+					cusNo: null,
+					userName: null,
+					openId: null
+				},
+				pic: null,
+				authCode: '',
+				showModel: false,
+				cardNo: null,
+				orgNo: null
+			}
+		},
+		onLoad(options) {
+			let userVo = uni.getStorageSync('userInfo');
+			this.user = userVo;
+		},
+		methods: {
+			updateName() {
+				this.showModel = true;
+			},
+			// 简单身份证校验（18 位）
+			checkIdCard(code) {
+				return /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/.test(
+					code
+				);
+			},
+			// 统一社会信用代码校验（18 位）
+			checkCreditCode(code) {
+				return /^[0-9A-Z]{18}$/.test(code);
+			},
+			confirmAuthCode() {
+				let loginType = this.user.userType
+				if (!this.authCode) {
+					this.showModel = false;
+					return this.$mytip.toast(loginType === '0' ? '请输入身份证号' : '请输入组织社会信用代码')
+				}
+				// 身份证校验
+				if (this.loginType === '0' && !this.checkIdCard(this.authCode)) {
+					uni.showToast({
+						title: '身份证号格式不正确',
+						icon: 'none'
+					});
+					return;
+				}
+
+				// 企业社会信用代码校验
+				if (this.loginType === '1' && !this.checkCreditCode(this.authCode)) {
+					uni.showToast({
+						title: '社会信用代码格式不正确',
+						icon: 'none'
+					});
+					return;
+				}
+				let life = uni.getStorageSync('lifeData') || {}
+				let token = life.vuex_token
+				let url = "/login/updateVerifyCode";
+				let encryptCode = rsaEncrypt(this.authCode);
+				this.$u.post(url, {
+					userType: loginType,
+					code: loginType === '0' ? encryptCode : this.authCode
+				}, {
+					'WT': token
+				}).then(obj => {
+					if (obj.flag) {
+						if (loginType === '0') {
+							this.cardNo = encryptCode
+							this.cardNo = this.applyMask(this.authCode)
+						} else {
+							this.orgNo = this.authCode
+						}
+						this.showModel = false;
+						this.$mytip.toast('修改成功');
+						this.getUserProfile();
+						uni.switchTab({
+							url: '/pages/center/center'
+						})
+					} else {
+						this.$mytip.toast('修改失败');
+					}
+				});
+
+			},
+			applyMask(idCard) {
+				if (idCard.length !== 18) return idCard; // 非18位直接返回
+				return idCard.replace(/(\d{6})(\d{8})(\d{4})/, '$1********$2****');
+			},
+			updateAvatar() {
+				this.$u.route('/pages-biz/profile/avatar')
+			},
+			subProfile() {
+				// 1.更新vuex中的用户信息
+				this.$mytip.toast('修改成功')
+				// 2.页面跳转
+
+			},
+			getUserProfile() {
+				// 如果是微信登录小程序，则获取用户的昵称与头像
+				// #ifdef MP-WEIXIN
+				// 此处执行微信才执行
+				// #endif
+				let token = this.$getToken();
+				let loginType = this.user.userType
+				let url = `/login/userInfo?loginType=${loginType}`;
+				this.$u.get(url, {}, {
+					'WT': token
+				}).then(obj => {
+					uni.setStorageSync('userInfo', {
+						userType: obj.data.userType,
+						oaAuth: obj.data.oaAuth,
+						cusNo: obj.data.cusNo,
+						userName: obj.data.userName,
+						openId: obj.data.openId
+					})
+				});
+			}
+		},
+		computed: {
+			getTitle() {
+				return this.user.userType === '0' ?
+					'身份证号' :
+					'企业社会信用代码'
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.slot-content {
+		padding: 40rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages-biz/profile/setting.vue b/pages-biz/profile/setting.vue
new file mode 100644
index 0000000..fd37f5a
--- /dev/null
+++ b/pages-biz/profile/setting.vue
@@ -0,0 +1,136 @@
+<template>
+	<view>
+		<u-navbar :is-back="true" title="设置" :border-bottom="false">
+		</u-navbar>
+		<view class="setting-content">
+			<u-cell-group>
+				<u-cell-item title="账号实名信息" @click="profile"></u-cell-item>
+				<!--    <u-cell-item title="订阅系统消息" :arrow="false">
+				          
+				            <u-switch v-model="longSubscribe" @change="toggleLongSubscribe" />
+				          
+				        </u-cell-item> -->
+			</u-cell-group>
+		</view>
+
+		<view class="btn">
+			<u-button @click="logout" plain>退出登录</u-button>
+		</view>
+
+		<view class="version">Version {{vuex_version}}</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				longSubscribe: false // 开关状态
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			profile() {
+				this.$u.route('/pages-biz/profile/profile')
+			},
+			logout() {
+				// 登录成功修改token与用户信息
+				this.$u.vuex('vuex_token', '');
+				this.$u.vuex('vuex_user', {});
+				uni.removeStorageSync('userInfo');
+				return uni.reLaunch({
+					url: '/pages/index/index'
+				})
+			},
+			toggleLongSubscribe(e) {
+				this.longSubscribe = e
+				// 微信小程序专用
+				// #ifdef MP-WEIXIN
+				if (this.longSubscribe) {
+					const tmplIds = ['TEMPLATE_ID_1', 'TEMPLATE_ID_2'] // 在小程序后台配置的长期订阅模板
+					wx.requestSubscribeMessage({
+						tmplIds,
+						success: (res) => {
+							// 用户同意才生效
+							console.log('长期订阅授权结果', res)
+							if (Object.values(res).some((v) => v === 'accept')) {
+								uni.showToast({
+									title: '长期订阅开启成功',
+									icon: 'success'
+								})
+								// 可以把状态保存到后端
+								this.saveLongSubscribeStatus(true)
+							} else {
+								uni.showToast({
+									title: '未授权订阅',
+									icon: 'none'
+								})
+								this.longSubscribe = false
+							}
+						},
+						fail: (err) => {
+							console.error(err)
+							this.longSubscribe = false
+						},
+					})
+				} else {
+					// 取消订阅
+					uni.showToast({
+						title: '已关闭系统消息订阅',
+						icon: 'none'
+					})
+					this.saveLongSubscribeStatus(false)
+				}
+				// #endif
+			},
+
+			saveLongSubscribeStatus(enable) {
+				// TODO: 后端保存用户长期订阅状态
+				console.log('保存长期订阅状态到后端', enable)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.setting-content {
+		padding: 0rpx 20rpx;
+		border-radius: 10rpx;
+		background: #FFFFFF;
+		width: 94%;
+		margin: 20rpx auto;
+
+		&::v-deep .u-cell {
+			color: #222222 !important;
+		}
+
+		&::v-deep .u-cell_title {
+			font-size: 30rpx !important;
+		}
+	}
+
+	.btn {
+		width: 94%;
+		margin: 30rpx auto;
+
+		&::v-deep .u-btn {
+			border-radius: 10rpx;
+			font-size: 36rpx !important;
+			color: #EA4047 !important;
+			border: 0 !important;
+		}
+
+		&::v-deep .u-hairline-border:after {
+			border: 0 !important;
+		}
+	}
+
+	.version {
+		position: absolute;
+		bottom: 20rpx;
+		width: 100%;
+		text-align: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/reserve/reserveRecords.vue b/pages-biz/reserve/reserveRecords.vue
similarity index 78%
rename from pages/reserve/reserveRecords.vue
rename to pages-biz/reserve/reserveRecords.vue
index 65f93a6..19c35d4 100644
--- a/pages/reserve/reserveRecords.vue
+++ b/pages-biz/reserve/reserveRecords.vue
@@ -2,7 +2,9 @@
   <view class="reserve-records">
 
     <!-- 顶部导航栏 -->
-     <customNavbar title="我的预约"/>
+     <customNavbar title="我的预约" :is-transparent="navbarStyle.isTransparent" :bg-color="navbarStyle.bgColor"
+			:text-color="navbarStyle.textColor" :opacity="navbarStyle.opacity" 
+			:show-home="true" />
     <!-- 内容部分 -->
     <scroll-view
       scroll-y
@@ -12,9 +14,9 @@
       :refresher-enabled="true"
       :refresher-triggered="isRefreshing"
     >
-      <view v-if="records.length > 0" class="record-list">
+      <view v-if="flowList.length > 0" class="record-list">
         <view
-          v-for="item in records"
+          v-for="item in flowList"
           :key="item.id"
           class="record-card"
         >
@@ -45,7 +47,7 @@
             <!-- 管家 -->
             <view class="info-item">
               <text class="info-label">管家：</text>
-              <text class="info-value">{{ item.managerName }}（{{ item.managerPhone }}）</text>
+              <text class="info-value">{{ item.managerName || '未知'}}（{{ item.managerPhone || '未知'}}）</text>
             </view>
           </view>
 
@@ -80,33 +82,18 @@
 export default {
   data() {
     return {
-      records: [
-        {
-          id: 1,
-          date: '2025-11-10 09:00',
-          status: 'pending',
-          assetName: '天河公寓A栋301',
-          assetAddress: '广州市天河区体育东路88号',
-          managerName: '张管家',
-          managerPhone: '13800138000',
-          lat: 23.129,
-          lng: 113.264
-        },
-        {
-          id: 2,
-          date: '2025-11-09 14:00',
-          status: 'done',
-          assetName: '越秀中心B座',
-          assetAddress: '广州市越秀区中山五路12号',
-          managerName: '李经理',
-          managerPhone: '13688886666',
-          lat: 23.133,
-          lng: 113.278
-        }
-      ],
+	  pageNo: 1,
+	  pageSize:10,
+	  flowList: [],
       loadStatus: 'loadmore',
       isRefreshing: false
-    };
+    }
+  },
+  onLoad(options){
+	this.fetchReserve()
+  },
+  onShow() {
+  	this.$checkToken(this.$getToken())
   },
   methods: {
     statusText(status) {
@@ -121,6 +108,7 @@ export default {
     },
     formatDate(dateStr) {
       // 格式化日期，例如：2025-11-10 周五 09:00
+	  if(!dateStr){return '-'}
       const date = new Date(dateStr);
       const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
       const year = date.getFullYear();
@@ -132,6 +120,31 @@ export default {
       
       return `${year}-${month}-${day} ${weekday} ${hours}:${minutes}`;
     },
+	fetchReserve(){
+		if (this.loadStatus !== 'loadmore') return;
+		   this.loadStatus = 'loading';
+		let url = '/reservate/queryPage'
+		this.$u.post(url, {
+			pageNo: this.pageNo,
+			pageSize: this.pageSize
+		},{
+			WT: this.$getToken()
+		}).then(res => {
+			const rows = res.data.result || [];
+			console.log(rows)
+			if (this.pageNo === 1) this.flowList = [];
+			this.flowList = this.flowList.concat(rows);
+			if (rows.length < this.pageSize) {
+			  this.loadStatus = 'nomore';
+			} else {
+			  this.pageNo++;
+			  this.loadStatus = 'loadmore';
+			}
+		}).catch(err => {
+			console.log("获取预约记录失败：", err)
+			this.loadStatus = 'loadmore';
+		})
+	},
     viewLocation(item) {
       uni.openLocation({
         latitude: item.lat,
@@ -145,10 +158,7 @@ export default {
       uni.makePhoneCall({ phoneNumber: phone });
     },
     loadMore() {
-      this.loadStatus = 'loading';
-      setTimeout(() => {
-        this.loadStatus = 'nomore';
-      }, 1000);
+      this.fetchReserve()
     },
     refresh() {
       this.isRefreshing = true;
@@ -162,13 +172,13 @@ export default {
 
 <style lang="scss" scoped>
 .reserve-records {
-  background: #f5f5f5;
   min-height: 100vh;
-  padding-top: 120rpx; /* 给导航栏留空间 */
+  padding-top: 175rpx; /* 给导航栏留空间 */
+  background: linear-gradient(0deg, #F3F1ED 43%, #F5E9DB 100%);
 }
 
 .scroll-content {
-  height: calc(100vh - 120rpx);
+  height: calc(100vh - -120rpx - 120rpx);
 }
 
 .record-list {
diff --git a/pages/search/search.vue b/pages-biz/search/search.vue
similarity index 94%
rename from pages/search/search.vue
rename to pages-biz/search/search.vue
index 5696c5e..24ab37e 100644
--- a/pages/search/search.vue
+++ b/pages-biz/search/search.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="u-margin-left-20 u-margin-right-20">
 		<u-navbar :is-back="true" title="搜索" :border-bottom="false"></u-navbar>
-		<u-search placeholder="请输入小区" v-model="keyword"  @search="clickSearch(value)"
+		<u-search placeholder="请输入资产名称/街道/位置等信息" v-model="keyword"  @search="clickSearch(value)"
 		 :focus="true" action-text="取消" @custom="cancelSearch"></u-search>
 		<!-- 搜索记录 -->
 		<template v-if="historyList.length > 0">
@@ -50,9 +50,9 @@
 					uni.hideKeyboard()
 					this.addHistory()
 					this.$u.route({
-						url: '/pages/search/searchList',
+						url: '/pages-biz/search/searchList',
 						params: {
-							villageName: this.keyword
+							keyword: this.keyword
 						}
 					})
 				}
diff --git a/pages/search/searchList.vue b/pages-biz/search/searchList.vue
similarity index 62%
rename from pages/search/searchList.vue
rename to pages-biz/search/searchList.vue
index 019810a..3013eec 100644
--- a/pages/search/searchList.vue
+++ b/pages-biz/search/searchList.vue
@@ -2,7 +2,8 @@
 	<view class="search-list-page">
 		<!-- 顶部导航栏 -->
 		<!-- <customNavbar title="搜索资产" /> -->
-		<u-navbar title="搜索资产" :autoBack="true" :background="background" title-color="#2D2B2C" back-icon-color="#2D2B2C">
+		<u-navbar title="搜索资产" :autoBack="true" :background="background" title-color="#2D2B2C"
+			back-icon-color="#2D2B2C">
 		</u-navbar>
 		<view class="search-list-content">
 			<!-- 筛选标签栏 -->
@@ -17,10 +18,11 @@
 			<!-- 搜索栏 -->
 			<view class="search-bar-wrapper">
 				<view class="search-bar">
-					<view class="city-select">杭州 <text class="icon-down"></text></view>
-					<view class="search-input">
+					<view class="city-select" @click="location()">{{ city ||'宜昌'}} <text class="icon-down"></text>
+					</view>
+					<view class="search-input" @click="search">
 						<text class="icon-search"></text>
-						<input type="text" placeholder="请输入小区名称" />
+						<input type="text" placeholder="搜索商铺/住房/土地" />
 					</view>
 				</view>
 			</view>
@@ -38,9 +40,10 @@
 				<template v-slot:left="{ leftList }">
 					<view class="demo-warter" v-for="(item, index) in leftList" :key="index">
 						<u-lazy-load threshold="750" border-radius="8" :image="item.coverImgUrl" :index="index"
-							@click="clickImage(item.id)" mode="aspectFill"></u-lazy-load>
-						<view class="item-title">{{ item.name }}</view>
-						<view class="item-desc">{{ item.houseType }} {{ item.footPrint }}㎡ {{ item.orientation }}</view>
+							@click="clickImage(item.assetsNo)" mode="aspectFill"></u-lazy-load>
+						<view class="item-title">{{ item.assetsName }}</view>
+						<view class="item-desc">{{ item.assetsType }} {{ item.footPrint }}㎡ {{ item.orientation }}
+						</view>
 						<view class="item-tags">
 							<view class="tag" v-for="(tag, tagIndex) in item.tags" :key="tagIndex">{{ tag }}</view>
 						</view>
@@ -50,9 +53,9 @@
 				<template v-slot:right="{ rightList }">
 					<view class="demo-warter" v-for="(item, index) in rightList" :key="index">
 						<u-lazy-load threshold="750" border-radius="8" :image="item.coverImgUrl" :index="index"
-							@click="clickImage(item.id)" mode="aspectFill"></u-lazy-load>
-						<view class="item-title">{{ item.name }}</view>
-						<view class="item-desc">{{ item.houseType }} {{ item.footPrint }}㎡ {{ item.orientation }}</view>
+							@click="clickImage(item.assetsNo)" mode="aspectFill"></u-lazy-load>
+						<view class="item-title">{{ item.assetsName }}</view>
+						<view class="item-desc">{{ item.assetsType}} {{ item.footPrint }}㎡ {{ item.orientation }}</view>
 						<view class="item-tags">
 							<view class="tag" v-for="(tag, tagIndex) in item.tags" :key="tagIndex">{{ tag }}</view>
 						</view>
@@ -60,7 +63,7 @@
 					</view>
 				</template>
 			</u-waterfall>
-			<u-loadmore bg-color="rgb(240, 240, 240)" :status="loadStatus" @loadmore="findHouseList"
+			<u-loadmore bg-color="rgb(240, 240, 240)" :status="loadStatus" @loadmore="loadMore"
 				style="height: 80rpx;line-height: 80rpx;"></u-loadmore>
 			<u-back-top :scroll-top="scrollTop" top="1000"></u-back-top>
 			<u-no-network></u-no-network>
@@ -78,6 +81,9 @@
 		},
 		data() {
 			return {
+				keyWord: null,
+				city: null,
+				streetList: [],
 				indexArr: [],
 				valueArr: [],
 				defaultSelected: [],
@@ -101,6 +107,12 @@
 		onLoad(option) {
 			let type = option.type
 			let villageName = option.villageName
+			let lifeData = uni.getStorageSync('lifeData');
+			let vuex_city = lifeData.vuex_city
+			if (option.keyword) {
+				this.keyWord = option.keyword
+			}
+			this.city = vuex_city
 			this.searchData = {}
 			if (type) {
 				this.searchData.type = type
@@ -108,29 +120,24 @@
 			if (villageName) {
 				this.searchData.villageName = villageName
 			}
-			// 获取房源数据
-			this.findHouseList();
+			this.resetAndLoad()
 			// 获取小区数据
 			this.findVillageList()
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		onReachBottom() {
-			this.loadStatus = 'loading';
-			// 获取数据
-			this.findHouseList()
-		},
 		// 下拉刷新
 		onPullDownRefresh() {
-			this.pageNum = 1
-			this.flowList = []
-			this.$refs.uWaterfall.clear();
-			// 获取数据
-			this.findHouseList();
+			this.resetAndLoad();
 			// 关闭刷新
 			uni.stopPullDownRefresh();
 		},
+		computed: {
+			staticHost() {
+				return this.$config.staticUrl
+			}
+		},
 		methods: {
 			// 标签点击事件
 			onTagClick(tag) {
@@ -146,159 +153,115 @@
 				// 这里可以添加根据标签筛选数据的逻辑
 				console.log('标签点击:', tag);
 				console.log('当前选中的标签:', this.selectedTags);
-				// 可以调用findHouseList方法重新加载数据，根据选中的标签进行筛选
-				// this.pageNum = 1;
-				// this.flowList = [];
-				// this.findHouseList(1);
+				this.resetAndLoad()
 			},
-
-			findHouseList(type = 0) {
-				if (type == 1) {
-					this.pageNum = 1
-					this.flowList = []
-					this.$refs.uWaterfall.clear();
-				}
-				// 隐藏接口请求，使用前端写死的测试数据
-				// let url = "/assets/findAssetList";
-				// this.$u.post(url, {
-				// 	state:1,
-				// 	villageCity:uni.getStorageSync('lifeData').vuex_city,
-				// 	pageNum: this.pageNum,
-				// 	pageSize: this.pageSize,
-				// 	orderByColumn: 'update_time,create_time',
-				// 	isAsc: 'desc'
-				// }).then(result => {
-				// 	const data = result.data.result;
-
-				// 前端写死的测试数据
-				const data = [{
-						id: 1,
-						name: '景秀天成保租房景秀天成保租房',
-						footPrint: 105,
-						rentFee: 1500,
-						coverImgUrl: '/static/img/index/swiper/swiper3.jpg',
-						houseType: '3室2厅',
-						orientation: '南',
-						tags: ['全套家具', '全套家电']
-					},
-					{
-						id: 2,
-						name: '景秀天成保租房景秀天成保租房',
-						footPrint: 105,
-						rentFee: 1500,
-						coverImgUrl: '/static/img/index/swiper/swiper3.jpg',
-						houseType: '3室2厅',
-						orientation: '南',
-						tags: ['全套家具', '全套家电']
-					},
-					{
-						id: 3,
-						name: '景秀天成保租房景秀天成保租房',
-						footPrint: 105,
-						rentFee: 1500,
-						coverImgUrl: '/static/img/index/swiper/swiper3.jpg',
-						houseType: '3室2厅',
-						orientation: '南',
-						tags: ['全套家具', '全套家电']
-					},
-					{
-						id: 4,
-						name: '景秀天成保租房景秀天成保租房',
-						footPrint: 105,
-						rentFee: 1500,
-						coverImgUrl: '/static/img/index/swiper/swiper3.jpg',
-						houseType: '3室2厅',
-						orientation: '南',
-						tags: ['全套家具', '全套家电']
-					},
-					{
-						id: 5,
-						name: '景秀天成保租房景秀天成保租房',
-						footPrint: 105,
-						rentFee: 1500,
-						coverImgUrl: '/static/img/index/swiper/swiper3.jpg',
-						houseType: '3室2厅',
-						orientation: '南',
-						tags: ['全套家具', '全套家电']
-					},
-					{
-						id: 6,
-						name: '景秀天成保租房景秀天成保租房',
-						footPrint: 105,
-						rentFee: 1500,
-						coverImgUrl: '/static/img/index/swiper/swiper3.jpg',
-						houseType: '3室2厅',
-						orientation: '南',
-						tags: ['全套家具', '全套家电']
-					}
-				];
-				if (this.pageNum > 1 && data.length < this.pageSize) {
-					// return this.loadStatus = 'nomore';
-				}
-				this.houseList = data;
-				for (let i = 0; i < this.houseList.length; i++) {
-					// 先转成字符串再转成对象，避免数组对象引用导致数据混乱
-					let item = this.houseList[i]
-					this.flowList.push(item);
-				}
-				++this.pageNum
+			location() {
+				this.$u.route({
+					url: '/pages-biz/location/location',
+				})
+			},
+			search() {
+				this.$u.route('/pages-biz/search/search');
+			},
+			resetAndLoad() {
+				this.pageNo = 1;
+				this.flowList = [];
 				this.loadStatus = 'loadmore';
-				// }).catch(err => {
-				// 	console.log("失败：", err)
-				// })
+
+				this.$nextTick(() => {
+					this.$refs.uWaterfall && this.$refs.uWaterfall.clear();
+					this.findHouseList();
+				});
+			},
+			findHouseList(type = null) {
+				if (this.loadStatus !== 'loadmore') return;
+
+				this.loadStatus = 'loading';
+
+				this.$u.post('/assets/queryPage', {
+					assetsStatus:'闲置中',
+					assetsType: type,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					keyWord: this.keyWord
+				}).then(result => {
+
+					const rows = result.data.result || [];
+
+					// 第一页无数据
+					if (this.pageNo === 1 && rows.length === 0) {
+						this.flowList = [];
+						this.loadStatus = 'nomore';
+						return;
+					}
+
+					rows.forEach(row => {
+						if (row.coverImgUrl) {
+							row.coverImgUrl = this.$config.staticUrl + row.coverImgUrl
+						} else {
+							row.coverImgUrl = this.$config.staticUrl + this.defaultImgUrl
+						}
+					})
+					// 追加数据
+					this.flowList = this.flowList.concat(rows);
+
+					// 判断是否还有下一页（核心）
+					if (rows.length < this.pageSize) {
+						this.loadStatus = 'nomore';
+					} else {
+						this.pageNo++; // ✅ 只有这里能 +1
+						this.loadStatus = 'loadmore';
+					}
+
+				}).catch(err => {
+					console.log("获取资产信息失败：", err);
+					this.loadStatus = 'loadmore';
+				}).finally(() => {
+					uni.stopPullDownRefresh();
+				});
+			},
+			loadMore() {
+				// 只有在 loadStatus 为 'loadmore' 时才触发
+				if (this.loadStatus !== 'loadmore') return;
+				// 调用接口获取下一页
+				this.findHouseList();
+			},
+			findStreet() {
+
 			},
 			findVillageList() {
-				// 隐藏接口请求，使用前端写死的测试数据
-				// let url = "/api/houseApi/findVillageList";
-				// this.$u.get(url,{
-				// 	city:uni.getStorageSync('lifeData').vuex_city,
-				// 	orderByColumn: 'name',
-				// 	isAsc: 'desc'
-				// }).then(result => {
-				// 	const data = result.rows
-				// 	for (let i = 0; i < data.length; i++) {
-				// 	    // 先转成字符串再转成对象，避免数组对象引用导致数据混乱
-				// 	    let item = data[i]
-				// 		searchData[0].submenu.push({
-				// 			name: item.name,
-				// 			value: item.name
-				// 		})
-				// 	}
-				// 	this.filterData = searchData;
-				// });
-
 				// 前端写死的测试小区数据
-				const villageData = [{
-						name: '景秀天成'
-					},
-					{
-						name: '锦绣花园'
-					},
-					{
-						name: '阳光小区'
-					},
-					{
-						name: '幸福家园'
-					},
-					{
-						name: '碧水湾'
-					}
-				];
+				// const villageData = [{
+				// 		name: '景秀天成'
+				// 	},
+				// 	{
+				// 		name: '锦绣花园'
+				// 	},
+				// 	{
+				// 		name: '阳光小区'
+				// 	},
+				// 	{
+				// 		name: '幸福家园'
+				// 	},
+				// 	{
+				// 		name: '碧水湾'
+				// 	}
+				// ];
 
 				// 添加测试小区数据到筛选菜单
-				for (let i = 0; i < villageData.length; i++) {
-					searchData[0].submenu.push({
-						name: villageData[i].name,
-						value: villageData[i].name
-					});
-				}
-				this.filterData = searchData;
+				// for (let i = 0; i < villageData.length; i++) {
+				// 	searchData[0].submenu.push({
+				// 		name: villageData[i].name,
+				// 		value: villageData[i].name
+				// 	});
+				// }
+				// this.filterData = searchData;
 			},
 			clickImage(houseId) {
 				this.$u.route({
-					url: '/pages/detail/detail',
+					url: '/pages-assets/assets/detail',
 					params: {
-						houseId: houseId
+						assetsNo: houseId
 					}
 				})
 			},
@@ -330,11 +293,7 @@
 				if (feature && feature.length > 0) {
 					this.searchData.feature = feature.toString()
 				}
-				this.pageNum = 1
-				this.houseList = []
-				this.flowList = []
-				this.$refs.uWaterfall.clear();
-				this.findHouseList()
+				this.resetAndLoad()
 			},
 			code() {
 				this.$mytip.toast('请咨询技术支持')
diff --git a/pages-biz/tool/calculator.vue b/pages-biz/tool/calculator.vue
new file mode 100644
index 0000000..97c1e42
--- /dev/null
+++ b/pages-biz/tool/calculator.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="calculator">
+		<customNavbar title="计算器" :showHome="true" />
+
+		<input class="display" v-model="expression" disabled />
+
+		<view class="keys">
+			<view
+				v-for="item in keys"
+				:key="item"
+				class="key"
+				:class="{
+					operator: operators.includes(item) || item === '%',
+					equal: item === '=',
+					control: ['C','⌫'].includes(item)
+				}"
+				@click="press(item)"
+				@touchstart="onTouchStart(item)"
+				@touchend="onTouchEnd"
+			>
+				{{ item }}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			expression: '',
+			timer: null,
+			operators: ['+', '-', '*', '/'],
+			keys: [
+				'7','8','9','/',
+				'4','5','6','*',
+				'1','2','3','-',
+				'0','.','%','+',
+				'C','⌫',
+				'='
+			]
+		}
+	},
+	methods: {
+		press(key) {
+			const ops = this.operators
+
+			if (key === 'C') {
+				this.expression = ''
+				return
+			}
+
+			if (key === '⌫') {
+				return
+			}
+
+			if (key === '%') {
+				this.applyPercent()
+				return
+			}
+
+			if (key === '=') {
+				if (!this.expression) return
+
+				while (/[+\-*/.]$/.test(this.expression)) {
+					this.expression = this.expression.slice(0, -1)
+				}
+
+				if (!/^\d+(\.\d+)?([+\-*/]\d+(\.\d+)?)*$/.test(this.expression)) {
+					uni.showToast({ title: '格式错误', icon: 'none' })
+					return
+				}
+
+				this.expression = this.calculate(this.expression)
+				return
+			}
+
+			if (ops.includes(key)) {
+				if (!this.expression) return
+				if (ops.includes(this.expression.slice(-1))) {
+					this.expression =
+						this.expression.slice(0, -1) + key
+					return
+				}
+			}
+
+			if (key === '.') {
+				const last = this.expression.split(/[+\-*/]/).pop()
+				if (last.includes('.')) return
+			}
+
+			this.expression += key
+		},
+
+		/* 长按删除 */
+		onTouchStart(key) {
+			if (key !== '⌫') return
+
+			this.expression = this.expression.slice(0, -1)
+
+			this.timer = setInterval(() => {
+				if (!this.expression) {
+					clearInterval(this.timer)
+					return
+				}
+				this.expression = this.expression.slice(0, -1)
+			}, 120)
+		},
+
+		onTouchEnd() {
+			clearInterval(this.timer)
+			this.timer = null
+		},
+
+		/* 百分号处理（核心） */
+		applyPercent() {
+			if (!this.expression) return
+
+			const match = this.expression.match(/(\d+(\.\d+)?)([+\-*/])?(\d+(\.\d+)?)?$/)
+			if (!match) return
+
+			const base = parseFloat(match[1])
+			const op = match[3]
+			const value = match[4] ? parseFloat(match[4]) : null
+
+			let percentValue
+
+			if (!op) {
+				percentValue = base / 100
+				this.expression = percentValue.toString()
+				return
+			}
+
+			if (op === '+' || op === '-') {
+				percentValue = base * (value / 100)
+			} else {
+				percentValue = value / 100
+			}
+
+			this.expression =
+				this.expression.slice(0, match.index) +
+				base +
+				op +
+				percentValue
+		},
+
+		/* 计算（无 eval） */
+		calculate(exp) {
+			const nums = exp.split(/[\+\-\*\/]/).map(Number)
+			const ops = exp.match(/[\+\-\*\/]/g) || []
+
+			for (let i = 0; i < ops.length; ) {
+				if (ops[i] === '*' || ops[i] === '/') {
+					const r =
+						ops[i] === '*'
+							? nums[i] * nums[i + 1]
+							: nums[i] / nums[i + 1]
+
+					nums.splice(i, 2, r)
+					ops.splice(i, 1)
+				} else {
+					i++
+				}
+			}
+
+			let result = nums[0]
+			for (let i = 0; i < ops.length; i++) {
+				result =
+					ops[i] === '+'
+						? result + nums[i + 1]
+						: result - nums[i + 1]
+			}
+
+			return Number(result.toFixed(10)).toString()
+		}
+	}
+}
+</script>
+
+<style scoped>
+.calculator {
+	padding: 30rpx;
+	padding-top: 175rpx;
+	background: #f7f8fa;
+	min-height: 100vh;
+}
+
+.display {
+	height: 120rpx;
+	font-size: 44rpx;
+	font-weight: 600;
+	border-radius: 12rpx;
+	background: #fff;
+	padding: 0 24rpx;
+	margin-bottom: 30rpx;
+	box-shadow: 0 8rpx 20rpx rgba(0,0,0,0.08);
+}
+
+.keys {
+	display: grid;
+	grid-template-columns: repeat(4, 1fr);
+	gap: 24rpx;
+}
+
+.key {
+	background: #ffffff;
+	text-align: center;
+	padding: 36rpx 0;
+	font-size: 36rpx;
+	font-weight: 500;
+	border-radius: 16rpx;
+	box-shadow: 0 10rpx 20rpx rgba(0,0,0,0.08);
+}
+
+.key:active {
+	transform: scale(0.95);
+}
+
+.operator {
+	background: #ffe8d9;
+	color: #ff7a18;
+	box-shadow: 0 10rpx 20rpx rgba(255,122,24,0.35);
+	font-size: 40rpx;
+}
+
+.control {
+	background: #ff4d4f;
+	color: #fff;
+	box-shadow: 0 10rpx 20rpx rgba(255,77,79,0.4);
+}
+
+.equal {
+	grid-column: span 4;
+	background: linear-gradient(135deg, #4facfe, #00f2fe);
+	color: #fff;
+	font-size: 44rpx;
+	font-weight: 600;
+	box-shadow: 0 12rpx 28rpx rgba(79,172,254,0.5);
+}
+</style>
diff --git a/pages/unpaid/unpaid.vue b/pages-biz/unpaid/unpaid.vue
similarity index 82%
rename from pages/unpaid/unpaid.vue
rename to pages-biz/unpaid/unpaid.vue
index c5b9c2d..a757862 100644
--- a/pages/unpaid/unpaid.vue
+++ b/pages-biz/unpaid/unpaid.vue
@@ -1,25 +1,25 @@
 <template>
 	<view class="pending-bill-page">
 		<!-- 自定义导航栏 -->
-		<custom-navbar title="我的待付" />
+		<custom-navbar title="租金待付" />
 
 		<scroll-view scroll-y class="scroll-content" :refresher-enabled="true" :refresher-triggered="isRefreshing"
 			@refresherrefresh="refresh" @scrolltolower="loadMore">
-			<view v-if="bills.length > 0">
-				<view class="bill-item" v-for="item in bills" :key="item.id">
+			<view v-if="flowList.length > 0">
+				<view class="bill-item" v-for="item in flowList" :key="item.billNo">
 					<!-- 左侧勾选 + 信息 -->
 					<view class="bill-left">
 						<u-checkbox v-model="item.checked" @change="toggleCheck(item)" size="32"
 							active-color="#EA414A" />
 						<view class="bill-info">
-							<text class="bill-name">{{ item.feeName }}</text>
-							<text class="bill-date">缴费截止：<text class="date">{{ item.dueDate }}</text></text>
+							<text class="bill-name">{{ $ellipsis(item.billName,27) }}</text>
+							<text class="bill-date">缴费截止：<text class="date">{{ item.billPayEndDate }}</text></text>
 						</view>
 					</view>
 
 					<!-- 右侧金额 + 支付按钮 -->
 					<view class="bill-right">
-						<text class="amount">{{ formatMoney(item.amount) }}</text>
+						<text class="amount">{{ formatMoney(item.billAmount) }}</text>
 						<button class="pay-btn" @click="goPayTest([item])">去支付
 						</button>
 					</view>
@@ -38,8 +38,8 @@
 			<view class="batch-pay-bar-left"><text>已选 {{ selectedBills.length }} 项</text></view>
 			<view class="batch-pay-bar-center">
 				合计：<text class="sumAmount">{{ formatMoney(sumAmount) }}</text>
-      </view>
-      <view class="batch-pay-bar-right">
+			</view>
+			<view class="batch-pay-bar-right">
 				<button class="bottomPayBtn" color="linear-gradient(90deg, #007aff, #00aaff)" type="primary"
 					size="small" @click="goPayTest(selectedBills)">
 					批量支付
@@ -53,34 +53,49 @@
 	export default {
 		data() {
 			return {
-				bills: [],
+				pageNo: 1,
+				pageSize: 10,
+				flowList: [],
 				isRefreshing: false,
-				loadStatus: 'more',
+				loadStatus: 'loadmore',
 				sumAmount: 0,
 				selectedBills: [], // 勾选的账单集合
 			};
 		},
-		onLoad() {
+		onLoad(options) {
 			this.loadBills();
 		},
-		onShow() {},
+		onShow() {
+			this.$checkToken(this.$getToken())
+		},
 		methods: {
 			loadBills() {
-				this.bills = [{
-						id: 'p101',
-						feeName: '第一期租金（2024.12.01-2024.12.31）',
-						dueDate: '2024-12-15',
-						amount: 300000,
-						checked: false,
-					},
-					{
-						id: 'p102',
-						feeName: '第二期物业费（2025.01.01-2025.01.31）',
-						dueDate: '2025-01-15',
-						amount: 500,
-						checked: false,
-					},
-				];
+				if (this.loadStatus !== 'loadmore') return;
+				this.loadStatus = 'loading';
+				const token = this.$getToken()
+				let url = '/bill/pageQueryContractBill'
+				this.$u.post(url, {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					billStatus: '待缴费'
+				}, {
+					WT: token
+				}).then(res => {
+					const rows = res.data.result || [];
+					console.log(rows)
+					
+					if (this.pageNo === 1) this.flowList = [];
+					this.flowList = this.flowList.concat(rows);
+					if (rows.length < this.pageSize) {
+						this.loadStatus = 'nomore';
+					} else {
+						this.pageNo++;
+						this.loadStatus = 'loadmore';
+					}
+				}).catch(err => {
+					console.log("获取待付合同账单记录失败：", err)
+					this.loadStatus = 'loadmore';
+				})
 				this.updateSelected();
 			},
 			refresh() {
@@ -92,7 +107,7 @@
 			},
 
 			loadMore() {
-				this.loadStatus = 'noMore';
+				this.loadBills();
 			},
 
 			formatMoney(val) {
@@ -222,7 +237,7 @@
 	.pending-bill-page {
 		background: #f7f8fa;
 		min-height: 100vh;
-		padding-top: 120rpx;
+		padding-top: 175rpx;
 		/* 自定义导航栏高度 */
 	}
 
@@ -260,7 +275,7 @@
 				color: #86868C;
 				margin-top: 6rpx;
 
-				.date{
+				.date {
 					font-size: 24rpx;
 					color: #2D2B2C;
 				}
@@ -317,15 +332,15 @@
 			color: #86868C;
 		}
 
-    .batch-pay-bar-center {
-      font-size: 28rpx;
-      color: #222222;
+		.batch-pay-bar-center {
+			font-size: 28rpx;
+			color: #222222;
 
 			.sumAmount {
 				font-size: 28rpx;
 				color: #ff7f00;
 			}
-    }
+		}
 
 		.batch-pay-bar-right {
 			flex-direction: column;
diff --git a/pages-biz/vr/vr.vue b/pages-biz/vr/vr.vue
new file mode 100644
index 0000000..002c299
--- /dev/null
+++ b/pages-biz/vr/vr.vue
@@ -0,0 +1,438 @@
+<template>
+	<view class="vr-page">
+		<!-- 返回按钮 -->
+		<view class="back-btn" @click="back">‹ 返回</view>
+
+		<!-- 主 Canvas -->
+		<canvas canvas-id="vrCanvas" class="vr-canvas" @touchstart="onTouchStart" @touchmove="onTouchMove"
+			@touchend="onTouchEnd"></canvas>
+
+		<!-- 左上角 3D mini preview -->
+		<canvas v-if="currentSpace.type==='model'" canvas-id="miniCanvas" class="mini-canvas"></canvas>
+
+		<!-- Hotspot 点击由 Three.js raycaster 处理 -->
+
+		<!-- 底栏 -->
+		<view class="bottom-bar">
+			<!-- 左侧空间切换 -->
+			<view class="left">
+				<button @click="showSpaceList = !showSpaceList">
+					<image src="/static/icons/space.png" />
+				</button>
+			</view>
+			<!-- 右侧工具 -->
+			<view class="right">
+				<button @click="showTools = !showTools">
+					<image src="/static/icons/tools.png" />
+				</button>
+			</view>
+		</view>
+
+		<!-- 空间缩略图弹窗 -->
+		<view v-if="showSpaceList" class="space-list">
+			<view v-for="space in spaces" :key="space.id" class="space-item" @click="switchSpace(space.id)">
+				<image :src="space.thumbnail" />
+				<text>{{ space.name }}</text>
+			</view>
+		</view>
+
+		<!-- 工具栏弹窗 -->
+		<view v-if="showTools" class="tools-panel">
+			<button @click="resetView">重置视角</button>
+			<button @click="toggleFullScreen">全屏</button>
+			<button @click="takePhoto">拍照</button>
+		</view>
+
+		<!-- 上一/下一空间按钮 -->
+		<view class="switch-btn left" @click="prevSpace">‹</view>
+		<view class="switch-btn right" @click="nextSpace">›</view>
+	</view>
+</template>
+
+<script>
+	import * as THREE from 'three'
+	import {
+		GLTFLoader
+	} from 'three/examples/jsm/loaders/GLTFLoader.js'
+
+	export default {
+		name: 'VRView',
+		data() {
+			return {
+				spaces: [], // VR 空间数组
+				currentIndex: 0,
+				currentSpace: null,
+
+				// Three.js 主场景
+				renderer: null,
+				scene: null,
+				camera: null,
+				sphere: null,
+				videoTexture: null,
+
+				// Mini 3D模型
+				miniRenderer: null,
+				miniScene: null,
+				miniCamera: null,
+				miniModel: null,
+
+				// Hotspot
+				raycaster: null,
+				mouse: new THREE.Vector2(),
+
+				// 触控
+				isDragging: false,
+				lastX: 0,
+				lastY: 0,
+				lon: 0,
+				lat: 0,
+
+				// UI
+				showSpaceList: false,
+				showTools: false
+			}
+		},
+		onLoad(options) {
+			if (options.vrList) {
+				try {
+					// JSON.parse(decodeURIComponent(options.spaces))
+					this.spaces = options.vrList
+				} catch (e) {
+					console.error('解析 VR 空间失败', e)
+				}
+			}
+			this.currentSpace = this.spaces[this.currentIndex]
+			this.initThree()
+		},
+		methods: {
+			back() {
+				const pages = getCurrentPages();
+				if (pages.length > 1) {
+				  uni.navigateBack();
+				} else {
+				  uni.switchTab({
+				  		url:'/pages/index/index'
+				  	})
+				}
+			},
+
+			// ==================== Three.js 主场景 ====================
+			initThree() {
+				const canvasQuery = uni.createSelectorQuery()
+				canvasQuery.select('#vrCanvas').node().exec(res => {
+					const canvasNode = res[0].node
+					const {
+						windowWidth: width,
+						windowHeight: height
+					} = uni.getSystemInfoSync()
+
+					// 主 renderer
+					this.renderer = new THREE.WebGLRenderer({
+						canvas: canvasNode,
+						antialias: true
+					})
+					this.renderer.setSize(width, height)
+
+					// scene & camera
+					this.scene = new THREE.Scene()
+					this.camera = new THREE.PerspectiveCamera(75, width / height, 0.1, 2000)
+					this.camera.position.set(0, 0, 0.01)
+
+					// raycaster
+					this.raycaster = new THREE.Raycaster()
+
+					this.loadSpace(this.currentSpace)
+					this.animate()
+				})
+			},
+
+			// 加载空间
+			loadSpace(space) {
+				// 清空场景
+				while (this.scene.children.length) this.scene.remove(this.scene.children[0])
+				if (this.videoTexture) {
+					this.videoTexture = null
+				}
+
+				// 图片
+				if (space.type === 'image') {
+					const geometry = new THREE.SphereGeometry(500, 60, 40)
+					geometry.scale(-1, 1, 1)
+					const texture = new THREE.TextureLoader().load(space.src)
+					const material = new THREE.MeshBasicMaterial({
+						map: texture
+					})
+					this.sphere = new THREE.Mesh(geometry, material)
+					this.scene.add(this.sphere)
+				}
+				// CubeMap
+				else if (space.type === 'cubemap') {
+					const urls = [space.cubemap.px, space.cubemap.nx, space.cubemap.py, space.cubemap.ny, space.cubemap.pz,
+						space.cubemap.nz
+					]
+					const cubeTexture = new THREE.CubeTextureLoader().load(urls)
+					this.scene.background = cubeTexture
+				}
+				// 视频
+				else if (space.type === 'video') {
+					const video = document.createElement('video')
+					video.src = space.src
+					video.crossOrigin = 'anonymous'
+					video.loop = true
+					video.muted = false
+					video.autoplay = true
+					video.play()
+					this.videoTexture = new THREE.VideoTexture(video)
+					const geometry = new THREE.SphereGeometry(500, 60, 40)
+					geometry.scale(-1, 1, 1)
+					const material = new THREE.MeshBasicMaterial({
+						map: this.videoTexture
+					})
+					this.sphere = new THREE.Mesh(geometry, material)
+					this.scene.add(this.sphere)
+				}
+				// 模型
+				else if (space.type === 'model') {
+					const loader = new GLTFLoader()
+					loader.load(space.src, gltf => {
+						this.sphere = gltf.scene
+						this.sphere.scale.set(space.modelScale, space.modelScale, space.modelScale)
+						this.scene.add(this.sphere)
+						this.initMiniModel(gltf.scene.clone(), space.modelScale)
+					})
+				}
+
+				// Hotspots
+				if (space.hotspots && space.hotspots.length) {
+					space.hotspots.forEach(h => {
+						const spriteMap = new THREE.TextureLoader().load('/static/icons/hotspot.png')
+						const spriteMaterial = new THREE.SpriteMaterial({
+							map: spriteMap
+						})
+						const sprite = new THREE.Sprite(spriteMaterial)
+						const phi = THREE.MathUtils.degToRad(90 - h.position.lat)
+						const theta = THREE.MathUtils.degToRad(h.position.lon)
+						const radius = 500
+						sprite.position.set(
+							radius * Math.sin(phi) * Math.cos(theta),
+							radius * Math.cos(phi),
+							radius * Math.sin(phi) * Math.sin(theta)
+						)
+						sprite.userData.targetId = h.targetId
+						this.scene.add(sprite)
+					})
+				}
+			},
+
+			animate() {
+				requestAnimationFrame(this.animate)
+				// 相机旋转
+				const phi = THREE.MathUtils.degToRad(90 - this.lat)
+				const theta = THREE.MathUtils.degToRad(this.lon)
+				this.camera.target = new THREE.Vector3(
+					500 * Math.sin(phi) * Math.cos(theta),
+					500 * Math.cos(phi),
+					500 * Math.sin(phi) * Math.sin(theta)
+				)
+				this.camera.lookAt(this.camera.target)
+				this.renderer.render(this.scene, this.camera)
+
+				// mini 模型同步旋转
+				if (this.currentSpace.type === 'model' && this.miniModel) {
+					this.miniModel.rotation.y = this.camera.rotation.y
+					this.miniRenderer.render(this.miniScene, this.miniCamera)
+				}
+			},
+
+			// ==================== Mini 3D 模型 ====================
+			initMiniModel(model, scale) {
+				const canvasQuery = uni.createSelectorQuery()
+				canvasQuery.select('#miniCanvas').node().exec(res => {
+					const canvasNode = res[0].node
+					this.miniRenderer = new THREE.WebGLRenderer({
+						canvas: canvasNode,
+						antialias: true,
+						alpha: true
+					})
+					this.miniRenderer.setSize(150, 150)
+					this.miniScene = new THREE.Scene()
+					this.miniCamera = new THREE.PerspectiveCamera(75, 1, 0.1, 2000)
+					this.miniCamera.position.set(0, 50, 100)
+					this.miniModel = model
+					this.miniScene.add(this.miniModel)
+				})
+			},
+
+			// ==================== 空间切换 ====================
+			switchSpace(id) {
+				const index = this.spaces.findIndex(s => s.id === id)
+				if (index >= 0) {
+					this.currentIndex = index
+					this.currentSpace = this.spaces[index]
+					this.loadSpace(this.currentSpace)
+					this.showSpaceList = false
+				}
+			},
+			prevSpace() {
+				this.currentIndex = (this.currentIndex - 1 + this.spaces.length) % this.spaces.length;
+				this.switchSpace(this.spaces[this.currentIndex].id)
+			},
+			nextSpace() {
+				this.currentIndex = (this.currentIndex + 1) % this.spaces.length;
+				this.switchSpace(this.spaces[this.currentIndex].id)
+			},
+
+			// ==================== 手势 ====================
+			onTouchStart(e) {
+				this.isDragging = true;
+				const t = e.touches[0];
+				this.lastX = t.clientX;
+				this.lastY = t.clientY
+			},
+			onTouchMove(e) {
+				if (!this.isDragging) return;
+				const t = e.touches[0];
+				const dx = t.clientX - this.lastX;
+				const dy = t.clientY - this.lastY;
+				this.lastX = t.clientX;
+				this.lastY = t.clientY;
+				this.lon -= dx * 0.1;
+				this.lat += dy * 0.1;
+				this.lat = Math.max(-85, Math.min(85, this.lat))
+			},
+			onTouchEnd() {
+				this.isDragging = false
+			},
+
+			// ==================== 工具栏功能示例 ====================
+			resetView() {
+				this.lon = 0;
+				this.lat = 0
+			},
+			toggleFullScreen() {
+				uni.setScreenBrightness({
+					value: 1
+				})
+			}, // 示例
+			takePhoto() {
+				console.log('拍照功能可扩展')
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.vr-page {
+		width: 100%;
+		height: 100%;
+		background: #000;
+		position: relative
+	}
+
+	.vr-canvas {
+		width: 100%;
+		height: 100%;
+		display: block
+	}
+
+	.mini-canvas {
+		position: absolute;
+		top: 20rpx;
+		left: 20rpx;
+		width: 150rpx;
+		height: 150rpx;
+		z-index: 10;
+		border: 1px solid #ccc;
+		border-radius: 6rpx
+	}
+
+	.back-btn {
+		position: absolute;
+		top: 40rpx;
+		left: 20rpx;
+		color: #fff;
+		font-size: 28rpx;
+		z-index: 10
+	}
+
+	.bottom-bar {
+		position: absolute;
+		bottom: 0;
+		width: 100%;
+		height: 80rpx;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 20rpx;
+		z-index: 10
+	}
+
+	.bottom-bar .left,
+	.bottom-bar .right {
+		display: flex;
+		align-items: center
+	}
+
+	.space-list {
+		position: absolute;
+		bottom: 80rpx;
+		left: 0;
+		width: 100%;
+		height: 150rpx;
+		background: rgba(0, 0, 0, 0.7);
+		display: flex;
+		overflow-x: scroll;
+		padding: 10rpx
+	}
+
+	.space-list .space-item {
+		margin-right: 10rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center
+	}
+
+	.space-list image {
+		width: 120rpx;
+		height: 80rpx;
+		border-radius: 6rpx
+	}
+
+	.tools-panel {
+		position: absolute;
+		bottom: 80rpx;
+		right: 0;
+		width: 200rpx;
+		background: rgba(0, 0, 0, 0.7);
+		display: flex;
+		flex-direction: column;
+		padding: 10rpx
+	}
+
+	.tools-panel button {
+		margin-bottom: 10rpx;
+		color: #fff
+	}
+
+	.switch-btn {
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		z-index: 10;
+		color: #fff;
+		font-size: 60rpx;
+		background: rgba(0, 0, 0, 0.3);
+		width: 80rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		border-radius: 50%
+	}
+
+	.switch-btn.left {
+		left: 20rpx
+	}
+
+	.switch-btn.right {
+		right: 20rpx
+	}
+</style>
\ No newline at end of file
diff --git a/pages/wae/wae.vue b/pages-biz/wae/wae.vue
similarity index 85%
rename from pages/wae/wae.vue
rename to pages-biz/wae/wae.vue
index 1a73b08..7cbe532 100644
--- a/pages/wae/wae.vue
+++ b/pages-biz/wae/wae.vue
@@ -1,25 +1,25 @@
 <template>
 	<view class="pending-bill-page">
 		<!-- 自定义导航栏 -->
-		<custom-navbar title="水电缴费" />
+		<custom-navbar title="水电费待付" />
 
 		<scroll-view scroll-y class="scroll-content" :refresher-enabled="true" :refresher-triggered="isRefreshing"
 			@refresherrefresh="refresh" @scrolltolower="loadMore">
 			<view v-if="bills.length > 0">
-				<view class="bill-item" v-for="item in bills" :key="item.id">
+				<view class="bill-item" v-for="item in bills" :key="item.billNo">
 					<!-- 左侧勾选 + 信息 -->
 					<view class="bill-left">
 						<u-checkbox v-model="item.checked" @change="toggleCheck(item)" size="32"
 							active-color="#EA414A" />
 						<view class="bill-info">
-							<text class="bill-name">{{ item.feeName }}</text>
-							<text class="bill-date">缴费截止：<text class="date">{{ item.dueDate }}</text></text>
+							<text class="bill-name">{{ item.billName }}</text>
+							<text class="bill-date">缴费截止：<text class="date">{{ item.billEndDate }}</text></text>
 						</view>
 					</view>
 
 					<!-- 右侧金额 + 支付按钮 -->
 					<view class="bill-right">
-						<text class="amount">{{ formatMoney(item.amount) }}</text>
+						<text class="amount">{{ formatMoney(item.billAmount) }}</text>
 						<button class="pay-btn" @click="goPayTest([item])">去支付
 						</button>
 					</view>
@@ -38,8 +38,8 @@
 			<view class="batch-pay-bar-left"><text>已选 {{ selectedBills.length }} 项</text></view>
 			<view class="batch-pay-bar-center">
 				合计：<text class="sumAmount">{{ formatMoney(sumAmount) }}</text>
-      </view>
-      <view class="batch-pay-bar-right">
+			</view>
+			<view class="batch-pay-bar-right">
 				<button class="bottomPayBtn" color="linear-gradient(90deg, #007aff, #00aaff)" type="primary"
 					size="small" @click="goPayTest(selectedBills)">
 					批量缴费
@@ -53,34 +53,48 @@
 	export default {
 		data() {
 			return {
+				pageNo: 1,
+				pageSize: 10,
 				bills: [],
 				isRefreshing: false,
-				loadStatus: 'more',
+				loadStatus: 'loadmore',
 				sumAmount: 0,
 				selectedBills: [], // 勾选的账单集合
 			};
 		},
-		onLoad() {
+		onLoad(options) {
 			this.loadBills();
 		},
-		onShow() {},
+		onShow() {
+			this.$checkToken(this.$getToken())
+		},
 		methods: {
 			loadBills() {
-				this.bills = [{
-						id: 1,
-						feeName: '电费（2025.10）',
-						dueDate: '2025-11-20',
-						amount: 120.5,
-						checked: false
-					},
-					{
-						id: 2,
-						feeName: '水费（2025.10）',
-						dueDate: '2025-11-22',
-						amount: 60.2,
-						checked: false
-					}
-				];
+				if (this.loadStatus !== 'loadmore') return;
+				this.loadStatus = 'loading';
+				const token = this.$getToken();
+				let url = '/bill/pageQueryWaeBill'
+				this.$u.post(url, {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize
+
+				}, {
+					WT: token
+				}).then(
+					result => {
+						const rows = result.data.result || [];
+
+						if (this.pageNo === 1) this.bills = [];
+
+						this.bills = this.bills.concat(rows);
+
+						if (rows.length < this.pageSize) {
+							this.loadStatus = 'nomore';
+						} else {
+							this.pageNo++;
+							this.loadStatus = 'loadmore';
+						}
+					})
 				this.updateSelected();
 			},
 			refresh() {
@@ -92,7 +106,7 @@
 			},
 
 			loadMore() {
-				this.loadStatus = 'noMore';
+				this.loadBills()
 			},
 
 			formatMoney(val) {
@@ -222,7 +236,7 @@
 	.pending-bill-page {
 		background: #f7f8fa;
 		min-height: 100vh;
-		padding-top: 120rpx;
+		padding-top: 175rpx;
 		/* 自定义导航栏高度 */
 	}
 
@@ -259,8 +273,8 @@
 				font-size: 24rpx;
 				color: #86868C;
 				margin-top: 6rpx;
-				
-				.date{
+
+				.date {
 					font-size: 24rpx;
 					color: #2D2B2C;
 				}
@@ -317,15 +331,15 @@
 			color: #86868C;
 		}
 
-    .batch-pay-bar-center {
-      font-size: 28rpx;
-      color: #222222;
+		.batch-pay-bar-center {
+			font-size: 28rpx;
+			color: #222222;
 
 			.sumAmount {
 				font-size: 28rpx;
 				color: #ff7f00;
 			}
-    }
+		}
 
 		.batch-pay-bar-right {
 			flex-direction: column;
diff --git a/pages-biz/wae/waeRecords.vue b/pages-biz/wae/waeRecords.vue
new file mode 100644
index 0000000..b96a7b7
--- /dev/null
+++ b/pages-biz/wae/waeRecords.vue
@@ -0,0 +1,195 @@
+<template>
+  <view class="water-electric-page">
+    <!-- 页面标题栏 -->
+   <customNavbar title="水电费明细" />
+    <!-- 空状态 -->
+   
+
+    <!-- 列表部分 -->
+	<!-- 收支记录列表 -->
+	<scroll-view scroll-y class="scroll-content" @scrolltolower="loadMore">
+		<view v-if="flowList.length > 0" class="record-list">
+		  <view
+		    class="record-item"
+		    v-for="(item, index) in flowList"
+		    :key="index"
+		    @click="toDetail(item)"
+		  >
+			<!-- <view class="record-icon">
+				<image src="/static/icon/水费.png" class="icon-1" v-if="item.feeType=='水费'"></image>
+				<image src="/static/icon/电费.png" class="icon-2" v-else></image>
+			</view> -->
+		    <!-- 左侧信息 -->
+		    <view class="record-left">
+		      <text class="record-title">{{ item.itemName }}</text>
+		      <text class="record-time">支付时间：{{ item.payDate }}</text>
+		    </view>
+		    <!-- 右侧金额 + 箭头 -->
+		    <view class="record-right">
+		      <view class="amount">
+		        ￥{{ item.itemAmount.toFixed(2) }}
+		        <u-icon name="arrow-right" size="20" color="#ccc"></u-icon>
+		      </view>
+		    </view>
+		  </view>
+		</view>
+	
+	<view v-if="records.length === 0" class="empty">
+	  <image src="/static/empty.png" mode="aspectFit" />
+	  <text>暂明细记录</text>
+	</view>
+	</scroll-view>
+   
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+	  pageNo: 1,
+	  pageSize:10,
+	  flowList: [],
+	  loadStatus: 'loadmore'
+    };
+  },
+  onShow() {
+  	this.$checkToken(this.$getToken())
+  },
+  onLoad() {
+  	this.fetchDataList();
+  },
+  methods: {
+	fetchDataList(){
+		if (this.loadStatus !== 'loadmore') return;
+		   this.loadStatus = 'loading';
+		let url = '/bill/pageQueryPayRecord'
+		this.$u.post(url, {
+			pageNo: this.pageNo,
+			pageSize: this.pageSize,
+			recordType:'wae'
+		},{
+			WT: this.$getToken()
+		}).then(res => {
+			const rows = res.data.result || [];
+			console.log(rows)
+			if (this.pageNo === 1) this.flowList = [];
+			this.flowList = this.flowList.concat(rows);
+			if (rows.length < this.pageSize) {
+			  this.loadStatus = 'nomore';
+			} else {
+			  this.pageNo++;
+			  this.loadStatus = 'loadmore';
+			}
+		}).catch(err => {
+			console.log("获取水电费账单缴费记录失败：", err)
+			this.loadStatus = 'loadmore';
+		})
+	},
+	loadMore() {
+		// 只有在 loadStatus 为 'loadmore' 时才触发
+		if (this.loadStatus !== 'loadmore') return;
+		// 调用接口获取下一页
+		this.fetchDataList();
+	},
+    toDetail(item) {
+
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.water-electric-page {
+  padding: 175rpx 20rpx 20rpx 20rpx;
+  
+  .header {
+    background-color: #fff;
+    padding: 30rpx;
+    border-radius: 16rpx;
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
+    text-align: center;
+
+    .title {
+      font-size: 32rpx;
+      font-weight: 600;
+    }
+  }
+
+  .record-list {
+    margin-top: 20rpx;
+  }
+
+  .record-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background: #fff;
+    border-radius: 16rpx;
+    margin-bottom: 20rpx;
+    padding: 24rpx 30rpx;
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
+	
+	.record-icon{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		.icon-1{
+			width: 33rpx;
+			height: 47rpx;
+		}
+		
+		.icon-2{
+			width: 35rpx;
+			height: 57rpx;
+		}
+	}
+
+    .record-left {
+      display: flex;
+      flex-direction: column;
+      gap: 10rpx;
+
+      .record-title {
+        font-size: 30rpx;
+        font-weight: 500;
+        color: #2D2B2C;
+      }
+
+      .record-time {
+        font-size: 24rpx;
+        color: #86868C;
+      }
+    }
+
+    .record-right {
+      display: flex;
+      align-items: center;
+      font-size: 30rpx;
+      font-weight: 400;
+      color: #222222;
+
+      .amount {
+        display: flex;
+        align-items: center;
+        gap: 8rpx;
+      }
+    }
+  }
+
+  .empty {
+    margin-top: 200rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    color: #aaa;
+    font-size: 28rpx;
+
+    image {
+      width: 200rpx;
+      height: 200rpx;
+      margin-bottom: 20rpx;
+    }
+  }
+}
+</style>
diff --git a/pages-biz/webview/webview.vue b/pages-biz/webview/webview.vue
new file mode 100644
index 0000000..2e1beae
--- /dev/null
+++ b/pages-biz/webview/webview.vue
@@ -0,0 +1,72 @@
+<template>
+ <view class="container">
+   <web-view v-if="src" :src="src" bindmessage="handleGetMessage"></web-view>
+ </view>
+</template>
+ 
+<script>
+export default {
+  data() {
+    return {
+      src: '' // WebView URL
+    }
+  },
+
+  // 页面加载
+  onLoad(e) {
+      let url = e.url || ''
+        try {
+          url = decodeURIComponent(url)
+        } catch (err) {
+          console.warn('decode error', url)
+        }
+	console.log("签署链接:" + url)
+	 // 强制刷新 WebView
+	    this.src = ''
+	    this.$nextTick(() => {
+	      this.src = url
+	      console.log('webview src set:', this.src)
+	    })
+  },
+
+  methods: {
+    /**
+     * 刷脸完成后重新加载页面
+     */
+    reloadPage(redirectUrl) {
+      console.log('---webview reloadPage', redirectUrl)
+      this.src = redirectUrl || this.src
+    },
+
+    /**
+     * 消息通知回调处理
+     * H5 / App / 小程序都可以调用
+     */
+    handleGetMessage(e) {
+      console.log('handleGetMessage', e)
+      const data = e.detail?.data?.[0]
+      if (data && data.result === 'success') {
+        // 跳转中转页
+        // #ifdef MP-WEIXIN
+        wx.navigateBack()
+        // #endif
+
+        // #ifdef H5
+            if (window.history.length > 1) {
+              window.history.go(-delta)
+            } else {
+              // 没有上一页就跳首页
+              this.$router.replace('/')
+            }
+            return
+        // #endif
+
+        // #ifdef APP-PLUS
+        // 这里根据你 APP 路由跳转方法
+        // plus.webview.open('/redirect/bizpage')
+        // #endif
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 8fcd4f2..5cef9ae 100644
--- a/pages.json
+++ b/pages.json
@@ -6,7 +6,7 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
+				"navigationStyle": "custom", // 隐藏系统导航栏
 				"navigationBarTitleText": "启辰资产",
 				"enablePullDownRefresh": true,
 				"app-plus": {
@@ -21,357 +21,293 @@
 		{
 			"path": "pages/center/center",
 			"style": {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
+				"navigationStyle": "custom", // 隐藏系统导航栏
 				"navigationBarTitleText": "我的"
 			}
 		}
-		,{
-		    "path" : "pages/form/leaseCancel",
-		    "style" :                                                                                    
-		    {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-		        "navigationBarTitleText": "退租申请",
-		        "enablePullDownRefresh": false
-		    }
-		}
-	    ,{
-            "path" : "pages/login/login",
-            "style" :                                                                                    
-            {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-                "navigationBarTitleText": "密码登录",
-                "enablePullDownRefresh": false
-            }
-        }
-		,{
-		    "path" : "pages/login/code",
-		    "style" :                                                                                    
-		    {
-				// "navigationStyle": "custom" ,// 隐藏系统导航栏
-		        "navigationBarTitleText": "获取验证码",
-		        "enablePullDownRefresh": false
-		    }
-		}
-		,{
-		    "path" : "pages/login/account",
-		    "style" :                                                                                    
-		    {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-		        "navigationBarTitleText": "短信登录",
-		        "enablePullDownRefresh": false
-		    }
-		}	
-		,{
-		    "path" : "pages/message/message",
-		    "style" :                                                                                    
-		    {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-		        "navigationBarTitleText": "我的消息",
-		        "enablePullDownRefresh": false
-		    }
-		}
-		,{
-		    "path" : "pages/login/problem",
-		    "style" :                                                                                    
-		    {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-		        "navigationBarTitleText": "常见问题",
-		        "enablePullDownRefresh": false
-		    }
-		},
+	
+	],
+	"subPackages": [
 		{
-		    "path" : "pages/center/myLease",
-		    "style" :                                                                                    
-		    {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-		        "navigationBarTitleText": "我的租赁资产"
-		    }
-		},
-		{
-		    "path" : "pages/wae/wae",
-		    "style" :                                                                                    
-		    {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-		        "navigationBarTitleText": "水电缴费"
-		    }
-		},
-		{
-		    "path" : "pages/bill/payHistory",
-		    "style" :                                                                                    
-		    {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-		        "navigationBarTitleText": "缴费记录"
-		    }
-		},
-		{
-		    "path" : "pages/wae/waeRecords",
-		    "style" :                                                                                    
-		    {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-		        "navigationBarTitleText": "水电费明细"
-		    }
-		}
-        ,{
-            "path" : "pages/profile/setting",
-            "style" :                                                                                    
-            {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-        },
-		{
-		    "path" : "pages/profile/profile",
-		    "style" :                                                                                    
-		    {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-		        "enablePullDownRefresh": false
-		    }
-		}
-        ,{
-            "path" : "pages/profile/password",
-            "style" :                                                                                    
-            {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-                "navigationBarTitleText": "修改密码",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/search/search",
-            "style" :                                                                                    
-            {
-               "navigationStyle": "custom" ,// 隐藏系统导航栏
-                "enablePullDownRefresh": false
+			"root": "pages-biz",
+			"pages": [
+				{
+					"path": "message/message",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "我的消息",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "message/messageDetail",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "消息详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "profile/setting",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "profile/profile",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"enablePullDownRefresh": false
+					}
+				}, 
+				{
+					"path": "contract/contract",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "我的合同"
+					}
+				},
+				{
+					"path": "contract/contractDetail",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "合同详情"
+					}
 				
-            }
-            
-        }
-		,{
-		    "path" : "pages/location/location",
-		    "style": {
-		    	"navigationStyle": "custom" ,// 隐藏系统导航栏
-		    	"navigationBarTitleText": "选择城市"
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/notice/notice",
-            "style" :                                                                                    
-            {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-				"navigationBarTitleText": "通知公告"
-            }
-            
-        },
-		{
-		    "path" : "pages/notice/noticeDetail",
-		    "style": {
-		    	"navigationStyle": "custom" ,// 隐藏系统导航栏
-		    	"navigationBarTitleText": "资讯"
-		    }
-		},
-		{
-		    "path" : "pages/center/contract",
-		    "style": {
-		    	"navigationStyle": "custom" ,// 隐藏系统导航栏
-		    	"navigationBarTitleText": "我的合同"
-		    }
-		},
-		  {
-            "path" : "pages/detail/contractDetail",
-		    "style": {
-		    	"navigationStyle": "custom" ,// 隐藏系统导航栏
-		    	"navigationBarTitleText": "合同详情"
-		    }
-            
-        },
-		{
-		    "path" : "pages/profile/aboutMe",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "关于我",
-		        "enablePullDownRefresh": false,
-				"navigationStyle": "custom" // 隐藏系统导航栏
-		    }
-		    
-		},
-		{
-		    "path" : "pages/bill/bill",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "我的账单",
-				"navigationStyle": "custom" // 隐藏系统导航栏
-		    }
-		    
-		},
-		{
-		    "path" : "pages/bill/billDetail",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "账单详情",
-				"navigationStyle": "custom" // 隐藏系统导航栏
-		    }
-		    
-		},
-		{
-		    "path" : "pages/unpaid/unpaid",
-		    "style": {
-		    	"navigationStyle": "custom" ,// 隐藏系统导航栏
-		    	"navigationBarTitleText": "我的待付"
-		    }
-		},
-        {
-            "path" : "pages/search/searchList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "资产列表",
-				"enablePullDownRefresh": true,
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-				"app-plus": {
-					"pullToRefresh": {
-						"support": true,
-						"color": "#2979ff", //小圈圈的颜色
-						"style": "circle" //小圈圈的样式
+				},
+				{
+					"path": "face/faceAuth",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "扫脸识别"
+					}
+				
+				},
+				{
+					"path": "privacy/userAgreement",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "用户协议"
+					}
+				},
+				{
+					"path": "privacy/privacyPolicy",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "隐私协议"
+					}
+				},
+				{
+					"path": "myrent/myLease",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "我的租赁资产"
+					}
+				},
+				{
+					"path": "wae/wae",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "水电缴费"
+					}
+				},
+
+				{
+					"path": "wae/waeRecords",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "水电费明细"
+					}
+				},
+				{
+					"path": "bill/payHistory",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "缴费记录"
+					}
+				},
+				{
+					"path": "bill/bill",
+					"style": {
+						"navigationBarTitleText": "我的账单",
+						"navigationStyle": "custom" // 隐藏系统导航栏
+					}
+
+				},
+				{
+					"path": "bill/billDetail",
+					"style": {
+						"navigationBarTitleText": "账单详情",
+						"navigationStyle": "custom" // 隐藏系统导航栏
+					}
+
+				},
+				{
+					"path": "unpaid/unpaid",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "我的待付"
+					}
+				},
+				{
+					"path": "login/login",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "密码登录",
+						"enablePullDownRefresh": false
+					}
+				}, 
+				{
+					"path": "search/search",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"enablePullDownRefresh": false
+				
+					}
+				
+				}, 
+				{
+					"path": "location/location",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "选择城市"
+					}
+				
+				}, 
+				{
+					"path": "notice/notice",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "通知公告"
+					}
+				
+				},
+				{
+					"path": "notice/noticeDetail",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "资讯"
+					}
+				},
+				{
+					"path": "search/searchList",
+					"style": {
+						"navigationBarTitleText": "资产列表",
+						"enablePullDownRefresh": true,
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"app-plus": {
+							"pullToRefresh": {
+								"support": true,
+								"color": "#2979ff", //小圈圈的颜色
+								"style": "circle" //小圈圈的样式
+							}
+						}
+					}
+				
+				},
+				{
+					"path": "chooseAddress/index",
+					"style": {
+						"navigationBarBackgroundColor": "#f8f8f8",
+						"navigationBarTitleText": "地图",
+						"backgroundColorTop": "#f8f8f8",
+						"backgroundColorBottom": "#ffffff"
+					}
+				},
+				{
+					"path": "chooseAddress/search",
+					"style": {
+						"navigationBarTitleText": "地址搜索"
+					}
+				}, 
+				{
+					"path": "chooseAddress/cityList",
+					"style": {
+						"navigationBarTitleText": "选择城市"
+					}
+				}, 
+				{
+					"path": "webview/webview",
+					"style": {
+						"navigationBarTitleText": "伍家国投"
+					}
+				},
+				{
+					"path": "reserve/reserveRecords",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "我的预约",
+						"enablePullDownRefresh": false
+					}   
+				},
+				{
+					"path": "vr/vr",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "vr看资产",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "tool/calculator",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "计算器",
+						"enablePullDownRefresh": false
 					}
 				}
-            }
-            
-        }
-        ,{
-            "path" : "pages/detail/assetsDetail",
-            "style" :                                                                                    
-            {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-                "navigationBarTitleText": "资产详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/detail/addHouse",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "房源",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/detail/preHouse",
-            "style" :                                                                                    
-            {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-                "navigationBarTitleText": "预增房源",
-                "enablePullDownRefresh": false
-            }
-        }
-        ,{
-            "path" : "pages/center/tips",
-            "style" : {
-                "navigationStyle": "custom" ,// 隐藏系统导航栏
-                "navigationBarTitleText": "避坑指南"
-            }
-        },
-		{
-            "path" : "pages/center/order",
-            "style" :                                                                                    
-            {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-                "navigationBarTitleText": "我的委托",
-                "enablePullDownRefresh": false
-            }
-        },
-		{
-		    "path" : "pages/center/heart",
-		    "style" :                                                                                    
-		    {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-		        "navigationBarTitleText": "收藏",
-		        "enablePullDownRefresh": false
-		    }
+			]
 		},
 		{
-            "path" : "pages/center/history",
-            "style" :                                                                                    
-            {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-                "navigationBarTitleText": "浏览记录",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/profile/avatar",
-            "style" :                                                                                    
-            {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-                "navigationBarTitleText": "设置头像",
-                "enablePullDownRefresh": false
-            }
-        },
-		{
-			"path": "pages/chooseAddress/index",
-			"style": {
-				"navigationBarBackgroundColor":"#f8f8f8",
-				"navigationBarTitleText":"地图",
-				"backgroundColorTop": "#f8f8f8",
-				"backgroundColorBottom":"#ffffff"
-			}
-		},
-		{
-		    "path" : "pages/chooseAddress/search",
-		    "style" : {
-				"navigationBarTitleText":"地址搜索"
-			}
+			"root": "pages-assets",
+			"pages": [{
+					"path": "assets/assetsDetail",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "资产详情",
+						"enablePullDownRefresh": false,
+						"componentPlaceholder": {
+						  "u-input": "view"
+						}
+					}
+				},
+				{
+					"path": "discharge/leaseCancelList",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "退租申请",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "discharge/leaseCancel",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "退租申请",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "fallback/fallback",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "留言板",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "fallback/fallbackDetail",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTitleText": "留言详情",
+						"enablePullDownRefresh": false
+					}
+				}
+			]
 		}
-		,{
-		    "path" : "pages/chooseAddress/cityList",
-		    "style" : {
-				"navigationBarTitleText":"选择城市"
-			}
-		}
-		,{
-		    "path" : "pages/webview/webview",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "开源字节"
-		    }
-		}
-        ,{
-            "path" : "pages/detail/evalList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "房源评价",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-		{
-            "path" : "pages/reserve/reserveRecords",
-            "style" :                                                                                    
-            {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-                "navigationBarTitleText": "我的预约",
-                "enablePullDownRefresh": false
-            }
-		},
-		{
-			"path": "pages/message/guestbook",
-			"style": {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-				"navigationBarTitleText": "留言板",
-                "enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/detail/guestbookDetail",
-			"style": {
-				"navigationStyle": "custom" ,// 隐藏系统导航栏
-				"navigationBarTitleText": "留言详情",
-                "enablePullDownRefresh": false
-			}
-		}
-    ],
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "World",
@@ -379,31 +315,29 @@
 		"backgroundColor": "#ffffff"
 	},
 	"tabBar": {
-	    "color": "#909399",
-	    "selectedColor": "#252B44",
-	    // "borderStyle": "#909399",
+		"color": "#909399",
+		"selectedColor": "#252B44",
+		// "borderStyle": "#909399",
 		"borderStyle": "white",
-	    "backgroundColor": "#ffffff",
-	    "list": [{
-	        "pagePath": "pages/index/index",
-	        "iconPath": "static/index.png",
-	        "selectedIconPath": "static/index-selected.png",
-	        "text": "首页"
-	    }, {
-	        "pagePath": "pages/center/center",
-	        "iconPath": "static/center.png",
-	        "selectedIconPath": "static/center-selected.png",
-	        "text": "我的"
-	    }]
+		"backgroundColor": "#ffffff",
+		"list": [{
+			"pagePath": "pages/index/index",
+			"iconPath": "static/index.png",
+			"selectedIconPath": "static/index-selected.png",
+			"text": "首页"
+		}, {
+			"pagePath": "pages/center/center",
+			"iconPath": "static/center.png",
+			"selectedIconPath": "static/center-selected.png",
+			"text": "我的"
+		}]
 	},
-	"condition" : { //模式配置，仅开发期间生效
+	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [
-			{
-				"name": "", //模式名称
-				"path": "", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			}
-		]
+		"list": [{
+			"name": "", //模式名称
+			"path": "", //启动页面，必选
+			"query": "" //启动参数，在页面的onLoad函数里面得到
+		}]
 	}
-}
+}
\ No newline at end of file
diff --git a/pages/auth/company.vue b/pages/auth/company.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/pages/auth/person.vue b/pages/auth/person.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/pages/center/center.vue b/pages/center/center.vue
index 3af8b6d..921243f 100644
--- a/pages/center/center.vue
+++ b/pages/center/center.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="user-center">
+	<view class="user-center" :style="{backgroundImage: `url(${staticHost + bgPath1})`}">
 		<customNavbar title="个人中心" ref="navbar" :is-transparent="navbarStyle.isTransparent"
 			:bg-color="navbarStyle.bgColor" :text-color="navbarStyle.textColor" :opacity="navbarStyle.opacity"
 			:extra-icons="navbarStyle.extraIcons" :show-home="false" :show-back="false" />
@@ -8,174 +8,127 @@
 			<u-avatar :src="avatar" size="133"></u-avatar>
 			<view class="user-info">
 				<view class="user-name">
-					<text class="name-text">黄某某</text>
-					<text class="auth-tag">未认证</text>
+					<text class="name-text">{{user.userName || '用户0564'}}</text>
+					<text class="auth-tag">{{user.oaAuth ? '已认证' : '未认证'}}</text>
 				</view>
-				<view class="user-type">用户类型：组织</view>
+				<view class="user-type">用户类型：{{user.userType ==='0' ? '个人' : '组织'}}</view>
 			</view>
 			<view class="msg-setting">
-				<view class="u-relative" @click="toMessage()">
+				<view class="u-relative msg-icon" @click="toMessage()">
 					<u-icon name="chat" size="48" color="#333"></u-icon>
+					<view v-if="unreadMsgCount > 0" class="badge">
+							{{ unreadMsgCount > 99 ? '99+' : unreadMsgCount }}
+						</view>
 				</view>
 				<u-icon name="setting" size="48" color="#333" @click="toSetting()"></u-icon>
 			</view>
 		</view>
 
-		<view class="contract-view">
+		<view class="contract-view" :style="{backgroundImage: `url(${staticHost + bgPath2})`}">
 			<!-- 我的合同和我的预约 -->
 			<view class="contract-appointment">
-				<view class="card" @click="clickNav('pages/center/contract')">
+				<view class="card" @click="clickNav('/pages-biz/contract/contract')">
 					<view class="card-title">我的合同</view>
 					<view class="card-main">
 						<view class="card-content">
-							<view class="card-number">5</view>
-							<view class="card-type">份合同</view>
+							<view class="card-number">{{unsignContractNum}}</view>
+							<view class="card-type">份待签署合同</view>
 						</view>
 						<view class="card-icon">
-							<image src="/static/icon/sign.png" mode="widthFix"></image>
+							<image :src="staticHost + '/public' + '/static/icon/sign.png'" mode="widthFix"></image>
 						</view>
 					</view>
 				</view>
-				<view class="card" @click="clickNav('pages/reserve/reserveRecords')">
+				<view class="card" @click="clickNav('/pages-biz/reserve/reserveRecords')">
 					<view class="card-title">我的预约</view>
 					<view class="card-main">
 						<view class="card-content">
-							<view class="card-number">3</view>
-							<view class="card-type">个预约</view>
+							<view class="card-number">{{handlingReserveNum}}</view>
+							<view class="card-type">个预约中</view>
 						</view>
 						<view class="card-icon">
-							<image src="/static/icon/sign.png" mode="widthFix"></image>
+							<image :src="staticHost + '/public' + '/static/icon/sign.png'" mode="widthFix"></image>
 						</view>
 					</view>
 				</view>
 			</view>
 
-			<!-- 我的服务 -->
+			<!-- 订单信息 -->
 			<view class="my-service">
-				<view class="service-title">我的服务</view>
+				<view class="service-title">订单信息</view>
 				<view class="service-list">
-					<view class="service-item" @click="clickNav('pages/bill/bill')">
+					<view class="service-item" @click="clickNav('/pages-biz/bill/payHistory')">
 						<view class="service-icon">
-							<image src="/static/icon/账单.png"></image>
+							<image :src="staticHost + '/public' + '/static/icon/bill.png'"></image>
 						</view>
 						<view class="service-name">账单</view>
 					</view>
-					<view class="service-item" @click="clickNav('pages/center/myLease')">
+					<view class="service-item" @click="clickNav('/pages-biz/myrent/myLease')">
 						<view class="service-icon">
-							<image src="/static/icon/租赁资产.png"></image>
+							<image :src="staticHost + '/public' + '/static/icon/myrent.png'"></image>
 						</view>
 						<view class="service-name">租赁资产</view>
 					</view>
-					<view class="service-item" @click="clickNav('pages/wae/wae')">
-						<view class="service-icon">
-							<image src="/static/icon/水电费.png"></image>
+					<view class="service-item" @click="clickNav('/pages-biz/wae/wae')">
+						<view class="service-icon badge-wrapper">
+							<image :src="staticHost + '/public' + '/static/icon/wae.png'"></image>
+							<view v-if="unpaidWaeCount > 0" class="badge">
+										{{ unpaidWaeCount > 99 ? '99+' : unpaidWaeCount }}
+									</view>
 						</view>
-						<view class="service-name">水电缴费</view>
+						<view class="service-name">水电费待付</view>
 					</view>
-					<view class="service-item" @click="clickNav('pages/unpaid/unpaid')">
-						<view class="service-icon">
-							<image src="/static/icon/待付款.png"></image>
+					<view class="service-item" @click="clickNav('/pages-biz/unpaid/unpaid')">
+						<view class="service-icon badge-wrapper">
+							<image :src="staticHost + '/public' + '/static/icon/unpaid.png'"></image>
+							<view v-if="unpaidRentCount > 0" class="badge">
+										{{ unpaidRentCount > 99 ? '99+' : unpaidRentCount }}
+									</view>
 						</view>
-						<view class="service-name">待付</view>
+						<view class="service-name">租金待付</view>
 					</view>
 				</view>
 			</view>
 		</view>
 
-		<!-- 常用工具 -->
+		<!-- 辅助工具 -->
 		<view class="common-tools">
-			<view class="tools-title">常用工具</view>
+			<view class="tools-title">辅助工具</view>
 			<view class="tools-list">
-				<view class="tool-item" @click="clickNav('pages/message/guestbook')">
+				<view class="tool-item" @click="clickNav('/pages-assets/fallback/fallback')">
 					<view class="tool-icon">
-						<image src="/static/icon/留言纸.png" mode="widthFix"></image>
+						<image :src="staticHost + '/public' + '/static/icon/fallback.png'" mode="widthFix"></image>
 					</view>
 					<view class="tool-name">留言板</view>
 				</view>
-				<view class="tool-item" @click="clickNav('pages/bill/payHistory')">
+				<!-- 新增计算器 -->
+				<view class="tool-item" @click="clickNav('/pages-biz/tool/calculator')">
 					<view class="tool-icon">
-						<image src="/static/icon/账本.png" mode="widthFix"></image>
+						<image :src="staticHost + '/public/static/icon/calculator.png'" mode="widthFix"></image>
+							</view>
+							<view class="tool-name">计算器</view>
 					</view>
-					<view class="tool-name">缴费记录</view>
-				</view>
-				<view class="tool-item" @click="clickNav('pages/wae/waeRecords')">
-					<view class="tool-icon">
-						<image src="/static/icon/书签.png" mode="widthFix"></image>
-					</view>
-					<view class="tool-name">水电费明细</view>
-				</view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import UCellItemPlus from "../../components/ucellitem/UCellItemPlus.vue";
 	import config from "@/common/config.js";
 
 	export default {
-		components: {
-			UCellItemPlus
-		},
-
 		data() {
 			const life = uni.getStorageSync('lifeData') || {}
-			const user = (life.vuex_user && life.vuex_user.user) || {}
-
 			return {
-				user, // user 信息放这里即可
-				show: true,
-				showGetProfile: false,
-				userType: '',
-				oaAuth: '',
-				gridList: [{
-						name: "我的合同",
-						icon: "/static/icon/sign.png",
-						url: "pages/center/history"
-					},
-					{
-						name: "我的账单",
-						icon: "../../static/icon/账单.png",
-						url: "pages/bill/bill"
-					},
-					{
-						name: "我的待付",
-						icon: "../../static/icon/待付款.png",
-						url: "pages/unpaid/unpaid"
-					},
-					{
-						name: "水电缴费",
-						icon: "../../static/icon/水电费.png",
-						url: "pages/wae/wae"
-					}
-				],
-				cellList: [{
-						name: "我的租赁资产",
-						icon: "/static/icon/住房C.png",
-						url: "pages/center/myLease"
-					},
-					{
-						name: "我的预约",
-						icon: "/static/icon/预约.png",
-						url: "pages/reserve/reserveRecords"
-					},
-					{
-						name: "缴费记录",
-						icon: "/static/icon/账本.png",
-						url: "pages/bill/payHistory"
-					},
-					{
-						name: "水电费明细",
-						icon: "/static/icon/书签.png",
-						url: "pages/wae/waeRecords"
-					},
-					{
-						name: "留言板",
-						icon: "/static/icon/留言纸.png",
-						url: "pages/wae/waeRecords"
-					}
-				],
+				user:{},
+				bgPath1: '/public/static/center/my-bg.png',
+				bgPath2: '/public/static/center/my-bg2.png',
+				unsignContractNum:0,
+				handlingReserveNum:0,
 				// 导航栏样式控制
+					unreadMsgCount: 0,      // 未读消息
+					unpaidWaeCount: 0,      // 水电费待付
+					unpaidRentCount: 0,     // 租金待付
 				navbarStyle: {
 					isTransparent: true,
 					bgColor: '#ffffff',
@@ -197,13 +150,18 @@
 				return raw.includes(config.staticUrl) ?
 					raw :
 					config.staticUrl + raw
+			},
+			staticHost() {
+				return this.$config.staticUrl
 			}
+			
 		},
 
 		onLoad() {
 			uni.$on('updateAvatar', () => {
 				this.updateAvatar();
 			})
+			
 		},
 
 		onUnload() {
@@ -211,23 +169,31 @@
 		},
 
 		onShow() {
-			// this.checkToken();
-
+			this.$checkToken(this.$getToken())
+			this.loadUserInfo()
+			this.countHandlingReserve()
+			this.countUnHandleContract()
+			
+	
 		},
 
 		methods: {
+			loadUserInfo(){
+				this.user = uni.getStorageSync('userInfo');
+			},
 			logout() {
 				this.$u.vuex('vuex_token', '');
 				this.$u.vuex('vuex_user', {});
-				this.$u.route('/pages/login/login')
+				this.$u.route('/pages/login/login');
+			    uni.removeStorageSync('userInfo');
 			},
 
 			toMessage() {
-				this.$u.route('/pages/message/message')
+				this.$u.route('/pages-biz/message/message')
 			},
 
 			toSetting() {
-				this.$u.route('/pages/profile/setting')
+				this.$u.route('/pages-biz/profile/setting')
 			},
 
 			callPhoneNumber() {
@@ -235,39 +201,11 @@
 					phoneNumber: "18720989281"
 				});
 			},
-
-			aboutMe() {
-				this.$u.route('/pages/profile/aboutMe')
-			},
-
-			toMyLease() {
-				this.$u.route('/pages/center/myLease')
-			},
-			checkToken() {
-				let lifeData = uni.getStorageSync('lifeData');
-				let token = lifeData.vuex_token
-				if (!token || token === null || token === undefined ||
-					(typeof token === 'object' && Object.keys(token).length === 0)) {
-					console.log("登录态不存在")
-					return uni.reLaunch({
-						url: '../login/login'
-					})
-				}
-				let url = "/login/checkExpiration";
-				this.$u.get(url, {}, {
-					'WT': token
-				}).then(obj => {
-					if (obj.data) {
-						uni.reLaunch({
-							url: '../login/login'
-						});
-					}
-				});
-			},
-
 			clickNav(url) {
 				if (url) {
-					this.$u.route(url);
+					this.$u.route({
+					    url
+					});
 				} else {
 					this.$mytip.toast('敬请期待')
 				}
@@ -277,48 +215,50 @@
 				// 触发 computed 自动更新
 				this.$forceUpdate()
 			},
-			// 进入个人中心时判断是否需要补充资料
-			checkNeedProfile() {
-				let life = uni.getStorageSync('lifeData') || {}
-				let user = life.vuex_user
-				let token = life.vuex_token
-				if (!token) return; // 未登录不弹窗
-				// 没有头像或昵称才弹窗
-				if (!user || !user.avatarUrl || !user.nickName) {
-					this.showGetProfile = true;
-				}
-			},
-			getWxProfile() {
-				uni.getUserProfile({
-					desc: "用于完善个人资料展示",
-					success: res => {
-						const userInfo = res.userInfo;
-						// 存储
-						this.$u.vuex('vuex_user', userInfo);
-
-						// 也可同步调用后端更新头像昵称
-						// this.$u.post('/user/updateWxInfo', userInfo);
-
-						this.showGetProfile = false;
-					},
-					fail: () => {
-						uni.showToast({
-							title: "授权失败",
-							icon: "none"
-						});
+			countUnHandleContract(){
+				this.$u.get(`/contract/countUnsign`, {},{
+				  WT: this.$getToken()
+				}).then(res => {
+					if(res.flag){
+						this.unsignContractNum = res.data
 					}
-				});
+				})
 			},
-			getUserOtherInfo() {
-				let life = uni.getStorageSync('lifeData') || {}
-				let token = life.vuex_token
-				let url = "/login/userOtherInfo";
-				this.$u.get(url, {}, {
-					'WT': token
-				}).then(obj => {
-					this.userType = obj.data.userType;
-					this.oaAuth = obj.data.oaAuth;
-				});
+			countHandlingReserve(){
+				this.$u.get(`/reservate/countHandling`, {},{
+				  WT: this.$getToken()
+				}).then(res => {
+					if(res.flag){
+						this.handlingReserveNum = res.data
+					}
+				})
+			},
+			countUnreadMsg(){
+				this.$u.get(`/messsage/countUnread`, {},{
+				  WT: this.$getToken()
+				}).then(res => {
+					if(res.flag){
+						this.unreadMsgCount = res.data
+					}
+				})
+			},
+			countUnpayRentBills(){
+				this.$u.get(`/bill/countUnpayRentBills`, {},{
+				  WT: this.$getToken()
+				}).then(res => {
+					if(res.flag){
+						this.unpaidRentCount = res.data
+					}
+				})
+			},
+			countUnpayWaeBills(){
+				this.$u.get(`/bill/countUnpayWaeBills`, {},{
+				  WT: this.$getToken()
+				}).then(res => {
+					if(res.flag){
+						this.unpaidWaeCount = res.data
+					}
+				})
 			}
 		}
 	}
@@ -326,8 +266,7 @@
 
 <style lang="scss" scoped>
 	.user-center {
-		padding-top: 120rpx;
-		background-image: url("https://eyidu.ydszw.cn/static/img/test/my-bg.png");//只支持网络图片，请自行上传至图片服务器并替换
+		padding-top: 175rpx;
 		background-color: #fff;
 		background-repeat: no-repeat;
 		background-size: 750rpx 731rpx;
@@ -379,7 +318,6 @@
 	.contract-view {
 		width: 96%;
 		margin: 0 auto;
-		background-image: url("https://eyidu.ydszw.cn/static/img/test/my-bg2.png"); //只支持网络图片，请自行上传至图片服务器并替换
 		background-repeat: round;
 		border-radius: 10rpx;
 	}
@@ -520,5 +458,38 @@
 	.tool-name {
 		font-size: 24rpx;
 		color: #222222;
+		
+	}
+	.badge-wrapper {
+		position: relative;
+		display: inline-block;
+		width: 80rpx;   // 对应 image 尺寸
+		height: 70rpx;  // 对应 image 尺寸
+	}
+	/* 红点角标 */
+	.badge {
+		position: absolute;
+		top: -10rpx;
+		right: -14rpx;
+		min-width: 32rpx;
+		height: 32rpx;
+		padding: 0 8rpx;
+	
+		background-color: #ff3b30;
+		color: #fff;
+		font-size: 20rpx;
+		font-weight: 500;
+	
+		border-radius: 16rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	
+		box-sizing: border-box;
+	}
+	
+	/* 消息图标特殊一点 */
+	.msg-icon {
+		position: relative;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/center/center_template1.vue b/pages/center/center_template1.vue
deleted file mode 100644
index 552d8b2..0000000
--- a/pages/center/center_template1.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<template>
-	<view>
-		<u-navbar :is-back="false" title="我的" :border-bottom="false"></u-navbar>
-		<view class="u-flex user-box u-p-l-30 u-p-r-20 u-p-t-30 u-p-b-30">
-			<view class="u-flex" @click="profile">
-				<view class="u-m-r-20">
-					<u-avatar :src="avatar" size="140"></u-avatar>
-				</view>
-				<view class="u-flex-1">
-					<view class="u-font-18 u-p-b-20">{{vuex_user.user.userName}}</view>
-					<view class="u-font-14 u-tips-color">昵称:{{vuex_user.user.nickName}}</view>
-					<view class="u-font-14 u-tips-color">用户类型:个人</view>
-				</view>
-			</view>
-		</view>
-		<view class="center-nav">
-			<u-row>
-				<u-col span="3" text-align="center" v-for="(item,index) in navList" :key="index">
-					<view v-if="item.name=='问题反馈'">
-						<!-- 调用微信反馈功能 -->
-						<button type="default" open-type="feedback"  class="clearBtn" hover-class="none" style="background-color: #FFFFFF;">
-							<u-icon :name="item.icon" color="#909399" size="50"></u-icon>
-							<view class="tabName" style="padding-top: 15rpx;">{{item.name}}</view>
-						</button>
-					</view>
-					<view @click="clickNav(item.url)" v-else>
-						<u-icon :name="item.icon" color="#909399" size="50"></u-icon>
-						<view class="tabName">{{item.name}}</view>
-					</view>
-				</u-col>
-			</u-row>
-		</view>
-		
-		<view class="u-m-t-20">
-			<u-cell-group>
-				<!-- <u-cell-item icon="integral" title="实名认证" @click="setting"></u-cell-item> -->
-				<u-cell-item icon="setting" title="个人中心" @click="setting"></u-cell-item>
-			</u-cell-group>
-		</view>
-		
-		<view class="u-m-t-20">
-			<u-cell-group>
-				<u-cell-item icon="level" :arrow="false" title="技术支持" value="18720989281"  @click="callPhoneNumber"></u-cell-item>
-				<u-cell-item icon="question-circle" title="常见问题" @click="problem"></u-cell-item>
-				<u-cell-item icon="star" title="关于我们" @click="aboutMe"></u-cell-item>
-			</u-cell-group>
-		</view>
-	</view>
-</template>
-
-<script>
-	import config from "@/common/config.js" // 全局配置文件
-	export default {
-		data() {
-			return {
-				avatar:uni.getStorageSync('lifeData').vuex_user.user.avatar.includes(config.staticUrl)?uni.getStorageSync('lifeData').vuex_user.user.avatar:config.staticUrl+uni.getStorageSync('lifeData').vuex_user.user.avatar,
-				show:true,
-				navList:[
-				   {name:"我的合同",icon:"checkmark-circle",url:"pages/center/history"},
-				   {name:"我的账单",icon:"heart",url:"pages/center/heart"},
-				   {name:"消息通知",icon:"order",url:"pages/center/order"},
-				   {name:"水电充值",icon:"info-circle"}
-				],
-			}
-		},
-		onLoad() {
-			uni.$on('updateAvatar', (obj) => {
-				// 获取数据
-				this.updateAvatar();
-			})
-		},
-		onUnload() {
-			// 移除监听事件  
-			uni.$off('updateAvatar');
-		},
-		onShow(){
-			// 检查token
-			this.checkToken();
-		},
-		methods: {
-			logout() {
-				// 登录成功修改token与用户信息
-				this.$u.vuex('vuex_token', '');
-				this.$u.vuex('vuex_user', {});
-				this.$u.route('/pages/login/login')
-			},
-			profile(){
-				this.$u.route('/pages/profile/profile')
-			},
-			setting(){
-				this.$u.route('/pages/profile/setting')
-			},
-			//拨打固定电话
-			callPhoneNumber() {
-				uni.makePhoneCall({
-					phoneNumber: "18720989281",
-				});
-			},
-			problem(){
-				this.$u.route({
-					url: 'pages/login/problem'
-				})
-			},
-			// 关于作者
-			aboutMe() {
-				this.$u.route('/pages/profile/aboutMe')
-			},
-			checkToken(){
-				// 判断是否有token
-				let lifeData = uni.getStorageSync('lifeData');
-				let token = lifeData.vuex_token
-				if(!token){
-					// 没有token 则跳转到登录
-					return uni.reLaunch({
-						url:'../login/login'
-					})
-				}else{
-					// 判断Token是否有效
-					let url = "/api/profile/isExpiration";
-					this.$u.get(url,{
-						token:token
-					}).then(obj => {
-						if(obj.data){
-							// 没有token过期则跳转到登录
-							return uni.reLaunch({
-								url:'../login/login'
-							})
-						}
-					});
-				}
-			},
-			code(){
-				this.$mytip.toast('敬请期待')
-			},
-			clickNav(url){
-				if(url){
-					this.$u.route(url);
-				}else{
-					this.$mytip.toast('敬请期待')
-				}
-			},
-			updateAvatar(){
-				this.avatar = uni.getStorageSync('lifeData').vuex_user.user.avatar.includes(config.staticUrl)?uni.getStorageSync('lifeData').vuex_user.user.avatar:config.staticUrl+uni.getStorageSync('lifeData').vuex_user.user.avatar
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-.user-box{
-	background-color: #fff;
-	justify-content: space-between;
-}
-
-.center-nav{
-	background-color: #FFFFFF;
-	margin-top: 30rpx;
-	padding: 30rpx 0;
-	border-radius: 8px;
-	.tabName{
-		color: #606266;
-		font-size: 26rpx;
-		padding-top: 10rpx;
-	}
-}
-
-.qiandao{
-	color: #606266;
-	font-size: 24rpx;
-	margin-right: 24rpx;
-	margin-top: 54rpx;
-	justify-content:center;
-	align-items: center;
-}
-
-.clearBtn{
-		margin:0;
-		padding: 0;
-		line-height: 1;
-		background-color: #FFFFFF;
-}
-
-.clearBtn::after{
-	position: unset !important;
-	border: unset;
-}
-</style>
\ No newline at end of file
diff --git a/pages/center/heart.vue b/pages/center/heart.vue
deleted file mode 100644
index 167d687..0000000
--- a/pages/center/heart.vue
+++ /dev/null
@@ -1,292 +0,0 @@
-<template>
-	<view>
-		<u-navbar :is-back="true" title="收藏" :border-bottom="false"></u-navbar>
-		<view class="wrap">
-			<scroll-view scroll-y style="height: 100%;width: 100%;">
-				<view class="page-box">
-					<view v-if="heartList.length === 0">
-						<view class="centre">
-							<image :src="empty" mode=""></image>
-							<view class="explain">
-								您还没有收藏的房源
-								<view class="tips">可以去逛逛</view>
-							</view>
-							<view class="btn" @click="goHome">首页</view>
-						</view>
-					</view>
-					<view v-else
-					 class="order" v-for="(item, index) in heartList" :key="index"
-					 @click="viewImage(item.id)">
-						<view class="top">
-							<view class="left">
-								<view class="store">{{ item.code }}</view>
-								<u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
-							</view>
-						</view>
-						<view class="item">
-							<view class="left"><image :src="item.image" mode="aspectFill"></image></view>
-							<view class="content">
-								<view class="title u-line-2">
-									{{item.villageName}} {{item.type == '整租' ? item.houseNum + item.houseHall + item.toiletNum : item.roomType}}
-								</view>
-								<view class="price">¥{{item.price}}</view>
-								<view class="type">
-									{{item.type}} | {{item.type == '整租' ? item.houseArea : item.roomArea}}㎡ | {{item.decoration}}
-								</view>
-							</view>
-						</view>
-						<view class="bottom">
-							<view class="evaluate btn" @click="viewImage(item.id)">查看</view>
-						</view>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import config from "@/common/config.js" // 全局配置文件
-	export default {
-		data() {
-			return {
-				empty:'/static/empty/default.png',
-				heartList: [],
-				pageNum: 1,
-				pageSize: 100,
-			};
-		},
-		onLoad() {
-			this.findHeartList();
-		},
-		methods: {
-			findHeartList() {
-				let url = "/api/houseApi/findHouseHeartList";
-				let lifeData = uni.getStorageSync('lifeData');
-				let vuex_user = lifeData.vuex_user
-				this.$u.get(url,{
-					userId:vuex_user.user.userId,
-					pageNum: this.pageNum,
-					pageSize: this.pageSize,
-					orderByColumn: 'update_time,create_time',
-					isAsc: 'desc'
-				}
-				).then(result => {
-					const data = result.rows;
-					this.houseList = data;
-					for (let i = 0; i < this.houseList.length; i++) {
-						// 先转成字符串再转成对象，避免数组对象引用导致数据混乱
-						let item = this.houseList[i]
-						if(!item.faceUrl.includes(config.staticUrl)){
-							item.image = config.staticUrl+item.faceUrl
-						}else{
-							item.image = item.faceUrl
-						}
-						if(item.type == 0){
-							item.type = '整租'
-						}else if(item.type == 1){
-							item.type = '合租'
-						}
-						if(item.roomType == 1){
-							item.roomType = '主卧'
-						}else if(item.roomType == 2){
-							item.roomType = '次卧'
-						}else{
-							item.roomType = '未知'
-						}
-						if(this.$u.test.isEmpty(item.houseNum)){
-							item.houseNum = ''
-						}
-						if(this.$u.test.isEmpty(item.houseHall)){
-							item.houseHall = ''
-						}
-						if(this.$u.test.isEmpty(item.toiletNum)){
-							item.toiletNum = ''
-						}
-						this.heartList.push(item);
-					}
-				});
-			},
-			goHome(){
-				uni.switchTab({
-					url: '/pages/index/index'
-				})
-			},
-			viewImage(houseId){
-				this.$u.route({
-					url: '/pages/detail/detail',
-					params: {
-						houseId: houseId
-					}
-				})
-			}
-		}
-	};
-</script>
-
-<style>
-/* #ifndef H5 */
-page {
-	height: 100%;
-	background-color: #f2f2f2;
-}
-/* #endif */
-</style>
-
-<style lang="scss" scoped>
-	.container{
-		width: 100%;
-		height: 100%;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		text-align: center;
-		.empty{
-			overflow: hidden;
-			.tip{
-				color: #909399  ;
-			}
-			.btn {
-				color:#fff ;
-				background-color: #2979ff;
-				width:200rpx;
-				padding: 15rpx 28rpx;
-				border-radius: 130rpx;
-				margin: 30rpx 0 0 100rpx;
-			}
-		}
-	}
-	.order {
-		width: 710rpx;
-		background-color: #ffffff;
-		margin: 20rpx auto;
-		border-radius: 20rpx;
-		box-sizing: border-box;
-		padding: 20rpx;
-		font-size: 28rpx;
-		.top {
-			display: flex;
-			justify-content: space-between;
-			.left {
-				display: flex;
-				align-items: center;
-				.store {
-					// margin: 0 10rpx;
-					font-size: 32rpx;
-				}
-			}
-			.right {
-				color: #2979ff;
-			}
-		}
-		.item {
-			display: flex;
-			margin: 20rpx 0 0 0;
-			.left {
-				margin-right: 30rpx;
-				image {
-					width: 150rpx;
-					height: 150rpx;
-					border-radius: 10rpx;
-				}
-			}
-			.content {
-				.title {
-					font-weight: bold;
-					font-size: 28rpx;
-					line-height: 50rpx;
-				}
-				.price{
-					margin: 10rpx 0;
-					font-size: 30rpx;
-				}
-				.type {
-					margin: 10rpx 0;
-					font-size: 24rpx;
-					color: $u-tips-color;
-				}
-				.desc {
-					margin: 10rpx 0;
-					font-size: 24rpx;
-					color: $u-tips-color;
-				}
-			}
-		}
-		.bottom {
-			display: flex;
-			margin-top: 20rpx;
-			padding: 0 10rpx;
-			justify-content: flex-end;
-			align-items: center;
-			.btn {
-				margin-left: 20rpx;
-				line-height: 52rpx;
-				width: 160rpx;
-				border-radius: 26rpx;
-				border: 2rpx solid $u-border-color;
-				font-size: 26rpx;
-				text-align: center;
-				color: $u-type-info-dark;
-			}
-			.evaluate {
-				color: $u-tips-color;
-			}
-		}
-	}
-	.centre {
-		text-align: center;
-		margin: 200rpx auto;
-		font-size: 32rpx;
-		image {
-			width: 164rpx;
-			height: 164rpx;
-			border-radius: 50%;
-			margin-bottom: 20rpx;
-		}
-		.tips {
-			font-size: 24rpx;
-			color: #999999;
-			margin-top: 20rpx;
-		}
-		.btn {
-			margin: 80rpx auto;
-			width: 200rpx;
-			border-radius: 32rpx;
-			line-height: 64rpx;
-			color: #ffffff;
-			font-size: 26rpx;
-			background-image:linear-gradient(to left,#2979ff,rgba(#2979ff,0.6));
-		}
-	}
-	.wrap {
-		display: flex;
-		flex-direction: column;
-		height: calc(100vh - var(--window-top));
-		width: 100%;
-	}
-	.swiper-box {
-		flex: 1;
-	}
-	.swiper-item {
-		height: 100%;
-	}
-
-	.buttom {
-		.loginType {
-			font-size: 14px;
-			position: fixed;
-			right: 30rpx;
-			bottom: 120rpx;
-			width: 60px;
-			height: 60px;
-			padding: 4px;
-			cursor: pointer;
-			background: #FFF;
-			text-align: center;
-			line-height: 60px;
-			border-radius: 100%;
-			-webkit-box-shadow: 0px 1px 20px 0px rgba(0,0,0,0.1),inset 0px -1px 0px 0px rgba(0,0,0,0.1);
-			box-shadow: 0px 1px 20px 0px rgba(0,0,0,0.1),inset 0px -1px 0px 0px rgba(0,0,0,0.1);
-		}
-	}
-</style>
diff --git a/pages/center/history.vue b/pages/center/history.vue
deleted file mode 100644
index ded9cd0..0000000
--- a/pages/center/history.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<template>
-	<view>
-		<u-navbar :is-back="true" title="浏览记录" :border-bottom="false">
-			<view class="u-nav-slot" slot="right" @click="clearHistory">
-				<u-icon name="trash"></u-icon>
-				清除
-			</view>
-		</u-navbar>
-		<scroll-view scroll-y style="height: 100%;width: 100%;">
-			<view class="page-box">
-				<view v-if="houseHistory.length === 0">
-					<view class="centre">
-						<image :src="empty" mode=""></image>
-						<view class="explain">
-							您还没有浏览过的房源
-							<view class="tips">可以去逛逛</view>
-						</view>
-						<view class="btn" @click="goHome">首页</view>
-					</view>
-				</view>
-				<view v-else class="order" v-for="(item, index) in houseHistory" :key="index"
-				 @click="clickImage(item.id)">
-					<view class="top">
-						<view class="left">
-							<view class="store">{{ item.code }}</view>
-							<u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
-						</view>
-					</view>
-					<view class="item">
-						<view class="left"><image :src="item.faceUrl" mode="aspectFill"></image></view>
-						<view class="content">
-							<view class="title u-line-2">
-								{{item.villageName}} {{item.type == '整租' ? item.houseNum + item.houseHall + item.toiletNum : item.roomType}}
-							</view>
-							<view class="price">¥{{item.price}}</view>
-							<view class="type">
-								{{item.type}} | {{item.type == '整租' ? item.houseArea : item.roomArea}}㎡ | {{item.decoration}}
-							</view>
-						</view>
-					</view>
-					<view class="bottom">
-						<view class="evaluate btn" @click="clickImage(item.id)">查看</view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	import config from "@/common/config.js" // 全局配置文件
-	export default {
-		data() {
-			return {
-				empty:'/static/empty/default.png',
-				houseHistory:uni.getStorageSync('houseHistory').reverse()
-			};
-		},
-		onLoad() {
-			
-		},
-		methods: {
-			clickImage(houseId) {
-				this.$u.route({
-					url: '/pages/detail/detail',
-					params: {
-						houseId: houseId
-					}
-				})
-			},
-			goHome(){
-				uni.switchTab({
-					url: '/pages/index/index'
-				})
-			},
-			clearHistory(){
-				// 清除搜索记录
-				uni.showModal({
-					title: '提示',
-					content: '是否清除浏览记录？',
-					cancelText: '取消',
-					confirmText: '确认',
-					success: res => {
-						if(res.confirm){
-							uni.removeStorageSync('houseHistory');
-							this.houseHistory = []
-							this.$mytip.toast('清除成功')
-						}
-					}
-				});
-			}
-		}
-	};
-</script>
-
-<style>
-/* #ifndef H5 */
-page {
-	height: 100%;
-	background-color: #f2f2f2;
-}
-/* #endif */
-</style>
-
-<style lang="scss" scoped>
-	.u-nav-slot{
-		color: $u-tips-color;
-		font-weight: normal;
-		font-size: 28rpx;
-		margin-right: 30rpx;
-	}
-	
-	.container{
-		width: 100%;
-		height: 100%;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		text-align: center;
-		.empty{
-			overflow: hidden;
-			.tip{
-				color: #909399  ;
-			}
-			.btn {
-				color:#fff ;
-				background-color: #909399;
-				width:200rpx;
-				padding: 15rpx 28rpx;
-				border-radius: 130rpx;
-				margin: 30rpx 0 0 100rpx;
-			}
-		}
-	}
-	.order {
-		width: 710rpx;
-		background-color: #ffffff;
-		margin: 20rpx auto;
-		border-radius: 20rpx;
-		box-sizing: border-box;
-		padding: 20rpx;
-		font-size: 28rpx;
-		.top {
-			display: flex;
-			justify-content: space-between;
-			.left {
-				display: flex;
-				align-items: center;
-				.store {
-					// margin: 0 10rpx;
-					font-size: 32rpx;
-				}
-			}
-			.right {
-				color: #2979ff;
-			}
-		}
-		.item {
-			display: flex;
-			margin: 20rpx 0 0;
-			.left {
-				margin-right: 30rpx;
-				image {
-					width: 150rpx;
-					height: 150rpx;
-					border-radius: 10rpx;
-				}
-			}
-			.content {
-				.title {
-					font-weight: bold;
-					font-size: 28rpx;
-					line-height: 50rpx;
-				}
-				.price{
-					margin: 10rpx 0;
-					font-size: 30rpx;
-				}
-				.type {
-					margin: 10rpx 0;
-					font-size: 24rpx;
-					color: $u-tips-color;
-				}
-			}
-		}
-		.bottom {
-			display: flex;
-			// margin-top: 40rpx;
-			padding: 0 10rpx;
-			justify-content: flex-end;
-			align-items: center;
-			.btn {
-				margin-left: 20rpx;
-				line-height: 52rpx;
-				width: 160rpx;
-				border-radius: 26rpx;
-				border: 2rpx solid $u-border-color;
-				font-size: 26rpx;
-				text-align: center;
-				color: $u-type-info-dark;
-			}
-			.evaluate {
-				color: $u-tips-color;
-				border-color: $u-tips-color;
-			}
-		}
-	}
-	.centre {
-		text-align: center;
-		margin: 200rpx auto;
-		font-size: 32rpx;
-		image {
-			width: 164rpx;
-			height: 164rpx;
-			border-radius: 50%;
-			margin-bottom: 20rpx;
-		}
-		.tips {
-			font-size: 24rpx;
-			color: #999999;
-			margin-top: 20rpx;
-		}
-		.btn {
-			margin: 80rpx auto;
-			width: 200rpx;
-			border-radius: 32rpx;
-			line-height: 64rpx;
-			color: #ffffff;
-			font-size: 26rpx;
-			background-image:linear-gradient(to left,#2979ff,rgba(#2979ff,0.6));
-		}
-	}
-</style>
diff --git a/pages/center/myLease.vue b/pages/center/myLease.vue
deleted file mode 100644
index 2fa0403..0000000
--- a/pages/center/myLease.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<template>
-  <view class="page">
-    <!-- 顶部自定义导航栏 -->
-    <customNavbar title="我的租赁资产" />
-
-    <!-- 筛选栏 -->
-<!--    <view class="filter-bar">
-      <u-button
-        v-for="(item, index) in filters"
-        :key="index"
-        :type="currentFilter === item.value ? 'primary' : 'default'"
-        size="mini"
-        class="filter-btn"
-        @click="changeFilter(item.value)"
-      >
-        {{ item.label }}
-      </u-button>
-    </view> -->
-
-    <!-- 租赁资产列表组件 -->
-    <scroll-view
-      scroll-y
-      class="scroll-content"
-      @scrolltolower="loadMore"
-    >
-      <asset-list
-        :list="assetList"
-        :load-status="loadStatus"
-        @click="goDetail"
-      />
-    </scroll-view>
-  </view>
-</template>
-
-<script>
-import AssetList from '@/components/asset/assetList.vue'
-
-export default {
-  name: 'MyLease',
-  components: { AssetList},
-  data() {
-    return {
-      filters: [
-        { label: '全部', value: 'all' },
-        { label: '进行中', value: 'active' },
-        { label: '即将到期', value: 'expiring' },
-        { label: '已到期', value: 'expired' },
-      ],
-      currentFilter: 'all',
-      assetList: [],
-      pageNo: 1,
-      pageSize: 10,
-      loadStatus: 'loadmore',
-    };
-  },
-  onLoad() {
-    this.loadAssets();
-  },
-  methods: {
-    changeFilter(value) {
-      if (this.currentFilter === value) return;
-      this.currentFilter = value;
-      this.pageNo = 1;
-      this.assetList = [];
-      this.loadAssets();
-    },
-
-    loadAssets() {
-      this.loadStatus = 'loading';
-
-      setTimeout(() => {
-        const mock = [
-          {
-            id: 1,
-            name: '科技园写字楼 501',
-            address: '深圳市南山区科兴科学园 A 栋',
-            // statusText: '进行中',
-            // status: 'active',
-            cover: '/static/img/index/swiper/swiper3.jpg',
-          },
-          {
-            id: 2,
-            name: '万科公寓 2101',
-            address: '龙华区民治街道梅龙路 8 号',
-            // statusText: '已到期',
-            // status: 'expired',
-            cover: '/static/img/index/swiper/swiper3.jpg',
-          },
-        ];
-
-        let filtered = mock;
-        if (this.currentFilter !== 'all') {
-          filtered = mock.filter(item => item.status === this.currentFilter);
-        }
-
-        this.assetList = this.pageNo === 1 ? filtered : [...this.assetList, ...filtered];
-        this.loadStatus = 'nomore';
-      }, 500);
-    },
-
-    loadMore() {
-      if (this.loadStatus === 'nomore') return;
-      this.pageNo++;
-      this.loadAssets();
-    },
-
-    goDetail(item) {
-      uni.navigateTo({
-        url: `/pages/detail/assetsDetail?id=${item.id}`,
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page {
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  background: #f7f8fa;
-  padding-top: 120rpx;
-}
-
-.filter-bar {
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  background-color: #fff;
-  padding: 20rpx 0;
-  margin-top: var(--custom-navbar-height);
-  border-bottom: 1rpx solid #f0f0f0;
-
-  .filter-btn {
-    min-width: 150rpx;
-    text-align: center;
-    font-size: 26rpx;
-    height: 60rpx;
-    line-height: 60rpx;
-    border-radius: 40rpx;
-    margin: 0 8rpx;
-  }
-}
-
-.scroll-content {
-  flex: 1;
-  height: calc(100vh - 200rpx);
-}
-</style>
\ No newline at end of file
diff --git a/pages/center/order.vue b/pages/center/order.vue
deleted file mode 100644
index 9e41417..0000000
--- a/pages/center/order.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-<template>
-	<view>
-		<u-navbar :is-back="true" title="我的委托" :border-bottom="false"></u-navbar>
-		<view class="wrap">
-			<view class="u-tabs-box">
-				<u-tabs-swiper activeColor="#2979ff" ref="tabs" :list="list" :current="current" @change="change" :is-scroll="false" swiperWidth="750"></u-tabs-swiper>
-			</view>
-			<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
-				<swiper-item class="swiper-item" v-for="(swiper,i) in orderList" :key="i">
-					<scroll-view scroll-y style="height: 100%;width: 100%;">
-						<view class="page-box">
-							<view v-if="swiper.length === 0">
-								<view class="centre">
-									<image :src="empty" mode=""></image>
-									<view class="explain">
-										您还没有相关的房源
-										<view class="tips">可以去委托房源</view>
-									</view>
-									<view class="btn" @click="publishHouse">委托房源</view>
-								</view>
-							</view>
-							<view v-else
-							 class="order" v-for="(item, index) in swiper" :key="index">
-								<view class="top">
-									<view class="left">
-										<view class="store">{{ item.code }}</view>
-										<u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
-									</view>
-								</view>
-								<view class="item">
-									<view class="left"><image :src="item.image" mode="aspectFill"></image></view>
-									<view class="content">
-										<view class="title u-line-2">
-											{{item.villageName}} {{item.type == '整租' ? item.houseNum + item.houseHall + item.toiletNum : item.roomType}}
-										</view>
-										<view class="price">¥{{item.price}}</view>
-										<view class="type">
-											{{item.type}} | {{item.type == '整租' ? item.houseArea : item.roomArea}}㎡ | {{item.decoration}}
-										</view>
-									</view>
-								</view>
-								<view class="bottom">
-									<view v-if="item.state == 0" class="evaluate btn"  @click.stop="clickImage(item.id)">修改</view>
-									<view v-else class="evaluate btn"  @click.stop="viewImage(item.id)">查看</view>
-								</view>
-							</view>
-						</view>
-					</scroll-view>
-				</swiper-item>
-			</swiper>
-		</view>
-		<view class="buttom">
-			<view class="loginType">
-				<view class="wechat item">
-					<view class="icon"><u-icon size="60" name="server-man" color="#999" @click="server"></u-icon></view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import config from "@/common/config.js" // 全局配置文件
-	export default {
-		data() {
-			return {
-				empty:'/static/empty/default.png',
-				orderList: [[], [], [], []],
-				list: [
-					{
-						name: '待审核'
-					},
-					{
-						name: '待出租',
-						// count: 1
-					},
-					{
-						name: '已出租'
-					},
-					{
-						name: '已下架',
-					}
-				],
-				current: 0,
-				swiperCurrent: 0,
-				tabsHeight: 0,
-				dx: 0,
-				pageNum: 1,
-				pageSize: 100,
-			};
-		},
-		onLoad() {
-			this.getOrderList(0);
-			this.getOrderList(1);
-			this.getOrderList(2);
-			this.getOrderList(3);
-		},
-		methods: {
-			login(){
-				this.$u.route('/pages/login/login')
-			},
-			// 页面数据
-			getOrderList(idx) {
-				this.findHouseList(idx)
-			},
-			// tab栏切换
-			change(index) {
-				this.swiperCurrent = index;
-				this.orderList[index] = []
-				this.getOrderList(index);
-			},
-			transition({ detail: { dx } }) {
-				this.$refs.tabs.setDx(dx);
-			},
-			animationfinish({ detail: { current } }) {
-				this.$refs.tabs.setFinishCurrent(current);
-				this.swiperCurrent = current;
-				this.current = current;
-			},
-			findHouseList(idx) {
-				let url = "/api/houseApi/findHouseRoomList";
-				let defaultData = {
-					state:idx,
-					publishId:uni.getStorageSync('lifeData').vuex_user.user.userId,
-					villageCity:uni.getStorageSync('lifeData').vuex_city,
-					pageNum: this.pageNum,
-					pageSize: this.pageSize,
-					orderByColumn: 'update_time,create_time',
-					isAsc: 'desc'
-				}
-				this.$u.get(url, {...defaultData,...this.searchData}).then(result => {
-					const data = result.rows;
-					this.houseList = data;
-					for (let i = 0; i < this.houseList.length; i++) {
-						// 先转成字符串再转成对象，避免数组对象引用导致数据混乱
-						let item = this.houseList[i]
-						if(!item.faceUrl.includes(config.staticUrl)){
-							item.image = config.staticUrl+item.faceUrl
-						}else{
-							item.image = item.faceUrl
-						}
-						if(item.type == 0){
-							item.type = '整租'
-						}else if(item.type == 1){
-							item.type = '合租'
-						}
-						if(item.roomType == 1){
-							item.roomType = '主卧'
-						}else if(item.roomType == 2){
-							item.roomType = '次卧'
-						}else{
-							item.roomType = '未知'
-						}
-						if(this.$u.test.isEmpty(item.houseNum)){
-							item.houseNum = ''
-						}
-						if(this.$u.test.isEmpty(item.houseHall)){
-							item.houseHall = ''
-						}
-						if(this.$u.test.isEmpty(item.toiletNum)){
-							item.toiletNum = ''
-						}
-						this.orderList[idx].push(item);
-					}
-				});
-			},
-			publishHouse(){
-				this.$u.route('/pages/detail/preHouse');
-			},
-			server(){
-				// window.open ('https://sourcebyte.cn')
-				uni.makePhoneCall({
-				  phoneNumber: "18720989281",
-				});
-			},
-			clickImage(houseId) {
-				this.$u.route({
-					url: '/pages/detail/preHouse',
-					params: {
-						houseId: houseId
-					}
-				})
-			},
-			viewImage(houseId){
-				this.$u.route({
-					url: '/pages/detail/detail',
-					params: {
-						houseId: houseId
-					}
-				})
-			}
-		}
-	};
-</script>
-
-<style>
-/* #ifndef H5 */
-page {
-	height: 100%;
-	background-color: #f2f2f2;
-}
-/* #endif */
-</style>
-
-<style lang="scss" scoped>
-	.container{
-		width: 100%;
-		height: 100%;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		text-align: center;
-		.empty{
-			overflow: hidden;
-			.tip{
-				color: #909399  ;
-			}
-			.btn {
-				color:#fff ;
-				background-color: #2979ff;
-				width:200rpx;
-				padding: 15rpx 28rpx;
-				border-radius: 130rpx;
-				margin: 30rpx 0 0 100rpx;
-			}
-		}
-	}
-	.order {
-		width: 710rpx;
-		background-color: #ffffff;
-		margin: 20rpx auto;
-		border-radius: 20rpx;
-		box-sizing: border-box;
-		padding: 20rpx;
-		font-size: 28rpx;
-		.top {
-			display: flex;
-			justify-content: space-between;
-			.left {
-				display: flex;
-				align-items: center;
-				.store {
-					// margin: 0 10rpx;
-					font-size: 32rpx;
-				}
-			}
-			.right {
-				color: #2979ff;
-			}
-		}
-		.item {
-			display: flex;
-			margin: 20rpx 0 0 0;
-			.left {
-				margin-right: 30rpx;
-				image {
-					width: 150rpx;
-					height: 150rpx;
-					border-radius: 10rpx;
-				}
-			}
-			.content {
-				.title {
-					font-weight: bold;
-					font-size: 28rpx;
-					line-height: 50rpx;
-				}
-				.price{
-					margin: 10rpx 0;
-					font-size: 30rpx;
-				}
-				.type {
-					margin: 10rpx 0;
-					font-size: 24rpx;
-					color: $u-tips-color;
-				}
-				.desc {
-					margin: 10rpx 0;
-					font-size: 24rpx;
-					color: $u-tips-color;
-				}
-			}
-		}
-		.bottom {
-			display: flex;
-			margin-top: 20rpx;
-			padding: 0 10rpx;
-			justify-content: flex-end;
-			align-items: center;
-			.btn {
-				margin-left: 20rpx;
-				line-height: 52rpx;
-				width: 160rpx;
-				border-radius: 26rpx;
-				border: 2rpx solid $u-border-color;
-				font-size: 26rpx;
-				text-align: center;
-				color: $u-type-info-dark;
-			}
-			.evaluate {
-				// color: #2979ff;
-				// border-color: #2979ff;
-				color: $u-tips-color;
-				border-color: $u-tips-color;
-			}
-		}
-	}
-	.centre {
-		text-align: center;
-		margin: 200rpx auto;
-		font-size: 32rpx;
-		image {
-			width: 164rpx;
-			height: 164rpx;
-			border-radius: 50%;
-			margin-bottom: 20rpx;
-		}
-		.tips {
-			font-size: 24rpx;
-			color: #999999;
-			margin-top: 20rpx;
-		}
-		.btn {
-			margin: 80rpx auto;
-			width: 200rpx;
-			border-radius: 32rpx;
-			line-height: 64rpx;
-			color: #ffffff;
-			font-size: 26rpx;
-			background-image:linear-gradient(to left,#2979ff,rgba(#2979ff,0.6));
-		}
-	}
-	.wrap {
-		display: flex;
-		flex-direction: column;
-		height: calc(100vh - var(--window-top));
-		width: 100%;
-	}
-	.swiper-box {
-		flex: 1;
-	}
-	.swiper-item {
-		height: 100%;
-	}
-
-	.buttom {
-		.loginType {
-			font-size: 14px;
-			position: fixed;
-			right: 30rpx;
-			bottom: 120rpx;
-			width: 60px;
-			height: 60px;
-			padding: 4px;
-			cursor: pointer;
-			background: #FFF;
-			text-align: center;
-			line-height: 60px;
-			border-radius: 100%;
-			-webkit-box-shadow: 0px 1px 20px 0px rgba(0,0,0,0.1),inset 0px -1px 0px 0px rgba(0,0,0,0.1);
-			box-shadow: 0px 1px 20px 0px rgba(0,0,0,0.1),inset 0px -1px 0px 0px rgba(0,0,0,0.1);
-		}
-	}
-</style>
diff --git a/pages/center/tips.vue b/pages/center/tips.vue
deleted file mode 100644
index d7f9925..0000000
--- a/pages/center/tips.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-	<view>
-		<u-navbar :is-back="true" :title="title" :border-bottom="false"></u-navbar>
-		<view class="u-content">
-			<u-parse :html="content"
-			:autosetTitle="true"
-			:show-with-animation="true"
-			:selectable="true"
-			></u-parse>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				title:'避坑指南',
-				content: ``
-			}
-		},
-		onLoad() {
-			let url = "/api/cmsApi/getServiceItemByAjax?type=租房避坑指南"
-			this.$u.get(url).then(res => {
-				// console.log(res.data.content);
-				this.content = res.data.content
-			});
-		},
-	}
-</script>
-
-<style>
-	page{
-		background-color: #FFFFFF;
-	}
-</style>
-<style lang="scss" scoped>
-	.u-content{
-		// margin:0 10rpx;
-		// padding: 24rpx;
-		font-size: 34rpx;
-		color: $u-main-color;
-		line-height: 1.8;
-		white-space: pre-wrap !important;
-	}
-</style>
-
diff --git a/pages/detail/addHouse.vue b/pages/detail/addHouse.vue
deleted file mode 100644
index 5181301..0000000
--- a/pages/detail/addHouse.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-	<view>
-		<view class="wrap">
-			<view class="u-tabs-box">
-				<u-tabs-swiper ref="tabs" :list="tabList" :current="current" @change="change" :is-scroll="false" swiperWidth="750" bar-width="120"></u-tabs-swiper>
-			</view>
-			<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
-				<swiper-item class="swiper-item">
-					<add-all-house :model="model"></add-all-house>
-				</swiper-item>
-				<swiper-item class="swiper-item">
-					<add-sub-house :model="model"></add-sub-house>
-				</swiper-item>
-			</swiper>
-		</view>
-	</view>
-</template>
-
-<script>
-
-import addAllHouse from '@/components/zy/addAllHouse.vue' 
-import addSubHouse from '@/components/zy/addSubHouse.vue' 
-export default {
-	components: {
-	  addAllHouse,addSubHouse
-	},
-	data() {
-		return {
-			tabList: [{name: '整租'},{name: '合租'}],
-			current: 0,
-			swiperCurrent: 0,
-			tabsHeight: 0,
-			// 房源对象
-			model: null,
-		};
-	},
-	onLoad: function (option) {
-		this.model = JSON.parse(option.room)
-	},
-	methods: {
-		// tab栏切换
-		change(index) {
-			this.swiperCurrent = index;
-		},
-		transition({ detail: { dx } }) {
-			this.$refs.tabs.setDx(dx);
-		},
-		animationfinish({ detail: { current } }) {
-			this.$refs.tabs.setFinishCurrent(current);
-			this.swiperCurrent = current;
-			this.current = current;
-			this.model.type = current;
-		}
-	}
-};
-</script>
-<style>
-	page{
-		background-color: #FFFFFF;
-	}
-</style>
-<style lang="scss" scoped>
-.tabSwiper {
-	width: 710rpx;
-	background-color: #ffffff;
-	margin: 20rpx auto;
-	border-radius: 20rpx;
-	box-sizing: border-box;
-	padding: 20rpx;
-	font-size: 28rpx;
-	.top {
-		display: flex;
-		justify-content: space-between;
-		.left {
-			display: flex;
-			align-items: center;
-			.title {
-				margin: 0 10rpx;
-				font-size: 32rpx;
-				font-weight: bold;
-			}
-		}
-		.right {
-			color: $u-tips-color;
-		}
-	}
-	.item {
-		display: flex;
-		margin: 20rpx 0 0;
-		.left {
-			margin-right: 20rpx;
-			image {
-				width: 200rpx;
-				height: 200rpx;
-				border-radius: 10rpx;
-			}
-		}
-		.content {
-			.title {
-				font-size: 28rpx;
-				line-height: 50rpx;
-			}
-		}
-		.right {
-			margin-left: 10rpx;
-			padding-top: 20rpx;
-			text-align: right;
-		}
-	}
-}
-.wrap {
-	display: flex;
-	flex-direction: column;
-	height: calc(100vh - var(--window-top));
-	width: 100%;
-}
-.swiper-box {
-	flex: 1;
-}
-.swiper-item {
-	height: 100%;
-}
-
-</style>
diff --git a/pages/detail/contractDetail.vue b/pages/detail/contractDetail.vue
deleted file mode 100644
index cf8f87f..0000000
--- a/pages/detail/contractDetail.vue
+++ /dev/null
@@ -1,250 +0,0 @@
-<template>
-  <view class="contract-detail-page">
-    <customNavbar title="我的合同"></customNavbar>
-    <!-- 顶部信息 -->
-    <view class="header">
-      <image class="cover" :src="contract.coverUrl" mode="aspectFill" />
-      <view class="info">
-        <text class="name">{{ contract.assetName }}</text>
-        <text class="room">{{ contract.assetRoom || '—' }}</text>
-      </view>
-    </view>
-
-    <!-- 合同基本信息 -->
-    <view class="section">
-      <view class="section-title">合同基本信息</view>
-      <view class="info-item" v-for="(item, index) in baseInfo" :key="index" @click="handleClick(item)">
-        <text class="label">{{ item.label }}</text>
-        <view class="value-box">
-          <text class="value">{{ item.value }}</text>
-          <u-icon v-if="item.hasArrow" name="arrow-right" size="30" color="#ccc" />
-        </view>
-      </view>
-    </view>
-
-    <!-- 费用信息 -->
-    <view class="section">
-      <view class="section-title">费用信息</view>
-      <view class="info-item" v-for="(item, index) in feeInfo" :key="index" @click="handleClick(item)">
-        <text class="label">{{ item.label }}</text>
-        <view class="value-box">
-          <text class="value">{{ item.value }}</text>
-          <u-icon v-if="item.hasArrow" name="arrow-right" size="30" color="#ccc" />
-        </view>
-      </view>
-    </view>
-
-    <!-- 签约主体信息 -->
-    <view class="section">
-      <view class="section-title">签约主体信息</view>
-      <view class="info-item" v-for="(item, index) in signerInfo" :key="index">
-        <text class="label">{{ item.label }}</text>
-        <text class="value">{{ item.value }}</text>
-      </view>
-    </view>
-
-    <!-- 底部操作栏 -->
-    <view v-if="contract.status === '待签署'" class="bottom-bar">
-      <u-button class="sign-btn" @click="goSign">
-        去签署
-      </u-button>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      contract: {
-        id: 'c123',
-        coverUrl: '/static/img/index/swiper/swiper3.jpg',
-        assetName: '深圳南山中心写字楼租赁合同',
-        assetRoom: 'B栋1203',
-        status: '待签署', // 可选：待签署 / 已签署 / 已过期
-        signStatus: '未签署',
-        startDate: '2025-01-01',
-        endDate: '2026-01-01',
-        payMethod: '按月支付',
-        payTime: '每月5日',
-        electronicId: 'e1001',
-        deposit: '￥5000',
-        rent: '￥8500/月',
-        electricity: '￥1.2/度',
-        water: '￥5/吨',
-        property: '￥300/月',
-        userId: 'u777',
-        signer: '张三',
-        idCard: '440301199001011234',
-        phone: '13800138000',
-        idValidDate: '2035-01-01',
-      },
-    };
-  },
-  computed: {
-    baseInfo() {
-      return [
-        { label: '合同状态', value: this.contract.status },
-        { label: '签约状态', value: this.contract.signStatus },
-        { label: '合同生效期', value: `${this.contract.startDate} 至 ${this.contract.endDate}` },
-        { label: '付款方式', value: this.contract.payMethod },
-        { label: '付款时间', value: this.contract.payTime },
-        { label: '电子合同', value: '', hasArrow: true, id: this.contract.electronicId },
-      ];
-    },
-    feeInfo() {
-      return [
-        { label: '押金/保证金', value: this.contract.deposit },
-        { label: '租金', value: this.contract.rent },
-        { label: '电费', value: this.contract.electricity },
-        { label: '水费', value: this.contract.water },
-        { label: '物业/增值服务', value: this.contract.property },
-        { label: '我的账单', value: '', hasArrow: true, id: this.contract.id },
-      ];
-    },
-    signerInfo() {
-      return [
-        { label: '签约人', value: this.contract.signer },
-        { label: '身份证号', value: this.contract.idCard },
-        { label: '手机号', value: this.contract.phone },
-        { label: '证件有效期', value: this.contract.idValidDate },
-      ];
-    },
-  },
-  methods: {
-    handleClick(item) {
-      if (item.label === '电子合同') {
-        uni.navigateTo({
-          url: `/pages/contract/contractFile?id=${item.id}`,
-        });
-      } else if (item.label === '我的账单') {
-        uni.navigateTo({
-          url: `/pages/bill/billList?userId=${this.contract.userId}&contractId=${item.id}`,
-        });
-      }
-    },
-    goSign() {
-      uni.navigateTo({
-        url: `/pages/contract/signContract?id=${this.contract.id}`,
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.contract-detail-page {
-  background: #f7f8fa;
-  min-height: 100vh;
-  /* 给导航栏留空间 */
-  padding-top: 120rpx;
-  /* 预留底部操作栏空间 */
-  padding-bottom: 150rpx;
-}
-
-/* 顶部封面信息 */
-.header {
-  display: flex;
-  background: #fff;
-  padding: 24rpx;
-  border-radius: 12rpx;
-  margin: 20rpx;
-
-  .cover {
-    width: 194rpx;
-    height: 156rpx;
-    border-radius: 10rpx;
-    margin-right: 20rpx;
-  }
-
-  .info {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-
-    .name {
-      font-size: 30rpx;
-      font-weight: bold;
-      color: #333;
-      margin-top: 10rpx;
-      margin-bottom: 12rpx;
-    }
-
-    .room {
-      font-size: 26rpx;
-      color: #666;
-    }
-  }
-}
-
-/* 信息区域 */
-.section {
-  background: #fff;
-  border-radius: 12rpx;
-  margin: 20rpx;
-  padding: 20rpx 24rpx;
-
-  .section-title {
-    font-weight: 500;
-    font-size: 40rpx;
-    margin-bottom: 12rpx;
-    color: #212121;
-  }
-
-  .info-item {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 40rpx 0;
-    border-bottom: 1rpx solid #f0f0f0;
-
-    &:last-child {
-      border-bottom: none;
-    }
-
-    .label {
-      font-size: 30rpx;
-      color: #86868C;
-    }
-
-    .value-box {
-      display: flex;
-      align-items: center;
-
-      .value {
-        font-size: 30rpx;
-        color: #222222;
-      }
-
-      u-icon {
-        margin-left: 10rpx;
-      }
-    }
-  }
-}
-
-/* 底部固定操作栏 */
-.bottom-bar {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background: #fff;
-  padding: 35rpx;
-  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.06);
-  z-index: 99;
-
-  .sign-btn {
-    width: 100%;
-    height: 88rpx;
-  }
-
-  /* 使用样式穿透让u-btn样式生效 */
-  &::v-deep .u-btn {
-    font-size: 30rpx;
-    color: #fff;
-    background: linear-gradient(90deg, #FF6F63 0%, #FB392A 100%);
-    border-radius: 10rpx;
-  }
-}
-</style>
diff --git a/pages/detail/detail.vue b/pages/detail/detail.vue
deleted file mode 100644
index 3ce9d30..0000000
--- a/pages/detail/detail.vue
+++ /dev/null
@@ -1,574 +0,0 @@
-<template>
-    <view class="u-margin-left-20 u-margin-right-20">
-		<u-navbar :is-back="true" title="房源" :border-bottom="false"
-		back-text="返回" :custom-back="goHome" ></u-navbar>
-        <view>
-            <u-swiper :list="swiperlist" :height="750" mode="number" effect3d effect3d-previous-margin="20" :interval="5000" @click="clickImg"></u-swiper>
-        </view>
-		<view class="item u-margin-top-5">
-			<view class="item-title">{{room.type == '整租' ? room.houseNum + room.houseHall + room.toiletNum : room.roomType}}</view>
-			<view class="item-price">¥{{room.price}}/月</view>
-		</view>
-		<view class="item" style="display: flex;align-items: center;flex-wrap: wrap;">
-			 <view v-for="(item,index) in tagList" :key="index"
-			  style="background-color: #f5f5f5;color: #606266;margin-right: 15rpx;
-			  margin-top: 15rpx;padding: 0 10rpx;height: 60rpx;line-height: 60rpx;">
-				{{item.title}}
-			</view>
-		</view>
-		<!-- 小程序通讯 -->
-		<button type="default" open-type="contact"  class="clearBtn">
-			<u-cell-group>
-				<u-cell-item title="服务费另计" value="在线咨询"></u-cell-item>
-			</u-cell-group>		
-		</button>
-		<view v-if="room.introduce">
-			<u-gap height="10" bg-color="#f8f8f8"></u-gap>
-			<u-card title="房源介绍" :border="false" :head-border-bottom="false" padding="0" title-size="38">
-				<view class="u-padding-top-45 item" slot="body">
-					{{room.introduce}}
-				</view>
-			</u-card>
-		</view>
-		<u-gap height="1" bg-color="#f8f8f8"></u-gap>
-		<view style="position: relative;">
-			<u-card title="小区介绍" :border="false" :head-border-bottom="false" padding="0" title-size="38">
-				<view class="u-padding-top-45" slot="body">
-					<view class="u-flex" style="justify-content: space-between;">
-						<view class="item">
-							<view>建筑年份：{{village.year}}</view>
-							<view>建筑类型：{{village.type}}</view>
-							<view>绿化率：{{village.green}}%</view>
-						</view>
-						<image src="https://img11.360buyimg.com/n7/jfs/t1/94448/29/2734/524808/5dd4cc16E990dfb6b/59c256f85a8c3757.jpg" mode="widthFix" 
-						style="width: 250rpx;height: 200rpx;"></image>
-					</view>
-				</view>
-			</u-card>
-		</view>
-		<u-gap height="1" bg-color="#f8f8f8"></u-gap>
-		<view style="position: relative;">
-			<u-card :title="room.villageName" :border="false" :head-border-bottom="false" padding="0" title-size="38">
-				<view class="u-padding-top-45" slot="body">
-					<map :latitude="latitude" :longitude="longitude">
-						<cover-view style='width:100%;height:100%;' @click="clickMap"></cover-view>
-					</map>
-					<view 
-					 @click="clickMap"
-					style="margin-top: 30rpx;padding-left: 10rpx;height:80rpx;
-					line-height: 80rpx;background-color: #fdfdfd;border-radius: 6px;
-					display: flex;justify-content: space-between;
-					padding-right: 10rpx;color: #909399;
-					">
-						<view>
-							<u-icon name="map" color="#909399" size="30"></u-icon>
-							<text style="margin-left: 8rpx;">
-								房源直线距离约 {{distance}} km
-							</text>
-						</view>
-						<view>
-							<text style="margin-right: 3rpx;">
-								导航
-							</text>
-							<u-icon name="arrow-right" color="#909399" size="30"></u-icon>
-						</view>
-					</view>
-					<view style="margin-top: 20rpx;margin-left: 10rpx;font-size: 10px;
-							color: #909399">
-						*数据仅供参考，请以实际看房为准
-					</view>
-				</view>
-			</u-card>
-		</view>
-		<u-gap height="1" bg-color="#f8f8f8"></u-gap>
-		<view style="position: relative;">
-			<u-card title="服务介绍" :border="false" :head-border-bottom="false" padding="0" title-size="38">
-				<view class="u-padding-top-35" slot="body">
-					<u-cell-group :border="false">
-						<u-cell-item icon="heart" title="承诺-四大租住承诺，安心有保障" :arrow="false" hover-class="none" :border-bottom="false"></u-cell-item>
-						<u-cell-item icon="level" title="品质-两类品质保障，入住更无忧" :arrow="false" hover-class="none" :border-bottom="false"></u-cell-item>
-						<u-cell-item icon="star" title="服务-两项日常服务，生活超便捷" :arrow="false" hover-class="none" :border-bottom="false"></u-cell-item>
-						<u-cell-item icon="rmb" title="付款-多种付款方式，支付更灵活" :arrow="false" hover-class="none" :border-bottom="false"></u-cell-item>
-					</u-cell-group>
-				</view>
-			</u-card>
-		</view>
-		<u-gap height="1" bg-color="#f8f8f8"></u-gap>
-		<view style="position: relative;">
-			<u-card title="房源评价" :border="false" :head-border-bottom="false" padding="0" title-size="38">				
-				<view class="u-padding-top-50 u-padding-bottom-50" slot="body">					
-					<u-cell-group :border="false">
-						{{evaluate}}
-						<text style="float: right;color: #909399;font-size: 13px;">{{credt}}</text>
-					</u-cell-group>
-				</view>		
-				<view slot="foot" style="padding-top: 30rpx;float: right;">
-					<u-icon name="chat-fill"></u-icon>
-					<text @click="moreEval" style="text-align: center;font-size: 12px;margin-left: 5rpx;">更多评价（{{evalsize}}）</text>
-				</view>
-			</u-card>
-		</view>		
-		<u-gap height="10" bg-color="#f8f8f8"></u-gap>
-		<view style="position: relative;padding-bottom: 50rpx;">
-			<u-card title="经纪人" :border="false" :head-border-bottom="false" padding="0" title-size="38">
-				<view class="u-padding-top-45" slot="body">
-					<view class="u-flex">
-					    <view class="u-m-r-20">
-					        <u-avatar :src="room.agentAvatar" size="80"></u-avatar>
-					    </view>
-					    <view class="u-flex-1">
-							<view class="u-font-16 u-p-b-40">{{room.agentName}}</view>
-					        <!-- <view class="u-font-12 u-p-b-10">{{user.agentPhone}}</view> -->
-					    </view>
-					</view>
-					<view class="arrow-right" @click="clickItem">
-						<view class="phone">
-							<u-icon name="phone" class="u-p-l-10" color="#d1d1d1"
-							size="40"
-							></u-icon>
-						</view>
-					</view>
-				</view>
-			</u-card>
-			<view class="item">
-				<u-divider>开源字节为您服务</u-divider>
-			</view>
-		</view>		
-		<view class="navigation">
-			<view class="left">
-				<button type="default" open-type="contact"  class="clearBtn"
-				style="font-size: 14px;color: #6a6a6a;">
-					<view class="item">
-						<u-icon name="server-fill" :size="40"></u-icon>
-						<view class="text">客服</view>	
-					</view>
-				</button>
-				<view class="item" @click="heartHouse">
-					<u-icon name="heart" :size="40" v-if="!room.heart"></u-icon>
-					<u-icon name="heart-fill" color="#ff9900" :size="40" v-if="room.heart"></u-icon>
-					<view class="text">收藏</view>
-				</view>
-				<button type="default" open-type="share"  class="clearBtn"
-				style="font-size: 14px;color: #6a6a6a;">
-					<view class="item">
-						<u-icon name="zhuanfa" :size="40"></u-icon>
-						<view class="text">分享</view>
-					</view> 
-				</button>
-			</view>
-			<view class="right" @click="clickItem">
-				<view class="btn">联系经纪人</view>
-			</view>
-		</view>
-    </view>
-</template>
-
-<script>
-	import config from "@/common/config.js" // 全局配置文件
-    export default {
-        data() {
-            return {
-				room: {
-					villageName:'',
-					houseNum:'',
-					houseHall:'',
-					toiletNum:'',
-					roomType:'',
-					direction:'',
-					price:'',
-					introduce:'',
-					heart:false,
-				},
-				village: {
-					year:'',
-					type:'',
-					green:'',
-				},
-                swiperlist: [],
-                tagList: [],
-				//评价列表
-				evaluList:[],
-				user: {},
-				longitude: 120.14,
-				latitude: 30.35, 
-				distance:0,
-				//自己的评论
-				ownevalu:'',
-				houseId:null,
-				evalsize:0,
-				havem:false,
-				evaluate:'',
-				credt:''
-            }
-        },
-		onLoad: function (option) {
-			let houseId = option.houseId //上个页面传递的参数。
-			this.houseId =houseId
-			// 渲染当前房源信息
-			this.findHouseById(houseId);
-			
-			// // 在页面中定义激励视频广告
-			// let videoAd = null
-			// // 在页面onLoad回调事件中创建激励视频广告实例
-			// if (wx.createRewardedVideoAd) {
-			//   videoAd = wx.createRewardedVideoAd({
-			// 	adUnitId: 'adunit-8cd5789a01a51891'
-			//   })
-			//   videoAd.onLoad(() => {
-			// 	  console.log('激励视频 成功加载广告')
-			//   })
-			//   videoAd.onError((err) => {})
-			//   videoAd.onClose((res) => {
-			// 	  console.log('激励视频 成功关闭广告')
-			//   })
-			// }
-			// // 用户触发广告后，显示激励视频广告
-			// if (videoAd) {
-			//   videoAd.show().catch(() => {
-			// 	// 失败重试
-			// 	videoAd.load()
-			// 	  .then(() => videoAd.show())
-			// 	  .catch(err => {
-			// 		console.log('激励视频 广告显示失败')
-			// 	  })
-			//   })
-			// }
-		},
-        methods: {
-			heartHouse(){
-				// 判断是否有userId
-				let lifeData = uni.getStorageSync('lifeData');
-				let vuex_user = lifeData.vuex_user
-				if(!vuex_user){
-					// 没有userId 则跳转到登录
-					return uni.reLaunch({
-						url:'../login/login'
-					})
-				}
-				// 收藏
-				let url = "api/houseApi/saveHeart";
-				this.$u.post(url, {
-					heart: this.room.heart,
-					houseId: this.room.id,
-					userId: vuex_user.user.userId,
-				}).then(result => {
-					this.room.heart = !this.room.heart
-					this.$mytip.toast(result.msg)
-				});
-			},
-			goHome(){
-				uni.reLaunch({
-					url:'../index/index'
-				})
-			},
-            clickItem() {
-                //拨打固定电话
-                uni.makePhoneCall({
-                	phoneNumber: this.room.agentPhone,
-                });
-            },
-			findHouseById(houseId){
-				let url = "api/houseApi/findHouseById";
-				this.$u.get(url, {
-					id: houseId
-				}).then(result => {
-					let room = result.data
-					if(room.type == 0){
-						room.type = '整租'
-					}else if(room.type == 1){
-						room.type = '合租'
-					}
-					if(room.roomType == 1){
-						room.roomType = '主卧'
-					}else if(room.roomType == 2){
-						room.roomType = '次卧'
-					}else{
-						room.roomType = '未知'
-					}
-					
-					if(this.$u.test.isEmpty(room.houseNum)){
-						room.houseNum = ''
-					}
-					if(this.$u.test.isEmpty(room.houseHall)){
-						room.houseHall = ''
-					}
-					if(this.$u.test.isEmpty(room.toiletNum)){
-						room.toiletNum = ''
-					}
-					if(this.$u.test.isEmpty(room.floor)){
-						room.floor = ''
-					}else{
-						room.floor = room.floor + '层'
-					}
-					this.swiperlist = room.imageList.map(val=>{
-						let imgUrl = val.imgUrl
-						if(!imgUrl.includes(config.staticUrl)){
-							imgUrl = config.staticUrl+val.imgUrl
-						}else{
-							imgUrl = val.imgUrl
-						}
-						return {
-							title: val.imageName,
-							image: imgUrl
-						}
-					})
-					this.tagList = room.featureList.map(val=>{
-						return {
-							title: val.feature,
-						}
-					})
-					if(!room.agentAvatar.includes(config.staticUrl)){
-						room.agentAvatar = config.staticUrl+room.agentAvatar
-					}
-					this.user = room.user
-					this.village = room.village
-					this.room = room
-					// 判断是否收藏
-					this.selectHouseHeart(houseId);
-					//查询房源评价
-					this.selectHouseEvals(houseId);
-					
-					// 分享自定义标题与图片
-					let shareTitle = ''
-					if(room.type == '整租'){
-						shareTitle = this.village.name + " " + this.room.houseNum + this.room.houseHall + this.room.toiletNum + " " + this.room.decoration+ " ¥" + this.room.price+"/月"
-					}else{
-						shareTitle = this.village.name + " " + room.roomType + " " + this.room.decoration+  " ¥" + this.room.price+"/月"
-					}
-					this.$u.mpShare = {
-						title:  shareTitle, // 默认为小程序名称，可自定义
-						// 支持PNG及JPG，默认为当前页面的截图
-						imageUrl: this.room.faceUrl, 
-					}
-					
-					// 添加到浏览历史
-					let houseHistory = uni.getStorageSync('houseHistory')
-					if(!houseHistory){
-						houseHistory = []
-					}
-					// 如果超过20个了，则删除最后一个
-					if(houseHistory.length >= 20){
-						houseHistory.pop()
-					}
-					houseHistory.push(this.room)
-					// 数据去重
-					const keyArr = [];
-					houseHistory.forEach((element,index) => {
-						keyArr.push(element.code);  // 通过code来判断
-					});
-					const newArr = [];
-					const newKey = new Set(keyArr);  // key去重
-					newKey.forEach(item =>{
-						const index = keyArr.findIndex(item2 => item2 === item);
-						newArr.push(houseHistory[index]);
-					})
-					uni.setStorageSync('houseHistory',newArr)
-					
-					// 经纬度
-					this.longitude = room.longitude
-					this.latitude = room.latitude
-					// 计算距离
-					let lat1 = 39.909
-					let lng1 = 116.39742
-					let lat2 = this.latitude
-					let lng2 = this.longitude
-					uni.getLocation({
-						type: 'gcj02',
-						success: res=> {
-							lat1 = res.latitude
-							lng1 = res.longitude
-							this.distance = this.getDistance(lat1,lng1 ,lat2 , lng2);
-						}
-					})
-				});
-			},
-			selectHouseHeart(houseId){
-				// 判断是否有userId
-				let lifeData = uni.getStorageSync('lifeData');
-				let vuex_user = lifeData.vuex_user
-				if(vuex_user){
-					let url = "api/houseApi/selectHouseHeart";
-					this.$u.get(url, {
-						houseId: houseId,
-						userId: vuex_user.user.userId,
-					}).then(result => {
-						this.room.heart = result.data
-					});
-				}
-			},			
-			selectHouseEvals(houseId){
-				let url = "api/houseApi/selectHouseEvals";
-				this.$u.get(url, {
-					houseId: houseId,
-					pageNum: 1,
-					pageSize: 1
-				}).then(result => {	
-					if(result.total >0){
-						this.evaluate = result.rows[0].evaluate;
-						if(this.evaluate.length>30){
-							this.evaluate = this.evaluate .substring(0, 30)+"......";
-						}
-						this.credt=result.rows[0].createTime;
-						this.havem=true;
-						this.evalsize = result.total;
-					}					
-				});
-			},
-			moreEval() {
-				this.$u.route({
-					url: '/pages/detail/evalList',
-					params: {
-						houseId: this.houseId
-					}
-				})
-			},
-			clickImg(index){
-				let imgArr = this.swiperlist.map(val=>{
-					return val.image
-				})
-				console.log(imgArr);
-				 // 预览图片
-				uni.previewImage({
-					current: index,
-					urls: imgArr
-				});
-			},
-			clickMap(e){
-				uni.openLocation({
-					longitude: Number(this.longitude),
-					latitude: Number(this.latitude),
-					name: this.room.villageName,
-					address: this.room.address
-				})
-			},
-			getDistance(lat1, lng1, lat2, lng2) {
-			    lat1 = lat1 || 0;
-				lng1 = lng1 || 0;
-				lat2 = lat2 || 0;
-				lng2 = lng2 || 0;
-				var rad1 = lat1 * Math.PI / 180.0;
-				var rad2 = lat2 * Math.PI / 180.0;
-				var a = rad1 - rad2;
-				var b = lng1 * Math.PI / 180.0 - lng2 * Math.PI / 180.0;
-				var r = 6378137;
-				var distance = r * 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(rad1) * Math.cos(rad2) * Math.pow(Math.sin(b / 2), 2)));
-				return (distance/1000).toFixed(2);
-			}
-        }
-    }
-</script>
-
-<style>
-    /* page不能写带scope的style标签中，否则无效 */
-    page {
-        background-color: rgb(255, 255, 255);
-    }
-</style>
-
-
-<style lang="scss" scoped>
-	map {
-		width: 100%;
-		height: 350rpx;
-	}
-	
-	.item{
-		padding: 25rpx;
-		line-height: 80rpx;
-		margin-top: -30rpx;
-	}
-	
-    .item-title {
-        font-size: 42rpx;
-        color: $u-main-color;
-        font-weight: bold;
-    }
-
-    .item-price {
-        font-weight: normal;
-        font-size: 45rpx;
-        color: $u-type-warning;
-    }
-
-    .item-desc {
-        font-weight: normal;
-        font-size: 36rpx;
-        color: $u-tips-color;
-    }
-	
-	.arrow-right{
-		position: absolute;
-		top: 80rpx;
-		right: 28rpx;
-		font-weight: normal;
-		font-size: 28rpx;
-		color: $u-tips-color;
-		.phone{
-			width: 90rpx;height:90rpx;
-			border-radius: 100%;
-			box-shadow: 0px 1px 20px 0px rgba(0,0,0,0.1);
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-	}
-	
-	.wayClass{
-		color: #606266;
-		padding: 30rpx;
-		line-height: 50rpx;
-	}
-
-	.clearBtn{
-		margin:0;
-		padding: 0;
-		line-height: 1;
-		background-color: #FFFFFF;
-	}
-	
-	.clearBtn::after{
-	    position: unset !important;
-	    border: unset;
-	}
-	
-	.navigation {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		padding: 0rpx 15rpx;
-		background-color: #ffffff;
-		box-shadow:0 -1px 1px 0 rgba(0, 0, 0, 0.05);
-		z-index: 9999;
-		.left {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			margin-top: 38rpx;
-			font-size: 14px;
-			color: #6a6a6a;
-			.item {
-				display: flex;
-				.text{
-					margin-left: 4rpx;
-				}
-			}
-		}
-		.right {
-			display: flex;
-			font-size: 28rpx;
-			align-items: center;
-			.btn {
-				line-height: 66rpx;
-				margin-left: 30rpx;
-				padding: 5rpx 50rpx;
-				color: #ffffff;
-				border-radius:  36rpx;
-				background-color: #2979ff;
-			}
-		}
-	}
-</style>
diff --git a/pages/detail/evalList.vue b/pages/detail/evalList.vue
deleted file mode 100644
index d61cf02..0000000
--- a/pages/detail/evalList.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-	<view  >
-		<view class="text">
-			<text style="font-size: 15px;margin-left: 20rpx;">全部评价({{total}})			
-			<text style="float: right;margin-right: 20rpx;font-weight: bold;" @click="inputDialogToggle" >添加评价</text>
-			</text>
-		</view>
-		<view class="text" v-for="(item,index) in listData" :key="index" style="padding: 0 20rpx;margin-top: 6rpx;">
-			<view><text>{{ item.evaluate }}</text></view>
-			<view style="text-align: right;color: #909399;font-size: 13px;"><text>{{ item.createTime }}</text></view>
-		</view>	
-		<view>
-			<!-- 输入框示例 -->
-			<uni-popup ref="inputDialog" type="dialog">
-				<uni-popup-dialog ref="inputClose"  mode="input" title="评价房源" value=""
-					 @confirm="submitEval">
-					<textarea placeholder="请输入评价" v-model="ownevalu" ></textarea>
-				</uni-popup-dialog>
-			</uni-popup>			
-			</uni-popup>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				houseId:null,
-				listData: [],
-				pageNum: 1,
-				pageSize: 20,
-				scrollTop: 0,
-				reload: false,
-				loadStatus: 'loadmore',
-				status: 'more',
-				total:0,
-				ownevalu:'',
-				userId:null
-			};
-		},
-		onLoad(option) {		
-			this.houseId = option.houseId; //上个页面传递的参数。
-			this.getList();
-		},
-		onPageScroll(e) {
-		    this.scrollTop = e.scrollTop;
-		},
-		onReachBottom() {
-		    this.loadStatus = 'loading';
-		    // 获取数据
-			this.getList()
-		},
-		// 下拉刷新
-		onPullDownRefresh() {
-			this.pageNum = 1
-			this.$refs.uWaterfall.clear();
-			// 获取数据
-			this.getList();
-			// 关闭刷新
-			uni.stopPullDownRefresh();
-		},
-		methods: {			
-			getList() {
-				let url = "/api/houseApi/selectHouseEvals";
-				let defaultData = {					
-					houseId:this.houseId,
-					pageNum: this.pageNum,
-					pageSize: this.pageSize
-				}
-				this.$u.get(url, {...defaultData}).then(result => {
-					console.log(result);
-					const data = result.rows;
-					this.total= result.total;
-					if(this.pageNum>0 && data.length < this.pageSize){
-						 this.loadStatus = 'nomore';
-					}else{
-						++ this.pageNum
-						this.loadStatus = 'loadmore';
-					}
-					this.listData = data;
-				});
-			},
-			inputDialogToggle() {
-				// 判断是否有userId
-				let lifeData = uni.getStorageSync('lifeData');
-				let vuex_user = lifeData.vuex_user
-				if(!vuex_user){
-					// 没有userId 则跳转到登录
-					return uni.reLaunch({
-						url:'../login/login'
-					})
-				}
-				this.userId=vuex_user.userId;
-				this.$refs.inputDialog.open();
-				//判断是否有评价权限
-				// let url = "api/houseApi/checkAuthEvals";
-				// this.$u.get(url, {
-				// 	houseId: this.houseId,
-				// 	userId:this.userId
-					
-				// }).then(result => {	
-				// 	if(result.code === 200 && result.data.length>0){
-				// 		this.$refs.inputDialog.open();
-				// 	}else{
-				// 		this.$mytip.toast("只有租客才能进行评论！");
-				// 	}				
-				// });
-			},			
-			submitEval(){
-				let url = "api/houseApi/saveHouseEvals";
-				this.$u.get(url, {
-					houseId: this.houseId,
-					evalu: this.ownevalu,
-					userId:this.userId
-					
-				}).then(result => {						
-					this.$mytip.toast('评价成功')
-					this.$refs.inputDialog.close()
-					this.getList();
-				});
-			}
-		}
-	};
-</script>
-
-<style>	
-	.text {
-		background-color: #fff;
-		line-height: 80rpx;
-	}
-</style>
diff --git a/pages/detail/preHouse.vue b/pages/detail/preHouse.vue
deleted file mode 100644
index b61b048..0000000
--- a/pages/detail/preHouse.vue
+++ /dev/null
@@ -1,318 +0,0 @@
-<template>
-	<view class="">
-		<!-- #ifndef MP-WEIXIN --> 
-			<u-image width="100%" height="350rpx" :src="src"></u-image>
-		<!-- #endif -->
-		<view class="wrap">
-			<u-form :model="model" :rules="rules" ref="uForm" :errorType="errorType">
-				<u-form-item :label-position="labelPosition" label="小区名称" prop="villageName" label-width="180"
-				left-icon="map" :leftIconStyle="{color:'#d5d5d5'}">
-					<u-input :border="border" type="select" :select-open="selectShow" v-model="model.villageName" placeholder="请选择小区(必选)" @click="selectShow = true"></u-input>
-				</u-form-item>
-				<u-form-item :label-position="labelPosition" label="详细地址" prop="address" label-width="180"
-				left-icon="file-text" :leftIconStyle="{color:'#d5d5d5'}" right-icon="map"
-				:rightIconStyle="{color:'#d5d5d5'}">
-					<u-input :border="border" placeholder="请在地图选择详细地址" v-model="model.address" type="text" disabled
-					@click="chooseAddress"></u-input>
-				</u-form-item>
-				<u-form-item  :label-position="labelPosition" label="房牌号" prop="houseNo" label-width="180"
-				left-icon="home" :leftIconStyle="{color:'#d5d5d5'}">
-					<u-input :border="border" placeholder="请输入门牌号(必填)" v-model="model.houseNo" type="text"></u-input>
-				</u-form-item>
-				<u-form-item  :label-position="labelPosition" label="装修" prop="decoration" label-width="180" left-icon="eye" :leftIconStyle="{color:'#d5d5d5'}">
-					<u-input :border="border" type="select" placeholder="请选择装修(必选)":select-open="decorationShow" v-model="model.decoration"  @click="decorationShow = true"></u-input>
-				</u-form-item>
-				<u-form-item  :label-position="labelPosition" label="房东姓名" prop="ownerName" label-width="180"
-				left-icon="account" :leftIconStyle="{color:'#d5d5d5'}">
-					<u-input :border="border" placeholder="请输入房东姓名(必填)" v-model="model.ownerName" type="text"></u-input>
-				</u-form-item>
-				<u-form-item  :label-position="labelPosition" label="房东电话" prop="owerPhone" label-width="180"
-				left-icon="phone" :leftIconStyle="{color:'#d5d5d5'}">
-					<u-input :border="border" placeholder="请输入房东电话(必填)" v-model="model.owerPhone" type="number" maxlength="11"></u-input>
-				</u-form-item>
-				<u-form-item label-width="180" :label-position="labelPosition" label="付款方式" prop="payType"
-				left-icon="rmb-circle" :leftIconStyle="{color:'#d5d5d5'}">
-					<u-input :border="border" type="select" :select-open="actionSheetShow" v-model="model.payType" placeholder="请选择付款方式(必选)" @click="actionSheetShow = true"></u-input>
-				</u-form-item>
-			</u-form>
-			<!-- 流量主-腾讯视频广告 -->
-			<ad unit-id="adunit-c6cdd74f48eed506" ad-type="video" ad-theme="white"></ad>
-			<u-select mode="single-column" :list="selectList" v-model="selectShow" @confirm="selectConfirm"></u-select>
-			<u-select mode="single-column" :list="decorationList" v-model="decorationShow" @confirm="decorationConfirm"></u-select>
-			<u-action-sheet :list="actionSheetList" v-model="actionSheetShow" @click="actionSheetCallback"></u-action-sheet>
-		</view>
-		<view class="bottom-btn">
-			<u-button type="primary" @click="submit">下一步</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		let that = this;
-		return {
-			src: 'http://img.sccnn.com/bimg/340/02027.jpg',
-			actionSheetShow: false,
-			model: {
-				type: 0,
-				houseType: '',
-				roomLabel: '',
-				villageName: '',
-				villageId: '',
-				address: '',
-				houseNo: '',
-				//装修
-				decoration:'',
-				//房东
-				ownerName:'',
-				//房东电话
-				owerPhone:'',
-				payType:'',
-				createName: uni.getStorageSync('lifeData').vuex_user.userName,
-				publishId: uni.getStorageSync('lifeData').vuex_user.userId,
-				state: 0,
-				longitude: 0,
-				latitude: 0,
-			},
-			selectList: [],
-			decorationList: [
-				{
-					label: '简装',
-					value: '简装'
-				},
-				{
-					label: '中装',
-					value: '中装'
-				},
-				{
-					label: '精装修',
-					value: '精装修'
-				},
-				{
-					label: '豪装',
-					value: '豪装'
-				}
-			],
-			actionSheetList: [
-				{
-					text: '月付'
-				},
-				{
-					text: '季付'
-				},
-				{
-					text: '半年付'
-				},
-				{
-					text: '年付'
-				}
-			],
-			rules: {
-				villageName: [
-					{
-						required: true,
-						message: '请选择小区',
-						trigger: ['change','blur'],
-					}
-				],
-				address: [
-					{
-						required: true,
-						message: '请输入详细地址',
-						trigger: ['change','blur'],
-					}
-				],
-				houseNo: [
-					{
-						required: true,
-						message: '请输入门牌号',
-						trigger: ['change','blur'],
-					}
-				],
-				decoration: [
-					{
-						required: true,
-						message: '请选择装修',
-						trigger: ['change','blur'],
-					}
-				],
-				ownerName: [
-					{
-						required: true,
-						message: '请输入房东姓名',
-						trigger: ['change','blur'],
-					}
-				],
-				owerPhone: [
-					{
-						required: true,
-						message: '请输入房东电话',
-						trigger: ['change','blur'],
-					}
-				],
-				payType: [
-					{
-						required: true,
-						message: '请选择付款方式',
-						trigger: ['change','blur'],
-					}
-				],
-			},
-			border: false,
-			check: false,
-			selectShow: false,
-			decorationShow: false,
-			labelPosition: 'left',
-			errorType: ['toast'],
-		};
-	},
-	onLoad(option) {
-		let houseId = option.houseId //上个页面传递的参数。
-		if(houseId){
-			// 渲染当前房源信息
-			this.findHouseById(houseId);
-		}
-		this.findVillageList()
-		
-		// 定位经纬度
-		uni.getLocation({
-			 type: 'gcj02',
-			 // 当指定 high 时，期望精度值为100m，当指定 best 时期望精度值为20m
-			 accuracy:'best',
-			 // 开启高精度定位
-			 isHighAccuracy:true,
-			 success: (res) => {
-			 	this.longitude=res.longitude
-			 	this.latitude= res.latitude
-			 }
-		});
-		uni.$on('changeAddressConfig', (address,lon,lat) => {
-			// 获取数据
-			this.changeAddressConfig(address,lon,lat);
-		})
-	},
-	onUnload() {
-		// 移除监听事件  
-		uni.$off('changeAddressConfig');
-	},
-	onReady() {
-		this.$refs.uForm.setRules(this.rules);
-	},
-	methods: {
-		changeAddressConfig(address,lon,lat){
-			this.model.address = address
-			this.model.longitude= lon
-			this.model.latitude= lat
-		},
-		submit() {
-			this.$refs.uForm.validate(valid => {
-				if (valid) {
-					if(!this.$u.test.mobile(this.model.owerPhone)){
-						return this.$mytip.toast('房东电话请输入手机号码')
-					}
-					return this.$u.route({
-						url: '/pages/detail/addHouse',
-						params: {
-							room: JSON.stringify(this.model)
-						}
-					})
-				} else {
-					console.log('验证失败');
-				}
-			});
-		},
-		selectConfirm(e) {
-			e.map((val, index) => {
-				this.model.villageName = val.label;
-				this.model.villageId = val.value
-			})
-		},
-		decorationConfirm(e) {
-			e.map((val, index) => {
-				this.model.decoration = val.label;
-			})
-		},
-		labelPositionChange(index) {
-			this.labelPosition = index == 0 ? 'left' : 'top';
-		},
-		// 点击actionSheet回调
-		actionSheetCallback(index) {
-			uni.hideKeyboard();
-			this.model.payType = this.actionSheetList[index].text;
-		},
-		findVillageList() {
-			let url = "/api/houseApi/findVillageList";
-			this.$u.get(url,{
-					city:uni.getStorageSync('lifeData').vuex_city,
-            		orderByColumn: 'name',
-            		isAsc: 'desc'
-            	}).then(result => {
-				const data = result.rows
-				for (let i = 0; i < data.length; i++) {
-				    // 先转成字符串再转成对象，避免数组对象引用导致数据混乱
-				    let item = data[i]
-					this.selectList.push({
-						label: item.name,
-						value: item.id
-					})
-				}
-				return data
-			});
-		},
-		findHouseById(houseId){
-			let url = "api/houseApi/findHouseById";
-			this.$u.get(url, {
-				id: houseId
-			}).then(result => {
-				let room = result.data
-				this.model = room
-				let houseType = this.model.houseNum + this.model.houseHall + this.model.toiletNum
-				if(houseType == 0){
-					houseType = ''
-				}
-				this.model.houseType = houseType
-				if(this.model.roomType == 1){
-					this.model.roomLabel = '主卧'
-				}else if(this.model.roomType == 2){
-					this.model.roomLabel = '次卧'
-				}
-			});
-		},
-		chooseAddress() {
-			this.$u.route({
-				url: '/pages/chooseAddress/index'
-			})
-		},
-	}
-};
-</script>
-
-<style>
-	page{
-		background-color: #FFFFFF;
-	}
-</style>
-<style scoped lang="scss">
-.wrap {
-	padding: 30rpx;
-}
-
-/* #ifdef MP-WEIXIN */  
-.bottom-btn {
-	position: fixed;
-	bottom: 8rpx;
-	width: 100%;
-	padding: 30rpx;
-	border-top: 1rpx solid #eee;
-	background-color: #FFFFFF;
-}
-/* #endif */
-
-/* #ifndef MP-WEIXIN */  
-.bottom-btn {
-	padding: 0 30rpx 30rpx 30rpx;
-	background-color: #FFFFFF;
-}
-/* #endif */
-</style>
diff --git a/pages/form/check.vue b/pages/form/check.vue
deleted file mode 100644
index 994f2a3..0000000
--- a/pages/form/check.vue
+++ /dev/null
@@ -1,337 +0,0 @@
-<template>
-	<view class="">
-		<!-- #ifndef MP-WEIXIN -->
-		<u-image width="100%" height="350rpx" :src="src"></u-image>
-		<!-- #endif -->
-		<view class="wrap">
-			<u-form :model="model" :rules="rules" ref="uForm" :errorType="errorType">
-				<u-form-item :label-position="labelPosition" label="巡检图片" prop="villageName" label-width="180"
-					left-icon="map" :leftIconStyle="{ color: '#d5d5d5' }">
-					<!-- 图片上传区域 -->
-					<view class="upload-box" @click="chooseImage">
-						<image v-if="imagePath" :src="imagePath" mode="aspectFit" />
-						<text v-else>+ 点击上传图片（必传）</text>
-						<text v-if="locationInfo" class="watermark">{{ locationInfo }}</text>
-					</view>
-				</u-form-item>
-				<u-form-item :label-position="labelPosition" label="详细地址" prop="address" label-width="180"
-					left-icon="file-text" :leftIconStyle="{ color: '#d5d5d5' }" right-icon="map"
-					:rightIconStyle="{ color: '#d5d5d5' }">
-					<u-input :border="border" placeholder="请在地图选择详细地址" v-model="model.address" type="text" disabled
-						@click="chooseAddress"></u-input>
-				</u-form-item>
-				<u-form-item :label-position="labelPosition" label="房牌号" prop="houseNo" label-width="180"
-					left-icon="home" :leftIconStyle="{ color: '#d5d5d5' }">
-					<u-input :border="border" placeholder="请输入门牌号(必填)" v-model="model.houseNo" type="text"></u-input>
-				</u-form-item>
-			</u-form>
-			<!-- 流量主-腾讯视频广告 -->
-			<!-- <ad unit-id="adunit-c6cdd74f48eed506" ad-type="video" ad-theme="white"></ad> -->
-			<u-select mode="single-column" :list="selectList" v-model="selectShow" @confirm="selectConfirm"></u-select>
-			<u-select mode="single-column" :list="decorationList" v-model="decorationShow"
-				@confirm="decorationConfirm"></u-select>
-			<u-action-sheet :list="actionSheetList" v-model="actionSheetShow"
-				@click="actionSheetCallback"></u-action-sheet>
-		</view>
-		<view class="bottom-btn">
-			<u-button type="primary" @click="submit">下一步</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		let that = this;
-		return {
-			src: 'http://img.sccnn.com/bimg/340/02027.jpg',
-			actionSheetShow: false,
-			model: {
-				type: 0,
-				houseType: '',
-				roomLabel: '',
-				villageName: '',
-				villageId: '',
-				address: '',
-				houseNo: '',
-				//装修
-				decoration: '',
-				//房东
-				ownerName: '',
-				//房东电话
-				owerPhone: '',
-				payType: '',
-				createName: uni.getStorageSync('lifeData').vuex_user.userName,
-				publishId: uni.getStorageSync('lifeData').vuex_user.userId,
-				state: 0,
-				longitude: 0,
-				latitude: 0,
-			},
-			selectList: [],
-			decorationList: [
-				{
-					label: '简装',
-					value: '简装'
-				},
-				{
-					label: '中装',
-					value: '中装'
-				},
-				{
-					label: '精装修',
-					value: '精装修'
-				},
-				{
-					label: '豪装',
-					value: '豪装'
-				}
-			],
-			actionSheetList: [
-				{
-					text: '月付'
-				},
-				{
-					text: '季付'
-				},
-				{
-					text: '半年付'
-				},
-				{
-					text: '年付'
-				}
-			],
-			rules: {
-				villageName: [
-					{
-						required: true,
-						message: '请选择小区',
-						trigger: ['change', 'blur'],
-					}
-				],
-				address: [
-					{
-						required: true,
-						message: '请输入详细地址',
-						trigger: ['change', 'blur'],
-					}
-				],
-				houseNo: [
-					{
-						required: true,
-						message: '请输入门牌号',
-						trigger: ['change', 'blur'],
-					}
-				],
-				decoration: [
-					{
-						required: true,
-						message: '请选择装修',
-						trigger: ['change', 'blur'],
-					}
-				],
-				ownerName: [
-					{
-						required: true,
-						message: '请输入房东姓名',
-						trigger: ['change', 'blur'],
-					}
-				],
-				owerPhone: [
-					{
-						required: true,
-						message: '请输入房东电话',
-						trigger: ['change', 'blur'],
-					}
-				],
-				payType: [
-					{
-						required: true,
-						message: '请选择付款方式',
-						trigger: ['change', 'blur'],
-					}
-				],
-			},
-			border: false,
-			check: false,
-			selectShow: false,
-			decorationShow: false,
-			labelPosition: 'left',
-			errorType: ['toast'],
-		};
-	},
-	onLoad(option) {
-		let houseId = option.houseId //上个页面传递的参数。
-		if (houseId) {
-			// 渲染当前房源信息
-			this.findHouseById(houseId);
-		}
-		this.findVillageList()
-
-		// 定位经纬度
-		uni.getLocation({
-			type: 'gcj02',
-			// 当指定 high 时，期望精度值为100m，当指定 best 时期望精度值为20m
-			accuracy: 'best',
-			// 开启高精度定位
-			isHighAccuracy: true,
-			success: (res) => {
-				this.longitude = res.longitude
-				this.latitude = res.latitude
-			}
-		});
-		uni.$on('changeAddressConfig', (address, lon, lat) => {
-			// 获取数据
-			this.changeAddressConfig(address, lon, lat);
-		})
-	},
-	onUnload() {
-		// 移除监听事件  
-		uni.$off('changeAddressConfig');
-	},
-	onReady() {
-		this.$refs.uForm.setRules(this.rules);
-	},
-	methods: {
-		changeAddressConfig(address, lon, lat) {
-			this.model.address = address
-			this.model.longitude = lon
-			this.model.latitude = lat
-		},
-		chooseImage() {
-			uni.chooseImage({
-				count: 1,
-				success: async res => {
-					this.form.image = res.tempFilePaths[0]
-					await this.getLocation()
-				}
-			})
-		},
-		getLocation() {
-			return new Promise((resolve, reject) => {
-				uni.getLocation({
-					type: 'gcj02',
-					success: res => {
-						this.locationInfo = `定位: ${res.latitude.toFixed(6)},${res.longitude.toFixed(6)}`
-						resolve()
-					},
-					fail: err => {
-						console.error('定位失败', err)
-						this.locationInfo = '定位获取失败'
-						resolve()
-					}
-				})
-			})
-		},
-		submit() {
-			this.$refs.uForm.validate(valid => {
-				if (valid) {
-					if (!this.$u.test.mobile(this.model.owerPhone)) {
-						return this.$mytip.toast('房东电话请输入手机号码')
-					}
-					return this.$u.route({
-						url: '/pages/detail/addHouse',
-						params: {
-							room: JSON.stringify(this.model)
-						}
-					})
-				} else {
-					console.log('验证失败');
-				}
-			});
-		},
-		selectConfirm(e) {
-			e.map((val, index) => {
-				this.model.villageName = val.label;
-				this.model.villageId = val.value
-			})
-		},
-		decorationConfirm(e) {
-			e.map((val, index) => {
-				this.model.decoration = val.label;
-			})
-		},
-		labelPositionChange(index) {
-			this.labelPosition = index == 0 ? 'left' : 'top';
-		},
-		// 点击actionSheet回调
-		actionSheetCallback(index) {
-			uni.hideKeyboard();
-			this.model.payType = this.actionSheetList[index].text;
-		},
-		findVillageList() {
-			let url = "/api/houseApi/findVillageList";
-			this.$u.get(url, {
-				city: uni.getStorageSync('lifeData').vuex_city,
-				orderByColumn: 'name',
-				isAsc: 'desc'
-			}).then(result => {
-				const data = result.rows
-				for (let i = 0; i < data.length; i++) {
-					// 先转成字符串再转成对象，避免数组对象引用导致数据混乱
-					let item = data[i]
-					this.selectList.push({
-						label: item.name,
-						value: item.id
-					})
-				}
-				return data
-			});
-		},
-		findHouseById(houseId) {
-			let url = "api/houseApi/findHouseById";
-			this.$u.get(url, {
-				id: houseId
-			}).then(result => {
-				let room = result.data
-				this.model = room
-				let houseType = this.model.houseNum + this.model.houseHall + this.model.toiletNum
-				if (houseType == 0) {
-					houseType = ''
-				}
-				this.model.houseType = houseType
-				if (this.model.roomType == 1) {
-					this.model.roomLabel = '主卧'
-				} else if (this.model.roomType == 2) {
-					this.model.roomLabel = '次卧'
-				}
-			});
-		},
-		chooseAddress() {
-			this.$u.route({
-				url: '/pages/chooseAddress/index'
-			})
-		},
-	}
-};
-</script>
-
-<style>
-page {
-	background-color: #FFFFFF;
-}
-</style>
-<style scoped lang="scss">
-.wrap {
-	padding: 30rpx;
-}
-
-/* #ifdef MP-WEIXIN */
-.bottom-btn {
-	position: fixed;
-	bottom: 8rpx;
-	width: 100%;
-	padding: 30rpx;
-	border-top: 1rpx solid #eee;
-	background-color: #FFFFFF;
-}
-
-/* #endif */
-
-/* #ifndef MP-WEIXIN */
-.bottom-btn {
-	padding: 0 30rpx 30rpx 30rpx;
-	background-color: #FFFFFF;
-}
-
-/* #endif */
-</style>
diff --git a/pages/form/leaseCancel.vue b/pages/form/leaseCancel.vue
deleted file mode 100644
index 2b8fa18..0000000
--- a/pages/form/leaseCancel.vue
+++ /dev/null
@@ -1,219 +0,0 @@
-<template>
-  <view class="lease-cancel-page">
-    <!-- 页面标题 -->
-     <customNavbar title="退租申请" />
-
-    <!-- 表单内容 -->
-    <view class="form-section">
-      <!-- 关联合同 -->
-      <view class="form-item">
-        <text class="label">关联合同</text>
-        <picker :range="contracts" range-key="name" @change="onContractChange">
-          <view class="picker-value">
-            {{ selectedContract ? selectedContract.name : '请选择合同' }}
-          </view>
-        </picker>
-      </view>
-
-      <!-- 退租日期 -->
-      <view class="form-item">
-        <text class="label">退租日期</text>
-        <picker mode="date" @change="onDateChange">
-          <view class="picker-value">
-            {{ cancelDate || '请选择退租日期' }}
-          </view>
-        </picker>
-      </view>
-
-      <!-- 退租原因 -->
-      <view class="form-item">
-        <text class="label">退租原因</text>
-        <textarea
-          v-model="reason"
-          placeholder="请输入退租原因"
-          class="textarea"
-        />
-      </view>
-
-      <!-- 银行信息 -->
-      <view class="section-title">银行账户信息</view>
-
-      <view class="form-item">
-        <text class="label">开户名</text>
-        <input
-          v-model="bankAccount.name"
-          placeholder="请输入开户名"
-          class="input"
-        />
-      </view>
-
-      <view class="form-item">
-        <text class="label">银行名称</text>
-        <input
-          v-model="bankAccount.bank"
-          placeholder="请输入银行名称"
-          class="input"
-        />
-      </view>
-
-      <view class="form-item">
-        <text class="label">银行卡号</text>
-        <input
-          v-model="bankAccount.number"
-          placeholder="请输入银行卡号"
-          class="input"
-        />
-      </view>
-    </view>
-
-    <!-- 提交按钮 -->
-    <view class="bottom-bar">
-      <button class="submit-btn" @click="submitForm">提交申请</button>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      contracts: [
-        { id: 1, name: '资产A - 租赁合同001' },
-        { id: 2, name: '资产B - 租赁合同002' },
-      ],
-      selectedContract: null,
-      cancelDate: '',
-      reason: '',
-      bankAccount: {
-        name: '',
-        bank: '',
-        number: '',
-      },
-    };
-  },
-  methods: {
-    onContractChange(e) {
-      const index = e.detail.value;
-      this.selectedContract = this.contracts[index];
-    },
-    onDateChange(e) {
-      this.cancelDate = e.detail.value;
-    },
-    submitForm() {
-      if (!this.selectedContract || !this.cancelDate || !this.reason) {
-        uni.showToast({
-          title: '请填写完整信息',
-          icon: 'none',
-        });
-        return;
-      }
-
-      // 模拟提交
-      const data = {
-        contractId: this.selectedContract.id,
-        cancelDate: this.cancelDate,
-        reason: this.reason,
-        bankAccount: this.bankAccount,
-      };
-
-      console.log('提交退租申请：', data);
-      uni.showToast({
-        title: '提交成功',
-        icon: 'success',
-      });
-      setTimeout(() => {
-        uni.navigateBack();
-      }, 1200);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.lease-cancel-page {
-  min-height: 100vh;
-  background-color: #f6f8fa;
-  display: flex;
-  flex-direction: column;
-  padding-top: 120rpx;
-  padding-bottom: 120rpx;
-}
-
-.page-header {
-  padding: 40rpx 30rpx 20rpx;
-  background-color: #fff;
-  .page-title {
-    font-size: 36rpx;
-    font-weight: bold;
-    color: #333;
-  }
-}
-
-.form-section {
-  margin-top: 20rpx;
-  background-color: #fff;
-  padding: 30rpx;
-  border-radius: 20rpx;
-}
-
-.section-title {
-  font-size: 30rpx;
-  font-weight: bold;
-  color: #EA4D3E;
-  margin-top: 40rpx;
-  margin-bottom: 20rpx;
-}
-
-.form-item {
-  display: flex;
-  flex-direction: column;
-  margin-bottom: 30rpx;
-
-  .label {
-    font-size: 28rpx;
-    color: #666;
-    margin-bottom: 12rpx;
-  }
-
-  .picker-value,
-  .input {
-    background-color: #f7f8fa;
-    border-radius: 12rpx;
-    padding: 20rpx;
-    font-size: 28rpx;
-    color: #333;
-  }
-
-  .textarea {
-    background-color: #f7f8fa;
-    border-radius: 12rpx;
-    padding: 20rpx;
-    font-size: 28rpx;
-    min-height: 140rpx;
-    color: #333;
-	width: 94%;
-  }
-}
-
-.bottom-bar {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background-color: #fff;
-  padding: 20rpx 40rpx;
-  box-shadow: 0 -4rpx 10rpx rgba(0, 0, 0, 0.08);
-  z-index: 999;
-}
-
-.submit-btn {
-  width: 100%;
-  height: 88rpx;
-  background: linear-gradient(90deg, #FF6F63 0%, #FB392A 100%);
-  border-radius: 44rpx;
-  color: #fff;
-  font-size: 32rpx;
-  font-weight: bold;
-  letter-spacing: 2rpx;
-}
-</style>
diff --git a/pages/form/report.vue b/pages/form/report.vue
deleted file mode 100644
index 26e306d..0000000
--- a/pages/form/report.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-	<view>
-		<u-navbar :is-back="true" :title="title" :border-bottom="false"></u-navbar>
-		<view class="u-content">
-			<u-parse :html="content"
-			:autosetTitle="true"
-			:show-with-animation="true"
-			:selectable="true"
-			></u-parse>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				title:'维修申报',
-				content: ``
-			}
-		},
-		onLoad() {
-			let url = "/api/cmsApi/getServiceItemByAjax?type=维修申报"
-			this.$u.get(url).then(res => {
-				// console.log(res.data.content);
-				this.content = res.data.content
-			});
-		},
-	}
-</script>
-
-<style>
-	page{
-		background-color: #FFFFFF;
-	}
-</style>
-<style lang="scss" scoped>
-	.u-content{
-		// margin:0 10rpx;
-		// padding: 24rpx;
-		font-size: 34rpx;
-		color: $u-main-color;
-		line-height: 1.8;
-		white-space: pre-wrap !important;
-	}
-</style>
-
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8b2ebaf..154a578 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="index">
-		<image src="/static/index/index_bg.png" mode="aspectFill" class="bg"></image>
+		<image :src="staticHost + '/public/static/index/index_bg.png'" mode="aspectFill" class="bg"></image>
 		<!-- 搜索栏 -->
 		<view class="index-title">
-			启辰资产
+			伍家国投
 		</view>
 		<view class="content-wrapper">
 
@@ -17,7 +17,7 @@
 					<u-row>
 						<u-col span="3" text-align="center" v-for="(item,index) in navList" :key="index">
 							<view class="u-padding-20" @tap="clickNav(item, index)" hover-class="hoverClass">
-								<image :src="item.src" style="width: 86rpx;height: 86rpx;" mode="heightFix"></image>
+								<image :src="staticHost + '/public' + item.src " style="width: 86rpx;height: 86rpx;" mode="heightFix"></image>
 								<view class="tabName" :style="{color:'#FFFFFF'}">{{item.name}}</view>
 							</view>
 						</u-col>
@@ -27,7 +27,7 @@
 					<u-row>
 						<u-col span="3" text-align="center" v-for="(item,index) in gridList" :key="index">
 							<view class="u-padding-20" @tap="clickGrid(item)" hover-class="hoverClass">
-								<image :src="item.src" style="width: 50rpx;height: 50rpx;" mode="heightFix"></image>
+								<image :src="staticHost + '/public' + item.src" style="width: 50rpx;height: 50rpx;" mode="heightFix"></image>
 								<view class="tabName" :style="{color:'#222222'}">{{item.name}}</view>
 							</view>
 						</u-col>
@@ -38,219 +38,184 @@
 			<u-gap height="10"></u-gap>
 			<!-- 公告栏 -->
 			<view @click="notice" class="noticeStyle">
-				<image src="/static/index/公告.png" style="width: 38rpx;height: 37rpx;margin-left: 22rpx;"></image>
+				<image :src="staticHost + '/public' + '/static/index/notice.png'" style="width: 38rpx;height: 37rpx;margin-left: 22rpx;"></image>
 				<view class="notice-content">
-				<u-notice-bar mode="vertical" :list="noticeList" type="primary" more-icon bg-color="none"
-					:duration="5000" :fontSize="30" color="#2D2B2C" :volumeIcon="false"></u-notice-bar>
+					<u-notice-bar mode="vertical" :list="noticeList" type="primary" more-icon bg-color="none"
+						:duration="5000" :fontSize="30" color="#2D2B2C" :volumeIcon="false"></u-notice-bar>
 				</view>
 			</view>
 
 			<u-gap height="5"></u-gap>
 
 			<view class="tab-content">
-			<!-- 顶部标签栏 -->
-			<view class="recommend-tabs">
-				<view 
-					class="tab-item" 
-					:class="{ active: activeRecommendTab === index }" 
-					v-for="(tab, index) in recommendTabs" 
-					:key="index"
-					@click="onRecommendTabClick(index)"
-				>
-					{{ tab }}
+				<!-- 顶部标签栏 -->
+				<view class="recommend-tabs">
+					<view class="tab-item" :class="{ active: activeRecommendTab === index }"
+						v-for="(tab, index) in recommendTabs" :key="index" @click="onRecommendTabClick(index)">
+						{{ tab.label }}
+					</view>
 				</view>
-			</view>
-			
-			<!-- 筛选标签 -->
-			<view class="filter-tabs">
-				<view 
-					class="filter-item" 
-					:class="{ active: activeFilterTabs.includes(index) }" 
-					v-for="(tab, index) in filterTabs" 
-					:key="index"
-					@click="onFilterTabClick(index)"
-				>
-					{{ tab }}
+
+				<!-- 筛选标签 -->
+				<view class="filter-tabs">
+					<view class="filter-item" :class="{ active: activeFilterTabs.includes(index) }"
+						v-for="(tab, index) in filterTabs" :key="index" @click="onFilterTabClick(index)">
+						{{ tab.label}}
+					</view>
 				</view>
-			</view>
-			
-			<scroll-view scroll-y style="height: calc(100vh - 200rpx);" :scroll-top="scrollTop" @scrolltolower="findHouseList"
-				lower-threshold="50">
-				<u-waterfall v-model="flowList" ref="uWaterfall">
-					<template v-slot:left="{leftList}">
-						<view class="demo-warter" v-for="(item, index) in leftList" :key="index"
-							style="margin-right: 10rpx;">
-							<u-lazy-load threshold="750" border-radius="8" :image="item.image"
-							:index="index" mode="aspectFill" @click="clickImage(item.id)"></u-lazy-load>
-							<view class="item-title">{{ item.assetsName}}</view>
-							<view class="item-desc">{{ item.footPrint}}㎡ {{ item.propertyType || '商业用房' }}</view>
-							<view class="item-price">¥{{item.rentFee}}/<text>月</text></view>
-						</view>
-					</template>
-					<template v-slot:right="{rightList}">
-						<view class="demo-warter" v-for="(item, index) in rightList" :key="index"
-							style="margin-left: 10rpx;">
-							<u-lazy-load threshold="750" border-radius="8" :image="item.image"
-							:index="index" mode="aspectFill" @click="clickImage(item.id)"></u-lazy-load>
-							<view class="item-title">{{ item.assetsName}}</view>
-							<view class="item-desc">{{ item.footPrint}}㎡ {{ item.propertyType || '商业用房' }}</view>
-							<view class="item-price">¥{{item.rentFee}}/<text>月</text></view>
-						</view>
-					</template>
-				</u-waterfall>
-			</scroll-view>
-			
+
+				<scroll-view scroll-y style="height: calc(100vh - 200rpx);" :scroll-top="scrollTop"
+					@scrolltolower="loadMore" lower-threshold="50">
+					<u-waterfall v-model="flowList" ref="uWaterfall">
+						<template v-slot:left="{leftList}">
+							<view class="demo-warter" v-for="(item, index) in leftList" :key="index"
+								style="margin-right: 10rpx;">
+								<u-lazy-load threshold="750" border-radius="8" :image="item.coverImgUrl"
+									:index="index" mode="aspectFill" @click="clickImage(item.assetsNo)"></u-lazy-load>
+								<view class="item-title">{{ item.assetsName}}</view>
+								<view class="item-desc">{{ item.footPrint || '0'}}㎡ {{ item.assetsType || '商业用房' }}
+								</view>
+								<view class="item-price">¥{{item.rentFee || '未知'}}/<text>月</text></view>
+							</view>
+						</template>
+						<template v-slot:right="{rightList}">
+							<view class="demo-warter" v-for="(item, index) in rightList" :key="index"
+								style="margin-left: 10rpx;">
+								<u-lazy-load threshold="750" border-radius="8" :image="item.coverImgUrl"
+									:index="index" mode="aspectFill" @click="clickImage(item.assetsNo)"></u-lazy-load>
+								<view class="item-title">{{ item.assetsName}}</view>
+								<view class="item-desc">{{ item.footPrint || '0'}}㎡ {{ item.assetsType || '商业用房' }}
+								</view>
+								<view class="item-price">¥{{item.rentFee || '未知'}}/<text>月</text></view>
+							</view>
+						</template>
+					</u-waterfall>
+					<u-loadmore :status="loadStatus" />
+				</scroll-view>
+
 			</view>
 
 			<u-back-top :scroll-top="scrollTop" top="1000"></u-back-top>
 			<u-no-network></u-no-network>
 
 		</view>
-		<u-popup v-model="showFillAuthInfo" mode="center" :mask-close-able="false" border-radius="24">
-			<view class="auth-popup">
-				<!-- 标题 -->
-				<view class="auth-title">
-					请完善{{authLabel}}信息
-				</view>
-
-				<!-- 描述 -->
-				<view class="auth-desc">
-					您当前尚未完善相关信息，为避免影响后续功能使用，请尽快补充。
-				</view>
-
-				<!-- 输入区域 -->
-				<view class="auth-input">
-					<u-input v-model="authCode" :placeholder="authPlaceholder" clearable border="bottom" font-size="30"
-						placeholder-style="color:#bbb" />
-				</view>
-
-				<!-- 按钮 -->
-				<button class="auth-btn" @click="recordAuthInfo">
-					提交
-				</button>
-			</view>
-		</u-popup>
 	</view>
 </template>
 
 <script>
 	import SearchBar from '../../components/searchBar/SearchBar.vue';
-	import indexNavbarVue from '../../components/navbar/indexNavbar.vue';
 	export default {
 		components: {
-			SearchBar,
-			indexNavbarVue
+			SearchBar
 		},
 		data() {
 			return {
+				init: true,
+				cusNo: null,
+				openId: null,
 				loginType: null,
 				authCode: '', // 身份证号 / 社会信用代码
-				showFillAuthInfo: false,
 				keyword: '',
-				pageNum: 1,
+				pageNo: 1,
 				pageSize: 20,
 				scrollTop: 0,
-				houseList: [],
 				activeIndex: 0, // 当前选中的索引
-				swiperList: [{
-						image: '/static/img/index/swiper/swiper3.jpg',
-						title: '身无彩凤双飞翼，心有灵犀一点通'
-					},
-					{
-						image: '/static/img/index/swiper/swiper.jpg',
-						title: '身无彩凤双飞翼，心有灵犀一点通'
-					},
-				],
-				noticeList: [
-					'景秀天成新上优质房源，欢迎咨询',
-					'限时优惠活动，租房立减500元',
-					'新用户注册即送200元租房券',
-					'寒雨连江夜入吴'
-				],
+				noticeList: [],
+				defaultImgUrl: '/public/static/index/assets.jpg',
 				navList: [{
 						name: "住房",
-						src: "/static/index/住房.png",
-						type: "0",
-						underline_color: "linear-gradient(to right, #ff8c00, #ffcc33)"
+						src: "/static/index/house.png",
+						type: "住房"
 					},
 					{
 						name: "商铺",
-						src: "/static/index/商铺.png",
-						type: "1",
-						underline_color: "linear-gradient(to right, #89CFF0, #5AA4D1)"
+						src: "/static/index/shop.png",
+						type: "住房"
 					},
 					{
 						name: "厂房",
-						src: "/static/index/厂房.png",
-						url: "/pages/center/tips",
-						underline_color: "linear-gradient(to right, #0000FF, #800080)"
+						src: "/static/index/factory.png",
+						type: "厂房"
 					},
 					{
 						name: "停车场",
-						src: "/static/index/停车场.png",
-						type: "2",
-						underline_color: "linear-gradient(to bottom, #000080, #00008080)"
+						src: "/static/index/parking.png",
+						type: "停车场"
 					}
 				],
 				gridList: [{
 						name: "看房预约",
-						src: "/static/index/看房预约.png",
-						url: "pages/reserve/reserveRecords"
+						src: "/static/index/reserve.png",
+						url: "/pages-biz/reserve/reserveRecords"
 					},
 					{
 						name: "合同签约",
-						src: "/static/index/合同签约.png",
-						url: "pages/center/contract"
+						src: "/static/index/contract.png",
+						url: "/pages-biz/contract/contract"
 					},
 					{
 						name: "退租申请",
-						src: "/static/index/退租申请.png",
-						url: "pages/form/leaseCancel"
+						src: "/static/index/discharge.png",
+						url: "/pages-assets/discharge/leaseCancelList"
 					},
 					{
 						name: "留言板",
-						src: "/static/index/留言板.png",
-						url: "pages/message/guestbook"
+						src: "/static/index/fallback.png",
+						url: "/pages-assets/fallback/fallback"
 					}
 				],
 				loadStatus: 'loadmore',
 				// 顶部标签栏状态
 				activeRecommendTab: 0,
-				recommendTabs: ['为您推荐', '附近', '上新'],
+				recommendTabs: [{
+						label: '为您推荐',
+						type: 'recommend'
+					},
+					{
+						label: '附近',
+						type: 'nearby'
+					},
+					{
+						label: '上新',
+						type: 'new'
+					}
+				],
 				// 筛选标签状态
 				activeFilterTabs: [0], // 支持多选
-				filterTabs: ['上新', '整租', '一室一厅'],
-				flowList: [
-					{ id: 1, assetsName: '景秀天成保租房景秀天成保租房', footPrint: 105, rentFee: 1500, image: '/static/img/index/swiper/swiper3.jpg', propertyType: '商业用房' },
-					{ id: 2, assetsName: '景秀天成保租房景秀天成保租房', footPrint: 105, rentFee: 1500, image: '/static/img/index/swiper/swiper3.jpg', propertyType: '商业用房' },
-					{ id: 3, assetsName: '景秀天成保租房景秀天成保租房', footPrint: 105, rentFee: 1500, image: '/static/img/index/swiper/swiper3.jpg', propertyType: '商业用房' },
-					{ id: 4, assetsName: '景秀天成保租房景秀天成保租房', footPrint: 105, rentFee: 1500, image: '/static/img/index/swiper/swiper3.jpg', propertyType: '商业用房' },
-					{ id: 5, assetsName: '景秀天成保租房景秀天成保租房', footPrint: 105, rentFee: 1500, image: '/static/img/index/swiper/swiper3.jpg', propertyType: '商业用房' },
-					{ id: 6, assetsName: '景秀天成保租房景秀天成保租房', footPrint: 105, rentFee: 1500, image: '/static/img/index/swiper/swiper3.jpg', propertyType: '商业用房' },
-					{ id: 7, assetsName: '景秀天成保租房景秀天成保租房', footPrint: 105, rentFee: 1500, image: '/static/img/index/swiper/swiper3.jpg', propertyType: '商业用房' },
-					{ id: 8, assetsName: '景秀天成保租房景秀天成保租房', footPrint: 105, rentFee: 1500, image: '/static/img/index/swiper/swiper3.jpg', propertyType: '商业用房' },
-					{ id: 9, assetsName: '景秀天成保租房景秀天成保租房', footPrint: 105, rentFee: 1500, image: '/static/img/index/swiper/swiper3.jpg', propertyType: '商业用房' },
-					{ id: 10, assetsName: '景秀天成保租房景秀天成保租房', footPrint: 105, rentFee: 1500, image: '/static/img/index/swiper/swiper3.jpg', propertyType: '商业用房' }
+				filterTabs: [{
+						label: '两室两厅',
+						room: 2,
+						hall: 2
+					},
+					{
+						label: '一室一厅',
+						room: 1,
+						hall: 1
+					}
 				],
+				flowList: [],
 				uvCode: uni.getStorageSync('uvCode')
 			}
 		},
 		onLoad() {
-			// 自动定位到所在的城市
-			// this.checkCity();
-			// 获取数据
-			// this.findHouseList();
-			// this.getNoticecList();
+			
+			this.getNoticecList();
 			// 流量统计
 			// this.appSysFlowInfo();
-			// uni.$on('findIndexHouseList', (obj) => {
-			// 	// 获取数据
-			// 	this.findHouseList(1);
-			// })
 
+			uni.$on('findIndexHouseList', (obj) => {
+				// 获取数据
+				this.findHouseList();
+			})
 		},
 		onShow() {
-			this.needFillAuthInfo();
+
+			let userInfo = uni.getStorageSync('userInfo');
+			if (userInfo) {
+				this.cusNo = userInfo.cusNo;
+				this.openId = userInfo.cusNo;
+			}
+			this.resetAndLoad()
 		},
 		onUnload() {
 			// 移除监听事件  
@@ -259,15 +224,9 @@
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		onReachBottom() {
-			this.loadStatus = 'loading';
-			// 获取数据
-			this.findHouseList()
-		},
 		// 下拉刷新
 		onPullDownRefresh() {
-			// 获取数据
-			this.findHouseList(1);
+			this.resetAndLoad();
 			// 关闭刷新
 			uni.stopPullDownRefresh();
 		},
@@ -275,15 +234,8 @@
 
 		},
 		computed: {
-			authLabel() {
-				return this.loginType === 'person' ?
-					'身份证号' :
-					'企业社会信用代码'
-			},
-			authPlaceholder() {
-				return this.loginType === 'person' ?
-					'请输入身份证号' :
-					'请输入企业社会信用代码'
+			staticHost() {
+				return this.$config.staticUrl
 			}
 		},
 		methods: {
@@ -295,11 +247,18 @@
 				// 重置筛选条件
 				this.activeFilterTabs = [0];
 				// 重新加载数据
-				this.pageNum = 1;
-				this.flowList = [];
-				this.findHouseList(1);
+				this.resetAndLoad();
+			},
+			resetAndLoad() {
+				this.pageNo = 1;
+				this.flowList = [];
+				this.loadStatus = 'loadmore';
+
+				this.$nextTick(() => {
+					this.$refs.uWaterfall && this.$refs.uWaterfall.clear();
+					this.findHouseList();
+				});
 			},
-			
 			// 筛选标签点击事件
 			onFilterTabClick(index) {
 				// 检查是否已选中
@@ -314,8 +273,9 @@
 				// 这里可以添加根据筛选标签筛选数据的逻辑
 				console.log('筛选标签点击:', this.filterTabs[index]);
 				console.log('当前选中的筛选标签:', this.activeFilterTabs.map(i => this.filterTabs[i]));
+				this.resetAndLoad();
 			},
-			
+
 			checkCity() {
 				// 检查是否已选择城市，如果未选择，跳转到选择城市页面
 				let lifeData = uni.getStorageSync('lifeData');
@@ -323,93 +283,82 @@
 				// console.log(vuex_city.length);
 				if (!vuex_city || vuex_city.length == 0) {
 					// 没有token 则跳转到登录
-					return this.$u.route('/pages/location/location');
+					return this.$u.route('/pages-biz/location/location');
 				}
 			},
-			// 简单身份证校验（18 位）
-			checkIdCard(code) {
-				return /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/.test(
-					code
-				);
-			},
-
-			// 统一社会信用代码校验（18 位）
-			checkCreditCode(code) {
-				return /^[0-9A-Z]{18}$/.test(code);
-			},
-			location() {
-				this.$u.route({
-					url: 'pages/location/location',
-				})
-			},
 			search() {
-				this.$u.route({
-					url: 'pages/search/search',
-				})
+				this.$u.route('/pages-biz/search/search');
 			},
 			notice() {
 				this.$u.route({
-					url: 'pages/notice/notice'
+					url: '/pages-biz/notice/notice'
 				})
 			},
 			//查找房源信息
-			findHouseList(type = 0) {
-				if (type == 1) {
-					this.pageNum = 1
-					this.flowList = []
-					this.$refs.uWaterfall.clear();
-				}
-				let url = "/assets/findAssetList";
-				this.$u.post(url, {
-					state: 1,
-					villageCity: uni.getStorageSync('lifeData').vuex_city,
-					pageNum: this.pageNum,
-					pageSize: this.pageSize,
-					orderByColumn: 'update_time,create_time',
-					isAsc: 'desc'
-				}).then(result => {
-					const data = result.data.result;
-					if (this.pageNum > 1 && data.length < this.pageSize) {
-						// return this.loadStatus = 'nomore';
-					}
-					this.houseList = data;
-					for (let i = 0; i < this.houseList.length; i++) {
-						// 先转成字符串再转成对象，避免数组对象引用导致数据混乱
-						let item = this.houseList[i]
-						// if(!item.faceUrl.includes(config.staticUrl)){
-						// 	item.image = config.staticUrl+item.faceUrl
-						// }else{
-						// 	item.image = item.faceUrl
-						// }
-						this.flowList.push(item);
-					}
-					++this.pageNum
-					this.loadStatus = 'loadmore';
-				}).catch(err => {
-					console.log("失败：", err)
-				})
-			},
-			clickSearch() {
-				this.$u.route('/pages/search/search');
-			},
-			clickImage(houseId) {
-				this.$u.route({
-					url: '/pages/detail/assetsDetail'
-				})
+			findHouseList(type = null) {
+				if (this.loadStatus !== 'loadmore') return;
 
-				// this.$u.route({
-				// 	url: '/pages/detail/detail',
-				// 	params: {
-				// 		houseId: houseId
-				// 	}
-				// })
+				this.loadStatus = 'loading';
+
+				this.$u.post('/assets/queryPage', {
+					assetsType: type,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					assetsStatus: '闲置中'
+				}).then(result => {
+
+					let rows = result.data.result || [];
+					// 第一页无数据
+					if (this.pageNo === 1 && rows.length === 0) {
+						this.flowList = [];
+						this.loadStatus = 'nomore';
+						return;
+					}
+                    rows.forEach(row =>{
+						if(row.coverImgUrl) {
+							row.coverImgUrl = this.$config.staticUrl + row.coverImgUrl
+						}else {
+							row.coverImgUrl = this.$config.staticUrl + this.defaultImgUrl
+						}
+					})
+					// 追加数据
+					this.flowList = this.flowList.concat(rows);
+
+					// 判断是否还有下一页（核心）
+					if (rows.length < this.pageSize) {
+						this.loadStatus = 'nomore';
+					} else {
+						this.pageNo++; // ✅ 只有这里能 +1
+						this.loadStatus = 'loadmore';
+					}
+
+				}).catch(err => {
+					console.log("获取资产信息失败：", err);
+					this.loadStatus = 'loadmore';
+				}).finally(() => {
+					uni.stopPullDownRefresh();
+				});
+			},
+			clickImage(assetsNo) {
+				console.log(assetsNo)
+				this.$u.route({
+					url: '/pages-assets/assets/assetsDetail',
+					params: {
+						assetsNo: assetsNo
+					}
+				})
 			},
 			clickNav(item, index) {
 				this.activeIndex = index;
-				this.findHouseList(item.type);
+				this.pageNo = 1;
+				this.flowList = [];
+				this.loadStatus = 'loadmore';
+				this.$nextTick(() => {
+					this.$refs.uWaterfall && this.$refs.uWaterfall.clear();
+					this.findHouseList(item.name);
+				});
 			},
 			clickGrid(item) {
-				console.log('跳转我的预约,url:' + item.url)
 				this.$u.route({
 					url: item.url
 				})
@@ -418,6 +367,12 @@
 			code() {
 				this.$mytip.toast('请咨询作者')
 			},
+			loadMore() {
+				// 只有在 loadStatus 为 'loadmore' 时才触发
+				if (this.loadStatus !== 'loadmore') return;
+				// 调用接口获取下一页
+				this.findHouseList();
+			},
 			appSysFlowInfo() {
 				// 流量统计
 				let uvCode = uni.getStorageSync("uvCode");
@@ -430,95 +385,21 @@
 					},
 				});
 			},
-			server() {
-				// window.open ('https://sourcebyte.cn')
-				uni.makePhoneCall({
-					phoneNumber: "18720989281",
-				});
-			},
 			getNoticecList() {
-				let url = "/notice/findNoticeList";
-				this.$u.get(url, {
-					pageNum: 1,
-					pageSize: 50,
-					orderByColumn: 'create_time',
-					isAsc: 'desc'
-				}).then(obj => {
-					let data = obj.data.result
-					data.filter(item => {
-						this.noticeList.push(item.noticeTitle)
-					})
-				});
-			},
-			needFillAuthInfo() {
-				let lifeData = uni.getStorageSync('lifeData');
-				let token = lifeData.vuex_token
-				if (!token || token === null || token === undefined ||
-					(typeof token === 'object' && Object.keys(token).length === 0)) {
-					return;
-				}
-				let url = "/login/needFillAuthInfo";
-				this.$u.get(url, {}, {
-					'WT': token
-				}).then(obj => {
-					console.log(obj.data)
-					if (obj.data) {
-						this.showFillAuthInfo = obj.data
-						const indexParam = uni.getStorageSync('indexParam') || {}
-						this.loginType = indexParam.loginType || 'person'
-					}
-				});
-			},
-			moreInfo() {
-				uni.navigateToMiniProgram({
-					appId: 'wxbca64173e772915e', // 此为开源字节appid
-					path: '/pages/index/index', // 此为开源字节首页路径
-					envVersion: "release",
-					success: res => {
-						// 打开成功
-						console.log("打开成功", res);
-					},
-					fail: err => {
-						console.log(err);
-					}
-				})
-			},
-			recordAuthInfo() {
-				// 身份证校验
-				if (this.loginType === 'person' && !this.checkIdCard(this.authCode)) {
-					uni.showToast({
-						title: '身份证号格式不正确',
-						icon: 'none'
-					});
-					return;
-				}
-
-				// 企业社会信用代码校验
-				if (this.loginType === 'company' && !this.checkCreditCode(this.authCode)) {
-					uni.showToast({
-						title: '社会信用代码格式不正确',
-						icon: 'none'
-					});
-					return;
-				}
-				let lifeData = uni.getStorageSync('lifeData');
-				let token = lifeData.vuex_token
-				if (!token || token === null || token === undefined ||
-					(typeof token === 'object' && Object.keys(token).length === 0)) {
-					return;
-				}
-				let url = "/login/recordAuthInfo";
+				let url = "/notice/pageQuery";
 				this.$u.post(url, {
-					code: this.authCode,
-					userType: this.loginType,
-				}, {
-					'WT': token
+					pageNo: 1,
+					pageSize: 10
 				}).then(obj => {
 					if (obj.flag) {
-						this.showFillAuthInfo = false;
-						this.authCode = '';
+						let data = obj.data.result
+						data.filter(item => {
+							this.noticeList.push(item.noticeTitle)
+						})
 					}
-				})
+				}).catch(err => {
+					console.log("获取招商公告失败：", err)
+				});
 			}
 		}
 	}
@@ -653,18 +534,18 @@
 		font-size: 32rpx;
 		font-weight: 600;
 	}
-	
+
 	.tab-item {
 		margin-right: 40rpx;
 		padding: 10rpx 0;
 		color: #333;
 	}
-	
+
 	.tab-item.active {
 		color: #FF2F31;
 		border-bottom: 4rpx solid #FF2F31;
 	}
-	
+
 	/* 筛选标签样式 */
 	.filter-tabs {
 		display: flex;
@@ -673,7 +554,7 @@
 		background: #fff;
 		flex-wrap: wrap;
 	}
-	
+
 	.filter-item {
 		margin-right: 20rpx;
 		margin-bottom: 10rpx;
@@ -683,7 +564,7 @@
 		font-size: 26rpx;
 		color: #666;
 	}
-	
+
 	.filter-item.active {
 		background: #FFECEC;
 		color: #FF2F31;
@@ -701,7 +582,7 @@
 		padding: 0 20rpx;
 		/* 左右留白一致 */
 	}
-	
+
 	/* 图片样式 */
 	.u-lazy-load {
 		width: 100%;
diff --git a/pages/index/indextemplate1.vue b/pages/index/indextemplate1.vue
deleted file mode 100644
index b68867c..0000000
--- a/pages/index/indextemplate1.vue
+++ /dev/null
@@ -1,431 +0,0 @@
-<template>
-	<view class="u-p-l-10 u-p-r-10">
-		<!-- 搜索栏 -->
-		<u-navbar :is-back="false">
-			<view style="display: flex;justify-content: center;align-items: center;">
-				<!-- 选择地区 -->
-				<view class="u-p-20"  @click="location">
-					{{vuex_city==''?'选择':vuex_city}}
-					<u-icon name="arrow-down-fill" class="u-p-l-10" color="#515356"></u-icon>
-				</view>
-				<!-- #ifdef MP-WEIXIN -->  
-				<u-search placeholder="你想住在哪儿" v-model="keyword" input-align="center"  :show-action="false" :clearabled="true"
-:disabled="true" style="width: 380rpx;" @click="search"></u-search>
-				<!-- #endif -->
-				<!-- #ifndef MP-WEIXIN --> 
-				<u-search placeholder="你想住在哪儿" v-model="keyword" input-align="center"  :show-action="false" :clearabled="true"
-				:disabled="true" style="width: 580rpx;" @click="search"></u-search>
-				<!-- #endif -->
-		</view>
-
-		</u-navbar>
-		<view>
-			<!-- 流量主-腾讯banner广告 -->
-			<!-- <ad unit-id="adunit-fcfdcc4d7095b6b1" ad-intervals="30"></ad> -->
-			<!-- 轮播图 -->
-			<!-- #ifndef MP-WEIXIN --> 
-				<!-- <u-swiper :list="swiperList" height="350"></u-swiper> -->
-			<!-- #endif -->
-			<u-swiper :list="swiperList" height="350" @click="moreInfo"></u-swiper>
-		</view>
-
-		<!-- 房源信息导航栏 -->
-		<view>
-			<view class="rowClass">
-				<u-row>
-					<u-col span="3" text-align="center" v-for="(item,index) in navList" :key="index">
-						<view class="u-padding-20" @tap="clickNav(item)" hover-class="hoverClass">
-							<image :src="item.src" style="width: 90rpx;height: 90rpx;" mode="widthFix"></image>
-							<view class="tabName">{{item.name}}</view>
-						</view>
-					</u-col>
-				</u-row>
-			</view>
-			<u-gap height="10"></u-gap>
-			<!-- 公告栏 -->
-			<view @click="notice">
-				<u-notice-bar mode="vertical" :list="noticeList" type="primary" more-icon
-				bg-color="#fff" :duration="5000" border-radius="15"></u-notice-bar>
-			</view>
-
-			<u-gap height="5"></u-gap>
-			<u-waterfall v-model="flowList" ref="uWaterfall">
-			    <template v-slot:left="{leftList}">
-			        <view class="demo-warter" v-for="(item, index) in leftList" :key="index">
-			            <u-lazy-load threshold="750" border-radius="12" :image="item.image" :index="index"
-			                         @click="clickImage(item.id)"></u-lazy-load>
-			            <view class="item-title">{{item.villageName}} {{item.type == '整租' ? item.houseNum + item.houseHall + item.toiletNum : item.roomType}}</view>
-						<view class="item-price">¥{{item.price}}</view>
-			             <view class="item-desc">{{item.type}} | {{item.type == '整租' ? item.houseArea : item.roomArea}}㎡ | {{item.decoration}} </view>
-			        </view>
-			    </template>
-			    <template v-slot:right="{rightList}">
-			        <view class="demo-warter" v-for="(item, index) in rightList" :key="index">
-			            <u-lazy-load threshold="750" border-radius="10" :image="item.image" :index="index"
-			                         @click="clickImage(item.id)"></u-lazy-load>
-			            <view class="item-title">{{item.villageName}} {{item.type == '整租' ? item.houseNum + item.houseHall + item.toiletNum : item.roomType}}</view>
-			            <view class="item-price">¥{{item.price}}</view>
-						 <view class="item-desc">{{item.type}} | {{item.type == '整租' ? item.houseArea : item.roomArea}}㎡ | {{item.decoration}} </view>
-			        </view>
-			    </template>
-			</u-waterfall>
-
-		</view>
-
-		<u-loadmore bg-color="rgb(240, 240, 240)" :status="loadStatus" @loadmore="findHouseList" style="height: 80rpx;line-height: 80rpx;"></u-loadmore>
-		<u-back-top :scroll-top="scrollTop" top="1000"></u-back-top>
-		<u-no-network></u-no-network>
-		<view class="buttom">
-			<view class="loginType">
-				<view class="wechat item">
-					<view class="icon"><u-icon size="60" name="server-man" color="#999" @click="server"></u-icon></view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import config from "@/common/config.js" // 全局配置文件
-	export default {
-		data() {
-			return {
-				keyword: '',
-				pageNum: 1,
-				pageSize: 20,
-				scrollTop: 0,
-				houseList: [],
-				swiperList: [
-					{
-						image: '/static/img/index/swiper/swiper2.png',
-					    title: '身无彩凤双飞翼，心有灵犀一点通'
-					},
-					{
-						image: '/static/img/index/swiper/swiper.jpg',
-					    title: '身无彩凤双飞翼，心有灵犀一点通'
-					},
-                ],
-				noticeList: [],
-				navList:[
-				   {name:"保租房",src:"/static/img/index/cover_2022/index_cover1.png",type:"0"},
-				   {name:"合租",src:"/static/img/index/cover_2022/index_cover2.png",type:"1"},
-				   {name:"避坑指南",src:"/static/img/index/cover_2022/index_cover3.png",url:"/pages/center/tips"},
-				   {name:"委托房源",src:"/static/img/index/cover_2022/index_cover4.png",type:"2"}
-				],
-				loadStatus: 'loadmore',
-				flowList: [],
-				uvCode: uni.getStorageSync('uvCode')
-			}
-		},
-		onLoad() {
-			// 自动定位到所在的城市
-			// this.checkCity();
-			// 获取数据
-			this.findHouseList();
-			this.getNoticecList();
-			// 流量统计
-			this.appSysFlowInfo();
-			uni.$on('findIndexHouseList', (obj) => {
-				// 获取数据
-				this.findHouseList(1);
-			})
-		},
-		onUnload() {
-			// 移除监听事件  
-			uni.$off('findIndexHouseList');
-		},
-		onPageScroll(e) {
-		    this.scrollTop = e.scrollTop;
-		},
-		onReachBottom() {
-		    this.loadStatus = 'loading';
-		    // 获取数据
-			this.findHouseList()
-		},
-		// 下拉刷新
-		onPullDownRefresh() {
-			// 获取数据
-			this.findHouseList(1);
-			// 关闭刷新
-			uni.stopPullDownRefresh();
-		},
-		methods: {
-			checkCity(){
-				// 检查是否已选择城市，如果未选择，跳转到选择城市页面
-				let lifeData = uni.getStorageSync('lifeData');
-				let vuex_city = lifeData.vuex_city
-				// console.log(vuex_city.length);
-				if(!vuex_city || vuex_city.length == 0){
-					// 没有token 则跳转到登录
-					return this.$u.route('/pages/location/location');
-				}
-			},
-			location(){
-				  this.$u.route({
-					url: 'pages/location/location',
-				  })
-			},
-			search(){
-				this.$u.route({
-					url: 'pages/search/search',
-				})
-			},
-			notice(){
-				this.$u.route({
-					url: 'pages/notice/notice'
-				})
-			},
-			//查找房源信息
-			findHouseList(type = 0) {
-				if(type == 1){
-					this.pageNum = 1
-					this.flowList = []
-					this.$refs.uWaterfall.clear();
-				}
-				let url = "/api/houseApi/findHouseRoomList";
-				this.$u.get(url, {
-					state:1,
-					villageCity:uni.getStorageSync('lifeData').vuex_city,
-					pageNum: this.pageNum,
-					pageSize: this.pageSize,
-					orderByColumn: 'update_time,create_time',
-					isAsc: 'desc'
-				}).then(result => {
-					const data = result.rows;
-					if(this.pageNum>1 && data.length < this.pageSize){
-						return this.loadStatus = 'nomore';
-					}
-					this.houseList = data;
-					for (let i = 0; i < this.houseList.length; i++) {
-					    // 先转成字符串再转成对象，避免数组对象引用导致数据混乱
-					    let item = this.houseList[i]
-						if(!item.faceUrl.includes(config.staticUrl)){
-							item.image = config.staticUrl+item.faceUrl
-						}else{
-							item.image = item.faceUrl
-						}
-						if(item.type == 0){
-							item.type = '整租'
-						}else if(item.type == 1){
-							item.type = '合租'
-						}
-						if(item.roomType == 1){
-							item.roomType = '主卧'
-						}else if(item.roomType == 2){
-							item.roomType = '次卧'
-						}else{
-							item.roomType = '未知'
-						}
-						if(this.$u.test.isEmpty(item.houseNum)){
-							item.houseNum = ''
-						}
-						if(this.$u.test.isEmpty(item.houseHall)){
-							item.houseHall = ''
-						}
-						if(this.$u.test.isEmpty(item.toiletNum)){
-							item.toiletNum = ''
-						}
-					    this.flowList.push(item);
-					}
-					++ this.pageNum 
-					this.loadStatus = 'loadmore';
-				});
-			},
-			clickSearch() {
-			    this.$u.route('/pages/search/search');
-			},
-			clickImage(houseId) {
-				this.$u.route({
-					url: '/pages/detail/detail',
-					params: {
-						houseId: houseId
-					}
-				})
-			},
-			clickNav(item){
-				if(item.url){
-					return this.$u.route(item.url);
-				}
-				if(item.type === "2"){
-					// 判断是否有token
-					let lifeData = uni.getStorageSync('lifeData');
-					let token = lifeData.vuex_token
-					// if(!token){
-					// 	// 没有token 则跳转到登录
-					// 	return uni.reLaunch({
-					// 		url:'../login/login'
-					// 	})
-					// }else{
-					// 	// 判断Token是否有效
-					// 	let url = "/api/profile/isExpiration";
-					// 	return this.$u.get(url,{
-					// 		token:token
-					// 	}).then(obj => {
-					// 		if(obj.data){
-					// 			// 没有token过期则跳转到登录
-					// 			return uni.reLaunch({
-					// 				url:'../login/login'
-					// 			})
-					// 		}else{
-					// 			return this.$u.route('/pages/detail/preHouse');
-					// 		}
-					// 	});
-					// }
-				}else if(item.type){
-					// return this.$u.route('/pages/search/searchList');
-					return this.$u.route({
-						url: '/pages/search/searchList',
-						params: {
-							type: item.type
-						}
-					})
-				}
-			},
-			code(){
-				this.$mytip.toast('请咨询作者')
-			},
-			appSysFlowInfo(){
-				// 流量统计
-				let uvCode = uni.getStorageSync("uvCode");
-				let url = "https://sourcebyte.cn/api/flow/upFlow?type=MINI&uvCode=" + uvCode;
-				uni.request({
-				  url: url,
-				  method: "POST",
-				  success: (res) => {
-					uni.setStorageSync("uvCode", res.data.data);
-				  },
-				});
-			},
-			server(){
-				// window.open ('https://sourcebyte.cn')
-				uni.makePhoneCall({
-				  phoneNumber: "18720989281",
-				});
-			},
-			getNoticecList(){
-				let url = "/api/notice/findNoticeList";
-				this.$u.get(url,{
-					pageNum:1,
-					pageSize:50,
-					orderByColumn:'create_time',
-					isAsc:'desc'
-				}).then(obj => {
-					let data = obj.rows
-					data.filter(item=>{
-						this.noticeList.push(item.noticeTitle)
-					})
-				});
-			},
-			moreInfo(){
-				uni.navigateToMiniProgram({
-					appId:'wxbca64173e772915e',// 此为开源字节appid
-					path:'/pages/index/index',// 此为开源字节首页路径
-					envVersion:"release",
-					success: res => {
-						 // 打开成功
-						 console.log("打开成功", res);
-					},
-					fail: err => {
-						 console.log(err);
-					}
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.nomore {
-		background-color: $u-bg-color;
-	}
-	
-	.search{
-		width: 54px;
-		height: 44px;
-		
-		&:active{
-			background-color: $u-bg-color;
-		}
-	}
-	
-	.rowClass{
-		border-radius: 8px;
-		background-color: rgb(255, 255, 255);
-		margin-top: 10rpx;
-	}
-	
-	.hoverClass{
-		background-color: #E4E7ED;
-	}
-	
-	.tabName{
-		font-size: 28rpx;
-		color: $u-main-color;
-	}
-	
-	.demo-warter {
-	    border-radius: 8px;
-	    margin-top: 3px;
-	    background-color: #ffffff;
-	    padding: 3px;
-	    position: relative;
-	}
-	
-	.u-close {
-	    position: absolute;
-	    top: 20rpx;
-	    right: 20rpx;
-	}
-	
-	.item-cover {
-	    font-size: 55rpx;
-	    color: $u-type-warning;
-	}
-	
-	.item-title {
-	    font-size: 28rpx;
-	    color: $u-main-color;
-	    font-weight: bold;
-		padding-top: 5rpx;
-		padding-left: 10rpx;
-	}
-	
-	.item-price {
-	    font-weight: normal;
-	    font-size: 32rpx;
-	    color: $u-type-warning;
-	}
-	
-	.item-desc {
-	    font-weight: normal;
-	    font-size: 26rpx;
-	    color: $u-tips-color;
-		padding-bottom: 5rpx;
-		padding-left: 10rpx;
-	}
-	
-	.item-tag {
-	    font-size: 24rpx;
-	    color: $u-tips-color;
-	    margin-top: 3px;
-	}
-	
-	.buttom {
-		.loginType {
-			font-size: 14px;
-			position: fixed;
-			right: 30rpx;
-			bottom: 300rpx;
-			width: 60px;
-			height: 60px;
-			padding: 4px;
-			cursor: pointer;
-			background: #FFF;
-			text-align: center;
-			line-height: 60px;
-			border-radius: 100%;
-			-webkit-box-shadow: 0px 1px 20px 0px rgba(0,0,0,0.1),inset 0px -1px 0px 0px rgba(0,0,0,0.1);
-			box-shadow: 0px 1px 20px 0px rgba(0,0,0,0.1),inset 0px -1px 0px 0px rgba(0,0,0,0.1);
-		}
-	}
-</style>
diff --git a/pages/login/account.vue b/pages/login/account.vue
deleted file mode 100644
index ca7ba88..0000000
--- a/pages/login/account.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-<template>
-	<view class="wrap">
-		<view class="content">
-			<view class="title">欢迎登录</view>
-			<input class="u-border-bottom" type="number" v-model="loginName" placeholder="请输入手机号" />
-			<view class="tips">未注册的手机号验证后自动创建账号</view>
-			<u-button @click="submit" :style="[inputStyle]" class="getCaptcha">获取短信验证码</u-button>
-			<view class="alternative">
-				<view class="account" @click="accountLogin">密码登录</view>
-				<view class="issue" @click="problem">遇到问题</view>
-			</view>
-		</view>
-		<!-- <view class="buttom">
-			<view class="loginType">
-				<view class="wechat item">
-					<view class="icon"><u-icon size="60" name="server-man" color="#999" @click="server"></u-icon></view>
-				</view>
-			</view>
-		</view> -->
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			loginName: ''
-		}
-	},
-	onLoad() {
-		// 在页面中定义激励视频广告
-		let videoAd = null
-		// 在页面onLoad回调事件中创建激励视频广告实例
-		if (wx.createRewardedVideoAd) {
-		  videoAd = wx.createRewardedVideoAd({
-		    adUnitId: 'adunit-8cd5789a01a51891'
-		  })
-		  videoAd.onLoad(() => {})
-		  videoAd.onError((err) => {})
-		  videoAd.onClose((res) => {})
-		}
-		// 用户触发广告后，显示激励视频广告
-		if (videoAd) {
-		  videoAd.show().catch(() => {
-		    // 失败重试
-		    videoAd.load()
-		      .then(() => videoAd.show())
-		      .catch(err => {
-		        console.log('激励视频 广告显示失败')
-		      })
-		  })
-		}
-	},
-	computed: {
-		// 小程序端无效
-		inputStyle() {
-			let style = {};
-			if(this.loginName && this.$u.test.mobile(this.loginName)) {
-				style.color = "#fff";
-				style.backgroundColor = this.$u.color['primary'];
-			}
-			return style;
-		}
-	},
-	methods: {
-		submit() {
-			if(this.$u.test.mobile(this.loginName)) {
-				this.$u.route({
-					url: 'pages/login/code',
-					params: {
-						loginName: this.loginName
-					}
-				})
-			}else{
-				this.$mytip.toast('请输入有效的手机号码')
-			}
-		},
-		accountLogin(){
-			this.$u.route({
-				url: 'pages/login/login'
-			})
-		},
-		problem(){
-			this.$u.route({
-				url: 'pages/login/problem'
-			})
-		},
-		server(){
-			window.open ('https://sourcebyte.cn')
-		}
-	}
-};
-</script>
-
-<style>
-	page {
-		overflow: hidden;
-		background-color: #ffffff;
-	}
-</style>
-<style lang="scss" scoped>
-.wrap {
-	font-size: 28rpx;
-	.content {
-		width: 600rpx;
-		margin: 80rpx auto 0;
-
-		.title {
-			text-align: left;
-			font-size: 60rpx;
-			font-weight: 500;
-			margin-bottom: 100rpx;
-		}
-		input {
-			text-align: left;
-			margin-bottom: 10rpx;
-			padding-bottom: 6rpx;
-		}
-		.tips {
-			color: $u-type-info;
-			margin-bottom: 60rpx;
-			margin-top: 8rpx;
-		}
-		.getCaptcha {
-			background-color: rgba(0, 0, 0,.1);
-			color: $u-tips-color;
-			border: none;
-			font-size: 30rpx;
-			padding: 12rpx 0;
-			
-			&::after {
-				border: none;
-			}
-		}
-		.alternative {
-			color: $u-tips-color;
-			display: flex;
-			justify-content: space-between;
-			margin-top: 30rpx;
-			.account {
-				&:active{
-					background-color: #ededed;
-				}
-			}
-		}
-	}
-	.buttom {
-		.loginType {
-			font-size: 14px;
-			position: fixed;
-			right: 50rpx;
-			bottom: 50rpx;
-			width: 60px;
-			height: 60px;
-			padding: 4px;
-			cursor: pointer;
-			background: #FFF;
-			text-align: center;
-			line-height: 60px;
-			border-radius: 100%;
-			-webkit-box-shadow: 0px 1px 20px 0px rgba(0,0,0,0.1),inset 0px -1px 0px 0px rgba(0,0,0,0.1);
-			box-shadow: 0px 1px 20px 0px rgba(0,0,0,0.1),inset 0px -1px 0px 0px rgba(0,0,0,0.1);
-		}
-	}
-}
-</style>
diff --git a/pages/login/code.vue b/pages/login/code.vue
deleted file mode 100644
index cae4b4a..0000000
--- a/pages/login/code.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-	<view class="wrap">
-		<view class="key-input">
-			<view class="title">输入验证码</view>
-			<view class="tips">验证码已发送至 {{loginName}}</view>
-			<u-message-input :focus="true" :value="value" @change="change" @finish="finish" mode="bottomLine" :maxlength="maxlength"></u-message-input>
-			<text :class="{ error: error }">验证码错误，请重新输入</text>
-			<view class="captcha">
-				<text :class="{ noCaptcha: show }" @tap="noCaptcha">收不到验证码点这里</text>
-				<text :class="{ regain: !show }">{{ second }}秒后重新获取验证码</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			maxlength: 4,
-			value: '',
-			second: 60,
-			show: false,
-			error: false,
-			loginName: ''
-		};
-	},
-	onLoad: function (option) {
-		this.loginName = option.loginName //上个页面传递的参数。
-		// 发送验证码
-		this.getCaptcha()
-		// 倒计时
-		let interval = setInterval(() => {
-			this.second--;
-			if (this.second <= 0) {
-				this.show = true;
-				if (this.value.lenth != 4) {
-					this.error = true;
-				}
-				clearInterval(interval);
-			}
-		}, 1000);
-	},
-	methods: {
-		getCaptcha(){
-			console.log('用户===>'+ this.loginName);
-			let url = "/api/captchaSms";
-			this.$u.get(url,{
-				loginName: this.loginName
-			}).then(data => {
-				console.log('验证码发送'+data.send);
-			});
-		},
-		// 收不到验证码选择时的选择
-		noCaptcha() {
-			let that = this
-			uni.showActionSheet({
-				itemList: ['重新获取验证码'],
-				success: function(res) {
-					that.getCaptcha()
-					that.$mytip.toast('验证码发送成功')
-				},
-				fail: function(res) {
-					
-				}
-			});
-		},
-		// change事件侦听
-		change(value) {
-			// console.log('change', value);
-		},
-		// 输入完验证码最后一位执行
-		finish(value) {
-			// 登录成功初始化token与用户信息
-			let url = "/api/thirdRegister";
-			this.$u.post(url,{
-				username: this.loginName,
-				code: value
-			}).then(data => {
-				// 登录成功初始化token与用户信息
-				this.$u.vuex('vuex_token', data.token);
-				this.$u.vuex('vuex_user', data.loginUser);
-				uni.switchTab({
-					url: '/pages/index/index'
-				})
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.wrap {
-	padding: 80rpx;
-}
-
-.box {
-	margin: 30rpx 0;
-	font-size: 30rpx;
-	color: 555;
-}
-
-.key-input {
-	padding: 30rpx 0;
-	text {
-		display: none;
-	}
-	.error {
-		display: block;
-		color: red;
-		font-size: 30rpx;
-		margin: 20rpx 0;
-	}
-}
-
-.title {
-	font-size: 50rpx;
-	color: #333;
-}
-
-.key-input .tips {
-	font-size: 30rpx;
-	color: #333;
-	margin-top: 20rpx;
-	margin-bottom: 60rpx;
-}
-.captcha {
-	color: $u-type-warning;
-	font-size: 30rpx;
-	margin-top: 40rpx;
-	.noCaptcha {
-		display: block;
-	}
-	.regain {
-		display: block;
-	}
-}
-</style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
deleted file mode 100644
index bc58b0b..0000000
--- a/pages/login/login.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-<template>
-    <view class="login-container">
-      <!-- 顶部状态栏 -->
-      <view class="status-bar">
-		  <u-icon
-		    :name="btn.icon"
-		    :color="btn.color || '#333'"
-		    :size="btn.size || 40"
-		  ></u-icon>
-	  </view>
-      
-      <!-- 主体内容区 -->
-      <view class="content">
-        <!-- 标题区域 -->
-        <view class="title">登录</view>
-        
-        <!-- 登录插图区域 -->
-        <view class="illustration">
-          <image src="/static/login/bg.png" mode="aspectFit"></image>
-        </view>
-        
-        <!-- 登录按钮 -->
-        <button class="login-btn" open-type="getPhoneNumber" @getphonenumber="onGetPhone">
-          使用微信授权登录
-        </button>
-        
-        <!-- 用户类型选择 -->
-        <view class="user-type" shape="square">
-          <u-radio-group v-model="loginType" active-color="#EA414A" shape="square" >
-				<u-radio name="person" >个人</u-radio>
-				<u-radio name="company" >企业</u-radio>
-			</u-radio-group>
-        </view>
-        
-        <!-- 协议提示 -->
-       <view class="agreement">
-         登录即同意
-         <text class="link">《用户协议》</text>
-         及
-         <text class="link">《隐私政策》</text>
-       </view>
-      </view>
-    </view>
-</template>
-
-
-<script>
-export default {
-  data() {
-    return {
-	  designWidth: 750,
-	  screenWidth: 0,
-	  scale: 1,
-      bgImages: [
-        '/static/loginbg1.jpg',
-        '/static/loginbg2.jpg'
-      ],
-      currentIndex: 0,
-      currentBg: '/static/login/bg.png',
-      isFading: false,
-      timer: null,
-	  loginType:"person"
-    }
-  },
-
-  onLoad() {
-    // this.startBgTimer();
-	wx.getWindowInfo({
-	    success: (res) => {
-	      this.screenWidth = res.windowWidth
-	      this.scale = this.screenWidth / this.designWidth
-	    }
-	  })
-  },
-
-  onUnload() {
-    clearInterval(this.timer);
-  },
-computed: {
-  // title 样式
-  titleStyle() {
-    const s = this.scale;
-    return {
-      width: `${93 * s}rpx`,
-      height: `${45 * s}rpx`,
-      fontSize: `${48 * s}rpx`,
-      lineHeight: `${40 * s}rpx`,
-      fontWeight: 500,
-      color: '#222222',
-      fontFamily: 'Noto Sans S Chinese',
-      textAlign: 'center'
-    }
-  },
-  headerStyle() {
-    const s = this.scale;
-    return {
-     marginTop: `${214 * s}rpx`,
-     flex: 1,
-     display: 'flex',
-     flexDirection: 'column',
-     alignItems: 'center',   // 水平居中
-     justifyContent: 'flex-start' // 从顶部开始
-    }
-  },
-  // cover 样式
-  coverStyle() {
-    const s = this.scale;
-    return {
-      width: `${428 * s}rpx`,
-      height: `${608 * s}rpx`
-    }
-  }
-},
-  methods: {
-    /** 背景切换定时器 */
-    startBgTimer() {
-      this.timer = setInterval(() => {
-        this.isFading = true;
-
-        setTimeout(() => {
-          this.currentIndex = (this.currentIndex + 1) % this.bgImages.length;
-          this.currentBg = this.bgImages[this.currentIndex];
-          this.isFading = false;
-        }, 500);
-      }, 4000);
-    },
-
-    /** 微信手机号授权 */
-    onGetPhone(e) {
-      const { code } = e.detail;
-
-      if (!code) {
-        this.$mytip.toast("授权失败");
-        return;
-      }
-      this.doLogin(code);
-    },
-
-    /** 执行登录逻辑 */
-    async doLogin(phoneGetCode) {
-      uni.showLoading({ title: "登录中...", mask: true });
-      
-      try {
-        // 微信登录
-        const loginRes = await new Promise((resolve, reject) => {
-          uni.login({
-            provider: 'weixin',
-            success: resolve,
-            fail: reject
-          });
-        });
-    
-        // 调用后端登录接口
-        const authRes = await this.$u.post(`/login/weChatLogin`, {
-    	phoneGetCode: phoneGetCode,
-    	loginCode: loginRes.code
-       });
-   
-        // 保存token
-        this.$u.vuex('vuex_token', authRes.data);
-        uni.hideLoading();
-		
-	    console.log(this.loginType)
-		uni.setStorageSync('indexParam', {
-		  loginType: this.loginType
-		})
-        // 跳转首页
-        uni.switchTab({
-          url: '/pages/index/index'
-        });
-    
-      } catch (err) {
-        uni.hideLoading();
-        this.$mytip.toast("登录失败");
-        console.error('Login failed:', err);
-      }
-    },
-    /** 触发手机号选择（子组件 → 父组件） */
-    showPhoneSelector(phoneList, openid) {
-      this.$emit("choosePhone", { phoneList, openid });
-    },
-    /** 查看协议 */
-    goPrivacy(type) {
-      const url = type === 'user'
-        ? '/pages/privacy/userAgreement'
-        : '/pages/privacy/privacyPolicy';
-
-      uni.navigateTo({ url });
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.login-container {
-  height: 100vh;
-  background-color: #fff;
-  box-sizing: border-box;
-  overflow: hidden;
-  
-  .status-bar {
-    margin-top: 7.56%;
-    height: var(--status-bar-height);
-  }
-  
-  .content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    height: calc(100vh - var(--status-bar-height));
-	margin-top: 12.8%;
-  }
-  
-  .title {
-    height: 45rpx;
-    font-family: Noto Sans S Chinese;
-    font-weight: 500;
-    font-size: 48rpx;
-    color: #222222;
-    line-height: 40rpx;
-  }
-  
-  .illustration {
-    width: 100%;
-    height: 44.6%;
-	padding-left: 21.47%;
-	padding-right: 21.47%;
-    margin-bottom: 6%;
-    overflow: hidden;
-  }
-  
-  .illustration image {
-    width: 100%;
-    height: 100%;
-  }
-  
-  .login-btn {
-    width: 78.6%;
-    height: 7.12%;
-    background: linear-gradient(90deg, #FF2F31 0%, #FF9379 100%);
-    border-radius: 49rpx;
-    font-family: Noto Sans S Chinese;
-    font-weight: 400;
-    font-size: 36rpx;
-    color: #FFFFFF;
-	 display: flex;
-	align-items: center;
-	justify-content: center;
-    margin-bottom: 40rpx;
-  }
-  
-  .user-type {
-    display: flex;
-    justify-content: center;
-    gap: 40rpx;
-    margin-bottom: 20rpx;
-  }
-  
-  .agreement {
-	font-family: Noto Sans S Chinese;
-	font-weight: 400;
-	font-size: 30rpx;
-	color: #CECECE;
-	align-items: center;
-	margin-top: 6.24%;
-  }
-  .link{
-	  color: #334254;
-  }
-}
-
-
-
-/* 响应式适配 */
-@media (max-width: 320rpx) {
-  .title { font-size: 42rpx; margin-bottom: 100rpx; }
-  .illustration { height: 360rpx; }
-  .login-btn { height: 80rpx; font-size: 30rpx; }
-}
-</style>
diff --git a/pages/login/problem.vue b/pages/login/problem.vue
deleted file mode 100644
index 5d84b68..0000000
--- a/pages/login/problem.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-	<view style="margin: 20rpx;">
-		<u-navbar :is-back="true" title="常见问题" :border-bottom="false"></u-navbar>
-		<u-collapse class="u-p-30">
-			<u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index" :open="item.open">
-				{{item.body}}
-			</u-collapse-item>
-		</u-collapse>
-		<view class="u-m-t-20">
-			<u-button class="u-m-20" type="default" @click="server" plain>
-				<u-icon name="level" color="#969799" size="38"></u-icon>
-				前往官网
-			</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			appUrl: false,
-			url: "https://sourcebyte.cn",
-			itemList: [
-				{
-					head: "初始密码是什么？",
-					body: "初始密码默认为手机号码,为了您的账户安全,请进入个人中心进行修改。",
-					open: false,
-				},
-				{
-					head: "技术支持电话是多少？",
-					body: "联系电话：18720989281",
-					open: false,
-				},
-				{
-					head: "关于我们",
-					body: "我们专注提供专业的软件产品和技术。为合作伙伴提供安全可靠的软件产品与解决方案，共同帮助终端用户实现业务创新、快速发展。" ,
-					open: true,
-				},
-				{
-					head: "加入我们",
-					body: "邮箱：261648947@qq.com",
-					open: false,
-				},
-			],
-		}
-	},
-	methods: {
-		server(){
-			let url = "https://sourcebyte.vip"
-			// #ifdef  H5
-				window.open(url, '_blank');
-			// #endif
-			// #ifndef  H5
-				this.$u.route("/pages/webview/webview", {
-				  title: '关于我们',
-				  src:url
-				});
-			// #endif
-			// if(this.isWeiXinLogin){
-			// 	uni.showToast({
-			// 		icon:'none',
-			// 		title:'www.sourcebyte.cn',
-			// 		duration:5000
-			// 	})
-			// }else{
-			// 	window.open(this.url)
-			// }
-		},
-		download(){
-			this.DownLoadAndroid();
-		},
-		//判断是否微信登陆
-		isWeiXinLogin() {
-			// #ifdef H5
-			let ua = window.navigator.userAgent.toLowerCase()
-			if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-				return true;
-			}
-			// #endif
-			return false;
-		},
-		//安卓下载
-		DownLoadAndroid() {
-			if (this.isWeiXinLogin()) {
-				uni.showToast({
-					icon:'none',
-					title:'请复制链接，在浏览器中打开下载',
-					duration:3000
-				})
-				this.appUrl = true;
-				return;
-			}
-			var downloadUrl = 'http://8.136.213.245/profile/apk/yixin.apk'; // 下载地址
-			var urlStr = encodeURI(downloadUrl)
-			// #ifdef APP-PLUS
-			plus.runtime.openURL(urlStr);
-			return;
-			// #endif
-			// #ifdef H5 
-			window.open(urlStr);
-			// #endif
-		},
-	}
-};
-</script>
-
-<style>
-	page {
-		background: #fff;
-	}
-	
-	.appUrl{
-		padding: 20rpx;
-	}
-</style>
diff --git a/pages/message/message.vue b/pages/message/message.vue
deleted file mode 100644
index 8a1f945..0000000
--- a/pages/message/message.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-	<view class="message-page">
-
-		<!-- 顶部导航栏 -->
-		<u-navbar title="消息中心" bg-color="#fff" title-color="#111" :border-bottom="true" @leftClick="goBack">
-			<view slot="left">
-				<u-icon name="arrow-left" size="44" color="#111"></u-icon>
-			</view>
-		</u-navbar>
-
-		<!-- 消息列表 -->
-		<scroll-view scroll-y class="message-list">
-			<view v-for="(msg,index) in messages" :key="index" class="msg-item u-flex u-row-between" @click="viewMessage(msg)">
-				<view class="u-flex">
-					<!-- <u-icon :name="msg.icon" size="48" :color="msg.read ? '#ccc' : 'cornflowerblue'"></u-icon> -->
-					<image :src="msg.icon"></image>
-					<view class="msg-content u-m-l-20">
-						<view class="msg-title u-font-16">{{ msg.title }}</view>
-						<view class="msg-desc u-tips-color u-font-12 u-line-2">{{ msg.desc }}</view>
-					</view>
-				</view>
-				<view class="msg-right u-text-right">
-					<view class="msg-time u-font-12 u-tips-color">{{ msg.time }}</view>
-					<view v-if="!msg.read" class="unread-dot"></view>
-				</view>
-			</view>
-
-			<u-loadmore :status="loadStatus" :loading-text="'加载中...'" :nomore-text="'没有更多消息了'"></u-loadmore>
-		</scroll-view>
-
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			messages: [
-				{
-					title: '账单提醒',
-					desc: '您的本月房租账单已生成，请在到期日前完成支付。',
-					time: '2025-10-29 09:12',
-					icon: '/static/icon/msg-1.png',
-					read: false
-				},
-				{
-					title: '系统通知',
-					desc: '恭喜您成功升级为魔力会员，快来看看新增的特权吧！',
-					time: '2025-10-28 18:46',
-					icon: '/static/icon/msg-2.png',
-					read: true
-				},
-				{
-					title: '活动优惠',
-					desc: '限时会员活动，租惠卡用户房租95折，快来参与！',
-					time: '2025-10-27 14:03',
-					icon: '/static/icon/msg-3.png',
-					read: false
-				}
-			],
-			loadStatus: 'nomore'
-		}
-	},
-	methods: {
-		goBack() {
-			uni.navigateBack()
-		},
-		viewMessage(msg) {
-			msg.read = true
-			uni.navigateTo({
-				url: `/pages/message/detail?title=${encodeURIComponent(msg.title)}&desc=${encodeURIComponent(msg.desc)}`
-			})
-		}
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-.message-page {
-	background-color: #ffffff;
-	min-height: 100vh;
-}
-
-.message-list {
-	padding: 20rpx;
-	box-sizing: border-box;
-}
-
-.msg-item {
-	padding: 20rpx;
-	margin-bottom: 20rpx;
-	align-items: flex-start;
-	position: relative;
-	border-bottom: 1px solid #E6E6E6;
-	
-	image{
-		width: 88rpx;
-		height: 88rpx;
-	}
-}
-
-.msg-content {
-	width: 500rpx;
-}
-
-.msg-title {
-	font-weight: bold;
-	color: #111;
-	margin-bottom: 10rpx;
-}
-
-.msg-right {
-	align-items: flex-end;
-	display: flex;
-	flex-direction: column;
-	justify-content: space-between;
-}
-
-.msg-time{
-	position: absolute;
-}
-
-.unread-dot {
-	width: 14rpx;
-	height: 14rpx;
-	background-color: #ff4d4f;
-	border-radius: 50%;
-	margin-top: 50rpx;
-}
-</style>
\ No newline at end of file
diff --git a/pages/profile/aboutMe.vue b/pages/profile/aboutMe.vue
deleted file mode 100644
index 95822e6..0000000
--- a/pages/profile/aboutMe.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<!-- 关于作者 -->
-<template>
-  <view class="about">
-    <like-fx ref="likeFx" :width="width" :height="height"></like-fx>
-	<view class="titleZ text-center align-center">
-		<text class="text-bold" style="font-size: 28px;">关于我们</text>
-		<view class="contentZ">
-			<text class="text-xl">我们专注提供专业的软件产品和技术。为合作伙伴提供安全可靠的软件产品与解决方案，共同帮助终端用户实现业务创新、快速发展。</text>
-		</view>
-	</view>
-  </view>
-</template>
-
-<script>
-  import LikeFx from '@/components/likeFx/likeFx.vue'
-  export default {
-    components: {
-      LikeFx
-    },
-    data() {
-      return {
-        animation_timer: null, // 动画定时器
-        width: 375,
-        height: 1920
-      }
-    },
-    onLoad() {
-      this._startLikeAnimation();
-    },
-	onUnload() {
-		clearTimeout(this.animation_timer)
-	},
-    methods: {
-      _startLikeAnimation() {
-        this.animation_timer = setInterval(() => {
-          this.$refs.likeFx.likeClick()
-        }, 300)
-      }
-    }
-  }
-</script>
-
-<style scoped>
-	.align-center {
-		text-align: center;
-	}
-	.titleZ{
-		width: 750rpx;
-		font-size: 42rpx;
-		margin-top: 60rpx;
-	}
-	.contentZ{
-		width: 650rpx;
-		margin: 10rpx auto 0;
-		text-align: left;
-	}
-  .about-bg {
-    background-size: cover;
-    width: 100vw;
-    height: 100vh;
-    justify-content: center;
-    flex-direction: column;
-    color: #fff;
-  }
-
-  .edit-fixed {
-    position: fixed;
-    width: 100%;
-    bottom: 0;
-    z-index: 1024;
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.1);
-  }
-
-  .detail-imgs image {
-    width: 100%;
-    float: left;
-    /* height:400rpx; 不定高了*/
-    border: 0;
-    padding: 0;
-    margin: 0
-  }
-
-  .share-img {
-    position: fixed;
-    padding: 10rpx;
-    width: 100rpx;
-    height: 100rpx;
-    /* top: 680rpx; */
-    bottom: 200rpx;
-    right: 20rpx;
-    z-index: 1024;
-    opacity: 0.8;
-    box-shadow: 0rpx 8rpx 30rpx 0rpx rgba(0, 0, 0, 0.3);
-    border: none;
-  }
-
-  .about {
-    margin: 0;
-    width: 100%;
-    height: 100vh;
-	padding-top: 20%;
-    color: #fff;
-    background: linear-gradient(-120deg, #F15BB5, #9A5CE5, #01BEFF, #00F5D4);
-    /* background: linear-gradient(-120deg, #0976ea, #c471f5, #f956b6, #ea7e0a); */
-    background-size: 500% 500%;
-    animation: gradientBG 15s ease infinite;
-  }
-
-  @keyframes gradientBG {
-    0% {
-      background-position: 0% 50%;
-    }
-
-    50% {
-      background-position: 100% 50%;
-    }
-
-    100% {
-      background-position: 0% 50%;
-    }
-  }
-
-  .container {
-    width: 100%;
-    position: absolute;
-    text-align: center;
-  }
-
-  .like-fx {
-    position: fixed;
-    right: 0;
-    z-index: 1024;
-    pointer-events: none;
-    /* background-color: red; */
-  }
-</style>
diff --git a/pages/profile/avatar.vue b/pages/profile/avatar.vue
deleted file mode 100644
index 52299be..0000000
--- a/pages/profile/avatar.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-	<view>
-		<u-navbar :is-back="true" title="设置头像" :border-bottom="false"></u-navbar>
-		<view class="wrap">
-			<u-upload :custom-btn="true" ref="uUpload" :auto-upload="true" :action="action" :max-size="10 * 1024 * 1024" max-count="1" width="690" height="690" :size-type="siteType">
-				<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
-					<u-icon name="plus" size="60" :color="$u.color['lightColor']"></u-icon>
-				</view>
-			</u-upload>
-			<view class="u-m-t-20 btn">
-				<u-button type="primary" @click="subProfile">提交</u-button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import config from "@/common/config.js" // 全局配置文件
-export default {
-	data() {
-		return {
-			// 服务器地址
-			action: config.staticUrl + '/common/upload',
-			siteType:['compressed']
-		};
-	},
-	methods: {
-		subProfile() {
-			let files = [];
-			// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-			files = this.$refs.uUpload.lists.filter(val => {
-				return val.progress == 100;
-			})
-			if(this.$u.test.isEmpty(files)){
-				return this.$mytip.toast('请选择图片')
-			}
-			let imageList = files.map(val => {
-				return {
-					// imgUrl: val.response.url,
-					imgUrl: val.response.fileName
-				}
-			})
-			let avatar =  imageList[0].imgUrl
-			let vuex_user = uni.getStorageSync('lifeData').vuex_user
-			let user = vuex_user.user
-			let userId = user.userId;
-			this.$u.put("api/profile/updateProfile",{
-				userId:userId,
-				avatar:avatar,
-			}).then(data => {
-				// 关闭
-				user.avatar = avatar
-				this.$u.vuex('vuex_user', vuex_user);
-				this.$mytip.toast('头像修改成功')
-				setTimeout(()=>{
-					uni.$emit('updateAvatar', {});
-					uni.switchTab({
-						url: '/pages/center/center'
-					})
-				},1000);
-			});
-		},
-	}
-};
-</script>
-
-<style>
-	page{
-		background-color: #FFFFFF;
-	}
-</style>
-<style scoped lang="scss">
-	.wrap {
-		padding: 30rpx;
-	}
-
-	.slot-btn {
-		width: 690rpx;
-		height: 690rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background: rgb(244, 245, 246);
-		border-radius: 10rpx;
-	}
-
-	.slot-btn__hover {
-		background-color: rgb(235, 236, 238);
-	}
-</style>
\ No newline at end of file
diff --git a/pages/profile/password.vue b/pages/profile/password.vue
deleted file mode 100644
index d9685c9..0000000
--- a/pages/profile/password.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<template>
-	<view>
-		<u-navbar :is-back="true" title="修改密码" :border-bottom="false"></u-navbar>
-		<view class="u-m-20">
-			<u-toast ref="uToast" />
-			<view>
-				<u-cell-group>
-					<u-field
-						v-model="oldpassword"
-						label="旧密码"
-						placeholder="请填写旧密码"
-						icon="lock"
-						iconColor="#d5d5d5"
-						label-width = "180"
-						password
-						focus
-					>
-					</u-field>
-					<u-field
-						v-model="newpassword"
-						label="新密码"
-						placeholder="请填写新密码"
-						icon="lock"
-						iconColor="#d5d5d5"
-						label-width = "180"
-						password
-					>
-					</u-field>
-					<u-field
-						v-model="password"
-						label="确认密码"
-						placeholder="请再次填写密码"
-						icon="lock-fill"
-						iconColor="#d5d5d5"
-						label-width = "180"
-						password
-					>
-					</u-field>
-				</u-cell-group>
-			</view>
-		</view>
-		<view class="btn">
-			<u-button type="primary" @tap="changePasswold">提交</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			oldpassword: '',
-			newpassword: '',
-			password: '',
-		}
-	},
-	methods: {
-		changePasswold() {
-			if(!this.oldpassword){
-				return this.$mytip.toast('请输入旧密码')
-			}
-			if(!this.newpassword){
-				return this.$mytip.toast('请输入新密码')
-			}
-			if(!this.password){
-				return this.$mytip.toast('请确认密码')
-			}
-			if(this.newpassword != this.password){
-				return this.$mytip.toast('密码不一致,请确认')
-			}
-			let url = "api/profile/updatePwd";
-			let userId = uni.getStorageSync('lifeData').vuex_user.user.userId;
-			this.$u.put(url,{
-				userId:userId,
-				oldPassword:this.oldpassword,
-				newPassword:this.newpassword
-			}).then(data => {
-				//提示后跳转页面
-				this.$mytip.toast('密码修改成功')
-				setTimeout(()=>{
-					uni.switchTab({
-						url: '/pages/center/center'
-					})
-				},1000);
-			});
-		},
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-	page{
-		overflow: hidden;
-	}
-	
-	.logo{
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		width: 100%;
-		height: 550rpx;
-		img {
-			text-align: center;
-		}
-	}
-
-	.version {
-		position:fixed;
-		bottom:0;
-		width: 100%;
-		text-align: center;
-		padding: 15rpx;
-	}
-	
-	.btn {
-		margin: 20rpx;
-	}
-</style>
diff --git a/pages/profile/profile.vue b/pages/profile/profile.vue
deleted file mode 100644
index 98f9b7e..0000000
--- a/pages/profile/profile.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<template>
-	<view class="u-m-20">
-		<u-navbar :is-back="true" title="个人信息" :border-bottom="false"></u-navbar>
-		<view>
-			<u-cell-group>
-				<u-cell-item title="头像" :arrow="true" hover-class="none" @click="updateAvatar">
-					<u-avatar :src="pic" size="100"></u-avatar>
-				</u-cell-item>
-			</u-cell-group>
-			<u-cell-group>
-				<u-cell-item title="昵称" :arrow="true" hover-class="none" @click="updateName">
-					{{vuex_user.user.nickName}}
-				</u-cell-item>
-			</u-cell-group>
-		</view>
-		
-		<u-modal v-model="showModel" @confirm="confirmName" ref="uModal" :async-close="true"
-		title="设置昵称">
-			<view class="slot-content">
-				<u-input v-model="nickName" type="text" :border="false" placeholder="请输入昵称"/>
-			</view>
-		</u-modal>
-		
-		<!-- <view class="u-m-t-20">
-			<u-button type="primary" @click="subProfile">提交</u-button>
-		</view> -->
-		
-		<!-- 如果是微信登录小程序，则获取用户的昵称与头像 -->
-		<!-- #ifdef MP-WEIXIN -->  
-			<!-- <u-button type="default">使用微信头像与昵称</u-button> -->
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import config from "@/common/config.js" // 全局配置文件
-	export default {
-		data() {
-			return {
-				pic:uni.getStorageSync('lifeData').vuex_user.user.avatar.includes(config.staticUrl)?uni.getStorageSync('lifeData').vuex_user.user.avatar:config.staticUrl+uni.getStorageSync('lifeData').vuex_user.user.avatar,
-				nickName:null,
-				showModel:false,
-			}
-		},
-		methods: {
-			updateName(){
-				this.showModel = true;
-			},
-			confirmName() {
-				if(!this.nickName){
-					this.showModel = false;
-					return this.$mytip.toast('请输入昵称')
-				}
-				let url = "api/profile/updateProfile";
-				let vuex_user = uni.getStorageSync('lifeData').vuex_user
-				let user = vuex_user.user
-				let userId = user.userId;
-				this.$u.put(url,{
-					userId:userId,
-					nickName:this.nickName,
-				}).then(data => {
-					// 关闭
-					user.nickName = this.nickName
-					this.$u.vuex('vuex_user', vuex_user);
-					this.showModel = false;
-					this.$mytip.toast('昵称修改成功')
-				});
-			},
-			updateAvatar(){
-				this.$u.route('/pages/profile/avatar')
-			},
-			subProfile(){
-				// 1.更新vuex中的用户信息
-				this.$mytip.toast('修改成功')
-				// 2.页面跳转
-				uni.switchTab({
-					url: '/pages/center/center'
-				})
-			},
-			getUserProfile(){
-				// 如果是微信登录小程序，则获取用户的昵称与头像
-				// #ifdef MP-WEIXIN
-					// 此处执行微信才执行
-				// #endif
-			    var that = this;
-			    uni.getUserProfile({
-			        desc: '获取您的微信信息以授权小程序',
-			        lang: 'zh_CN',
-			        success: UserProfileRes => {  
-			            console.log(UserProfileRes)
-			            uni.login({
-			                provider: 'weixin',
-			                success: function(loginRes) {
-			                    let avatarUrl = UserProfileRes.userInfo.avatarUrl; //用户头像
-			                    let nickName = UserProfileRes.userInfo.nickName; //用户微信名
-			                    let gender = UserProfileRes.userInfo.gender;//性别
-								console.log(avatarUrl);
-								// 去修改用户的昵称与头像
-			                },
-			                fail(err) {
-			                    console.log(err)
-			                }
-			            });
-			        },
-			        fail:err=>{
-			            console.log(err)
-			        }
-			    })
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.slot-content{
-		padding: 40rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/profile/setting.vue b/pages/profile/setting.vue
deleted file mode 100644
index 722cd70..0000000
--- a/pages/profile/setting.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<template>
-	<view>
-		<u-navbar :is-back="true" title="设置" :border-bottom="false">
-		</u-navbar>
-		<view class="setting-content">
-			<u-cell-group>
-				<u-cell-item title="个人信息" @click="profile"></u-cell-item>
-				<u-cell-item title="修改密码" @click="changePassword"></u-cell-item>
-			</u-cell-group>
-		</view>
-
-		<view class="btn">
-			<u-button @click="logout" plain>退出登录</u-button>
-		</view>
-
-		<view class="version">Version {{vuex_version}}</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-
-			}
-		},
-		onLoad() {
-
-		},
-		methods: {
-			profile() {
-				this.$u.route('/pages/profile/profile')
-			},
-			logout() {
-				// 登录成功修改token与用户信息
-				this.$u.vuex('vuex_token', '');
-				this.$u.vuex('vuex_user', {});
-				return uni.reLaunch({
-					url: '../index/index'
-				})
-			},
-			changePassword() {
-				this.$u.route('/pages/profile/password')
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.setting-content {
-		padding: 0rpx 20rpx;
-		border-radius: 10rpx;
-		background: #FFFFFF;
-		width: 94%;
-		margin: 20rpx auto;
-		
-		&::v-deep .u-cell{
-			color: #222222 !important;
-		}
-		
-		&::v-deep .u-cell_title{
-			font-size: 30rpx !important;
-		}
-	}
-
-	.btn {
-		width: 94%;
-		margin: 30rpx auto;
-
-		&::v-deep .u-btn {
-			border-radius: 10rpx;
-			font-size: 36rpx !important;
-			color: #EA4047 !important;
-			border: 0 !important;
-		}
-
-		&::v-deep .u-hairline-border:after {
-			border: 0 !important;
-		}
-	}
-
-	.version {
-		position: absolute;
-		bottom: 20rpx;
-		width: 100%;
-		text-align: center;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/vr/vr.vue b/pages/vr/vr.vue
deleted file mode 100644
index cc7f062..0000000
--- a/pages/vr/vr.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <view class="vr-page">
-    <web-view :src="src"></web-view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      src: ""
-    };
-  },
-  onLoad(options) {
-    this.src = decodeURIComponent(options.url);
-  }
-};
-</script>
-
-<style>
-.vr-page,
-.vr-page web-view {
-  width: 100%;
-  height: 100%;
-}
-</style>
diff --git a/pages/wae/waeRecords.vue b/pages/wae/waeRecords.vue
deleted file mode 100644
index 8480fa9..0000000
--- a/pages/wae/waeRecords.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-<template>
-  <view class="water-electric-page">
-    <!-- 页面标题栏 -->
-   <customNavbar title="水电费明细" />
-    <!-- 空状态 -->
-    <view v-if="records.length === 0" class="empty">
-      <image src="/static/empty.png" mode="aspectFit" />
-      <text>暂明细记录</text>
-    </view>
-
-    <!-- 列表部分 -->
-    <view v-else class="record-list">
-      <view
-        class="record-item"
-        v-for="(item, index) in records"
-        :key="index"
-        @click="toDetail(item)"
-      >
-		<view class="record-icon">
-			<image src="/static/icon/水费.png" class="icon-1" v-if="item.feeType=='水费'"></image>
-			<image src="/static/icon/电费.png" class="icon-2" v-else></image>
-		</view>
-        <!-- 左侧信息 -->
-        <view class="record-left">
-          <text class="record-title">{{ item.feeType }}（{{ item.period }}）</text>
-          <text class="record-time">支付时间：{{ item.payTime }}</text>
-        </view>
-
-        <!-- 右侧金额 + 箭头 -->
-        <view class="record-right">
-          <view class="amount">
-            ￥{{ item.amount.toFixed(2) }}
-            <u-icon name="arrow-right" size="20" color="#ccc"></u-icon>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      records: [
-        {
-          id: 1,
-          feeType: '电费',
-          period: '2024.08.01 - 2024.08.31',
-          payTime: '2024-09-05 12:21',
-          amount: 120.5
-        },
-        {
-          id: 2,
-          feeType: '水费',
-          period: '2024.08.01 - 2024.08.31',
-          payTime: '',
-          amount: 45.8
-        },
-        {
-          id: 3,
-          feeType: '电费',
-          period: '2024.09.01 - 2024.09.30',
-          payTime: '2024-10-03 15:12',
-          amount: 133.2
-        }
-      ]
-    };
-  },
-  methods: {
-    toDetail(item) {
-      uni.navigateTo({
-        url: `/pages/bill/waterElectricDetail?id=${item.id}`
-      });
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.water-electric-page {
-  padding: 120rpx 20rpx 20rpx 20rpx;
-  
-  .header {
-    background-color: #fff;
-    padding: 30rpx;
-    border-radius: 16rpx;
-    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
-    text-align: center;
-
-    .title {
-      font-size: 32rpx;
-      font-weight: 600;
-    }
-  }
-
-  .record-list {
-    margin-top: 20rpx;
-  }
-
-  .record-item {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    background: #fff;
-    border-radius: 16rpx;
-    margin-bottom: 20rpx;
-    padding: 24rpx 30rpx;
-    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
-	
-	.record-icon{
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		.icon-1{
-			width: 33rpx;
-			height: 47rpx;
-		}
-		
-		.icon-2{
-			width: 35rpx;
-			height: 57rpx;
-		}
-	}
-
-    .record-left {
-      display: flex;
-      flex-direction: column;
-      gap: 10rpx;
-
-      .record-title {
-        font-size: 30rpx;
-        font-weight: 500;
-        color: #2D2B2C;
-      }
-
-      .record-time {
-        font-size: 24rpx;
-        color: #86868C;
-      }
-    }
-
-    .record-right {
-      display: flex;
-      align-items: center;
-      font-size: 30rpx;
-      font-weight: 400;
-      color: #222222;
-
-      .amount {
-        display: flex;
-        align-items: center;
-        gap: 8rpx;
-      }
-    }
-  }
-
-  .empty {
-    margin-top: 200rpx;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    color: #aaa;
-    font-size: 28rpx;
-
-    image {
-      width: 200rpx;
-      height: 200rpx;
-      margin-bottom: 20rpx;
-    }
-  }
-}
-</style>
diff --git a/pages/webview/webview.vue b/pages/webview/webview.vue
deleted file mode 100644
index 21f9b9d..0000000
--- a/pages/webview/webview.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-<template>
-  <view v-if="src">
-    <web-view :webview-styles="wbStyles" :src="src" :fullscreen="false" bindmessage="handleGetMessage"/>
-  </view>
-</template>
- 
-<script>
-export default {
-  data() {
-    return {
-      title: '',
-      src: '',
-      wbStyles: {
-        width: '100%',
-        height: '100%',
-      },
-    }
-  },
-  methods: {
-	  handleGetMessage(e){
-		  
-	  }
-  },
-  onLoad(option) {
-	  console.log(option.title);
-    this.title = option?.title
-    this.src = option?.src
-  },
-}
-</script>
\ No newline at end of file
diff --git a/static/30091712.jpg b/static/30091712.jpg
deleted file mode 100644
index 86a5c7e..0000000
Binary files a/static/30091712.jpg and /dev/null differ
diff --git a/static/common/js/touch-emulator.js b/static/common/js/touch-emulator.js
deleted file mode 100644
index 9632413..0000000
--- a/static/common/js/touch-emulator.js
+++ /dev/null
@@ -1,363 +0,0 @@
-(function(window, document, exportName, undefined) {
-    "use strict";
-
-    var isMultiTouch = false;
-    var multiTouchStartPos;
-    var eventTarget;
-    var touchElements = {};
-
-    // polyfills
-    if(!document.createTouch) {
-        document.createTouch = function(view, target, identifier, pageX, pageY, screenX, screenY, clientX, clientY) {
-            // auto set
-            if(clientX == undefined || clientY == undefined) {
-                clientX = pageX - window.pageXOffset;
-                clientY = pageY - window.pageYOffset;
-            }
-
-            return new Touch(target, identifier, {
-                pageX: pageX,
-                pageY: pageY,
-                screenX: screenX,
-                screenY: screenY,
-                clientX: clientX,
-                clientY: clientY
-            });
-        };
-    }
-
-    if(!document.createTouchList) {
-        document.createTouchList = function() {
-            var touchList = new TouchList();
-            for (var i = 0; i < arguments.length; i++) {
-                touchList[i] = arguments[i];
-            }
-            touchList.length = arguments.length;
-            return touchList;
-        };
-    }
-
-    /**
-     * create an touch point
-     * @constructor
-     * @param target
-     * @param identifier
-     * @param pos
-     * @param deltaX
-     * @param deltaY
-     * @returns {Object} touchPoint
-     */
-    function Touch(target, identifier, pos, deltaX, deltaY) {
-        deltaX = deltaX || 0;
-        deltaY = deltaY || 0;
-
-        this.identifier = identifier;
-        this.target = target;
-        this.clientX = pos.clientX + deltaX;
-        this.clientY = pos.clientY + deltaY;
-        this.screenX = pos.screenX + deltaX;
-        this.screenY = pos.screenY + deltaY;
-        this.pageX = pos.pageX + deltaX;
-        this.pageY = pos.pageY + deltaY;
-    }
-
-    /**
-     * create empty touchlist with the methods
-     * @constructor
-     * @returns touchList
-     */
-    function TouchList() {
-        var touchList = [];
-
-        touchList.item = function(index) {
-            return this[index] || null;
-        };
-
-        // specified by Mozilla
-        touchList.identifiedTouch = function(id) {
-            return this[id + 1] || null;
-        };
-
-        return touchList;
-    }
-
-
-    /**
-     * Simple trick to fake touch event support
-     * this is enough for most libraries like Modernizr and Hammer
-     */
-    function fakeTouchSupport() {
-        var objs = [window, document.documentElement];
-        var props = ['ontouchstart', 'ontouchmove', 'ontouchcancel', 'ontouchend'];
-
-        for(var o=0; o<objs.length; o++) {
-            for(var p=0; p<props.length; p++) {
-                if(objs[o] && objs[o][props[p]] == undefined) {
-                    objs[o][props[p]] = null;
-                }
-            }
-        }
-    }
-
-    /**
-     * we don't have to emulate on a touch device
-     * @returns {boolean}
-     */
-    function hasTouchSupport() {
-        return ("ontouchstart" in window) || // touch events
-               (window.Modernizr && window.Modernizr.touch) || // modernizr
-               (navigator.msMaxTouchPoints || navigator.maxTouchPoints) > 2; // pointer events
-    }
-
-    /**
-     * disable mouseevents on the page
-     * @param ev
-     */
-    function preventMouseEvents(ev) {
-		// 注释启用默认事件
-        // ev.preventDefault();
-        // ev.stopPropagation();
-    }
-
-    /**
-     * only trigger touches when the left mousebutton has been pressed
-     * @param touchType
-     * @returns {Function}
-     */
-    function onMouse(touchType) {
-        return function(ev) {
-            // prevent mouse events
-            preventMouseEvents(ev);
-
-            if (ev.which !== 1) {
-                return;
-            }
-
-            // The EventTarget on which the touch point started when it was first placed on the surface,
-            // even if the touch point has since moved outside the interactive area of that element.
-            // also, when the target doesnt exist anymore, we update it
-            if (ev.type == 'mousedown' || !eventTarget || (eventTarget && !eventTarget.dispatchEvent)) {
-                eventTarget = ev.target;
-            }
-
-            // shiftKey has been lost, so trigger a touchend
-            if (isMultiTouch && !ev.shiftKey) {
-                triggerTouch('touchend', ev);
-                isMultiTouch = false;
-            }
-
-            triggerTouch(touchType, ev);
-
-            // we're entering the multi-touch mode!
-            if (!isMultiTouch && ev.shiftKey) {
-                isMultiTouch = true;
-                multiTouchStartPos = {
-                    pageX: ev.pageX,
-                    pageY: ev.pageY,
-                    clientX: ev.clientX,
-                    clientY: ev.clientY,
-                    screenX: ev.screenX,
-                    screenY: ev.screenY
-                };
-                triggerTouch('touchstart', ev);
-            }
-
-            // reset
-            if (ev.type == 'mouseup') {
-                multiTouchStartPos = null;
-                isMultiTouch = false;
-                eventTarget = null;
-            }
-        }
-    }
-
-    /**
-     * trigger a touch event
-     * @param eventName
-     * @param mouseEv
-     */
-    function triggerTouch(eventName, mouseEv) {
-        var touchEvent = document.createEvent('Event');
-        touchEvent.initEvent(eventName, true, true);
-
-        touchEvent.altKey = mouseEv.altKey;
-        touchEvent.ctrlKey = mouseEv.ctrlKey;
-        touchEvent.metaKey = mouseEv.metaKey;
-        touchEvent.shiftKey = mouseEv.shiftKey;
-
-        touchEvent.touches = getActiveTouches(mouseEv, eventName);
-        touchEvent.targetTouches = getActiveTouches(mouseEv, eventName);
-        touchEvent.changedTouches = getChangedTouches(mouseEv, eventName);
-
-        eventTarget.dispatchEvent(touchEvent);
-    }
-
-    /**
-     * create a touchList based on the mouse event
-     * @param mouseEv
-     * @returns {TouchList}
-     */
-    function createTouchList(mouseEv) {
-        var touchList = new TouchList();
-
-        if (isMultiTouch) {
-            var f = TouchEmulator.multiTouchOffset;
-            var deltaX = multiTouchStartPos.pageX - mouseEv.pageX;
-            var deltaY = multiTouchStartPos.pageY - mouseEv.pageY;
-
-            touchList.push(new Touch(eventTarget, 1, multiTouchStartPos, (deltaX*-1) - f, (deltaY*-1) + f));
-            touchList.push(new Touch(eventTarget, 2, multiTouchStartPos, deltaX+f, deltaY-f));
-        } else {
-            touchList.push(new Touch(eventTarget, 1, mouseEv, 0, 0));
-        }
-
-        return touchList;
-    }
-
-    /**
-     * receive all active touches
-     * @param mouseEv
-     * @returns {TouchList}
-     */
-    function getActiveTouches(mouseEv, eventName) {
-        // empty list
-        if (mouseEv.type == 'mouseup') {
-            return new TouchList();
-        }
-
-        var touchList = createTouchList(mouseEv);
-        if(isMultiTouch && mouseEv.type != 'mouseup' && eventName == 'touchend') {
-            touchList.splice(1, 1);
-        }
-        return touchList;
-    }
-
-    /**
-     * receive a filtered set of touches with only the changed pointers
-     * @param mouseEv
-     * @param eventName
-     * @returns {TouchList}
-     */
-    function getChangedTouches(mouseEv, eventName) {
-        var touchList = createTouchList(mouseEv);
-
-        // we only want to return the added/removed item on multitouch
-        // which is the second pointer, so remove the first pointer from the touchList
-        //
-        // but when the mouseEv.type is mouseup, we want to send all touches because then
-        // no new input will be possible
-        if(isMultiTouch && mouseEv.type != 'mouseup' &&
-            (eventName == 'touchstart' || eventName == 'touchend')) {
-            touchList.splice(0, 1);
-        }
-
-        return touchList;
-    }
-
-    /**
-     * show the touchpoints on the screen
-     */
-    function showTouches(ev) {
-        var touch, i, el, styles;
-
-        // first all visible touches
-        for(i = 0; i < ev.touches.length; i++) {
-            touch = ev.touches[i];
-            el = touchElements[touch.identifier];
-            if(!el) {
-                el = touchElements[touch.identifier] = document.createElement("div");
-                document.body.appendChild(el);
-            }
-
-            styles = TouchEmulator.template(touch);
-            for(var prop in styles) {
-                el.style[prop] = styles[prop];
-            }
-        }
-
-        // remove all ended touches
-        if(ev.type == 'touchend' || ev.type == 'touchcancel') {
-            for(i = 0; i < ev.changedTouches.length; i++) {
-                touch = ev.changedTouches[i];
-                el = touchElements[touch.identifier];
-                if(el) {
-                    el.parentNode.removeChild(el);
-                    delete touchElements[touch.identifier];
-                }
-            }
-        }
-    }
-
-    /**
-     * TouchEmulator initializer
-     */
-    function TouchEmulator() {
-        if (hasTouchSupport()) {
-            return;
-        }
-
-        fakeTouchSupport();
-
-        window.addEventListener("mousedown", onMouse('touchstart'), true);
-        window.addEventListener("mousemove", onMouse('touchmove'), true);
-        window.addEventListener("mouseup", onMouse('touchend'), true);
-
-        window.addEventListener("mouseenter", preventMouseEvents, true);
-        window.addEventListener("mouseleave", preventMouseEvents, true);
-        window.addEventListener("mouseout", preventMouseEvents, true);
-        window.addEventListener("mouseover", preventMouseEvents, true);
-
-        // it uses itself!
-        window.addEventListener("touchstart", showTouches, true);
-        window.addEventListener("touchmove", showTouches, true);
-        window.addEventListener("touchend", showTouches, true);
-        window.addEventListener("touchcancel", showTouches, true);
-    }
-
-    // start distance when entering the multitouch mode
-    TouchEmulator.multiTouchOffset = 75;
-
-    /**
-     * css template for the touch rendering
-     * @param touch
-     * @returns object
-     */
-    TouchEmulator.template = function(touch) {
-        var size = 0;
-        var transform = 'translate('+ (touch.clientX-(size/2)) +'px, '+ (touch.clientY-(size/2)) +'px)';
-        return {
-            position: 'fixed',
-            left: 0,
-            top: 0,
-            background: '#fff',
-            border: 'solid 1px #999',
-            opacity: .6,
-            borderRadius: '100%',
-            height: size + 'px',
-            width: size + 'px',
-            padding: 0,
-            margin: 0,
-            display: 'block',
-            overflow: 'hidden',
-            pointerEvents: 'none',
-            webkitUserSelect: 'none',
-            mozUserSelect: 'none',
-            userSelect: 'none',
-            webkitTransform: transform,
-            mozTransform: transform,
-            transform: transform,
-            zIndex: 100
-        }
-    };
-
-    // export
-    if (typeof define == "function" && define.amd) {
-        define(function() {
-            return TouchEmulator;
-        });
-    } else if (typeof module != "undefined" && module.exports) {
-        module.exports = TouchEmulator;
-    } else {
-        window[exportName] = TouchEmulator;
-    }
-})(window, document, "TouchEmulator");
\ No newline at end of file
diff --git a/static/icon/msg-1.png b/static/icon/msg-1.png
deleted file mode 100644
index 7fcf47a..0000000
Binary files a/static/icon/msg-1.png and /dev/null differ
diff --git a/static/icon/msg-2.png b/static/icon/msg-2.png
deleted file mode 100644
index 01c28d1..0000000
Binary files a/static/icon/msg-2.png and /dev/null differ
diff --git a/static/icon/msg-3.png b/static/icon/msg-3.png
deleted file mode 100644
index 02a9b63..0000000
Binary files a/static/icon/msg-3.png and /dev/null differ
diff --git a/static/icon/my-bg.png b/static/icon/my-bg.png
deleted file mode 100644
index bb79c98..0000000
Binary files a/static/icon/my-bg.png and /dev/null differ
diff --git a/static/icon/my-bg2.png b/static/icon/my-bg2.png
deleted file mode 100644
index 3c74455..0000000
Binary files a/static/icon/my-bg2.png and /dev/null differ
diff --git a/static/icon/parking.png b/static/icon/parking.png
deleted file mode 100644
index 1caa892..0000000
Binary files a/static/icon/parking.png and /dev/null differ
diff --git a/static/icon/sign.png b/static/icon/sign.png
deleted file mode 100644
index 377751d..0000000
Binary files a/static/icon/sign.png and /dev/null differ
diff --git a/static/icon/个人商铺.png b/static/icon/个人商铺.png
deleted file mode 100644
index df6ca39..0000000
Binary files a/static/icon/个人商铺.png and /dev/null differ
diff --git a/static/icon/书签.png b/static/icon/书签.png
deleted file mode 100644
index 877f10e..0000000
Binary files a/static/icon/书签.png and /dev/null differ
diff --git a/static/icon/优惠商城.png b/static/icon/优惠商城.png
deleted file mode 100644
index 4fe5ed2..0000000
Binary files a/static/icon/优惠商城.png and /dev/null differ
diff --git a/static/icon/住房信息.png b/static/icon/住房信息.png
deleted file mode 100644
index 65d892c..0000000
Binary files a/static/icon/住房信息.png and /dev/null differ
diff --git a/static/icon/保租房.png b/static/icon/保租房.png
deleted file mode 100644
index c20f4c4..0000000
Binary files a/static/icon/保租房.png and /dev/null differ
diff --git a/static/icon/停车场.png b/static/icon/停车场.png
deleted file mode 100644
index 6bf941e..0000000
Binary files a/static/icon/停车场.png and /dev/null differ
diff --git a/static/icon/厂房.png b/static/icon/厂房.png
deleted file mode 100644
index b35da55..0000000
Binary files a/static/icon/厂房.png and /dev/null differ
diff --git a/static/icon/厂房C.png b/static/icon/厂房C.png
deleted file mode 100644
index cb9eab0..0000000
Binary files a/static/icon/厂房C.png and /dev/null differ
diff --git a/static/icon/合同签约.png b/static/icon/合同签约.png
deleted file mode 100644
index 741c8ca..0000000
Binary files a/static/icon/合同签约.png and /dev/null differ
diff --git a/static/icon/商铺.png b/static/icon/商铺.png
deleted file mode 100644
index 45b1c38..0000000
Binary files a/static/icon/商铺.png and /dev/null differ
diff --git a/static/icon/商铺C.png b/static/icon/商铺C.png
deleted file mode 100644
index de36cca..0000000
Binary files a/static/icon/商铺C.png and /dev/null differ
diff --git a/static/icon/待付款.png b/static/icon/待付款.png
deleted file mode 100644
index c650b01..0000000
Binary files a/static/icon/待付款.png and /dev/null differ
diff --git a/static/icon/我的合同.png b/static/icon/我的合同.png
deleted file mode 100644
index 8341e4c..0000000
Binary files a/static/icon/我的合同.png and /dev/null differ
diff --git a/static/icon/我的待付.png b/static/icon/我的待付.png
deleted file mode 100644
index 6b66c8e..0000000
Binary files a/static/icon/我的待付.png and /dev/null differ
diff --git a/static/icon/我的账单.png b/static/icon/我的账单.png
deleted file mode 100644
index 9272faf..0000000
Binary files a/static/icon/我的账单.png and /dev/null differ
diff --git a/static/icon/支付订金.png b/static/icon/支付订金.png
deleted file mode 100644
index 9d90544..0000000
Binary files a/static/icon/支付订金.png and /dev/null differ
diff --git a/static/icon/水电缴费.png b/static/icon/水电缴费.png
deleted file mode 100644
index 679e613..0000000
Binary files a/static/icon/水电缴费.png and /dev/null differ
diff --git a/static/icon/水电费.png b/static/icon/水电费.png
deleted file mode 100644
index 7b82a19..0000000
Binary files a/static/icon/水电费.png and /dev/null differ
diff --git a/static/icon/水费.png b/static/icon/水费.png
deleted file mode 100644
index 64a1a3a..0000000
Binary files a/static/icon/水费.png and /dev/null differ
diff --git a/static/icon/消息-置灰 (1)@2x.png b/static/icon/消息-置灰 (1)@2x.png
deleted file mode 100644
index b82e763..0000000
Binary files a/static/icon/消息-置灰 (1)@2x.png and /dev/null differ
diff --git a/static/icon/电费.png b/static/icon/电费.png
deleted file mode 100644
index 6307f06..0000000
Binary files a/static/icon/电费.png and /dev/null differ
diff --git a/static/icon/留言纸.png b/static/icon/留言纸.png
deleted file mode 100644
index dea4727..0000000
Binary files a/static/icon/留言纸.png and /dev/null differ
diff --git a/static/icon/租赁资产.png b/static/icon/租赁资产.png
deleted file mode 100644
index 8be2a49..0000000
Binary files a/static/icon/租赁资产.png and /dev/null differ
diff --git a/static/icon/缴费记录.png b/static/icon/缴费记录.png
deleted file mode 100644
index d9e6e68..0000000
Binary files a/static/icon/缴费记录.png and /dev/null differ
diff --git a/static/icon/设置 (2)@2x.png b/static/icon/设置 (2)@2x.png
deleted file mode 100644
index 247cee7..0000000
Binary files a/static/icon/设置 (2)@2x.png and /dev/null differ
diff --git a/static/icon/账单.png b/static/icon/账单.png
deleted file mode 100644
index 20eaafc..0000000
Binary files a/static/icon/账单.png and /dev/null differ
diff --git a/static/icon/账本.png b/static/icon/账本.png
deleted file mode 100644
index cb5b4d9..0000000
Binary files a/static/icon/账本.png and /dev/null differ
diff --git a/static/icon/退租.png b/static/icon/退租.png
deleted file mode 100644
index 838cddf..0000000
Binary files a/static/icon/退租.png and /dev/null differ
diff --git a/static/icon/退租申请.png b/static/icon/退租申请.png
deleted file mode 100644
index 482bada..0000000
Binary files a/static/icon/退租申请.png and /dev/null differ
diff --git a/static/icon/预约.png b/static/icon/预约.png
deleted file mode 100644
index c4d4b73..0000000
Binary files a/static/icon/预约.png and /dev/null differ
diff --git a/static/icon/预约看房.png b/static/icon/预约看房.png
deleted file mode 100644
index 1b970c7..0000000
Binary files a/static/icon/预约看房.png and /dev/null differ
diff --git a/static/img/index/cover/index_cover1.png b/static/img/index/cover/index_cover1.png
deleted file mode 100644
index 8020a29..0000000
Binary files a/static/img/index/cover/index_cover1.png and /dev/null differ
diff --git a/static/img/index/cover/index_cover2.png b/static/img/index/cover/index_cover2.png
deleted file mode 100644
index ef21559..0000000
Binary files a/static/img/index/cover/index_cover2.png and /dev/null differ
diff --git a/static/img/index/cover/index_cover3.png b/static/img/index/cover/index_cover3.png
deleted file mode 100644
index 8f8aec5..0000000
Binary files a/static/img/index/cover/index_cover3.png and /dev/null differ
diff --git a/static/img/index/cover/index_cover4.png b/static/img/index/cover/index_cover4.png
deleted file mode 100644
index 86f5a52..0000000
Binary files a/static/img/index/cover/index_cover4.png and /dev/null differ
diff --git a/static/img/index/cover_2022/.keep b/static/img/index/cover_2022/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/static/img/index/cover_2022/index_cover1.png b/static/img/index/cover_2022/index_cover1.png
deleted file mode 100644
index c3ec54b..0000000
Binary files a/static/img/index/cover_2022/index_cover1.png and /dev/null differ
diff --git a/static/img/index/cover_2022/index_cover2.png b/static/img/index/cover_2022/index_cover2.png
deleted file mode 100644
index d5373dc..0000000
Binary files a/static/img/index/cover_2022/index_cover2.png and /dev/null differ
diff --git a/static/img/index/cover_2022/index_cover3.png b/static/img/index/cover_2022/index_cover3.png
deleted file mode 100644
index 36fcaad..0000000
Binary files a/static/img/index/cover_2022/index_cover3.png and /dev/null differ
diff --git a/static/img/index/cover_2022/index_cover4.png b/static/img/index/cover_2022/index_cover4.png
deleted file mode 100644
index 763892d..0000000
Binary files a/static/img/index/cover_2022/index_cover4.png and /dev/null differ
diff --git a/static/img/index/cover_2025/assets.png b/static/img/index/cover_2025/assets.png
deleted file mode 100644
index 336f3a7..0000000
Binary files a/static/img/index/cover_2025/assets.png and /dev/null differ
diff --git a/static/img/index/cover_2025/check.png b/static/img/index/cover_2025/check.png
deleted file mode 100644
index fecb170..0000000
Binary files a/static/img/index/cover_2025/check.png and /dev/null differ
diff --git a/static/img/index/cover_2025/invoice.png b/static/img/index/cover_2025/invoice.png
deleted file mode 100644
index e6b53b6..0000000
Binary files a/static/img/index/cover_2025/invoice.png and /dev/null differ
diff --git a/static/img/index/cover_2025/repair.png b/static/img/index/cover_2025/repair.png
deleted file mode 100644
index a4daf32..0000000
Binary files a/static/img/index/cover_2025/repair.png and /dev/null differ
diff --git a/static/img/index/swiper/swiper.jpg b/static/img/index/swiper/swiper.jpg
deleted file mode 100644
index be508de..0000000
Binary files a/static/img/index/swiper/swiper.jpg and /dev/null differ
diff --git a/static/img/index/swiper/swiper2.png b/static/img/index/swiper/swiper2.png
deleted file mode 100644
index bdb58a4..0000000
Binary files a/static/img/index/swiper/swiper2.png and /dev/null differ
diff --git a/static/img/index/swiper/swiper3.jpg b/static/img/index/swiper/swiper3.jpg
deleted file mode 100644
index 55ec05f..0000000
Binary files a/static/img/index/swiper/swiper3.jpg and /dev/null differ
diff --git a/static/img/likeFx/1.png b/static/img/likeFx/1.png
deleted file mode 100644
index 686c6cd..0000000
Binary files a/static/img/likeFx/1.png and /dev/null differ
diff --git a/static/img/likeFx/10.png b/static/img/likeFx/10.png
deleted file mode 100644
index 293278f..0000000
Binary files a/static/img/likeFx/10.png and /dev/null differ
diff --git a/static/img/likeFx/11.png b/static/img/likeFx/11.png
deleted file mode 100644
index de0e854..0000000
Binary files a/static/img/likeFx/11.png and /dev/null differ
diff --git a/static/img/likeFx/12.png b/static/img/likeFx/12.png
deleted file mode 100644
index d131c3e..0000000
Binary files a/static/img/likeFx/12.png and /dev/null differ
diff --git a/static/img/likeFx/13.png b/static/img/likeFx/13.png
deleted file mode 100644
index 579b219..0000000
Binary files a/static/img/likeFx/13.png and /dev/null differ
diff --git a/static/img/likeFx/14.png b/static/img/likeFx/14.png
deleted file mode 100644
index fa198cb..0000000
Binary files a/static/img/likeFx/14.png and /dev/null differ
diff --git a/static/img/likeFx/15.png b/static/img/likeFx/15.png
deleted file mode 100644
index d78baa1..0000000
Binary files a/static/img/likeFx/15.png and /dev/null differ
diff --git a/static/img/likeFx/16.png b/static/img/likeFx/16.png
deleted file mode 100644
index c6be2fe..0000000
Binary files a/static/img/likeFx/16.png and /dev/null differ
diff --git a/static/img/likeFx/17.png b/static/img/likeFx/17.png
deleted file mode 100644
index d18f281..0000000
Binary files a/static/img/likeFx/17.png and /dev/null differ
diff --git a/static/img/likeFx/18.png b/static/img/likeFx/18.png
deleted file mode 100644
index 214511e..0000000
Binary files a/static/img/likeFx/18.png and /dev/null differ
diff --git a/static/img/likeFx/19.png b/static/img/likeFx/19.png
deleted file mode 100644
index cd3cd4d..0000000
Binary files a/static/img/likeFx/19.png and /dev/null differ
diff --git a/static/img/likeFx/2.png b/static/img/likeFx/2.png
deleted file mode 100644
index 0ac25e8..0000000
Binary files a/static/img/likeFx/2.png and /dev/null differ
diff --git a/static/img/likeFx/20.png b/static/img/likeFx/20.png
deleted file mode 100644
index efe8550..0000000
Binary files a/static/img/likeFx/20.png and /dev/null differ
diff --git a/static/img/likeFx/21.png b/static/img/likeFx/21.png
deleted file mode 100644
index bc8d32b..0000000
Binary files a/static/img/likeFx/21.png and /dev/null differ
diff --git a/static/img/likeFx/22.png b/static/img/likeFx/22.png
deleted file mode 100644
index 3e5c480..0000000
Binary files a/static/img/likeFx/22.png and /dev/null differ
diff --git a/static/img/likeFx/23.png b/static/img/likeFx/23.png
deleted file mode 100644
index 368a08f..0000000
Binary files a/static/img/likeFx/23.png and /dev/null differ
diff --git a/static/img/likeFx/24.png b/static/img/likeFx/24.png
deleted file mode 100644
index 7f6fd54..0000000
Binary files a/static/img/likeFx/24.png and /dev/null differ
diff --git a/static/img/likeFx/25.png b/static/img/likeFx/25.png
deleted file mode 100644
index 7e820f9..0000000
Binary files a/static/img/likeFx/25.png and /dev/null differ
diff --git a/static/img/likeFx/26.png b/static/img/likeFx/26.png
deleted file mode 100644
index 6acdd73..0000000
Binary files a/static/img/likeFx/26.png and /dev/null differ
diff --git a/static/img/likeFx/27.png b/static/img/likeFx/27.png
deleted file mode 100644
index c165c43..0000000
Binary files a/static/img/likeFx/27.png and /dev/null differ
diff --git a/static/img/likeFx/28.png b/static/img/likeFx/28.png
deleted file mode 100644
index 9435c43..0000000
Binary files a/static/img/likeFx/28.png and /dev/null differ
diff --git a/static/img/likeFx/29.png b/static/img/likeFx/29.png
deleted file mode 100644
index d58f900..0000000
Binary files a/static/img/likeFx/29.png and /dev/null differ
diff --git a/static/img/likeFx/3.png b/static/img/likeFx/3.png
deleted file mode 100644
index 4ed5644..0000000
Binary files a/static/img/likeFx/3.png and /dev/null differ
diff --git a/static/img/likeFx/30.png b/static/img/likeFx/30.png
deleted file mode 100644
index e4d3bfb..0000000
Binary files a/static/img/likeFx/30.png and /dev/null differ
diff --git a/static/img/likeFx/31.png b/static/img/likeFx/31.png
deleted file mode 100644
index 781ef5c..0000000
Binary files a/static/img/likeFx/31.png and /dev/null differ
diff --git a/static/img/likeFx/32.png b/static/img/likeFx/32.png
deleted file mode 100644
index 61bd73d..0000000
Binary files a/static/img/likeFx/32.png and /dev/null differ
diff --git a/static/img/likeFx/33.png b/static/img/likeFx/33.png
deleted file mode 100644
index 76f6ae4..0000000
Binary files a/static/img/likeFx/33.png and /dev/null differ
diff --git a/static/img/likeFx/4.png b/static/img/likeFx/4.png
deleted file mode 100644
index e9b5edd..0000000
Binary files a/static/img/likeFx/4.png and /dev/null differ
diff --git a/static/img/likeFx/5.png b/static/img/likeFx/5.png
deleted file mode 100644
index 77f5c5d..0000000
Binary files a/static/img/likeFx/5.png and /dev/null differ
diff --git a/static/img/likeFx/6.png b/static/img/likeFx/6.png
deleted file mode 100644
index 2793c49..0000000
Binary files a/static/img/likeFx/6.png and /dev/null differ
diff --git a/static/img/likeFx/7.png b/static/img/likeFx/7.png
deleted file mode 100644
index 63d1fb0..0000000
Binary files a/static/img/likeFx/7.png and /dev/null differ
diff --git a/static/img/likeFx/8.png b/static/img/likeFx/8.png
deleted file mode 100644
index 4a58493..0000000
Binary files a/static/img/likeFx/8.png and /dev/null differ
diff --git a/static/img/likeFx/9.png b/static/img/likeFx/9.png
deleted file mode 100644
index 5bfefc8..0000000
Binary files a/static/img/likeFx/9.png and /dev/null differ
diff --git a/static/index/index_bg.png b/static/index/index_bg.png
deleted file mode 100644
index 4797eb8..0000000
Binary files a/static/index/index_bg.png and /dev/null differ
diff --git a/static/index/住房.png b/static/index/住房.png
deleted file mode 100644
index e2022b8..0000000
Binary files a/static/index/住房.png and /dev/null differ
diff --git a/static/index/停车场.png b/static/index/停车场.png
deleted file mode 100644
index ca7f99d..0000000
Binary files a/static/index/停车场.png and /dev/null differ
diff --git a/static/index/公告.png b/static/index/公告.png
deleted file mode 100644
index 9153ca5..0000000
Binary files a/static/index/公告.png and /dev/null differ
diff --git a/static/index/公告_slices/公告@2x.png b/static/index/公告_slices/公告@2x.png
deleted file mode 100644
index 8865ae9..0000000
Binary files a/static/index/公告_slices/公告@2x.png and /dev/null differ
diff --git a/static/index/厂房.png b/static/index/厂房.png
deleted file mode 100644
index 83c6e9d..0000000
Binary files a/static/index/厂房.png and /dev/null differ
diff --git a/static/index/合同签约.png b/static/index/合同签约.png
deleted file mode 100644
index 77c8904..0000000
Binary files a/static/index/合同签约.png and /dev/null differ
diff --git a/static/index/商铺.png b/static/index/商铺.png
deleted file mode 100644
index 2126e75..0000000
Binary files a/static/index/商铺.png and /dev/null differ
diff --git a/static/index/图层 1129_slices/图层 1129@2x.png b/static/index/图层 1129_slices/图层 1129@2x.png
deleted file mode 100644
index 1e0bf87..0000000
Binary files a/static/index/图层 1129_slices/图层 1129@2x.png and /dev/null differ
diff --git a/static/index/图层 1130_slices/图层 1130@2x.png b/static/index/图层 1130_slices/图层 1130@2x.png
deleted file mode 100644
index 5dd895e..0000000
Binary files a/static/index/图层 1130_slices/图层 1130@2x.png and /dev/null differ
diff --git a/static/index/图层 1131_slices/图层 1131@2x.png b/static/index/图层 1131_slices/图层 1131@2x.png
deleted file mode 100644
index 8db6f3e..0000000
Binary files a/static/index/图层 1131_slices/图层 1131@2x.png and /dev/null differ
diff --git a/static/index/图层 1132_slices/图层 1132@2x.png b/static/index/图层 1132_slices/图层 1132@2x.png
deleted file mode 100644
index a9211fc..0000000
Binary files a/static/index/图层 1132_slices/图层 1132@2x.png and /dev/null differ
diff --git a/static/index/图层 1134_slices/图层 1134@2x.png b/static/index/图层 1134_slices/图层 1134@2x.png
deleted file mode 100644
index bacc535..0000000
Binary files a/static/index/图层 1134_slices/图层 1134@2x.png and /dev/null differ
diff --git a/static/index/留言板.png b/static/index/留言板.png
deleted file mode 100644
index 45b581a..0000000
Binary files a/static/index/留言板.png and /dev/null differ
diff --git a/static/index/看房预约.png b/static/index/看房预约.png
deleted file mode 100644
index 7e563bf..0000000
Binary files a/static/index/看房预约.png and /dev/null differ
diff --git a/static/index/组 3_slices/组 3@2x.png b/static/index/组 3_slices/组 3@2x.png
deleted file mode 100644
index a1940e9..0000000
Binary files a/static/index/组 3_slices/组 3@2x.png and /dev/null differ
diff --git a/static/index/组 4_slices/组 4@2x.png b/static/index/组 4_slices/组 4@2x.png
deleted file mode 100644
index 6318219..0000000
Binary files a/static/index/组 4_slices/组 4@2x.png and /dev/null differ
diff --git a/static/index/组 5_slices/组 5@2x.png b/static/index/组 5_slices/组 5@2x.png
deleted file mode 100644
index 57ecb23..0000000
Binary files a/static/index/组 5_slices/组 5@2x.png and /dev/null differ
diff --git a/static/index/组 6_slices/组 6@2x.png b/static/index/组 6_slices/组 6@2x.png
deleted file mode 100644
index ac8784a..0000000
Binary files a/static/index/组 6_slices/组 6@2x.png and /dev/null differ
diff --git a/static/index/退租申请.png b/static/index/退租申请.png
deleted file mode 100644
index f3716c5..0000000
Binary files a/static/index/退租申请.png and /dev/null differ
diff --git a/static/location-selected.png b/static/location-selected.png
deleted file mode 100644
index 8abc21a..0000000
Binary files a/static/location-selected.png and /dev/null differ
diff --git a/static/location.png b/static/location.png
deleted file mode 100644
index 3d80403..0000000
Binary files a/static/location.png and /dev/null differ
diff --git a/static/login.mp4 b/static/login.mp4
deleted file mode 100644
index 6daad34..0000000
Binary files a/static/login.mp4 and /dev/null differ
diff --git a/static/login/bg.png b/static/login/bg.png
deleted file mode 100644
index d6948ca..0000000
Binary files a/static/login/bg.png and /dev/null differ
diff --git a/static/login/图层 1154_slices.zip b/static/login/图层 1154_slices.zip
deleted file mode 100644
index dd615e4..0000000
Binary files a/static/login/图层 1154_slices.zip and /dev/null differ
diff --git a/static/login/图层 1154_slices/bg.png b/static/login/图层 1154_slices/bg.png
deleted file mode 100644
index d6948ca..0000000
Binary files a/static/login/图层 1154_slices/bg.png and /dev/null differ
diff --git a/static/login/图层 1154_slices/图层 1154@2x.png b/static/login/图层 1154_slices/图层 1154@2x.png
deleted file mode 100644
index cad9d68..0000000
Binary files a/static/login/图层 1154_slices/图层 1154@2x.png and /dev/null differ
diff --git a/static/message-selected.png b/static/message-selected.png
deleted file mode 100644
index 3394053..0000000
Binary files a/static/message-selected.png and /dev/null differ
diff --git a/static/message.png b/static/message.png
deleted file mode 100644
index 1302deb..0000000
Binary files a/static/message.png and /dev/null differ
diff --git a/static/navigate-selected.png b/static/navigate-selected.png
deleted file mode 100644
index 4e6d9d8..0000000
Binary files a/static/navigate-selected.png and /dev/null differ
diff --git a/static/qiandao.png b/static/qiandao.png
deleted file mode 100644
index 85de1fc..0000000
Binary files a/static/qiandao.png and /dev/null differ