fix

virgo.wzfrontend/yui_wx/pages.json

@@ -97,6 +97,21 @@
 			"style": {
 				"navigationBarTitleText": "关注列表"
 			}
+		}, {
+			"path": "pages/collect/collect",
+			"style": {
+				"navigationBarTitleText": "收藏列表"
+			}
+		}, {
+			"path": "pages/clientDetail/clientDetail",
+			"style": {
+				"navigationBarTitleText": "客户详情"
+			}
+		}, {
+			"path": "pages/client/client",
+			"style": {
+				"navigationBarTitleText": "我的客户"
+			}
 		}
 	],
 	"tabBar": {

virgo.wzfrontend/yui_wx/pages/attention/attention.vue

@@ -1,8 +1,7 @@
 <template>
 	<view class="attention">
-		<uv-tabs :list="tabList" @click="clickTab" :scrollable="false"></uv-tabs>
-		<mescroll-body top="120" bottom="40" @init="mescrollInit" @down="downCallback" @up="upCallback" :option="{}">
-			<view class="fans-list" v-if="type === 1">
+		<mescroll-body top="30" bottom="40" @init="mescrollInit" @down="downCallback" @up="upCallback" :option="{}">
+			<view class="fans-list">
 				<view class="fans-item" v-for="(item,index) in list" :key="item.id"
 					@click="$navigateTo('/pages/person/person?userId='+item.userId)">
 					<image class="fans-avatar" :src="item.fansUserPortrait" mode="">
@@ -13,9 +12,6 @@
 					</view>
 				</view>
 			</view>
-			<view class="house-list" v-else-if="type === 2">
-				<house-item v-for="(item,index) in list" :house="item" :key="item.id"></house-item>
-			</view>
 		</mescroll-body>
 	</view>
 </template>
@@ -24,24 +20,12 @@
 	import {
 		getFansAttentionListByPage
 	} from '@/request/api/my.js'
-	import {
-		getCollectionHouseListByPage
-	} from '@/request/api/house.js'
 	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
-	import houseItem from "@/components/house/houseItem.vue";
 	export default {
 		mixins: [MescrollMixin], // 使用mixin
 		data() {
 			return {
-				list: [],
-				tabList: [{
-					id: 1,
-					name: '关注用户',
-				}, {
-					id: 2,
-					name: '关注房源',
-				}],
-				type: 1
+				list: []
 			}
 		},
 		onLoad() {
@@ -50,109 +34,23 @@
 		methods: {
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {
-				if (this.type === 1) {
-					getFansAttentionListByPage(page.num, 10).then(res => {
-						if (res.code === 200) {
-							this.mescroll.endBySize(res.data.dataList.length, res.data.totalCount);
-							if (page.num == 1) this.list = []; //如果是第一页需手动制空列表
-							let data = res.data.dataList;
-							this.list = this.list.concat(data); //追加新数据
-						} else {
-							this.mescroll.endErr();
-						}
-					}).catch(() => {
-						//联网失败, 结束加载
-						this.mescroll.endErr();
-					})
-				} else {
-					getCollectionHouseListByPage(page.num, 10).then(res => {
-						if (res.code === 200) {
-							this.mescroll.endBySize(res.data.dataList.length, res.data.totalCount);
-							if (page.num == 1) this.list = []; //如果是第一页需手动制空列表
-							let data = res.data.dataList;
-							this.list = this.list.concat(data); //追加新数据
-						} else {
-							this.mescroll.endErr();
-						}
-					}).catch(() => {
-						//联网失败, 结束加载
+				getFansAttentionListByPage(page.num, 10).then(res => {
+					if (res.code === 200) {
+						this.mescroll.endBySize(res.data.dataList.length, res.data.totalCount);
+						if (page.num == 1) this.list = []; //如果是第一页需手动制空列表
+						let data = res.data.dataList;
+						this.list = this.list.concat(data); //追加新数据
+					} else {
 						this.mescroll.endErr();
-					})
-				}
-			},
-			clickTab(item) {
-				this.type = item.id;
-				this.list = [];
-				this.mescroll.resetUpScroll();
+					}
+				}).catch(() => {
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+
 			}
-		},
-		components: {
-			houseItem
 		}
 	}
 </script>
 
-<style lang="scss">
-	.attention {
-		.uv-tabs {
-			position: fixed;
-			top: 0;
-			width: 100%;
-			background: #ffffff;
-			border-top: 2rpx solid $uni-border-1;
-			z-index: 99999;
-		}
-
-		.house-list {
-			padding: 0 30rpx;
-		}
-	}
-
-	.fans-list {
-		padding: 0 30rpx;
-		box-sizing: border-box;
-
-		.fans-item {
-			height: 140rpx;
-			background-color: #ffffff;
-			border-radius: 8px;
-			box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
-			display: flex;
-			align-items: center;
-			padding: 0 30rpx;
-			margin-bottom: 20rpx;
-		}
-
-		.fans-avatar {
-			width: 100rpx;
-			height: 100rpx;
-			border-radius: 100rpx;
-		}
-
-		.fans-content {
-			flex: 1;
-			width: 0;
-			margin-left: 20rpx;
-		}
-
-		.fans-name {
-			font-size: 32rpx;
-		}
-
-		.fans-organization {
-			color: $uni-secondary-color;
-			font-weight: 300;
-			margin-top: 4rpx;
-			font-size: 24rpx;
-		}
-
-		.fans-icon {
-			width: 80rpx;
-			height: 80rpx;
-			border-radius: 50%;
-			background: $uni-primary;
-			text-align: center;
-			line-height: 80rpx;
-		}
-	}
-</style>
+<style lang="scss"></style>

virgo.wzfrontend/yui_wx/pages/client/client.vue

@@ -0,0 +1,86 @@
+<template>
+	<view class="client">
+		<mescroll-body top="30" bottom="40" @init="mescrollInit" @down="downCallback" @up="upCallback" :option="{}">
+			<view class="common-list">
+				<view class="common-item" v-for="(item,index) in list" :key="item.id"
+					@click="$navigateTo('/pages/clientDetail/clientDetail?clientId='+item.id)">
+					<view class="title">{{item.name}}</view>
+					<view class="date">{{item.visitingTime}}</view>
+					<view class="space">1#-3F-305</view>
+					<view class="other">
+						<view class="item">
+							<view class="label">客户行业</view>
+							<view class="value">{{item.customerIndustry}}</view>
+						</view>
+						<view class="item">
+							<view class="label">客户需求</view>
+							<view class="value">{{item.demand}}</view>
+						</view>
+					</view>
+					<view class="state">
+						<view class="create">
+							<uni-icons class="inherit-icons" type="person-filled" color="#08979c" size="18"></uni-icons>
+							<text class="name">{{user.userName}}</text>
+						</view>
+						<view class="tag">
+							<view class="status-tag info" v-if="!item.status">待邀请</view>
+							<view class="status-tag warning" v-if="item.status == 1">邀请中</view>
+							<view class="status-tag success" v-if="item.status == 2">通过邀请</view>
+							<view class="status-tag error" v-if="item.status == 3">拒绝邀请</view>
+						</view>
+					</view>
+					<view class="icon">
+						<uni-icons type="staff-filled" color="#08979c" size="30"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</mescroll-body>
+	</view>
+</template>
+
+<script>
+	import {
+		getCustomerListByPage
+	} from '@/request/api/my.js'
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	export default {
+		mixins: [MescrollMixin], // 使用mixin
+		data() {
+			return {
+				list: [],
+				user: {}
+			}
+		},
+		onShow() {
+			this.user = this.$store.getters.user;
+		},
+		onLoad() {},
+		methods: {
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback(page) {
+				getCustomerListByPage({
+					currPage: page.num,
+					pageSize: 10,
+					userId: this.$store.getters.user.userId
+				}).then(res => {
+					if (res.code === 200) {
+						this.mescroll.endBySize(res.data.dataList.length, res.data.totalCount);
+						if (page.num == 1) this.list = []; //如果是第一页需手动制空列表
+						let data = res.data.dataList;
+						this.list = this.list.concat(data); //追加新数据
+					} else {
+						this.mescroll.endErr();
+					}
+				}).catch(() => {
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

virgo.wzfrontend/yui_wx/pages/clientDetail/clientDetail.vue

@@ -0,0 +1,222 @@
+<template>
+	<view class="client-detail detail" v-if="detail.id">
+		<view class="detail-box">
+			<view class="title-box">
+				<view class="title">{{detail.name}}</view>
+				<view class="date">{{detail.visitingTime}}</view>
+				<view class="title-icon">
+					<uni-icons type="staff-filled" color="#fff" size="24"></uni-icons>
+				</view>
+			</view>
+			<view class="other">
+				<div class="item">
+					<div class="label">客户类型</div>
+					<div class="value">{{$field.findTypeName('customerType',detail.type)}}</div>
+				</div>
+				<div class="item">
+					<div class="label">联系人</div>
+					<div class="value">{{detail.person}}</div>
+				</div>
+				<div class="item">
+					<div class="label">联系电话</div>
+					<div class="value">{{detail.phone}}</div>
+				</div>
+
+				<div class="item">
+					<div class="label">微信号</div>
+					<div class="value">{{detail.weChatAccount}}</div>
+				</div>
+				<div class="item">
+					<div class="label">职位</div>
+					<div class="value">{{detail.job}}</div>
+				</div>
+				<div class="item">
+					<div class="label">跟进状态</div>
+					<div class="value">{{$field.findTypeName('followUpState',detail.followUpState)}}</div>
+				</div>
+				<div class="item">
+					<div class="label">需求区间</div>
+					<div class="value">{{detail.demand}}</div>
+				</div>
+				<div class="item">
+					<div class="label">装修需求</div>
+					<div class="value">{{detail.decorationRequirements}}</div>
+				</div>
+				<div class="item">
+					<div class="label">客户行业</div>
+					<div class="value">{{detail.customerIndustry}}</div>
+				</div>
+				<div class="item">
+					<div class="label">备注</div>
+					<div class="value">{{detail.remark}}</div>
+				</div>
+			</view>
+			<view class="state">
+				<view class="create">
+					<uni-icons class="inherit-icons" type="person-filled" color="#08979c" size="18"></uni-icons>
+					<text class="name">{{user.userName}}</text>
+				</view>
+				<view class="tag">
+					<view class="status-tag info" v-if="!detail.status">待邀请</view>
+					<view class="status-tag warning" v-if="detail.status == 1">邀请中</view>
+					<view class="status-tag success" v-if="detail.status == 2">通过邀请</view>
+					<view class="status-tag error" v-if="detail.status == 3">拒绝邀请</view>
+				</view>
+			</view>
+		</view>
+		<view class="detail-box">
+			<view class="sub-title">
+				<uni-icons type="wallet-filled" class="inherit-icons" size="24" color="#08979c"></uni-icons>
+				<text class="sub-label">首次来访</text>
+			</view>
+			<view class="other">
+				<div class="item">
+					<div class="label">跟进人</div>
+					<div class="value">{{detail.followUpPerson}}</div>
+				</div>
+				<div class="item">
+					<div class="label">来访时间</div>
+					<div class="value">{{detail.visitingTime}}</div>
+				</div>
+				<div class="item">
+					<div class="label">带看房源</div>
+					<div class="value">{{detail.firsTimeRoom}}</div>
+				</div>
+				<div class="item">
+					<div class="label">来访渠道</div>
+					<div class="value">{{detail.visitingChannels}}</div>
+				</div>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getCustomerDetailById
+	} from '@/request/api/my.js'
+	export default {
+		data() {
+			return {
+				clientId: '',
+				detail: {},
+				user: {}
+			}
+		},
+		onLoad(body) {
+			if (body.clientId) this.clientId = body.clientId;
+			this.init();
+			this.user = this.$store.getters.user;
+		},
+		methods: {
+			init() {
+				if (!this.clientId) return;
+				getCustomerDetailById(this.clientId).then(res => {
+					if (res.code === 200) {
+						this.detail = res.data;
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.detail {
+		padding: 30rpx;
+
+		.detail-box {
+			background-color: #ffffff;
+			border-radius: 16rpx;
+			box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+			padding: 30rpx;
+			position: relative;
+			margin-bottom: 30rpx;
+		}
+
+		.sub-title {
+			display: flex;
+			align-items: center;
+			margin-left: -8rpx;
+
+			.sub-label {
+				font-size: 32rpx;
+				font-weight: 600;
+				margin-left: 14rpx;
+			}
+		}
+
+		.title-box {
+			padding-left: 90rpx;
+			position: relative;
+
+			.title-icon {
+				width: 70rpx;
+				height: 70rpx;
+				text-align: center;
+				line-height: 70rpx;
+				background: $uni-primary;
+				border-radius: 70rpx;
+				position: absolute;
+				left: 0;
+				top: 50%;
+				margin-top: -35rpx;
+			}
+
+			.title {
+				font-size: 32rpx;
+				font-weight: 600;
+			}
+
+			.date {
+				font-size: 24rpx;
+				color: $uni-secondary-color;
+			}
+		}
+
+		.other {
+			margin-top: 20rpx;
+
+			.item {
+				margin-top: 10rpx;
+			}
+
+			.label {
+				color: $uni-secondary-color;
+				font-size: 24rpx;
+			}
+
+			.value {
+				margin-top: 6rpx;
+				font-weight: 400;
+			}
+		}
+
+		.state {
+			margin-top: 20rpx;
+			display: flex;
+			justify-content: space-between;
+
+			.create {
+				height: 48rpx;
+				border-radius: 48rpx;
+				border: 1px solid $uni-primary;
+				display: flex;
+				align-items: center;
+				color: $uni-primary;
+				padding: 0 10rpx;
+
+				.name {
+					font-size: 24rpx;
+					flex: 1;
+					max-width: 150rpx;
+					min-width: 70rpx;
+					overflow: hidden;
+					margin-left: 10rpx;
+					line-height: 36rpx;
+					padding-right: 10rpx;
+				}
+			}
+		}
+	}
+</style>

virgo.wzfrontend/yui_wx/pages/collect/collect.vue

@@ -0,0 +1,58 @@
+<template>
+	<view class="collect">
+		<mescroll-body top="30" bottom="40" @init="mescrollInit" @down="downCallback" @up="upCallback" :option="{}">
+			<view class="house-list">
+				<house-item v-for="(item,index) in list" :house="item" :key="item.id"></house-item>
+			</view>
+		</mescroll-body>
+	</view>
+</template>
+
+<script>
+	import {
+		getCollectionHouseListByPage
+	} from '@/request/api/house.js'
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	import houseItem from "@/components/house/houseItem.vue";
+	export default {
+		mixins: [MescrollMixin], // 使用mixin
+		data() {
+			return {
+				list: []
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback(page) {
+				getCollectionHouseListByPage(page.num, 10).then(res => {
+					if (res.code === 200) {
+						this.mescroll.endBySize(res.data.dataList.length, res.data.totalCount);
+						if (page.num == 1) this.list = []; //如果是第一页需手动制空列表
+						let data = res.data.dataList;
+						this.list = this.list.concat(data); //追加新数据
+					} else {
+						this.mescroll.endErr();
+					}
+				}).catch(() => {
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+
+			}
+		},
+		components: {
+			houseItem
+		}
+	}
+</script>
+
+<style lang="scss">
+	.collect {
+		.house-list {
+			padding: 0 30rpx;
+		}
+	}
+</style>

virgo.wzfrontend/yui_wx/pages/fans/fans.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<mescroll-body top="40" bottom="40" @init="mescrollInit" @down="downCallback" @up="upCallback" :option="{}">
+		<mescroll-body top="30" bottom="40" @init="mescrollInit" @down="downCallback" @up="upCallback" :option="{}">
 			<view class="fans-list">
 				<view class="fans-item" v-for="(item,index) in list" :key="item.id">
 					<image class="fans-avatar" :src="item.fansUserPortrait" mode="">
@@ -53,51 +53,4 @@
 	}
 </script>
 
-<style lang="scss">
-	.fans-list {
-		padding: 0 30rpx;
-		box-sizing: border-box;
-
-		.fans-item {
-			height: 140rpx;
-			background-color: #ffffff;
-			border-radius: 8px;
-			box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
-			display: flex;
-			align-items: center;
-			padding: 0 30rpx;
-		}
-
-		.fans-avatar {
-			width: 100rpx;
-			height: 100rpx;
-			border-radius: 100rpx;
-		}
-
-		.fans-content {
-			flex: 1;
-			width: 0;
-			margin-left: 20rpx;
-		}
-
-		.fans-name {
-			font-size: 32rpx;
-		}
-
-		.fans-organization {
-			color: $uni-secondary-color;
-			font-weight: 300;
-			margin-top: 4rpx;
-			font-size: 24rpx;
-		}
-
-		.fans-icon {
-			width: 80rpx;
-			height: 80rpx;
-			border-radius: 50%;
-			background: $uni-primary;
-			text-align: center;
-			line-height: 80rpx;
-		}
-	}
-</style>
+<style lang="scss"></style>

virgo.wzfrontend/yui_wx/pages/my/my.vue

@@ -23,7 +23,18 @@
 				</view>
 			</view>
 			<view class="my-list">
-				<view class="my-item">
+				<view class="my-item" @click="$navigateTo('/pages/collect/collect')">
+					<view class="my-icon">
+						<uni-icons type="staff-filled" color="#fff" size="24"></uni-icons>
+					</view>
+					<view class="item-content">
+						我的收藏
+					</view>
+					<view class="my-forward">
+						<uni-icons type="forward" size="18" color="#c1c0c8"></uni-icons>
+					</view>
+				</view>
+				<view class="my-item" @click="$navigateTo('/pages/client/client')">
 					<view class="my-icon">
 						<uni-icons type="staff-filled" color="#fff" size="24"></uni-icons>
 					</view>

virgo.wzfrontend/yui_wx/request/api/my.js

@@ -78,4 +78,26 @@ export function getFansAttentionListByPage(currPage, pageSize) {
 		url: `/api/fans/attention/${currPage}/${pageSize}`,
 		method: 'get'
 	})
+}
+/* 
+ * 获取客户列表
+ * 
+ */
+export function getCustomerListByPage(data) {
+	return request({
+		url: `/manager/client/${data.currPage}/${data.pageSize}`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 获取客户详情
+ * 
+ * 
+ */
+export function getCustomerDetailById(id) {
+	return request({
+		url: `/manager/client/${id}`,
+		method: 'get'
+	})
 }

virgo.wzfrontend/yui_wx/static/scss/common.scss

@@ -1,5 +1,8 @@
 @import '@/uni_modules/uni-scss/theme.scss';
 @import '@/uni.scss';
+.inherit-icons{
+	display: inherit;
+}
 //修改uni-ui样式
 .form-box {
 	.uni-forms {
@@ -88,5 +91,158 @@
 button[type=primary]{
 	background: $uni-primary;
 }
+//用户列表
+.fans-list {
+	padding: 0 30rpx;
+	box-sizing: border-box;
 
-		
+	.fans-item {
+		height: 140rpx;
+		background-color: #ffffff;
+		border-radius: 16rpx;
+		box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+		display: flex;
+		align-items: center;
+		padding: 0 30rpx;
+	}
+
+	.fans-avatar {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 100rpx;
+	}
+
+	.fans-content {
+		flex: 1;
+		width: 0;
+		margin-left: 20rpx;
+	}
+
+	.fans-name {
+		font-size: 32rpx;
+	}
+
+	.fans-organization {
+		color: $uni-secondary-color;
+		font-weight: 300;
+		margin-top: 4rpx;
+		font-size: 24rpx;
+	}
+
+	.fans-icon {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 50%;
+		background: $uni-primary;
+		text-align: center;
+		line-height: 80rpx;
+	}
+}
+//通用列表
+.status-tag {
+	height: 52rpx;
+	border-radius: 52rpx;
+	line-height: 52rpx;
+	padding: 0 30rpx;
+	font-size: 24rpx;
+	color: #fff;
+
+	&.success {
+		background-color: $uni-success;
+	}
+
+	&.primary {
+		background-color: $uni-primary;
+	}
+	
+	&.info {
+		background-color: $uni-info;
+	}
+	
+	&.warning {
+		background-color: $uni-warning;
+	}
+	
+	&.error {
+		background-color: $uni-error;
+	}
+}
+
+.common-list {
+	padding: 0 30rpx;
+	box-sizing: border-box;
+
+	.common-item {
+		background-color: #ffffff;
+		border-radius: 16rpx;
+		box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+		padding: 30rpx;
+		position: relative;
+
+		.icon {
+			position: absolute;
+			top: 30rpx;
+			right: 30rpx;
+		}
+
+		.title {
+			font-size: 32rpx;
+			font-weight: 600;
+		}
+
+		.date {
+			font-size: 24rpx;
+			color: $uni-secondary-color;
+			margin: 10rpx 0;
+		}
+
+		.space {
+			font-size: 24rpx;
+		}
+
+		.other {
+			margin-top: 20rpx;
+
+			.item {
+				margin-top: 16rpx;
+			}
+
+			.label {
+				color: $uni-secondary-color;
+				font-size: 24rpx;
+			}
+
+			.value {
+				margin-top: 6rpx;
+				font-weight: 400;
+			}
+		}
+
+		.state {
+			margin-top: 20rpx;
+			display: flex;
+			justify-content: space-between;
+
+			.create {
+				height: 48rpx;
+				border-radius: 48rpx;
+				border: 1px solid $uni-primary;
+				display: flex;
+				align-items: center;
+				color: $uni-primary;
+				padding: 0 10rpx;
+
+				.name {
+					font-size: 24rpx;
+					flex: 1;
+					max-width: 150rpx;
+					min-width: 70rpx;
+					overflow: hidden;
+					margin-left: 10rpx;
+					line-height: 36rpx;
+					padding-right: 10rpx;
+				}
+			}
+		}
+	}
+}

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

@@ -18,7 +18,10 @@
     "pages/myDetail/myDetail",
     "pages/person/person",
     "pages/fans/fans",
-    "pages/attention/attention"
+    "pages/attention/attention",
+    "pages/collect/collect",
+    "pages/clientDetail/clientDetail",
+    "pages/client/client"
   ],
   "subPackages": [],
   "window": {

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

@@ -46,6 +46,9 @@
 .icon-gongyuan:before {
 	content: "\e617";
 }
+.inherit-icons {
+  display: inherit;
+}
 .form-box .uni-forms {
   background: #fff;
   border-radius: 16rpx;
@@ -122,6 +125,135 @@
 button[type=primary] {
   background: #08979c;
 }
+.fans-list {
+  padding: 0 30rpx;
+  box-sizing: border-box;
+}
+.fans-list .fans-item {
+  height: 140rpx;
+  background-color: #ffffff;
+  border-radius: 16rpx;
+  box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+  display: flex;
+  align-items: center;
+  padding: 0 30rpx;
+}
+.fans-list .fans-avatar {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 100rpx;
+}
+.fans-list .fans-content {
+  flex: 1;
+  width: 0;
+  margin-left: 20rpx;
+}
+.fans-list .fans-name {
+  font-size: 32rpx;
+}
+.fans-list .fans-organization {
+  color: #8c8c8c;
+  font-weight: 300;
+  margin-top: 4rpx;
+  font-size: 24rpx;
+}
+.fans-list .fans-icon {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+  background: #08979c;
+  text-align: center;
+  line-height: 80rpx;
+}
+.status-tag {
+  height: 52rpx;
+  border-radius: 52rpx;
+  line-height: 52rpx;
+  padding: 0 30rpx;
+  font-size: 24rpx;
+  color: #fff;
+}
+.status-tag.success {
+  background-color: #389e0d;
+}
+.status-tag.primary {
+  background-color: #08979c;
+}
+.status-tag.info {
+  background-color: #8f939c;
+}
+.status-tag.warning {
+  background-color: #fa8c16;
+}
+.status-tag.error {
+  background-color: #ff4d4f;
+}
+.common-list {
+  padding: 0 30rpx;
+  box-sizing: border-box;
+}
+.common-list .common-item {
+  background-color: #ffffff;
+  border-radius: 16rpx;
+  box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+  padding: 30rpx;
+  position: relative;
+}
+.common-list .common-item .icon {
+  position: absolute;
+  top: 30rpx;
+  right: 30rpx;
+}
+.common-list .common-item .title {
+  font-size: 32rpx;
+  font-weight: 600;
+}
+.common-list .common-item .date {
+  font-size: 24rpx;
+  color: #8c8c8c;
+  margin: 10rpx 0;
+}
+.common-list .common-item .space {
+  font-size: 24rpx;
+}
+.common-list .common-item .other {
+  margin-top: 20rpx;
+}
+.common-list .common-item .other .item {
+  margin-top: 16rpx;
+}
+.common-list .common-item .other .label {
+  color: #8c8c8c;
+  font-size: 24rpx;
+}
+.common-list .common-item .other .value {
+  margin-top: 6rpx;
+  font-weight: 400;
+}
+.common-list .common-item .state {
+  margin-top: 20rpx;
+  display: flex;
+  justify-content: space-between;
+}
+.common-list .common-item .state .create {
+  height: 48rpx;
+  border-radius: 48rpx;
+  border: 1px solid #08979c;
+  display: flex;
+  align-items: center;
+  color: #08979c;
+  padding: 0 10rpx;
+}
+.common-list .common-item .state .create .name {
+  font-size: 24rpx;
+  flex: 1;
+  max-width: 150rpx;
+  min-width: 70rpx;
+  overflow: hidden;
+  margin-left: 10rpx;
+  line-height: 36rpx;
+  padding-right: 10rpx;
+}
 page {
   color: #1f1f1f;
   font-size: 28rpx;

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/attention/attention.json

@@ -1,8 +1,6 @@
 {
   "navigationBarTitleText": "关注列表",
   "usingComponents": {
-    "uv-tabs": "/uni_modules/uv-tabs/components/uv-tabs/uv-tabs",
-    "mescroll-body": "/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body",
-    "house-item": "/components/house/houseItem"
+    "mescroll-body": "/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body"
   }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/attention/attention.wxss

@@ -6,17 +6,6 @@
  以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
  */
 /* 水平间距 */
-.attention .uv-tabs {
-  position: fixed;
-  top: 0;
-  width: 100%;
-  background: #ffffff;
-  border-top: 2rpx solid #d9d9d9;
-  z-index: 99999;
-}
-.attention .house-list {
-  padding: 0 30rpx;
-}
 .fans-list {
   padding: 0 30rpx;
   box-sizing: border-box;

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/client/client.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "我的客户",
+  "usingComponents": {
+    "mescroll-body": "/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/client/client.wxss

@@ -0,0 +1,88 @@
+@charset "UTF-8";
+/* 需要放到文件最上面 */
+/* 水平间距 */
+/* 水平间距 */
+/*
+ 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
+ */
+/* 水平间距 */
+.status-tag {
+  height: 52rpx;
+  border-radius: 52rpx;
+  line-height: 52rpx;
+  padding: 0 30rpx;
+  font-size: 24rpx;
+  color: #fff;
+}
+.status-tag.success {
+  background-color: #389e0d;
+}
+.status-tag.primary {
+  background-color: #08979c;
+}
+.common-list {
+  padding: 0 30rpx;
+  box-sizing: border-box;
+}
+.common-list .common-item {
+  background-color: #ffffff;
+  border-radius: 16rpx;
+  box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+  padding: 30rpx;
+  position: relative;
+}
+.common-list .common-item .icon {
+  position: absolute;
+  top: 30rpx;
+  right: 30rpx;
+}
+.common-list .common-item .title {
+  font-size: 32rpx;
+  font-weight: 600;
+}
+.common-list .common-item .date {
+  font-size: 24rpx;
+  color: #8c8c8c;
+  margin: 10rpx 0;
+}
+.common-list .common-item .space {
+  font-size: 24rpx;
+}
+.common-list .common-item .other {
+  margin-top: 20rpx;
+}
+.common-list .common-item .other .item {
+  margin-top: 10rpx;
+}
+.common-list .common-item .other .label {
+  color: #8c8c8c;
+  font-size: 24rpx;
+}
+.common-list .common-item .other .value {
+  margin-top: 6rpx;
+  font-weight: 400;
+}
+.common-list .common-item .state {
+  margin-top: 20rpx;
+  display: flex;
+  justify-content: space-between;
+}
+.common-list .common-item .state .create {
+  height: 48rpx;
+  border-radius: 48rpx;
+  border: 1px solid #08979c;
+  display: flex;
+  align-items: center;
+  color: #08979c;
+  padding: 0 10rpx;
+}
+.common-list .common-item .state .create .name {
+  font-size: 24rpx;
+  flex: 1;
+  max-width: 150rpx;
+  min-width: 70rpx;
+  overflow: hidden;
+  margin-left: 10rpx;
+  line-height: 36rpx;
+}
+

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/clientDetail/clientDetail.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "客户详情",
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/clientDetail/clientDetail.wxss

@@ -0,0 +1,92 @@
+@charset "UTF-8";
+/* 需要放到文件最上面 */
+/* 水平间距 */
+/* 水平间距 */
+/*
+ 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
+ */
+/* 水平间距 */
+.detail {
+  padding: 30rpx;
+}
+.detail .detail-box {
+  background-color: #ffffff;
+  border-radius: 16rpx;
+  box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+  padding: 30rpx;
+  position: relative;
+  margin-bottom: 30rpx;
+}
+.detail .sub-title {
+  display: flex;
+  align-items: center;
+  margin-left: -8rpx;
+}
+.detail .sub-title .sub-label {
+  font-size: 32rpx;
+  font-weight: 600;
+  margin-left: 14rpx;
+}
+.detail .title-box {
+  padding-left: 90rpx;
+  position: relative;
+}
+.detail .title-box .title-icon {
+  width: 70rpx;
+  height: 70rpx;
+  text-align: center;
+  line-height: 70rpx;
+  background: #08979c;
+  border-radius: 70rpx;
+  position: absolute;
+  left: 0;
+  top: 50%;
+  margin-top: -35rpx;
+}
+.detail .title-box .title {
+  font-size: 32rpx;
+  font-weight: 600;
+}
+.detail .title-box .date {
+  font-size: 24rpx;
+  color: #8c8c8c;
+}
+.detail .other {
+  margin-top: 20rpx;
+}
+.detail .other .item {
+  margin-top: 10rpx;
+}
+.detail .other .label {
+  color: #8c8c8c;
+  font-size: 24rpx;
+}
+.detail .other .value {
+  margin-top: 6rpx;
+  font-weight: 400;
+}
+.detail .state {
+  margin-top: 20rpx;
+  display: flex;
+  justify-content: space-between;
+}
+.detail .state .create {
+  height: 48rpx;
+  border-radius: 48rpx;
+  border: 1px solid #08979c;
+  display: flex;
+  align-items: center;
+  color: #08979c;
+  padding: 0 10rpx;
+}
+.detail .state .create .name {
+  font-size: 24rpx;
+  flex: 1;
+  max-width: 150rpx;
+  min-width: 70rpx;
+  overflow: hidden;
+  margin-left: 10rpx;
+  line-height: 36rpx;
+  padding-right: 10rpx;
+}
+

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/collect/collect.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "收藏列表",
+  "usingComponents": {
+    "mescroll-body": "/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body",
+    "house-item": "/components/house/houseItem"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/collect/collect.wxss

@@ -0,0 +1,12 @@
+@charset "UTF-8";
+/* 需要放到文件最上面 */
+/* 水平间距 */
+/* 水平间距 */
+/*
+ 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
+ */
+/* 水平间距 */
+.collect .house-list {
+  padding: 0 30rpx;
+}
+

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/static/scss/common.scss

@@ -1,5 +1,8 @@
 @import '@/uni_modules/uni-scss/theme.scss';
 @import '@/uni.scss';
+.inherit-icons{
+	display: inherit;
+}
 //修改uni-ui样式
 .form-box {
 	.uni-forms {
@@ -88,5 +91,158 @@
 button[type=primary]{
 	background: $uni-primary;
 }
+//用户列表
+.fans-list {
+	padding: 0 30rpx;
+	box-sizing: border-box;
 
-		
+	.fans-item {
+		height: 140rpx;
+		background-color: #ffffff;
+		border-radius: 16rpx;
+		box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+		display: flex;
+		align-items: center;
+		padding: 0 30rpx;
+	}
+
+	.fans-avatar {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 100rpx;
+	}
+
+	.fans-content {
+		flex: 1;
+		width: 0;
+		margin-left: 20rpx;
+	}
+
+	.fans-name {
+		font-size: 32rpx;
+	}
+
+	.fans-organization {
+		color: $uni-secondary-color;
+		font-weight: 300;
+		margin-top: 4rpx;
+		font-size: 24rpx;
+	}
+
+	.fans-icon {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 50%;
+		background: $uni-primary;
+		text-align: center;
+		line-height: 80rpx;
+	}
+}
+//通用列表
+.status-tag {
+	height: 52rpx;
+	border-radius: 52rpx;
+	line-height: 52rpx;
+	padding: 0 30rpx;
+	font-size: 24rpx;
+	color: #fff;
+
+	&.success {
+		background-color: $uni-success;
+	}
+
+	&.primary {
+		background-color: $uni-primary;
+	}
+	
+	&.info {
+		background-color: $uni-info;
+	}
+	
+	&.warning {
+		background-color: $uni-warning;
+	}
+	
+	&.error {
+		background-color: $uni-error;
+	}
+}
+
+.common-list {
+	padding: 0 30rpx;
+	box-sizing: border-box;
+
+	.common-item {
+		background-color: #ffffff;
+		border-radius: 16rpx;
+		box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
+		padding: 30rpx;
+		position: relative;
+
+		.icon {
+			position: absolute;
+			top: 30rpx;
+			right: 30rpx;
+		}
+
+		.title {
+			font-size: 32rpx;
+			font-weight: 600;
+		}
+
+		.date {
+			font-size: 24rpx;
+			color: $uni-secondary-color;
+			margin: 10rpx 0;
+		}
+
+		.space {
+			font-size: 24rpx;
+		}
+
+		.other {
+			margin-top: 20rpx;
+
+			.item {
+				margin-top: 16rpx;
+			}
+
+			.label {
+				color: $uni-secondary-color;
+				font-size: 24rpx;
+			}
+
+			.value {
+				margin-top: 6rpx;
+				font-weight: 400;
+			}
+		}
+
+		.state {
+			margin-top: 20rpx;
+			display: flex;
+			justify-content: space-between;
+
+			.create {
+				height: 48rpx;
+				border-radius: 48rpx;
+				border: 1px solid $uni-primary;
+				display: flex;
+				align-items: center;
+				color: $uni-primary;
+				padding: 0 10rpx;
+
+				.name {
+					font-size: 24rpx;
+					flex: 1;
+					max-width: 150rpx;
+					min-width: 70rpx;
+					overflow: hidden;
+					margin-left: 10rpx;
+					line-height: 36rpx;
+					padding-right: 10rpx;
+				}
+			}
+		}
+	}
+}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty"
-  }
+  },
+  "component": true
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/mescroll-uni/components/mescroll-uni/components/mescroll-top.js

@@ -1 +0,0 @@
-Component({})

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/mescroll-uni/components/mescroll-uni/components/mescroll-top.json

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

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/mescroll-uni/components/mescroll-uni/components/mescroll-top.wxml

@@ -1 +0,0 @@
-<block wx:if="{{option.src}}"><image class="{{['mescroll-totop',isShow?'mescroll-totop-in':'mescroll-totop-out',[(option.safearea)?'mescroll-totop-safearea':'']]}}" style="{{'z-index:'+(option.zIndex)+';'+('left:'+(left)+';')+('right:'+(right)+';')+('bottom:'+($root.m0)+';')+('width:'+($root.m1)+';')+('border-radius:'+($root.m2)+';')}}" src="{{option.src}}" mode="widthFix" data-event-opts="{{[['tap',[['toTopClick',['$event']]]]]}}" bindtap="__e"></image></block>

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/mescroll-uni/components/mescroll-uni/components/mescroll-top.wxss

@@ -1,96 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/* 回到顶部的按钮 */
-.mescroll-totop {
-	z-index: 9990;
-	position: fixed !important; /* 加上important避免编译到H5,在多mescroll中定位失效 */
-	right: 20rpx;
-	bottom: 120rpx;
-	width: 72rpx;
-	height: auto;
-	border-radius: 50%;
-	opacity: 0;
-	transition: opacity 0.5s; /* 过渡 */
-	margin-bottom: 0px; /* css变量 */
-}
-/* 适配 iPhoneX */
-@supports (bottom: constant(safe-area-inset-bottom)) or (bottom: env(safe-area-inset-bottom)) {
-.mescroll-totop-safearea {
-		margin-bottom: calc(0px + constant(safe-area-inset-bottom)); /* window-bottom + 适配 iPhoneX */
-		margin-bottom: calc(0px + env(safe-area-inset-bottom));
-}
-}
-/* 显示 -- 淡入 */
-.mescroll-totop-in {
-	opacity: 1;
-}
-/* 隐藏 -- 淡出且不接收事件*/
-.mescroll-totop-out {
-	opacity: 0;
-	pointer-events: none;
-}
-

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-badge/components/uv-badge/uv-badge.json

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

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-badge/components/uv-badge/uv-badge.wxml

@@ -1 +0,0 @@
-<block wx:if="{{$root.m0}}"><text class="{{['uv-badge','data-v-7be88939',isDot?'uv-badge--dot':'uv-badge--not-dot',inverted&&'uv-badge--inverted',shape==='horn'&&'uv-badge--horn','uv-badge--'+propsType+(inverted?'--inverted':'')]}}" style="{{$root.s0}}">{{isDot?'':showValue}}</text></block>

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-badge/components/uv-badge/uv-badge.wxss

@@ -1,73 +0,0 @@
-@charset "UTF-8";
-/* 需要放到文件最上面 */
-/* 水平间距 */
-/* 水平间距 */
-/*
- 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
- */
-/* 水平间距 */
-view.data-v-7be88939, scroll-view.data-v-7be88939, swiper-item.data-v-7be88939 {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-.uv-badge.data-v-7be88939 {
-  border-top-right-radius: 100px;
-  border-top-left-radius: 100px;
-  border-bottom-left-radius: 100px;
-  border-bottom-right-radius: 100px;
-  display: flex;
-  flex-direction: row;
-  line-height: 11px;
-  text-align: center;
-  font-size: 11px;
-  color: #FFFFFF;
-}
-.uv-badge--dot.data-v-7be88939 {
-  height: 8px;
-  width: 8px;
-}
-.uv-badge--inverted.data-v-7be88939 {
-  font-size: 13px;
-}
-.uv-badge--not-dot.data-v-7be88939 {
-  padding: 2px 5px;
-}
-.uv-badge--horn.data-v-7be88939 {
-  border-bottom-left-radius: 0;
-}
-.uv-badge--primary.data-v-7be88939 {
-  background-color: #3c9cff;
-}
-.uv-badge--primary--inverted.data-v-7be88939 {
-  color: #3c9cff;
-}
-.uv-badge--error.data-v-7be88939 {
-  background-color: #f56c6c;
-}
-.uv-badge--error--inverted.data-v-7be88939 {
-  color: #f56c6c;
-}
-.uv-badge--success.data-v-7be88939 {
-  background-color: #5ac725;
-}
-.uv-badge--success--inverted.data-v-7be88939 {
-  color: #5ac725;
-}
-.uv-badge--info.data-v-7be88939 {
-  background-color: #909399;
-}
-.uv-badge--info--inverted.data-v-7be88939 {
-  color: #909399;
-}
-.uv-badge--warning.data-v-7be88939 {
-  background-color: #f9ae3d;
-}
-.uv-badge--warning--inverted.data-v-7be88939 {
-  color: #f9ae3d;
-}
-

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-tabs/components/uv-tabs/uv-tabs.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "uv-badge": "/uni_modules/uv-badge/components/uv-badge/uv-badge"
-  },
-  "component": true
-}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/uni_modules/uv-tabs/components/uv-tabs/uv-tabs.wxss

@@ -1,66 +0,0 @@
-@charset "UTF-8";
-/* 需要放到文件最上面 */
-/* 水平间距 */
-/* 水平间距 */
-/*
- 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
- */
-/* 水平间距 */
-view.data-v-28a80996, scroll-view.data-v-28a80996, swiper-item.data-v-28a80996 {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-.uv-tabs__wrapper.data-v-28a80996 {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-.uv-tabs__wrapper__scroll-view-wrapper.data-v-28a80996 {
-  flex: 1;
-  overflow: auto hidden;
-}
-.uv-tabs__wrapper__scroll-view.data-v-28a80996 {
-  display: flex;
-  flex-direction: row;
-  flex: 1;
-}
-.uv-tabs__wrapper__nav.data-v-28a80996 {
-  display: flex;
-  flex-direction: row;
-  position: relative;
-}
-.uv-tabs__wrapper__nav__item.data-v-28a80996 {
-  padding: 0 11px;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-}
-.uv-tabs__wrapper__nav__item--disabled.data-v-28a80996 {
-  cursor: not-allowed;
-}
-.uv-tabs__wrapper__nav__item__text.data-v-28a80996 {
-  font-size: 15px;
-  color: #606266;
-}
-.uv-tabs__wrapper__nav__item__text--disabled.data-v-28a80996 {
-  color: #c8c9cc !important;
-}
-.uv-tabs__wrapper__nav__line.data-v-28a80996 {
-  height: 3px;
-  background: #3c9cff;
-  width: 30px;
-  position: absolute;
-  bottom: 2px;
-  border-radius: 100px;
-  transition-property: -webkit-transform;
-  transition-property: transform;
-  transition-property: transform, -webkit-transform;
-  transition-duration: 300ms;
-}
-