fix

virgo.wzfrontend/wx/App.vue

@@ -15,15 +15,12 @@
 <style lang="scss">
 	/*每个页面公共css */
 	@import '@/uni_modules/uni-scss/index.scss';
-	@import '@/static/css/common.scss';
 
 	// 设置整个项目的背景色
 	page {
-		background-color: #F8F8F8;
 		color: $uni-main-color;
-		width: 100%;
-		height: 100%;
 		font-size: 28rpx;
+		background: $uni-background-color;
 
 		img {
 			width: 100%;

virgo.wzfrontend/wx/components/house/house.vue

@@ -1,311 +0,0 @@
-<template>
-	<view class="product">
-		<view class="product-item" @click="godetails">
-			<view class="product-box">
-				<view class="product-img">
-					<image src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5" mode="aspectFill"></image>
-					<view class="floor">
-						<view class="floor-box">
-							<uni-icons type="location" color="#fff" size="12"></uni-icons>
-							1号楼-一层
-						</view>
-					</view>
-				</view>
-				<view class="product-info">
-					<view class="title"><text>房源名称</text></view>
-					<view class="other">
-						<text>120m²</text>
-						<text class="line">|</text>
-						<text>标签1</text>
-						<text class="line">|</text>
-						<text>标签2</text>
-					</view>
-					<view class="price">
-						<view class="price-box">
-							<text>120</text>
-							<view class="price-text">元/月</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="product-item" @click="godetails">
-			<view class="product-box">
-				<view class="product-img">
-					<image src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5" mode="aspectFill"></image>
-					<view class="floor">
-						<view class="floor-box">
-							<uni-icons type="location" color="#fff" size="12"></uni-icons>
-							1号楼-一层
-						</view>
-					</view>
-				</view>
-				<view class="product-info">
-					<view class="title"><text>房源名称</text></view>
-					<view class="other">
-						<text>120m²</text>
-						<text class="line">|</text>
-						<text>标签1</text>
-						<text class="line">|</text>
-						<text>标签2</text>
-					</view>
-					<view class="price">
-						<view class="price-box">
-							<text>120</text>
-							<view class="price-text">元/月</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="product-item" @click="godetails">
-			<view class="product-box">
-				<view class="product-img">
-					<image src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5" mode="aspectFill"></image>
-					<view class="floor">
-						<view class="floor-box">
-							<uni-icons type="location" color="#fff" size="12"></uni-icons>
-							1号楼-一层
-						</view>
-					</view>
-				</view>
-				<view class="product-info">
-					<view class="title"><text>房源名称</text></view>
-					<view class="other">
-						<text>120m²</text>
-						<text class="line">|</text>
-						<text>标签1</text>
-						<text class="line">|</text>
-						<text>标签2</text>
-					</view>
-					<view class="price">
-						<view class="price-box">
-							<text>120</text>
-							<view class="price-text">元/月</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="product-item" @click="godetails">
-			<view class="product-box">
-				<view class="product-img">
-					<image src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5" mode="aspectFill"></image>
-					<view class="floor">
-						<view class="floor-box">
-							<uni-icons type="location" color="#fff" size="12"></uni-icons>
-							1号楼-一层
-						</view>
-					</view>
-				</view>
-				<view class="product-info">
-					<view class="title"><text>房源名称</text></view>
-					<view class="other">
-						<text>120m²</text>
-						<text class="line">|</text>
-						<text>标签1</text>
-						<text class="line">|</text>
-						<text>标签2</text>
-					</view>
-					<view class="price">
-						<view class="price-box">
-							<text>120</text>
-							<view class="price-text">元/月</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="product-item" @click="godetails">
-			<view class="product-box">
-				<view class="product-img">
-					<image src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5" mode="aspectFill"></image>
-					<view class="floor">
-						<view class="floor-box">
-							<uni-icons type="location" color="#fff" size="12"></uni-icons>
-							1号楼-一层
-						</view>
-					</view>
-				</view>
-				<view class="product-info">
-					<view class="title"><text>房源名称</text></view>
-					<view class="other">
-						<text>120m²</text>
-						<text class="line">|</text>
-						<text>标签1</text>
-						<text class="line">|</text>
-						<text>标签2</text>
-					</view>
-					<view class="price">
-						<view class="price-box">
-							<text>120</text>
-							<view class="price-text">元/月</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="product-item" @click="godetails">
-			<view class="product-box">
-				<view class="product-img">
-					<image src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5" mode="aspectFill"></image>
-					<view class="floor">
-						<view class="floor-box">
-							<uni-icons type="location" color="#fff" size="12"></uni-icons>
-							1号楼-一层
-						</view>
-					</view>
-				</view>
-				<view class="product-info">
-					<view class="title"><text>房源名称</text></view>
-					<view class="other">
-						<text>120m²</text>
-						<text class="line">|</text>
-						<text>标签1</text>
-						<text class="line">|</text>
-						<text>标签2</text>
-					</view>
-					<view class="price">
-						<view class="price-box">
-							<text>120</text>
-							<view class="price-text">元/月</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "house",
-		data() {
-			return {
-				productList: []
-			};
-		},
-		methods: {
-			// 详情
-			godetails() {
-				uni.navigateTo({
-					url: '/pages/houseDetail/houseDetail'
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.product {
-		display: flex;
-		flex-wrap: wrap;
-		margin-top: 30rpx;
-		padding-bottom: 60rpx;
-
-		.product-item {
-			width: 50%;
-			box-sizing: border-box;
-			margin-bottom: 30rpx;
-		}
-
-		.product-item:nth-child(2n-1) {
-			padding-right: 16rpx;
-		}
-
-		.product-item:nth-child(2n) {
-			padding-left: 16rpx;
-		}
-
-		.product-box {
-			background: #FFFFFF;
-			border-radius: 16rpx;
-			overflow: hidden;
-
-		}
-
-		.product-img {
-			position: relative;
-		}
-
-		.product-img image {
-			width: 100%;
-			height: 260rpx !important;
-		}
-
-		.floor {
-			position: absolute;
-			left: 0;
-			bottom: 20rpx;
-			width: 100%;
-			color: #FFFFFF;
-			font-size: 24rpx;
-
-		}
-
-		.floor-box {
-			display: block;
-			overflow: hidden;
-			word-break: keep-all;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			padding: 0 10rpx;
-			display: flex;
-			align-items: center;
-		}
-
-		.floor .iconfont {
-			color: #FFFFFF;
-			font-size: 24rpx;
-			display: inline-block;
-			margin-right: 4rpx;
-		}
-
-		.product-info {
-			padding: 10rpx 0 20rpx 0;
-
-			.title {
-				font-size: 28rpx;
-				padding: 0 20rpx;
-			}
-
-			.other {
-				display: flex;
-				padding-top: 10rpx;
-				padding-left: 20rpx;
-				color: #aaa;
-
-				text {
-					font-size: 24rpx;
-				}
-
-				.line {
-					margin: 0 10rpx;
-				}
-			}
-
-			.price {
-				display: flex;
-				align-items: center;
-				padding-top: 6rpx;
-				color: red;
-				padding-left: 20rpx;
-			}
-
-			.price-box {
-				flex: 1;
-			}
-
-			.price-box text {
-				font-weight: bold;
-				font-size: 30rpx;
-			}
-
-			.price-box .price-text {
-				display: inline-block;
-				font-size: 24rpx;
-				scale: 0.9;
-			}
-		}
-	}
-</style>

virgo.wzfrontend/wx/components/house/houseList.vue

@@ -0,0 +1,210 @@
+<template>
+	<view class="house-list">
+		<view class="house-item" v-for="(item,index) in houseList" :key="index">
+			<view class="house-item-box">
+				<view class="house-item-img">
+					<image :src="item.privewImage" mode="aspectFill"></image>
+					<view class="house-item-floor">
+						<uni-icons type="location" color="#fff" size="12"></uni-icons>
+						<text>{{item.projectItemName}}-{{item.projectItemTargetName}}</text>
+					</view>
+				</view>
+				<view class="house-item-info">
+					<view class="house-item-name">{{item.name}}</view>
+					<view class="house-item-tag">
+						<text v-for="(tag,i) in item.tagList" :key="i">
+							<text>{{tag}}</text>
+							<text class="line" v-if="i < item.tagList.length-1">|</text>
+						</text>
+					</view>
+					<view class="house-item-price">
+						<text>{{item.price}}</text>
+						<view class="price-type">{{item.priceType}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'houseList',
+		data() {
+			return {
+				houseList: [{
+					privewImage: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5',
+					projectItemName: '一号楼',
+					projectItemTargetName: '一层',
+					name: '1602，可短租～',
+					tagList: ['标签1', '标签2', '标签3'],
+					price: '1200',
+					priceType: '元/月'
+				}, {
+					privewImage: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5',
+					projectItemName: '一号楼',
+					projectItemTargetName: '一层',
+					name: '1602，可短租～',
+					tagList: ['标签1', '标签2', '标签3'],
+					price: '1200',
+					priceType: '元/月'
+				}, {
+					privewImage: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5',
+					projectItemName: '一号楼',
+					projectItemTargetName: '一层',
+					name: '1602，可短租～',
+					tagList: ['标签1', '标签2', '标签3'],
+					price: '1200',
+					priceType: '元/月'
+				}, {
+					privewImage: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5',
+					projectItemName: '一号楼',
+					projectItemTargetName: '一层',
+					name: '1602，可短租～',
+					tagList: ['标签1', '标签2', '标签3'],
+					price: '1200',
+					priceType: '元/月'
+				}, {
+					privewImage: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5',
+					projectItemName: '一号楼',
+					projectItemTargetName: '一层',
+					name: '1602，可短租～',
+					tagList: ['标签1', '标签2', '标签3'],
+					price: '1200',
+					priceType: '元/月'
+				}, {
+					privewImage: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5',
+					projectItemName: '一号楼',
+					projectItemTargetName: '一层',
+					name: '1602，可短租～',
+					tagList: ['标签1', '标签2', '标签3'],
+					price: '1200',
+					priceType: '元/月'
+				}, {
+					privewImage: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5',
+					projectItemName: '一号楼',
+					projectItemTargetName: '一层',
+					name: '1602，可短租～',
+					tagList: ['标签1', '标签2', '标签3'],
+					price: '1200',
+					priceType: '元/月'
+				}, {
+					privewImage: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5',
+					projectItemName: '一号楼',
+					projectItemTargetName: '一层',
+					name: '1602，可短租～',
+					tagList: ['标签1', '标签2', '标签3'],
+					price: '1200',
+					priceType: '元/月'
+				}, {
+					privewImage: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5',
+					projectItemName: '一号楼',
+					projectItemTargetName: '一层',
+					name: '1602，可短租～',
+					tagList: ['标签1', '标签2', '标签3'],
+					price: '1200',
+					priceType: '元/月'
+				}]
+			}
+		},
+		onShow() {
+
+		},
+		onLoad() {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.house-list {
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 30rpx;
+		padding-bottom: 60rpx;
+
+		.house-item {
+			width: 50%;
+			box-sizing: border-box;
+			margin-bottom: 30rpx;
+
+			&:nth-child(2n-1) {
+				padding-right: 16rpx;
+			}
+
+			&:nth-child(2n) {
+				padding-left: 16rpx;
+			}
+
+			.house-item-box {
+				background: $uni-white;
+				border-radius: 16rpx;
+				overflow: hidden;
+
+				.house-item-img {
+					position: relative;
+
+					image {
+						width: 100%;
+						height: 260rpx !important;
+					}
+				}
+
+				.house-item-floor {
+					position: absolute;
+					left: 0;
+					bottom: 20rpx;
+					width: 100%;
+					color: #FFFFFF;
+					font-size: 24rpx;
+					display: flex;
+					align-items: center;
+					padding-left: 10rpx;
+				}
+
+				.house-item-info {
+					padding: 10rpx 0 20rpx 0;
+
+					.house-item-name {
+						font-size: 28rpx;
+						padding: 0 20rpx;
+					}
+
+					.house-item-tag {
+						display: flex;
+						padding-top: 10rpx;
+						padding-left: 20rpx;
+						color: $uni-extra-color;
+
+						text {
+							font-size: 24rpx;
+						}
+
+						.line {
+							margin: 0 10rpx;
+						}
+					}
+
+					.house-item-price {
+						display: flex;
+						align-items: center;
+						padding-top: 6rpx;
+						color: $uni-error;
+						padding-left: 20rpx;
+
+						text {
+							font-weight: bold;
+							font-size: 30rpx;
+						}
+
+						.price-type {
+							display: inline-block;
+							font-size: 24rpx;
+							scale: 0.9;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

virgo.wzfrontend/wx/components/login/yModal.vue

@@ -1,27 +1,27 @@
 <template>
-	<view class="yModal-container" :class="show ? 'show' : ''">
+	<view class="model-container" :class="show ? 'show' : ''">
 		<!-- 提示 -->
-		<view class="yModal">
-			<view class="yModal-content">
-				<view class="yModal-title">
+		<view class="model">
+			<view class="model-content">
+				<view class="model-title">
 					{{title}}
 				</view>
 				<slot></slot>
 			</view>
-			<view class="yModal-bottom">
-				<view class="yModal-bottom-item">
-					<button plain class="yModal-bottom-btn cancel-btn" hover-class="active" @click="cancel">
+			<view class="model-bottom">
+				<view class="model-bottom-item">
+					<button plain class="model-bottom-btn cancel-btn" hover-class="active" @click="cancel">
 						{{cancelTxt}}
 					</button>
 				</view>
-				<view class="yModal-bottom-item">
-					<button plain class="yModal-bottom-btn confirm-btn" hover-class="active" @click="confirm">
+				<view class="model-bottom-item">
+					<button plain class="model-bottom-btn confirm-btn" hover-class="active" @click="confirm">
 						{{confirmTxt}}
 					</button>
 				</view>
 			</view>
 		</view>
-		<view v-if="show" class="yModal-mask"></view>
+		<view v-if="show" class="model-mask"></view>
 	</view>
 
 </template>
@@ -60,7 +60,7 @@
 </script>
 
 <style lang="scss">
-	.yModal-container {
+	.model-container {
 		width: 100%;
 		height: 100%;
 		position: fixed;
@@ -75,45 +75,46 @@
 		}
 	}
 
-	.yModal {
+	.model {
 		position: absolute;
 		width: 622rpx;
-		background-color: #fff;
+		background-color: $uni-white;
 		top: 50%;
 		left: 50%;
 		transform: translate3d(-50%, -50%, 0);
 		border-radius: 30rpx;
-		font-size: 32rpx;
-		color: #323233;
+		color: $uni-main-color;
 		z-index: 902;
 
-		.yModal-content {
+		.model-content {
 			padding: 40rpx 30rpx;
 		}
 
-		.yModal-title {
+		.model-title {
 			text-align: center;
 		}
 
-		.yModal-bottom {
+		.model-bottom {
 			display: flex;
 
-			.yModal-bottom-item {
+			.model-bottom-item {
 				flex: 1;
 
 				&:last-of-type {
-					.yModal-bottom-btn {
-						border-left: 1px solid #EBEDF0;
+					.model-bottom-btn {
+						border-left: 1px solid $uni-border-2;
 						border-bottom-left-radius: 0;
+
 					}
 				}
 			}
 
-			.yModal-bottom-btn {
+			.model-bottom-btn {
 				border: 0;
-				border-top: 1px solid #EBEDF0;
+				border-top: 1px solid $uni-border-2;
 				border-top-left-radius: 0;
 				border-top-right-radius: 0;
+				font-size: 32rpx;
 
 				&.active {
 					opacity: 0.6;
@@ -127,8 +128,8 @@
 		}
 	}
 
-	.yModal-mask {
-		background-color: rgba(0, 0, 0, .3);
+	.model-mask {
+		background-color: $uni-mask;
 		z-index: 901;
 		width: 100%;
 		height: 100%;

virgo.wzfrontend/wx/main.js

@@ -1,10 +1,13 @@
 import Vue from 'vue'
 import App from './App'
+import store from './store'
 
-Vue.config.productionTip = false
-App.mpType = 'app'
+Vue.prototype.$store = store;
+Vue.config.productionTip = false;
+App.mpType = 'app';
 
 const app = new Vue({
+	store,
 	...App
 })
 app.$mount()

virgo.wzfrontend/wx/pages.json

@@ -72,8 +72,8 @@
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "有极",
-		"navigationBarBackgroundColor": "#F8F8F8",
+		"navigationBarTitleText": "有极物业",
+		"navigationBarBackgroundColor": "#ffffff",
 		"backgroundColor": "#F8F8F8"
 	}
 }

virgo.wzfrontend/wx/pages/houseDetail/houseDetail.vue

@@ -7,14 +7,20 @@
 					indicator-color="#fff" indicator-active-color="#74e0fa" class="banner-swiper"
 					@change="swiperchange">
 					<swiper-item>
-						<view class="swiper-item" @click="previewImage('https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5')">
-							<image src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5" mode="aspectFill" class="banner-swiper-img">
+						<view class="swiper-item"
+							@click="previewImage('https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5')">
+							<image
+								src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5"
+								mode="aspectFill" class="banner-swiper-img">
 							</image>
 						</view>
 					</swiper-item>
 					<swiper-item>
-						<view class="swiper-item" @click="previewImage('https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5')">
-							<image src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5" mode="aspectFill" class="banner-swiper-img">
+						<view class="swiper-item"
+							@click="previewImage('https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5')">
+							<image
+								src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/3556e2b4f9c844758c3af76407b3a5d5"
+								mode="aspectFill" class="banner-swiper-img">
 							</image>
 						</view>
 					</swiper-item>
@@ -68,9 +74,8 @@
 			</view>
 			<!-- 底部按钮 -->
 			<view class="btn">
-				<view class="share color01"><text>预约看房</text>
-				</view>
-				<view class="share color02"><text>电话咨询</text></view>
+				<view class="share color01"><text>签约</text></view>
+				<view class="share color02"><text>咨询</text></view>
 				<view class="share"><text>留言</text></view>
 			</view>
 		</view>

virgo.wzfrontend/wx/pages/index/index.vue

@@ -5,45 +5,50 @@
 				<text class="label">项目名称</text>
 				<uni-icons class="project-icon" type="right" size="16"></uni-icons>
 			</view>
+			<view class="change-role">
+				<uni-icons type="contact" size="14" class="role-icon"></uni-icons>切换角色
+			</view>
 		</view>
 		<view class="banner-box">
-			<uni-swiper-dot :info="info" mode="round">
-				<swiper class="swiper-box">
-					<swiper-item class="swiper-item-box" v-for="(item, index) in info" :key="index">
-						<view class="swiper-item" :style="'background-image:url('+item.url+')'"></view>
-					</swiper-item>
-				</swiper>
-			</uni-swiper-dot>
+			<swiper class="swiper-box">
+				<swiper-item class="swiper-item-box" v-for="(item, index) in info" :key="index">
+					<view class="swiper-item" :style="'background-image:url(' + item.url + ')'"></view>
+				</swiper-item>
+			</swiper>
 		</view>
 		<view class="grid">
 			<view class="grid-item red">
 				<view>
 					<view class="label">房源列表</view>
-					<view class="sub-label">查看房源
-						<uni-icons class="sub-label-icon" type="right" size="14" color="#eee"></uni-icons>
+					<view class="sub-label">
+						查看房源
+						<uni-icons class="sub-label-icon" type="right" size="14"></uni-icons>
 					</view>
 				</view>
-				<uni-icons class="home-filled" type="home-filled" size="40" color="#eee"></uni-icons>
+				<uni-icons class="home-filled" type="home-filled" size="40"></uni-icons>
 			</view>
 			<view class="grid-item blue">
 				<view>
 					<view class="label">客户管理</view>
-					<view class="sub-label">查看客户
-						<uni-icons class="sub-label-icon" type="right" size="14" color="#eee"></uni-icons>
+					<view class="sub-label">
+						查看客户
+						<uni-icons class="sub-label-icon" type="right" size="14"></uni-icons>
 					</view>
 				</view>
-				<uni-icons class="home-filled" type="person-filled" size="40" color="#eee"></uni-icons>
+				<uni-icons class="home-filled" type="person-filled" size="40"></uni-icons>
 			</view>
 		</view>
-		<view class="good-box">
-			<text>推荐房源</text>
+		<view class="house-box">
+			<view class="good-box">
+				<text>推荐房源</text>
+			</view>
+			<house-list></house-list>
 		</view>
-		<house></house>
 	</view>
 </template>
 
 <script>
-	import house from '@/components/house/house'
+	import houseList from '@/components/house/houseList.vue'
 	export default {
 		data() {
 			return {
@@ -53,103 +58,115 @@
 					{
 						url: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/f488a1cc0e904ed089d52d88e3c1b33d'
 					}
-				],
-				modeIndex: -1,
-				current: 0,
-				swiperDotIndex: 0
+				]
 			}
 		},
+		onShow() {},
 		methods: {},
 		components: {
-			house
-		},
+			houseList
+		}
 	}
 </script>
 
 <style lang="scss">
 	.index-container {
-		padding: 0 30rpx;
 		box-sizing: border-box;
-
-		.good-box {
-			margin-top: 30rpx;
-			position: relative;
-			text-align: center;
-
-			text {
-				background: #f3f6f8;
-				z-index: 9;
-				position: relative;
-				padding: 5px 10px;
-				color: $uni-secondary-color;
-			}
-
-			&:before {
-				content: '';
-				bottom: 20rpx;
-				position: absolute;
-				left: 0;
-				height: 1px;
-				right: 0;
-				background: #eee;
-				z-index: 8;
-			}
-		}
+		position: relative;
 
 		.project-box {
-			padding: 30rpx 0;
-			position: sticky;
+			padding: 20rpx 30rpx;
+			display: flex;
+			justify-content: space-between;
+			background-color: $uni-white;
+			border-top: 1px solid $uni-border-2;
+			position: fixed;
+			/* #ifdef MP-WEIXIN */
+			top: 0;
+			/* #endif */
+			/* #ifdef H5 */
+			top: calc(44px + env(safe-area-inset-top));
+			/* #endif */
+			left: 0;
+			right: 0;
+			z-index: 99;
 
 			.project-name {
 				display: flex;
-				font-size: 16px;
 				align-items: center;
 				font-weight: 400;
+				align-items: center;
+				flex: 1;
+				width: 0;
+				overflow: hidden;
 			}
 
 			.project-icon {
 				margin-left: 8rpx;
 			}
+
+			.change-role {
+				font-size: 24rpx;
+				color: $uni-secondary-color;
+				border: 1px solid $uni-border-3;
+				width: 160rpx;
+				height: 40rpx;
+				border-radius: 40rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+
+			.role-icon {
+				text {
+					color: $uni-secondary-color !important;
+				}
+
+				margin-right: 8rpx;
+			}
 		}
 
 		.banner-box {
-			border-radius: 20rpx;
-			overflow: hidden;
-		}
+			padding: 30rpx;
+			box-sizing: border-box;
+			margin-top: 86rpx;
 
-		.swiper-box {
-			height: 400rpx;
-		}
+			.swiper-box {
+				height: 400rpx;
+				border-radius: 20rpx;
+				overflow: hidden;
+			}
 
-		.swiper-item {
-			width: 100%;
-			height: 100%;
-			background-size: cover;
-			background-position: bottom;
-		}
+			.swiper-item {
+				width: 100%;
+				height: 100%;
+				background-size: cover;
+				background-position: bottom;
+			}
 
-		.swiper-item-box:first-child {
-			border-radius: 20rpx 0 0 20rpx;
-		}
+			.swiper-item-box:first-child {
+				border-radius: 20rpx 0 0 20rpx;
+			}
 
-		.swiper-item-box:last-child {
-			border-radius: 0 20rpx 20rpx 0;
+			.swiper-item-box:last-child {
+				border-radius: 0 20rpx 20rpx 0;
+			}
 		}
 
 		.grid {
 			display: flex;
 			flex-wrap: wrap;
-			margin-top: 30rpx;
+			padding: 0 30rpx;
+			box-sizing: border-box;
 
 			.grid-item {
 				flex: 1;
 				height: 180rpx;
-				background: #fff;
 				border-radius: 16rpx;
-				color: #fff;
+				color: $uni-white;
 				display: flex;
 				align-items: center;
-				padding: 0 10px;
+				padding: 0 20rpx;
 				justify-content: space-between;
 
 				&.red {
@@ -162,29 +179,83 @@
 			}
 
 			.label {
-				font-size: 36rpx;
+				font-size: 32rpx;
 				margin-bottom: 5px;
 			}
 
 			.sub-label {
-				color: rgba(255, 255, 255, 0.5);
+				color: $uni-extras-color;
 				font-size: 24rpx;
 				display: flex;
 				align-items: center;
 				height: 40rpx;
+				opacity: 0.5;
 			}
 
+
 			.sub-label-icon {
-				opacity: 0.7;
+				/* #ifdef H5 */
+				color: $uni-extras-color !important;
+
+				/* #endif */
+				/* #ifdef MP-WEIXIN */
+				text {
+					color: $uni-extras-color !important;
+				}
+
+				/* #endif */
 			}
 
+
+
+
+
 			.grid-item:nth-child(2n) {
 				margin-left: 30rpx;
 			}
 
 			.home-filled {
-				color: #eee;
 				opacity: 0.3;
+				/* #ifdef H5 */
+				color: $uni-extras-color !important;
+
+				/* #endif */
+				/* #ifdef MP-WEIXIN */
+				text {
+					color: $uni-extras-color !important;
+				}
+
+				/* #endif */
+			}
+		}
+
+		.house-box {
+			padding: 0 30rpx;
+			box-sizing: border-box;
+
+			.good-box {
+				margin-top: 30rpx;
+				position: relative;
+				text-align: center;
+
+				text {
+					background: $uni-background-color;
+					z-index: 9;
+					position: relative;
+					padding: 5px 10px;
+					color: $uni-secondary-color;
+				}
+
+				&:before {
+					content: '';
+					bottom: 20rpx;
+					position: absolute;
+					left: 0;
+					height: 1px;
+					right: 0;
+					background: $uni-border-2;
+					z-index: 8;
+				}
 			}
 		}
 	}

virgo.wzfrontend/wx/pages/my/my.vue

@@ -1,32 +1,28 @@
 <template>
-	<view class="container my-index">
-		<img class="user-header-image" :src="bgImage" alt="" />
-		<!-- 用户信息 - 开始 -->
-		<view class="user-info-box">
-			<img class="img" :src="logoImage" alt="" />
-			<view class="user-info-right">
-				<view class="user-nickname" @click="goPage('/pages/login/login')">登录/注册</view>
-			</view>
+	<view class="my-index">
+		<image class="my-header-image" :src="bgImage" mode="aspectFill"></image>
+		<view class="user-info-box" @click="goPage('/pages/login/login')">
+			<image class="avatar-image" :src="logoImage" mode="aspectFill"></image>
+			<view class="user-info-right">登录/注册</view>
 		</view>
-		<!-- 用户信息 - 结束 -->
 		<view class="user-activity-menu">
 			<view class="menu-item">
 				<view class="left">
-					<uni-icons type="home" size="24" color="#535353"></uni-icons>
+					<uni-icons class="menu-icon" type="home" size="24"></uni-icons>
 					<view class="menu-name">我的房源</view>
 				</view>
 				<uni-icons type="right" size="20" color="#717171"></uni-icons>
 			</view>
 			<view class="menu-item">
 				<view class="left">
-					<uni-icons type="wallet" size="24" color="#535353"></uni-icons>
+					<uni-icons class="menu-icon" type="wallet" size="24"></uni-icons>
 					<view class="menu-name">缴费管理</view>
 				</view>
 				<uni-icons type="right" size="20" color="#717171"></uni-icons>
 			</view>
 			<view class="menu-item">
 				<view class="left">
-					<uni-icons type="calendar" size="24" color="#535353"></uni-icons>
+					<uni-icons class="menu-icon" type="calendar" size="24"></uni-icons>
 					<view class="menu-name">发票管理</view>
 				</view>
 				<uni-icons type="right" size="20" color="#717171"></uni-icons>
@@ -60,10 +56,9 @@
 	.my-index {
 		position: relative;
 
-		.user-header-image {
+		.my-header-image {
 			width: 100%;
 			height: 320rpx;
-			object-fit: cover;
 		}
 
 		.user-info-box {
@@ -77,7 +72,7 @@
 			left: 30rpx;
 			right: 30rpx;
 
-			.img {
+			.avatar-image {
 				width: 100rpx;
 				height: 100rpx;
 				border-radius: 10rpx;
@@ -85,6 +80,8 @@
 
 			.user-info-right {
 				margin-left: 20rpx;
+				font-size: 32rpx;
+				font-weight: 500;
 			}
 		}
 
@@ -105,15 +102,22 @@
 					display: flex;
 					align-items: center;
 
-					.menu-icon {
-						width: 40rpx;
-						height: 40rpx;
+					.menu-name {
+						margin-left: 20rpx;
+						color: $uni-base-color;
 					}
 
+					.menu-icon {
+						/* #ifdef H5 */
+						color: $uni-base-color !important;
 
-					.menu-name {
-						margin-left: 20rpx;
-						color: #333;
+						/* #endif */
+						/* #ifdef MP-WEIXIN */
+						text {
+							color: $uni-base-color !important;
+						}
+
+						/* #endif */
 					}
 				}
 			}

virgo.wzfrontend/wx/pages/order/order.vue

@@ -1,22 +1,24 @@
-<template>
-	<view>
-		order page
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>
+<template>
+	<view class="order-index">
+		order page
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.order-index {
+		background: #fff;
+	}
+</style>

virgo.wzfrontend/wx/store/getters.js

@@ -0,0 +1,7 @@
+const getters = {
+	codeNumber: state => state.app.codeNumber, //获取验证码倒计时-防止刷新页面重置倒计时
+	user: state => state.app.user, //用户基本信息
+	organization: state => state.app.organization, //所属组织信息
+	project: state => state.app.project, //项目
+}
+export default getters

virgo.wzfrontend/wx/store/index.js

@@ -0,0 +1,21 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+import getters from './getters'
+
+Vue.use(Vuex)
+
+const modulesFiles = require.context('./modules', true, /\.js$/)
+
+const modules = modulesFiles.keys().reduce((modules, modulePath) => {
+	const moduleName = modulePath.replace(/^\.\/(.*)\.\w+$/, '$1')
+	const value = modulesFiles(modulePath)
+	modules[moduleName] = value.default
+	return modules
+}, {})
+
+const store = new Vuex.Store({
+	modules,
+	getters
+})
+
+export default store

virgo.wzfrontend/wx/store/modules/app.js

@@ -0,0 +1,55 @@
+/* 
+ *	app基本信息
+ * 	
+ */
+const state = {
+	user: {},
+	organization: {},
+	project: {},
+	codeNumber: 60
+}
+
+const mutations = {
+	CHANGE_USER: (state, user) => {
+		state.user = user;
+	},
+	CHANGE_ORGANIZATION: (state, organization) => {
+		state.organization = organization;
+	},
+	CHANGE_PROJECT: (state, project) => {
+		state.project = project;
+	},
+	CHANGE_CODENUMBER: (state, num) => {
+		state.codeNumber = num;
+	}
+}
+
+const actions = {
+	changeUser({
+		commit
+	}, user) {
+		commit('CHANGE_USER', user);
+	},
+	changeOrganization({
+		commit
+	}, organization) {
+		commit('CHANGE_ORGANIZATION', organization);
+	},
+	changeProject({
+		commit,
+	}, project) {
+		commit('CHANGE_PROJECT', project);
+	},
+	changeCodeNumber({
+		commit,
+	}, num) {
+		commit('CHANGE_CODENUMBER', num < 0 ? 60 : num);
+	}
+}
+
+export default {
+	namespaced: true,
+	state,
+	mutations,
+	actions
+}

virgo.wzfrontend/wx/uni.scss

@@ -32,6 +32,7 @@ $uni-main-color: #3a3a3a; 			// 主要文字
 $uni-base-color: #6a6a6a;			// 常规文字
 $uni-secondary-color: #909399;	// 次要文字
 $uni-extra-color: #c7c7c7;			// 辅助说明
+$uni-extras-color: #eee;			// 辅助说明
 
 // 边框颜色
 $uni-border-1: #F0F0F0;
@@ -44,9 +45,6 @@ $uni-black: #000000;
 $uni-white: #ffffff;
 $uni-transparent: rgba($color: #000000, $alpha: 0);
 
-// 背景色
-$uni-bg-color: #f7f7f7;
-
 /* 水平间距 */
 $uni-spacing-sm: 8px;
 $uni-spacing-base: 15px;
@@ -59,3 +57,6 @@ $uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
 
 // 蒙版
 $uni-mask: rgba($color: #000000, $alpha: 0.4);
+
+// 背景色
+$uni-background-color:#f8f8f8;

virgo.wzfrontend/wx/unpackage/dist/build/mp-weixin/app.json

@@ -11,8 +11,8 @@
   "subPackages": [],
   "window": {
     "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "有极",
-    "navigationBarBackgroundColor": "#F8F8F8",
+    "navigationBarTitleText": "有极物业",
+    "navigationBarBackgroundColor": "#ffffff",
     "backgroundColor": "#F8F8F8"
   },
   "tabBar": {

virgo.wzfrontend/wx/unpackage/dist/build/mp-weixin/pages/index/index.json

@@ -2,7 +2,6 @@
   "navigationBarTitleText": "首页",
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
-    "uni-swiper-dot": "/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot",
-    "house": "/components/house/house"
+    "house-list": "/components/house/houseList"
   }
 }

virgo.wzfrontend/wx/unpackage/dist/build/mp-weixin/pages/login/login.json

@@ -2,6 +2,6 @@
   "navigationBarTitleText": "登录",
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
-    "y-modal": "/components/login/yModal"
+    "model": "/components/login/model"
   }
 }

virgo.wzfrontend/wx/unpackage/dist/build/mp-weixin/pages/order/order.wxml

@@ -1 +1 @@
-<view>order page</view>
+<view class="order-index">order page</view>

virgo.wzfrontend/wx/unpackage/dist/build/mp-weixin/pages/order/order.wxss

@@ -0,0 +1 @@
+.order-index{background:#fff}

virgo.wzfrontend/wx/unpackage/dist/build/mp-weixin/project.config.json

@@ -18,7 +18,7 @@
     }
   },
   "compileType": "miniprogram",
-  "libVersion": "3.4.4",
+  "libVersion": "3.4.3",
   "appid": "wx3c006d364161d240",
   "projectname": "wx",
   "condition": {},

virgo.wzfrontend/wx/unpackage/dist/dev/.sourcemap/mp-weixin/components/house/houseItem.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"components/house/houseItem.js","sourceRoot":""}

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/app.json

@@ -11,8 +11,8 @@
   "subPackages": [],
   "window": {
     "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "有极",
-    "navigationBarBackgroundColor": "#F8F8F8",
+    "navigationBarTitleText": "有极物业",
+    "navigationBarBackgroundColor": "#ffffff",
     "backgroundColor": "#F8F8F8"
   },
   "tabBar": {

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -2342,15 +2342,10 @@
   background-color: #f4f4f5;
   border-color: #e9e9eb;
 }
-.index-container .uni-swiper__dots-box {
-  display: none !important;
-}
 page {
-  background-color: #F8F8F8;
   color: #3a3a3a;
-  width: 100%;
-  height: 100%;
   font-size: 28rpx;
+  background: #f8f8f8;
 }
 page ._img {
   width: 100%;

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"uni_modules/uni-icons/components/uni-icons/uni-icons":1,"components/house/house":1,"uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot":1,"components/login/yModal":1};
+/******/ 		var cssChunks = {"uni_modules/uni-icons/components/uni-icons/uni-icons":1,"components/house/houseList":1,"components/login/model":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"uni_modules/uni-icons/components/uni-icons/uni-icons":"uni_modules/uni-icons/components/uni-icons/uni-icons","components/house/house":"components/house/house","uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot":"uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot","components/login/yModal":"components/login/yModal"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"uni_modules/uni-icons/components/uni-icons/uni-icons":"uni_modules/uni-icons/components/uni-icons/uni-icons","components/house/houseList":"components/house/houseList","components/login/model":"components/login/model"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/components/house/house.wxss

@@ -1,100 +0,0 @@
-@charset "UTF-8";
-/* 需要放到文件最上面 */
-/* 水平间距 */
-/* 水平间距 */
-/*
- 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
- */
-/* 水平间距 */
-.product {
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 30rpx;
-  padding-bottom: 60rpx;
-}
-.product .product-item {
-  width: 50%;
-  box-sizing: border-box;
-  margin-bottom: 30rpx;
-}
-.product .product-item:nth-child(2n-1) {
-  padding-right: 16rpx;
-}
-.product .product-item:nth-child(2n) {
-  padding-left: 16rpx;
-}
-.product .product-box {
-  background: #FFFFFF;
-  border-radius: 16rpx;
-  overflow: hidden;
-}
-.product .product-img {
-  position: relative;
-}
-.product .product-img image {
-  width: 100%;
-  height: 260rpx !important;
-}
-.product .floor {
-  position: absolute;
-  left: 0;
-  bottom: 20rpx;
-  width: 100%;
-  color: #FFFFFF;
-  font-size: 24rpx;
-}
-.product .floor-box {
-  display: block;
-  overflow: hidden;
-  word-break: keep-all;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  padding: 0 10rpx;
-  display: flex;
-  align-items: center;
-}
-.product .floor .iconfont {
-  color: #FFFFFF;
-  font-size: 24rpx;
-  display: inline-block;
-  margin-right: 4rpx;
-}
-.product .product-info {
-  padding: 10rpx 0 20rpx 0;
-}
-.product .product-info .title {
-  font-size: 28rpx;
-  padding: 0 20rpx;
-}
-.product .product-info .other {
-  display: flex;
-  padding-top: 10rpx;
-  padding-left: 20rpx;
-  color: #aaa;
-}
-.product .product-info .other text {
-  font-size: 24rpx;
-}
-.product .product-info .other .line {
-  margin: 0 10rpx;
-}
-.product .product-info .price {
-  display: flex;
-  align-items: center;
-  padding-top: 6rpx;
-  color: red;
-  padding-left: 20rpx;
-}
-.product .product-info .price-box {
-  flex: 1;
-}
-.product .product-info .price-box text {
-  font-weight: bold;
-  font-size: 30rpx;
-}
-.product .product-info .price-box .price-text {
-  display: inline-block;
-  font-size: 24rpx;
-  scale: 0.9;
-}
-

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/components/house/houseList.wxss

@@ -0,0 +1,84 @@
+@charset "UTF-8";
+/* 需要放到文件最上面 */
+/* 水平间距 */
+/* 水平间距 */
+/*
+ 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
+ */
+/* 水平间距 */
+.house-list {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 30rpx;
+  padding-bottom: 60rpx;
+}
+.house-list .house-item {
+  width: 50%;
+  box-sizing: border-box;
+  margin-bottom: 30rpx;
+}
+.house-list .house-item:nth-child(2n-1) {
+  padding-right: 16rpx;
+}
+.house-list .house-item:nth-child(2n) {
+  padding-left: 16rpx;
+}
+.house-list .house-item .house-item-box {
+  background: #ffffff;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+.house-list .house-item .house-item-box .house-item-img {
+  position: relative;
+}
+.house-list .house-item .house-item-box .house-item-img image {
+  width: 100%;
+  height: 260rpx !important;
+}
+.house-list .house-item .house-item-box .house-item-floor {
+  position: absolute;
+  left: 0;
+  bottom: 20rpx;
+  width: 100%;
+  color: #FFFFFF;
+  font-size: 24rpx;
+  display: flex;
+  align-items: center;
+  padding-left: 10rpx;
+}
+.house-list .house-item .house-item-box .house-item-info {
+  padding: 10rpx 0 20rpx 0;
+}
+.house-list .house-item .house-item-box .house-item-info .house-item-name {
+  font-size: 28rpx;
+  padding: 0 20rpx;
+}
+.house-list .house-item .house-item-box .house-item-info .house-item-tag {
+  display: flex;
+  padding-top: 10rpx;
+  padding-left: 20rpx;
+  color: #c7c7c7;
+}
+.house-list .house-item .house-item-box .house-item-info .house-item-tag text {
+  font-size: 24rpx;
+}
+.house-list .house-item .house-item-box .house-item-info .house-item-tag .line {
+  margin: 0 10rpx;
+}
+.house-list .house-item .house-item-box .house-item-info .house-item-price {
+  display: flex;
+  align-items: center;
+  padding-top: 6rpx;
+  color: #e43d33;
+  padding-left: 20rpx;
+}
+.house-list .house-item .house-item-box .house-item-info .house-item-price text {
+  font-weight: bold;
+  font-size: 30rpx;
+}
+.house-list .house-item .house-item-box .house-item-info .house-item-price .price-type {
+  display: inline-block;
+  font-size: 24rpx;
+  scale: 0.9;
+}
+

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/components/login/yModal.wxss

@@ -6,7 +6,7 @@
  以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
  */
 /* 水平间距 */
-.yModal-container {
+.model-container {
   width: 100%;
   height: 100%;
   position: fixed;
@@ -15,53 +15,53 @@
   z-index: -1;
   display: none;
 }
-.yModal-container.show {
+.model-container.show {
   z-index: 900;
   display: block;
 }
-.yModal {
+.model {
   position: absolute;
   width: 622rpx;
-  background-color: #fff;
+  background-color: #ffffff;
   top: 50%;
   left: 50%;
   -webkit-transform: translate3d(-50%, -50%, 0);
           transform: translate3d(-50%, -50%, 0);
   border-radius: 30rpx;
-  font-size: 32rpx;
-  color: #323233;
+  color: #3a3a3a;
   z-index: 902;
 }
-.yModal .yModal-content {
+.model .model-content {
   padding: 40rpx 30rpx;
 }
-.yModal .yModal-title {
+.model .model-title {
   text-align: center;
 }
-.yModal .yModal-bottom {
+.model .model-bottom {
   display: flex;
 }
-.yModal .yModal-bottom .yModal-bottom-item {
+.model .model-bottom .model-bottom-item {
   flex: 1;
 }
-.yModal .yModal-bottom .yModal-bottom-item:last-of-type .yModal-bottom-btn {
-  border-left: 1px solid #EBEDF0;
+.model .model-bottom .model-bottom-item:last-of-type .model-bottom-btn {
+  border-left: 1px solid #EDEDED;
   border-bottom-left-radius: 0;
 }
-.yModal .yModal-bottom .yModal-bottom-btn {
+.model .model-bottom .model-bottom-btn {
   border: 0;
-  border-top: 1px solid #EBEDF0;
+  border-top: 1px solid #EDEDED;
   border-top-left-radius: 0;
   border-top-right-radius: 0;
+  font-size: 32rpx;
 }
-.yModal .yModal-bottom .yModal-bottom-btn.active {
+.model .model-bottom .model-bottom-btn.active {
   opacity: 0.6;
 }
-.yModal .yModal-bottom .confirm-btn {
+.model .model-bottom .confirm-btn {
   color: #3371FF;
 }
-.yModal-mask {
-  background-color: rgba(0, 0, 0, 0.3);
+.model-mask {
+  background-color: rgba(0, 0, 0, 0.4);
   z-index: 901;
   width: 100%;
   height: 100%;

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/components/login/yModal.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -2,7 +2,6 @@
   "navigationBarTitleText": "首页",
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
-    "uni-swiper-dot": "/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot",
-    "house": "/components/house/house"
+    "house-list": "/components/house/houseList"
   }
 }

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -7,78 +7,86 @@
  */
 /* 水平间距 */
 .index-container {
-  padding: 0 30rpx;
   box-sizing: border-box;
-}
-.index-container .good-box {
-  margin-top: 30rpx;
-  position: relative;
-  text-align: center;
-}
-.index-container .good-box text {
-  background: #f3f6f8;
-  z-index: 9;
   position: relative;
-  padding: 5px 10px;
-  color: #909399;
 }
-.index-container .good-box:before {
-  content: '';
-  bottom: 20rpx;
-  position: absolute;
+.index-container .project-box {
+  padding: 20rpx 30rpx;
+  display: flex;
+  justify-content: space-between;
+  background-color: #ffffff;
+  border-top: 1px solid #EDEDED;
+  position: fixed;
+  top: 0;
   left: 0;
-  height: 1px;
   right: 0;
-  background: #eee;
-  z-index: 8;
-}
-.index-container .project-box {
-  padding: 30rpx 0;
-  position: -webkit-sticky;
-  position: sticky;
+  z-index: 99;
 }
 .index-container .project-box .project-name {
   display: flex;
-  font-size: 16px;
   align-items: center;
   font-weight: 400;
+  align-items: center;
+  flex: 1;
+  width: 0;
+  overflow: hidden;
 }
 .index-container .project-box .project-icon {
   margin-left: 8rpx;
 }
+.index-container .project-box .change-role {
+  font-size: 24rpx;
+  color: #909399;
+  border: 1px solid #DCDCDC;
+  width: 160rpx;
+  height: 40rpx;
+  border-radius: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.index-container .project-box .role-icon {
+  margin-right: 8rpx;
+}
+.index-container .project-box .role-icon text {
+  color: #909399 !important;
+}
 .index-container .banner-box {
-  border-radius: 20rpx;
-  overflow: hidden;
+  padding: 30rpx;
+  box-sizing: border-box;
+  margin-top: 86rpx;
 }
-.index-container .swiper-box {
+.index-container .banner-box .swiper-box {
   height: 400rpx;
+  border-radius: 20rpx;
+  overflow: hidden;
 }
-.index-container .swiper-item {
+.index-container .banner-box .swiper-item {
   width: 100%;
   height: 100%;
   background-size: cover;
   background-position: bottom;
 }
-.index-container .swiper-item-box:first-child {
+.index-container .banner-box .swiper-item-box:first-child {
   border-radius: 20rpx 0 0 20rpx;
 }
-.index-container .swiper-item-box:last-child {
+.index-container .banner-box .swiper-item-box:last-child {
   border-radius: 0 20rpx 20rpx 0;
 }
 .index-container .grid {
   display: flex;
   flex-wrap: wrap;
-  margin-top: 30rpx;
+  padding: 0 30rpx;
+  box-sizing: border-box;
 }
 .index-container .grid .grid-item {
   flex: 1;
   height: 180rpx;
-  background: #fff;
   border-radius: 16rpx;
-  color: #fff;
+  color: #ffffff;
   display: flex;
   align-items: center;
-  padding: 0 10px;
+  padding: 0 20rpx;
   justify-content: space-between;
 }
 .index-container .grid .grid-item.red {
@@ -88,24 +96,53 @@
   background: linear-gradient(to right, #459fe6, #6cc9e4);
 }
 .index-container .grid .label {
-  font-size: 36rpx;
+  font-size: 32rpx;
   margin-bottom: 5px;
 }
 .index-container .grid .sub-label {
-  color: rgba(255, 255, 255, 0.5);
+  color: #eee;
   font-size: 24rpx;
   display: flex;
   align-items: center;
   height: 40rpx;
+  opacity: 0.5;
 }
-.index-container .grid .sub-label-icon {
-  opacity: 0.7;
+.index-container .grid .sub-label-icon text {
+  color: #eee !important;
 }
 .index-container .grid .grid-item:nth-child(2n) {
   margin-left: 30rpx;
 }
 .index-container .grid .home-filled {
-  color: #eee;
   opacity: 0.3;
 }
+.index-container .grid .home-filled text {
+  color: #eee !important;
+}
+.index-container .house-box {
+  padding: 0 30rpx;
+  box-sizing: border-box;
+}
+.index-container .house-box .good-box {
+  margin-top: 30rpx;
+  position: relative;
+  text-align: center;
+}
+.index-container .house-box .good-box text {
+  background: #f8f8f8;
+  z-index: 9;
+  position: relative;
+  padding: 5px 10px;
+  color: #909399;
+}
+.index-container .house-box .good-box:before {
+  content: '';
+  bottom: 20rpx;
+  position: absolute;
+  left: 0;
+  height: 1px;
+  right: 0;
+  background: #EDEDED;
+  z-index: 8;
+}
 

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/pages/login/login.json

@@ -2,6 +2,6 @@
   "navigationBarTitleText": "登录",
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
-    "y-modal": "/components/login/yModal"
+    "model": "/components/login/model"
   }
 }

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/pages/login/login.wxss

@@ -6,24 +6,28 @@
  以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
  */
 /* 水平间距 */
-.login-container.data-v-b237504c {
+.login-container {
   width: 100%;
   height: 100%;
   display: flex;
   flex-direction: column;
   align-items: center;
 }
-.login-container .logo.data-v-b237504c {
+.login-container .logo {
   margin-top: 80rpx;
   width: 150rpx;
   height: 150rpx;
 }
-.login-container .code-input-container.data-v-b237504c {
+.login-container .logo image {
+  width: 100%;
+  height: 100%;
+}
+.login-container .code-input-container {
   display: flex;
   align-items: center;
   margin-top: 20rpx;
 }
-.login-container .code-input-container .code-input.data-v-b237504c {
+.login-container .code-input-container .code-input {
   background: #F7F8FA;
   width: 306rpx;
   height: 84rpx;
@@ -32,20 +36,20 @@
   border-radius: 20rpx;
   box-sizing: border-box;
 }
-.login-container .code-input-container .code-input.data-v-b237504c::-webkit-input-placeholder {
+.login-container .code-input-container .code-input::-webkit-input-placeholder {
   line-height: 84rpx;
 }
-.login-container .code-input-container .code-input.data-v-b237504c::placeholder {
+.login-container .code-input-container .code-input::placeholder {
   line-height: 84rpx;
 }
-.login-container .code-input-container .code-canvas-wrapper.data-v-b237504c {
+.login-container .code-input-container .code-canvas-wrapper {
   flex: 1;
 }
-.login-container .code-input-container .code-canvas-wrapper .code-image.data-v-b237504c {
+.login-container .code-input-container .code-canvas-wrapper .code-image {
   width: 100%;
   height: 84rpx;
 }
-.login-container .form.data-v-b237504c {
+.login-container .form {
   margin-top: 70rpx;
   display: flex;
   flex-direction: column;
@@ -53,56 +57,59 @@
   width: 686rpx;
   margin: 70rpx auto;
 }
-.login-container .form .form-item.data-v-b237504c {
+.login-container .form .form-item {
   width: 100%;
   border-radius: 200rpx;
   height: 100rpx;
-  background-color: #fff;
+  background-color: #ffffff;
   display: flex;
   margin-bottom: 50rpx;
 }
-.login-container .form .form-item.data-v-b237504c:last-of-type {
+.login-container .form .form-item:last-of-type {
   margin-bottom: 0;
 }
-.login-container .form .form-input-item.data-v-b237504c {
+.login-container .form .form-input-item {
   height: 100%;
   width: 100%;
   display: flex;
   align-items: center;
   box-sizing: border-box;
 }
-.login-container .form .form-input-item .form-input-left.data-v-b237504c {
+.login-container .form .form-input-item .form-input-left {
   display: flex;
   align-items: center;
   margin-left: 30rpx;
 }
-.login-container .form .form-input-item .phone-info.data-v-b237504c {
+.login-container .form .form-input-item .form-input-left .form-input-icons text {
+  color: #909399 !important;
+}
+.login-container .form .form-input-item .phone-info {
   margin-left: 20rpx;
 }
-.login-container .form .form-input-item .phone-info .phone-info-txt.data-v-b237504c {
+.login-container .form .form-input-item .phone-info .phone-info-txt {
   margin-right: 8rpx;
 }
-.login-container .form .form-input-item .phone-info .phone-info-img.data-v-b237504c {
+.login-container .form .form-input-item .phone-info .phone-info-img {
   width: 24rpx;
   height: 24rpx;
 }
-.login-container .form .form-input-item .form-input-content.data-v-b237504c {
+.login-container .form .form-input-item .form-input-content {
   flex: 1 1 auto;
   padding-right: 20rpx;
   position: relative;
 }
-.login-container .form .form-input-item .form-input-content .form-input.data-v-b237504c {
+.login-container .form .form-input-item .form-input-content .form-input {
   width: 100%;
   padding-left: 20rpx;
 }
-.login-container .form .form-input-item .form-input-content .form-input.data-v-b237504c  .uni-input-placeholder {
+.login-container .form .form-input-item .form-input-content .form-input  .uni-input-placeholder {
   color: #C8C9CC;
 }
-.login-container .form .code-input-wrapper.data-v-b237504c {
+.login-container .form .code-input-wrapper {
   display: flex;
   align-items: center;
 }
-.login-container .form .code-input-wrapper .code-input-btn.data-v-b237504c {
+.login-container .form .code-input-wrapper .code-input-btn {
   width: auto;
   width: 200rpx;
   height: 64rpx;
@@ -116,36 +123,41 @@
   background: #3371FF;
   color: #fff;
 }
-.login-container .form .code-input-wrapper .code-input-btn.disabled.data-v-b237504c {
+.login-container .form .code-input-wrapper .code-input-btn.disabled {
   opacity: 0.5;
 }
-.login-container .form .code-input-wrapper .code-input-btn.data-v-b237504c::after {
+.login-container .form .code-input-wrapper .code-input-btn::after {
   display: none;
 }
-.login-container .form .form-btn-container.data-v-b237504c {
+.login-container .form .form-btn-container {
   margin-top: 20rpx;
   width: 100%;
 }
-.login-container .form .form-btn.data-v-b237504c {
+.login-container .form .form-btn {
   height: 88rpx;
   border-radius: 200rpx;
   padding: 24rpx 32rpx;
   line-height: 40rpx;
-  color: #fff;
+  color: #ffffff;
   background-color: #3371FF;
   font-size: 32rpx;
 }
-.login-container .form .form-btn.disabled.data-v-b237504c {
+.login-container .form .form-btn.disabled {
   opacity: 0.5;
 }
-.login-container .form .form-btn.data-v-b237504c::after {
+.login-container .form .form-btn::after {
   display: none;
 }
-.login-container .form .wx-btn.data-v-b237504c {
+.login-container .form .wx-btn {
+  height: 88rpx;
+  padding: 24rpx 32rpx;
   border-radius: 200rpx;
+  line-height: 40rpx;
   font-size: 32rpx;
+  color: #ffffff;
+  background-color: #18bc37;
 }
-.login-container .form .wx-btn.data-v-b237504c::after {
+.login-container .form .wx-btn::after {
   display: none;
 }
 

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/pages/my/my.wxss

@@ -9,10 +9,9 @@
 .my-index {
   position: relative;
 }
-.my-index .user-header-image {
+.my-index .my-header-image {
   width: 100%;
   height: 320rpx;
-  object-fit: cover;
 }
 .my-index .user-info-box {
   background: #ffffff;
@@ -25,13 +24,15 @@
   left: 30rpx;
   right: 30rpx;
 }
-.my-index .user-info-box .img {
+.my-index .user-info-box .avatar-image {
   width: 100rpx;
   height: 100rpx;
   border-radius: 10rpx;
 }
 .my-index .user-info-box .user-info-right {
   margin-left: 20rpx;
+  font-size: 32rpx;
+  font-weight: 500;
 }
 .my-index .user-activity-menu {
   margin: 30rpx;
@@ -50,12 +51,11 @@
   display: flex;
   align-items: center;
 }
-.my-index .user-activity-menu .menu-item .left .menu-icon {
-  width: 40rpx;
-  height: 40rpx;
-}
 .my-index .user-activity-menu .menu-item .left .menu-name {
   margin-left: 20rpx;
-  color: #333;
+  color: #6a6a6a;
+}
+.my-index .user-activity-menu .menu-item .left .menu-icon text {
+  color: #6a6a6a !important;
 }