fix

virgo.wzfrontend/yui_wx/manifest.json

@@ -58,7 +58,7 @@
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
-                "desc" : "用于位置"
+                "desc" : "用于获取位置，展示相应的房源信息"
             }
         },
         "lazyCodeLoading" : "requiredComponents",
@@ -68,6 +68,9 @@
                 "version" : "1.0.0",
                 "provider" : "wxf2b3a0262975d8c2"
             }
+        },
+        "optimization" : {
+            "subPackages" : true
         }
     },
     "vueVersion" : "2"

virgo.wzfrontend/yui_wx/pages/bill/bill.vue

@@ -3,7 +3,7 @@
 		<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/billDetail/billDetail?billId='+item.id+'&type='+type)">
+					@click="$navigateTo('/pageIndex/billDetail/billDetail?billId='+item.id+'&type='+type)">
 					<view class="title" v-if="type === 1">{{'第' + item.phase + '期'}}</view>
 					<view class="title" v-else>{{ item.name}}</view>
 					<view class="date" v-if="type === 1">{{item.startDate}}至{{item.endDate}}</view>

virgo.wzfrontend/yui_wx/pages/billDetail/billDetail.vue

@@ -163,14 +163,14 @@
 						this.operationBtn.push({
 							id: 1,
 							name: '账单付款',
-							type: '/pages/billRecord/billRecord'
+							type: '/pageIndex/billRecord/billRecord'
 						})
 					}
 					if (this.detail.status === 1 && this.detail.organizationId === this.$store.getters.organization.id) {
 						this.operationBtn.push({
 							id: 2,
 							name: '账单发票',
-							type: '/pages/billInvoice/billInvoice'
+							type: '/pageIndex/billInvoice/billInvoice'
 						})
 					}
 					if (this.type == 2 && !this.detail.status && this.detail.organizationId === this.$store.getters
@@ -178,7 +178,7 @@
 						this.operationBtn.push({
 							id: 3,
 							name: '发送账单给客户',
-							type: '/pages/billInvoice/billInvoice'
+							type: '/pageIndex/billInvoice/billInvoice'
 						})
 					}
 				}

virgo.wzfrontend/yui_wx/pages/bim/bim.vue

@@ -54,7 +54,7 @@
 			clickBim(item) {
 				if (item.status === 1) return this.$toast('模型转换中');
 				if (item.status === 0) return this.$toast('该模型暂未转换');
-				this.$navigateTo('/pages/bimShow/bimShow?title=' + item.name + '&fileId=' + item.bimfaceInfo.fileId +
+				this.$navigateTo('/pageIndex/bimShow/bimShow?title=' + item.name + '&fileId=' + item.bimfaceInfo.fileId +
 					'&type=model&showType=1');
 			}
 		}

virgo.wzfrontend/yui_wx/pages/contract/contract.vue

@@ -3,7 +3,7 @@
 		<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/contractDetail/contractDetail?contractId='+item.id)">
+					@click="$navigateTo('/pageIndex/contractDetail/contractDetail?contractId='+item.id)">
 					<view class="title">{{item.code}}</view>
 					<view class="date">{{item.startDate}}至{{item.endDate}}</view>
 					<view>

virgo.wzfrontend/yui_wx/pages/contractDetail/contractDetail.vue

@@ -180,10 +180,10 @@
 	import {
 		getContractDetailById
 	} from '@/request/api/contract.js'
-	import clauseDetail from '@/components/contract/clauseDetail.vue'
+	import clauseDetail from '@/pageIndex/components/contract/clauseDetail.vue'
 	import upload from '@/components/common/upload.vue'
 	import config from "@/config";
-	import steps from '@/components/contract/steps.vue';
+	import steps from '@/pageIndex/components/contract/steps.vue';
 	export default {
 		data() {
 			return {

virgo.wzfrontend/yui_wx/pages/deviceDetail/deviceDetail.vue

@@ -10,12 +10,12 @@
 </template>
 
 <script>
-	import aircondition from '@/components/device/aircondition';
-	import lighting from '@/components/device/lighting';
-	import meterShow from '@/components/device/meter';
-	import water from '@/components/device/water';
-	import environment from '@/components/device/environment';
-	import control from '@/components/device/control'
+	import aircondition from '@/pageIndex/components/device/aircondition';
+	import lighting from '@/pageIndex/components/device/lighting';
+	import meterShow from '@/pageIndex/components/device/meter';
+	import water from '@/pageIndex/components/device/water';
+	import environment from '@/pageIndex/components/device/environment';
+	import control from '@/pageIndex/components/device/control'
 	export default {
 		data() {
 			return {

virgo.wzfrontend/yui_wx/pages/deviceList/deviceList.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script>
-	import projectDropDown from '@/components/common/projectDropDown.vue'
+	import projectDropDown from '@/pageIndex/components/common/projectDropDown.vue'
 	import deviceList from '@/uitls/deviceList';
 	export default {
 		data() {
@@ -48,11 +48,10 @@
 					if (e.value === 'all') return this.deviceList = deviceList;
 					this.deviceList = deviceList.filter(node => node.positionName === e.label);
 				}
-				console.log(e);
 			},
 			clickDevice(item) {
 				this.$navigateTo(
-					`/pages/deviceDetail/deviceDetail?id=${item.id}&name=${item.name}&type=${item.type}&space=${item.positionName}`
+					`/pageIndex/deviceDetail/deviceDetail?id=${item.id}&name=${item.name}&type=${item.type}&space=${item.positionName}`
 				);
 			}
 		},

virgo.wzfrontend/yui_wx/pages/monitorList/monitorList.vue

@@ -3,7 +3,7 @@
 		<project-drop-down @change="change"></project-drop-down>
 		<view class="device-list">
 			<view class="device-item-box" v-for="(item,index) in monitorList" :key="index"
-				@click="$navigateTo('/pages/monitor/monitor')">
+				@click="$navigateTo('/pageIndex/monitor/monitor')">
 				<view class="item-box">
 					<view class="item-icon">
 						<uni-icons :type="item.iconName" custom-prefix="iconfont" :size="item.iconSize" color="#c3c3c3">
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-	import projectDropDown from '@/components/common/projectDropDown.vue'
+	import projectDropDown from '@/pageIndex/components/common/projectDropDown.vue'
 	import monitorList from '@/uitls/monitorList.js';
 	export default {
 		data() {

virgo.wzfrontend/yui_wx/pages/order/order.vue

@@ -3,7 +3,7 @@
 		<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/orderDetail/orderDetail?orderId='+item.id)">
+					@click="$navigateTo('/pageIndex/orderDetail/orderDetail?orderId='+item.id)">
 					<view class="title">{{item.name}}</view>
 					<view class="date">{{item.date}}</view>
 					<view>

virgo.wzfrontend/yui_wx/pages/orderDetail/orderDetail.vue

@@ -162,13 +162,13 @@
 						this.submitOrder('是否提交工单，提交后将不能再修改?', 1);
 						break;
 					case 2:
-						this.$navigateTo('/pages/orderHandle/orderHandle?operationId=' + this.operation.id);
+						this.$navigateTo('/pageIndex/orderHandle/orderHandle?operationId=' + this.operation.id);
 						break;
 					case 3:
 						this.submitOrder('是否开始工单?', 2);
 						break;
 					case 4:
-						this.$navigateTo('/pages/selectUser/selectUser?orderId=' + this.detail.id);
+						this.$navigateTo('/pageIndex/selectUser/selectUser?orderId=' + this.detail.id);
 						break;
 					case 5:
 						this.submitOrder('是否完成工单?', 3);

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

@@ -3,7 +3,7 @@
 		<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)">
+					@click="$navigateTo('/pageMy/clientDetail/clientDetail?clientId='+item.id)">
 					<view class="title">{{item.name}}</view>
 					<view class="date">{{item.visitingTime}}</view>
 					<view>

virgo.wzfrontend/yui_wx/pages/myHouse/myHouse.vue

@@ -45,16 +45,14 @@
 				}).then(res => {
 					if (res.code === 200) {
 						this.mescroll.endBySize(res.data.dataList.length, res.data.totalCount);
-						if (page.num == 1) this.list = []; //如果是第一页需手动制空列表
-						console.log(res.data.dataList);
+						if (page.num == 1) this.list = []; //如果是第一页需手动制空列表
 						let data = res.data.dataList.map(node => {
 							return {
 								houseId: node.id,
 								image: this.imageUrl(node.showPicture),
 								title: `${node.projectItemName}-${node.projectItemTargetName}-${node.roomNumber}`
 							}
-						})
-						console.log(data);
+						})
 						this.list = this.list.concat(data); //追加新数据
 					} else {
 						this.mescroll.endErr();

virgo.wzfrontend/yui_wx/pages.json

@@ -6,14 +6,14 @@
 			"navigationBarTitleText": ""
 		}
 	}, {
-		"path": "pages/index/index",
+		"path": "pages/message/message",
 		"style": {
-			"navigationBarTitleText": "首页"
+			"navigationBarTitleText": "消息"
 		}
 	}, {
-		"path": "pages/data/data",
+		"path": "pages/index/index",
 		"style": {
-			"navigationBarTitleText": "数据"
+			"navigationBarTitleText": "首页"
 		}
 	}, {
 		"path": "pages/my/my",
@@ -21,19 +21,14 @@
 			"navigationBarTitleText": "个人中心"
 		}
 	}, {
-		"path": "pages/login/login",
-		"style": {
-			"navigationBarTitleText": "登录"
-		}
-	}, {
-		"path": "pages/myHouse/myHouse",
+		"path": "pages/projectAdmin/projectAdmin",
 		"style": {
-			"navigationBarTitleText": "我的房源"
+			"navigationBarTitleText": "项目工作台"
 		}
 	}, {
-		"path": "pages/message/message",
+		"path": "pages/login/login",
 		"style": {
-			"navigationBarTitleText": "消息"
+			"navigationBarTitleText": "登录"
 		}
 	}, {
 		"path": "pages/city/city",
@@ -70,81 +65,16 @@
 		"style": {
 			"navigationBarTitleText": "会话"
 		}
-	}, {
-		"path": "pages/myDetail/myDetail",
-		"style": {
-			"navigationBarTitleText": "个人信息"
-		}
 	}, {
 		"path": "pages/person/person",
 		"style": {
 			"navigationBarTitleText": "房东信息"
 		}
-	}, {
-		"path": "pages/fans/fans",
-		"style": {
-			"navigationBarTitleText": "粉丝列表"
-		}
-	}, {
-		"path": "pages/attention/attention",
-		"style": {
-			"navigationBarTitleText": "关注列表"
-		}
-	}, {
-		"path": "pages/collect/collect",
-		"style": {
-			"navigationBarTitleText": "收藏列表"
-		}
-	}, {
-		"path": "pages/clientDetail/clientDetail",
-		"style": {
-			"navigationBarTitleText": "客户详情"
-		}
-	}, {
-		"path": "pages/organization/organization",
-		"style": {
-			"navigationBarTitleText": "我的公司"
-		}
-	}, {
-		"path": "pages/client/client",
-		"style": {
-			"navigationBarTitleText": "我的客户"
-		}
 	}, {
 		"path": "pages/search/search",
 		"style": {
 			"navigationBarTitleText": "搜索"
 		}
-	}, {
-		"path": "pages/projectList/projectList",
-		"style": {
-			"navigationBarTitleText": "项目列表"
-		}
-	}, {
-		"path": "pages/order/order",
-		"style": {
-			"navigationBarTitleText": ""
-		}
-	}, {
-		"path": "pages/orderHandle/orderHandle",
-		"style": {
-			"navigationBarTitleText": "处理工单"
-		}
-	}, {
-		"path": "pages/orderDetail/orderDetail",
-		"style": {
-			"navigationBarTitleText": "工单详情"
-		}
-	}, {
-		"path": "pages/selectUser/selectUser",
-		"style": {
-			"navigationBarTitleText": "选择成员"
-		}
-	}, {
-		"path": "pages/contract/contract",
-		"style": {
-			"navigationBarTitleText": ""
-		}
 	}, {
 		"path": "pages/pdf/pdf",
 		"style": {
@@ -160,46 +90,11 @@
 		"style": {
 			"navigationBarTitleText": "文档"
 		}
-	}, {
-		"path": "pages/contractDetail/contractDetail",
-		"style": {
-			"navigationBarTitleText": "合同详情"
-		}
 	}, {
 		"path": "pages/requestSeal/requestSeal",
 		"style": {
 			"navigationBarTitleText": "申请印章"
 		}
-	}, {
-		"path": "pages/bill/bill",
-		"style": {
-			"navigationBarTitleText": "账单列表"
-		}
-	}, {
-		"path": "pages/billDetail/billDetail",
-		"style": {
-			"navigationBarTitleText": "账单详情"
-		}
-	}, {
-		"path": "pages/invoice/invoice",
-		"style": {
-			"navigationBarTitleText": "发票列表"
-		}
-	}, {
-		"path": "pages/invoiceDetail/invoiceDetail",
-		"style": {
-			"navigationBarTitleText": "发票详情"
-		}
-	}, {
-		"path": "pages/billRecord/billRecord",
-		"style": {
-			"navigationBarTitleText": "账单付款"
-		}
-	}, {
-		"path": "pages/billInvoice/billInvoice",
-		"style": {
-			"navigationBarTitleText": "账单发票"
-		}
 	}, {
 		"path": "pages/messageSystem/messageSystem",
 		"style": {
@@ -215,76 +110,178 @@
 		"style": {
 			"navigationBarTitleText": "通知详情"
 		}
-	}, {
-		"path": "pages/dataDetail/dataDetail",
-		"style": {
-			"navigationBarTitleText": "数据详情"
-		}
-	}, {
-		"path": "pages/download/download",
-		"style": {
-			"navigationBarTitleText": "我的下载"
-		}
 	}, {
 		"path": "pages/dataOrder/dataOrder",
 		"style": {
 			"navigationBarTitleText": "合同工单"
 		}
-	}, {
-		"path": "pages/deviceList/deviceList",
-		"style": {
-			"navigationBarTitleText": "物联设备"
-		}
-	}, {
-		"path": "pages/monitor/monitor",
-		"style": {
-			"navigationBarTitleText": "监控",
-			"mp-weixin": {
-				"usingComponents": {
-					"ezplayer": "plugin://ezplayer/ezplayer"
-				}
-			}
-		}
-	}, {
-		"path": "pages/monitorList/monitorList",
-		"style": {
-			"navigationBarTitleText": "监控列表"
-		}
-	}, {
-		"path": "pages/deviceDetail/deviceDetail",
-		"style": {
-			"navigationBarTitleText": ""
-		}
-	}, {
-		"path": "pages/bim/bim",
-		"style": {
-			"navigationBarTitleText": "模型列表"
-		}
-	}, {
-		"path": "pages/bimShow/bimShow",
-		"style": {
-			"navigationBarTitleText": ""
-		}
-	}, {
-		"path": "pages/myReservation/myReservation",
-		"style": {
-			"navigationBarTitleText": "我的预约"
-		}
-	}, {
-		"path": "pages/dataCenter/dataCenter",
-		"style": {
-			"navigationBarTitleText": "数据中心"
-		}
 	}, {
 		"path": "pages/file/file",
 		"style": {
 			"navigationBarTitleText": ""
 		}
+	}],
+	"subPackages": [{
+		"root": "pageMy",
+		"pages": [{
+			"path": "myDetail/myDetail",
+			"style": {
+				"navigationBarTitleText": "个人信息"
+			}
+		}, {
+			"path": "myHouse/myHouse",
+			"style": {
+				"navigationBarTitleText": "我的房源"
+			}
+		}, {
+			"path": "fans/fans",
+			"style": {
+				"navigationBarTitleText": "粉丝列表"
+			}
+		}, {
+			"path": "attention/attention",
+			"style": {
+				"navigationBarTitleText": "关注列表"
+			}
+		}, {
+			"path": "collect/collect",
+			"style": {
+				"navigationBarTitleText": "收藏列表"
+			}
+		}, {
+			"path": "clientDetail/clientDetail",
+			"style": {
+				"navigationBarTitleText": "客户详情"
+			}
+		}, {
+			"path": "organization/organization",
+			"style": {
+				"navigationBarTitleText": "我的公司"
+			}
+		}, {
+			"path": "client/client",
+			"style": {
+				"navigationBarTitleText": "我的客户"
+			}
+		}, {
+			"path": "myReservation/myReservation",
+			"style": {
+				"navigationBarTitleText": "我的预约"
+			}
+		}, {
+			"path": "download/download",
+			"style": {
+				"navigationBarTitleText": "我的下载"
+			}
+		}, {
+			"path": "dataCenter/dataCenter",
+			"style": {
+				"navigationBarTitleText": "数据中心"
+			}
+		}]
 	}, {
-		"path": "pages/projectAdmin/projectAdmin",
-		"style": {
-			"navigationBarTitleText": "项目工作台"
-		}
+		"root": "pageIndex",
+		"pages": [{
+			"path": "projectList/projectList",
+			"style": {
+				"navigationBarTitleText": "项目列表"
+			}
+		}, {
+			"path": "contract/contract",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		}, {
+			"path": "contractDetail/contractDetail",
+			"style": {
+				"navigationBarTitleText": "合同详情"
+			}
+		}, {
+			"path": "bill/bill",
+			"style": {
+				"navigationBarTitleText": "账单列表"
+			}
+		}, {
+			"path": "billDetail/billDetail",
+			"style": {
+				"navigationBarTitleText": "账单详情"
+			}
+		}, {
+			"path": "invoice/invoice",
+			"style": {
+				"navigationBarTitleText": "发票列表"
+			}
+		}, {
+			"path": "invoiceDetail/invoiceDetail",
+			"style": {
+				"navigationBarTitleText": "发票详情"
+			}
+		}, {
+			"path": "billRecord/billRecord",
+			"style": {
+				"navigationBarTitleText": "账单付款"
+			}
+		}, {
+			"path": "billInvoice/billInvoice",
+			"style": {
+				"navigationBarTitleText": "账单发票"
+			}
+		}, {
+			"path": "order/order",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		}, {
+			"path": "orderHandle/orderHandle",
+			"style": {
+				"navigationBarTitleText": "处理工单"
+			}
+		}, {
+			"path": "orderDetail/orderDetail",
+			"style": {
+				"navigationBarTitleText": "工单详情"
+			}
+		}, {
+			"path": "selectUser/selectUser",
+			"style": {
+				"navigationBarTitleText": "选择成员"
+			}
+		}, {
+			"path": "deviceList/deviceList",
+			"style": {
+				"navigationBarTitleText": "物联设备"
+			}
+		}, {
+			"path": "monitor/monitor",
+			"style": {
+				"navigationBarTitleText": "监控",
+				"mp-weixin": {
+					"usingComponents": {
+						"ezplayer": "plugin://ezplayer/ezplayer"
+					}
+				}
+			}
+		}, {
+			"path": "monitorList/monitorList",
+			"style": {
+				"navigationBarTitleText": "监控列表"
+			}
+		}, {
+			"path": "deviceDetail/deviceDetail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		}, {
+			"path": "bim/bim",
+			"style": {
+				"navigationBarTitleText": "模型列表"
+			}
+		}, {
+			"path": "bimShow/bimShow",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		}]
 	}],
 	"tabBar": {
 		"color": "#8c8c8c",
@@ -303,12 +300,12 @@
 			"pagePath": "pages/highseas/highseas",
 			"iconPath": "static/image/tabbar/highseas.png",
 			"selectedIconPath": "static/image/tabbar/highseas-active.png",
-			"text": "公海"
+			"text": "workark"
 		}, {
-			"pagePath": "pages/dataCenter/dataCenter",
+			"pagePath": "pages/projectAdmin/projectAdmin",
 			"iconPath": "static/image/tabbar/data.png",
 			"selectedIconPath": "static/image/tabbar/data-active.png",
-			"text": "数据"
+			"text": "工作台"
 		}, {
 			"pagePath": "pages/my/my",
 			"iconPath": "static/image/tabbar/my.png",

virgo.wzfrontend/yui_wx/pages/data/data.vue

@@ -1,149 +0,0 @@
-<template>
-	<view>
-		<mescroll-empty :option="option" @emptyclick="$navigateTo('/pages/login/login')" v-if="isEmpty">
-		</mescroll-empty>
-		<mescroll-body top="30" bottom="30" @init="mescrollInit" @down="downCallback" @up="upCallback" v-else>
-			<view class="data-house-list">
-				<view class="data-house-item" v-for="(item,index) in list" :key="item.id"
-					@click="$navigateTo('/pages/dataDetail/dataDetail?houseId='+item.id)">
-					<image class="image" :src="imageUrl(item.showPicture)" mode="aspectFill"></image>
-					<view class=" content">
-						<view class="title">{{item.projectItemName}}-{{item.projectItemTargetName}}-{{item.roomNumber}}
-						</view>
-						<view class="const">
-							<view class="const-item">
-								<uni-icons class="inherit-icons" type="map-filled" color="#7f7f7f"></uni-icons>
-								<text class="text">2</text>
-							</view>
-							<view class="const-item">
-								<uni-icons class="inherit-icons" type="calendar-filled" color="#7f7f7f"></uni-icons>
-								<text class="text">2</text>
-							</view>
-						</view>
-						<view class="sub">{{item.projectName}}</view>
-					</view>
-				</view>
-			</view>
-		</mescroll-body>
-	</view>
-</template>
-
-<script>
-	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
-	import {
-		getHouseListByPage
-	} from '@/request/api/house.js'
-	export default {
-		mixins: [MescrollMixin], // 使用mixin
-		data() {
-			return {
-				option: {
-					tip: '暂未加入项目'
-				},
-				list: [],
-				isEmpty: true
-			}
-		},
-		onLoad() {
-			uni.$on('reloadData', () => {
-				this.mescroll.resetUpScroll();
-			})
-		},
-		onShow() {
-			this.isEmpty = true;
-			if (!uni.getStorageSync('token')) {
-				this.option = {
-					tip: '暂未登录',
-					btnText: '点击登录'
-				}
-			} else if (!this.$store.getters.project.id) {
-				this.option = {
-					tip: '暂未加入项目'
-				}
-			} else {
-				this.isEmpty = false;
-			}
-		},
-		methods: {
-			imageUrl(data) {
-				if (!data || data === '[]') return 'https://assets.api.uizard.io/api/cdn/stream/c05650d2-192b-4a56-ae97-05638f53804c.png';
-				return JSON.parse(data)[0].url;
-			},
-			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-			upCallback(page) {
-				getHouseListByPage({
-					currPage: page.num,
-					pageSize: 10,
-					projectId: this.$store.getters.project.id
-				}).then(res => {
-					if (res.code === 200) {
-						this.mescroll.endBySize(res.data.dataList.length, res.data.totalCount);
-						if (page.num == 1) this.list = []; //如果是第一页需手动制空列表
-						this.list = this.list.concat(res.data.dataList); //追加新数据
-					} else {
-						this.mescroll.endErr();
-					}
-				}).catch(() => {
-					//联网失败, 结束加载
-					this.mescroll.endErr();
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.data-house-list {
-		padding: 0 30rpx;
-
-		.data-house-item {
-			height: 200rpx;
-			background: #fff;
-			display: flex;
-			align-items: center;
-			border-radius: 16rpx;
-			box-shadow: 0px 1px 12px rgba(3, 3, 3, 0.08);
-			padding: 0 30rpx;
-			margin-bottom: 30rpx;
-		}
-
-		.image {
-			width: 200rpx;
-			height: 140rpx;
-			border-radius: 8rpx;
-		}
-
-		.content {
-			margin-left: 20rpx;
-		}
-
-		.title {
-			font-size: 32rpx;
-			font-weight: 600;
-			margin-bottom: 10rpx;
-		}
-
-		.sub {
-			font-weight: 300;
-			font-size: 24rpx;
-			margin-top: 10rpx;
-			color: $uni-secondary-color;
-		}
-
-		.const {
-			display: flex;
-			align-items: center;
-
-			.const-item {
-				display: flex;
-				align-items: center;
-				color: $uni-secondary-color;
-				margin-right: 20rpx;
-			}
-
-			.text {
-				margin-left: 6rpx;
-			}
-		}
-	}
-</style>

virgo.wzfrontend/yui_wx/pages/dataDetail/dataDetail.vue

@@ -1,145 +0,0 @@
-<template>
-	<view class="data-detail detail">
-		<house-items :house="detail" v-if="detail.id"></house-items>
-		<view class="detail-box">
-			<view class="sub-title">
-				<uni-icons class="inherit-icons" type="icon-hetongwendang" custom-prefix="iconfont" color="#08979c"
-					size="26">
-				</uni-icons>
-				<text class="sub-label">房源合同</text>
-			</view>
-			<view class="other-list">
-				<mescroll-empty :option="{tip:'暂未签订合同'}" v-if="contract.length === 0"></mescroll-empty>
-				<view class="other">
-					<view class="contarct-item hui-ellipsis" v-for="(item,index) in contract" :key="item.id"
-						@click="$navigateTo('/pages/contractDetail/contractDetail?contractId='+item.id)">
-						<view class="contarct-content">
-							<view class="content-item content-title">{{item.code}}</view>
-							<view class="content-item right">
-								<view class="status-tag info" v-if="!item.status">待发送</view>
-								<view class="status-tag warning" v-else-if="item.status === 1">待确认</view>
-								<view class="status-tag success" v-else-if="item.status === 2">已生效</view>
-							</view>
-						</view>
-						<view class="contarct-content last">
-							<view class="content-item">
-								<view class="content-label">出租方:</view>
-								<view class="content-value hui-ellipsis">{{item.organizationName}}</view>
-							</view>
-							<view class="content-item right">
-								<view class="content-label">租赁方:</view>
-								<view class="content-value hui-ellipsis">
-									{{item.tenantType === 1 ? item.merchantName: item.clientName}}
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="detail-box">
-			<view class="sub-title">
-				<uni-icons class="inherit-icons" type="icon-weixiugongdan" custom-prefix="iconfont" color="#08979c"
-					size="26">
-				</uni-icons>
-				<text class="sub-label">房源工单</text>
-			</view>
-			<view class="other-list">
-				<mescroll-empty :option="{tip:'暂未有工单数据'}" v-if="order.length === 0"></mescroll-empty>
-				<view class="other">
-					<view class="contarct-item hui-ellipsis" v-for="(item,index) in order" :key="item.id"
-						@click="$navigateTo('/pages/orderDetail/orderDetail?orderId='+item.id)">
-						<view class="contarct-content">
-							<view class="content-item content-title">{{item.name}}</view>
-							<view class="content-item right">
-								<view class="status-tag info" v-if="!item.status">待提交</view>
-								<view class="status-tag primary" v-else-if="item.status === 1">待处理</view>
-								<view class="status-tag warning" v-else-if="item.status === 2">处理中</view>
-								<view class="status-tag success" v-else>已处理</view>
-							</view>
-						</view>
-						<view class="contarct-content last">
-							<view class="content-item">
-								<view class="content-label">跟进者:</view>
-								<view class="content-value hui-ellipsis">{{item.followUpPersonName || '-'}}</view>
-							</view>
-							<view class="content-item right">
-								<view class="content-label">租客:</view>
-								<view class="content-value hui-ellipsis">
-									{{(item.tenantType === 1 ? item.merchantName: item.clientName) || '-'}}
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import houseItems from "@/components/house/houseItems.vue";
-	import {
-		getHouseDetailById
-	} from '@/request/api/house.js'
-	import {
-		getContractList
-	} from '@/request/api/contract.js'
-	import {
-		getOrderPageListByQuery
-	} from '@/request/api/order.js'
-	export default {
-		data() {
-			return {
-				houseId: '',
-				detail: {},
-				contract: [],
-				order: []
-			}
-		},
-		onLoad(body) {
-			if (body.houseId) this.houseId = body.houseId;
-			this.init();
-		},
-		components: {
-			houseItems
-		},
-		methods: {
-			init() {
-				getHouseDetailById(this.houseId).then(res => {
-					if (res.code === 200) {
-						this.detail = res.data;
-						this.getContract();
-						this.getOrder();
-					}
-				})
-			},
-			getContract() {
-				getContractList({
-					projectItemTargetRoomIds: this.houseId
-				}).then(res => {
-					if (res.code === 200) {
-						this.contract = res.data;
-					}
-				})
-			},
-			getOrder() {
-				getOrderPageListByQuery({
-					currPage: 1,
-					pageSize: 100,
-					projectItemTargetRoomIds: this.houseId
-				}).then(res => {
-					if (res.code === 200) {
-						this.order = res.data.dataList;
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.data-detail {
-		// padding: 30rpx;
-	}
-</style>

virgo.wzfrontend/yui_wx/pages/highseas/highseas.vue

@@ -15,7 +15,7 @@
 				</view>
 			</view>
 		</navbar>
-		<mescroll-body :top="getNavBarHeight()" bottom="20" @init="mescrollInit" @down="downCallback" @up="upCallback"
+		<mescroll-body :top="getTopHeight()" bottom="20" @init="mescrollInit" @down="downCallback" @up="upCallback"
 			:down="{
 				auto:false
 			}">
@@ -111,22 +111,23 @@
 					}
 				});
 			},
-			// 获取状态栏高度
 			geStatusBarHeight() {
 				return uni.getSystemInfoSync()['statusBarHeight']
 			},
-			// 获取导航栏高度
 			getNavBarHeight() {
 				// #ifdef MP-WEIXIN
 				let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
 				// 导航栏高度 = 胶囊高度 + 上间距 + 下间距 + 微调	（menuButtonInfo.top - uni.getSystemInfoSync()['statusBarHeight'] = 上间距）	        
 				let navbarHeight = menuButtonInfo.height + (menuButtonInfo.top - uni.getSystemInfoSync()[
-					'statusBarHeight']) * 2 + 2
+					'statusBarHeight']) * 2 + 4
 				// #endif
 				// #ifdef APP-PLUS || H5
 				let navbarHeight = 44
 				// #endif
-				return (navbarHeight + this.geStatusBarHeight()) * 2;
+				return navbarHeight
+			},
+			getTopHeight() {
+				return this.geStatusBarHeight() + this.getNavBarHeight() + 30
 			},
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {

virgo.wzfrontend/yui_wx/pages/index/index.vue

@@ -5,7 +5,7 @@
 		</mescroll-empty>
 		<view class="index-container" v-else>
 			<view class="project">
-				<view class="project-box" @click="$navigateTo('/pages/projectList/projectList')">
+				<view class="project-box" @click="$navigateTo('/pageIndex/projectList/projectList')">
 					<uni-icons custom-prefix="iconfont" type="icon-wodegongsi-gaoliang" class="inherit-icons"
 						color="#08979c">
 					</uni-icons>
@@ -21,7 +21,7 @@
 				<view class="title">合同管理</view>
 				<view class="group-box">
 					<view class="group-item">
-						<view class="group-veiw bg1" @click="$navigateTo('/pages/contract/contract?type=1')">
+						<view class="group-veiw bg1" @click="$navigateTo('/pageIndex/contract/contract?type=1')">
 							<text class="label">合同列表</text>
 							<view class="group-icon">
 								<uni-icons custom-prefix="iconfont" type="icon-hetongguanli" color="#fff" size="30">
@@ -31,7 +31,7 @@
 					</view>
 					<view class="small-box">
 						<view class="small">
-							<view class="group-veiw bg2" @click="$navigateTo('/pages/contract/contract?type=2')">
+							<view class="group-veiw bg2" @click="$navigateTo('/pageIndex/contract/contract?type=2')">
 								<text class="label">公司合同</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-anli" color="#fff" size="30">
@@ -40,7 +40,7 @@
 							</view>
 						</view>
 						<view class="small">
-							<view class="group-veiw bg3" @click="$navigateTo('/pages/contract/contract?type=3')">
+							<view class="group-veiw bg3" @click="$navigateTo('/pageIndex/contract/contract?type=3')">
 								<text class="label">个人合同</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-gerenhetongchaxun" color="#fff"
@@ -55,7 +55,7 @@
 				<view class="group-box">
 					<view class="small-box small-boxs">
 						<view class="small">
-							<view class="group-veiw bg7" @click="$navigateTo('/pages/bill/bill?type=1')">
+							<view class="group-veiw bg7" @click="$navigateTo('/pageIndex/bill/bill?type=1')">
 								<text class="label">合同账单</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-jiesuanguanli" color="#fff"
@@ -67,7 +67,7 @@
 					</view>
 					<view class="small-box small-boxs">
 						<view class="small">
-							<view class="group-veiw bg8" @click="$navigateTo('/pages/bill/bill?type=2')">
+							<view class="group-veiw bg8" @click="$navigateTo('/pageIndex/bill/bill?type=2')">
 								<text class="label">常规账单</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-yuemingxi" color="#fff" size="30">
@@ -81,7 +81,7 @@
 				<view class="group-box">
 					<view class="small-box small-boxs">
 						<view class="small">
-							<view class="group-veiw bg9" @click="$navigateTo('/pages/invoice/invoice?type=1')">
+							<view class="group-veiw bg9" @click="$navigateTo('/pageIndex/invoice/invoice?type=1')">
 								<text class="label">合同发票</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-app-hetongguanli-hetongfapiao"
@@ -93,7 +93,7 @@
 					</view>
 					<view class="small-box small-boxs">
 						<view class="small">
-							<view class="group-veiw bg10" @click="$navigateTo('/pages/invoice/invoice?type=2')">
+							<view class="group-veiw bg10" @click="$navigateTo('/pageIndex/invoice/invoice?type=2')">
 								<text class="label">付款发票</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-integralrecord" color="#fff"
@@ -108,7 +108,7 @@
 				<view class="group-box">
 					<view class="small-box">
 						<view class="small">
-							<view class="group-veiw bg5" @click="$navigateTo('/pages/order/order?type=1')">
+							<view class="group-veiw bg5" @click="$navigateTo('/pageIndex/order/order?type=1')">
 								<text class="label">维修工单</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-weixiugongdan" color="#fff"
@@ -118,7 +118,7 @@
 							</view>
 						</view>
 						<view class="small">
-							<view class="group-veiw bg6" @click="$navigateTo('/pages/order/order?type=2')">
+							<view class="group-veiw bg6" @click="$navigateTo('/pageIndex/order/order?type=2')">
 								<text class="label">保洁工单</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-jinribaojie" color="#fff" size="30">
@@ -128,7 +128,7 @@
 						</view>
 					</view>
 					<view class="group-item">
-						<view class="group-veiw bg4" @click="$navigateTo('/pages/order/order?type=3')">
+						<view class="group-veiw bg4" @click="$navigateTo('/pageIndex/order/order?type=3')">
 							<text class="label">运维工单</text>
 							<view class="group-icon">
 								<uni-icons custom-prefix="iconfont" type="icon-yunwei-jiancebaogao" color="#fff"
@@ -142,7 +142,7 @@
 				<view class="group-box">
 					<view class="small-box small-boxs">
 						<view class="small">
-							<view class="group-veiw bg1" @click="$navigateTo('/pages/deviceList/deviceList')">
+							<view class="group-veiw bg1" @click="$navigateTo('/pageIndex/deviceList/deviceList')">
 								<text class="label">物联设备</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-weixiugongdan" color="#fff"
@@ -154,7 +154,7 @@
 					</view>
 					<view class="small-box small-boxs">
 						<view class="small">
-							<view class="group-veiw bg7" @click="$navigateTo('/pages/monitorList/monitorList')">
+							<view class="group-veiw bg7" @click="$navigateTo('/pageIndex/monitorList/monitorList')">
 								<text class="label">视频监控</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-weixiugongdan" color="#fff"
@@ -169,7 +169,7 @@
 				<view class="group-box">
 					<view class="small-box small-boxs">
 						<view class="small">
-							<view class="group-veiw bg2" @click="$navigateTo('/pages/bim/bim')">
+							<view class="group-veiw bg2" @click="$navigateTo('/pageIndex/bim/bim')">
 								<text class="label">模型列表</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-weixiugongdan" color="#fff"
@@ -182,7 +182,7 @@
 					<view class="small-box small-boxs">
 						<view class="small">
 							<view class="group-veiw bg8"
-								@click="$navigateTo('/pages/bimShow/bimShow?title=楼层分布&fileId=10000890570651&type=model&showType=2')">
+								@click="$navigateTo('/pageIndex/bimShow/bimShow?title=楼层分布&fileId=10000890570651&type=model&showType=2')">
 								<text class="label">楼层分布</text>
 								<view class="group-icon">
 									<uni-icons custom-prefix="iconfont" type="icon-weixiugongdan" color="#fff"
@@ -195,9 +195,6 @@
 				</view>
 			</view>
 		</view>
-		<view class="project-admin" v-if="project.id" @click="$navigateTo('/pages/projectAdmin/projectAdmin')">
-			<uni-icons type="home-filled" size="30" color="#fff"></uni-icons>
-		</view>
 	</view>
 </template>
 

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

@@ -2,21 +2,21 @@
 	<view class="my-box">
 		<view class="my-content">
 			<view class="my-top"></view>
-			<image class="my-avatar" @click="$navigateTo('/pages/myDetail/myDetail')" :src="user.portrait"
+			<image class="my-avatar" @click="$navigateTo('/pageMy/myDetail/myDetail')" :src="user.portrait"
 				mode="aspectFill"></image>
-			<view class="name" @click="$navigateTo('/pages/myDetail/myDetail')">{{user.userName || '登录/注册'}}</view>
+			<view class="name" @click="$navigateTo('/pageMy/myDetail/myDetail')">{{user.userName || '登录/注册'}}</view>
 			<view class="organization" v-if="user.organizedName">{{user.organizedName}}</view>
 			<view class="my-tab">
 				<view class="tab-box">
-					<view class="tab-item" @click="$navigateTo('/pages/myHouse/myHouse')">
+					<view class="tab-item" @click="$navigateTo('/pageMy/myHouse/myHouse')">
 						<view class="tab-number">{{fansCount.roomCount}}</view>
 						<view class="tab-text">房源</view>
 					</view>
-					<view class="tab-item" @click="$navigateTo('/pages/fans/fans')">
+					<view class="tab-item" @click="$navigateTo('/pageMy/fans/fans')">
 						<view class="tab-number">{{fansCount.fansCount}}</view>
 						<view class="tab-text">粉丝</view>
 					</view>
-					<view class="tab-item" @click="$navigateTo('/pages/attention/attention')">
+					<view class="tab-item" @click="$navigateTo('/pageMy/attention/attention')">
 						<view class="tab-number">{{fansCount.attentionCount}}</view>
 						<view class="tab-text">关注</view>
 					</view>
@@ -24,7 +24,7 @@
 			</view>
 			<view class="my-list">
 				<view class="my-list-box">
-					<view class="my-item" @click="$navigateTo('/pages/collect/collect')">
+					<view class="my-item" @click="$navigateTo('/pageMy/collect/collect')">
 						<view class="my-icon bg1">
 							<uni-icons custom-prefix="iconfont" type="icon-wodeshoucangshixin" color="#fff" size="20">
 							</uni-icons>
@@ -36,7 +36,7 @@
 							<uni-icons type="forward" size="18" color="#c1c0c8"></uni-icons>
 						</view>
 					</view>
-					<view class="my-item" @click="$navigateTo('/pages/client/client')">
+					<view class="my-item" @click="$navigateTo('/pageMy/client/client')">
 						<view class="my-icon bg2">
 							<uni-icons custom-prefix="iconfont" type="icon-wodekehu" color="#fff" size="20">
 							</uni-icons>
@@ -48,7 +48,7 @@
 							<uni-icons type="forward" size="18" color="#c1c0c8"></uni-icons>
 						</view>
 					</view>
-					<view class="my-item" @click="$navigateTo('/pages/myReservation/myReservation')">
+					<view class="my-item" @click="$navigateTo('/pageMy/myReservation/myReservation')">
 						<view class="my-icon bg5">
 							<uni-icons custom-prefix="iconfont" type="icon-kefuzhongxin" color="#fff" size="24">
 							</uni-icons>
@@ -60,7 +60,7 @@
 							<uni-icons type="forward" size="18" color="#c1c0c8"></uni-icons>
 						</view>
 					</view>
-					<view class="my-item" @click="$navigateTo('/pages/organization/organization')">
+					<view class="my-item" @click="$navigateTo('/pageMy/organization/organization')">
 						<view class="my-icon bg3">
 							<uni-icons custom-prefix="iconfont" type="icon-wodegongsi-gaoliang" color="#fff" size="22">
 							</uni-icons>
@@ -71,9 +71,21 @@
 						<view class="my-forward">
 							<uni-icons type="forward" size="18" color="#c1c0c8"></uni-icons>
 						</view>
+					</view>
+					<view class="my-item" @click="$navigateTo('/pageMy/dataCenter/dataCenter')">
+						<view class="my-icon bg4">
+							<uni-icons custom-prefix="iconfont" type="icon-wenjian" color="#fff" size="20">
+							</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/download/download')">
-						<view class="my-icon bg4">
+					<view class="my-item" @click="$navigateTo('/pageMy/download/download')">
+						<view class="my-icon bg5">
 							<uni-icons custom-prefix="iconfont" type="icon-wodexiazaizhongxin" color="#fff" size="18">
 							</uni-icons>
 						</view>

virgo.wzfrontend/yui_wx/pages/projectAdmin/projectAdmin.vue

@@ -1,265 +1,269 @@
 <template>
-	<view class="project-container">
-		<view class="project-item">
-			<view class="project-title">
-				<view class="title-line"></view>
-				<view class="title-label">房源管理</view>
-			</view>
-			<view class="project-content">
-				<view class="air-item">
-					<view class="test-item">
-						<view class="name">总面积(㎡)</view>
-						<view class="number">{{houseData.totalArea}}</view>
-					</view>
-					<view class="line"></view>
-					<view class="test-item">
-						<view class="name">已租面积(㎡)</view>
-						<view class="number">{{houseData.remainArea}}</view>
-					</view>
-					<view class="line"></view>
-					<view class="test-item">
-						<view class="name">剩余面积(㎡)</view>
-						<view class="number">{{houseData.haveRentedArea}}</view>
-					</view>
-				</view>
-				<view class="air-item">
-					<view class="test-item">
-						<view class="name">总房源(个)</view>
-						<view class="number">{{houseData.totalRoom}}</view>
-					</view>
-					<view class="line"></view>
-					<view class="test-item">
-						<view class="name">已租房源(个)</view>
-						<view class="number">{{houseData.remainRoom}}</view>
-					</view>
-					<view class="line"></view>
-					<view class="test-item">
-						<view class="name">剩余房源(个)</view>
-						<view class="number">{{houseData.haveRentedRoom}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="project-item">
-			<view class="project-title">
-				<view class="title-line"></view>
-				<view class="title-label">费用管理</view>
-				<view class="title-tab">
-					<uv-subsection :list="billList" :current="billIndex" activeColor="#08979c"
-						custom-style="border-radius: 16rpx;" custom-item-style="border-radius: 12rpx;"
-						@change="changeBill">
-					</uv-subsection>
+	<view>
+		<mescroll-empty :option="option" @emptyclick="$navigateTo('/pages/login/login')" v-if="isEmpty">
+		</mescroll-empty>
+		<view class="project-container" v-else>
+			<view class="project-item">
+				<view class="project-title">
+					<view class="title-line"></view>
+					<view class="title-label">房源管理</view>
 				</view>
-			</view>
-			<view class="project-content">
-				<view class="bill-title">房租</view>
-				<view class="bill-content">
+				<view class="project-content">
 					<view class="air-item">
 						<view class="test-item">
-							<view class="name">应收(元)</view>
-							<view class="number">{{nowPaymentData.property.receivable}}</view>
+							<view class="name">总面积(㎡)</view>
+							<view class="number">{{houseData.totalArea}}</view>
 						</view>
 						<view class="line"></view>
 						<view class="test-item">
-							<view class="name">已收(元)</view>
-							<view class="number">{{nowPaymentData.property.received}}</view>
+							<view class="name">已租面积(㎡)</view>
+							<view class="number">{{houseData.remainArea}}</view>
 						</view>
 						<view class="line"></view>
 						<view class="test-item">
-							<view class="name">逾期(元)</view>
-							<view class="number">{{nowPaymentData.property.overdue}}</view>
+							<view class="name">剩余面积(㎡)</view>
+							<view class="number">{{houseData.haveRentedArea}}</view>
 						</view>
 					</view>
-				</view>
-				<view class="bill-title">物业</view>
-				<view class="bill-content">
 					<view class="air-item">
 						<view class="test-item">
-							<view class="name">应收(元)</view>
-							<view class="number">{{nowPaymentData.rent.receivable}}</view>
+							<view class="name">总房源(个)</view>
+							<view class="number">{{houseData.totalRoom}}</view>
 						</view>
 						<view class="line"></view>
 						<view class="test-item">
-							<view class="name">已收(元)</view>
-							<view class="number">{{nowPaymentData.rent.received}}</view>
+							<view class="name">已租房源(个)</view>
+							<view class="number">{{houseData.remainRoom}}</view>
 						</view>
 						<view class="line"></view>
 						<view class="test-item">
-							<view class="name">逾期(元)</view>
-							<view class="number">{{nowPaymentData.rent.overdue}}</view>
+							<view class="name">剩余房源(个)</view>
+							<view class="number">{{houseData.haveRentedRoom}}</view>
 						</view>
 					</view>
 				</view>
-				<view class="bill-title">水电</view>
-				<view class="bill-content">
-					<view class="air-item">
-						<view class="test-item">
-							<view class="name">应收(元)</view>
-							<view class="number">{{nowPaymentData.hydropower.receivable}}</view>
+			</view>
+			<view class="project-item">
+				<view class="project-title">
+					<view class="title-line"></view>
+					<view class="title-label">费用管理</view>
+					<view class="title-tab">
+						<uv-subsection :list="billList" :current="billIndex" activeColor="#08979c"
+							custom-style="border-radius: 16rpx;" custom-item-style="border-radius: 12rpx;"
+							@change="changeBill">
+						</uv-subsection>
+					</view>
+				</view>
+				<view class="project-content">
+					<view class="bill-title">房租</view>
+					<view class="bill-content">
+						<view class="air-item">
+							<view class="test-item">
+								<view class="name">应收(元)</view>
+								<view class="number">{{nowPaymentData.property.receivable}}</view>
+							</view>
+							<view class="line"></view>
+							<view class="test-item">
+								<view class="name">已收(元)</view>
+								<view class="number">{{nowPaymentData.property.received}}</view>
+							</view>
+							<view class="line"></view>
+							<view class="test-item">
+								<view class="name">逾期(元)</view>
+								<view class="number">{{nowPaymentData.property.overdue}}</view>
+							</view>
 						</view>
-						<view class="line"></view>
-						<view class="test-item">
-							<view class="name">已收(元)</view>
-							<view class="number">{{nowPaymentData.hydropower.received}}</view>
+					</view>
+					<view class="bill-title">物业</view>
+					<view class="bill-content">
+						<view class="air-item">
+							<view class="test-item">
+								<view class="name">应收(元)</view>
+								<view class="number">{{nowPaymentData.rent.receivable}}</view>
+							</view>
+							<view class="line"></view>
+							<view class="test-item">
+								<view class="name">已收(元)</view>
+								<view class="number">{{nowPaymentData.rent.received}}</view>
+							</view>
+							<view class="line"></view>
+							<view class="test-item">
+								<view class="name">逾期(元)</view>
+								<view class="number">{{nowPaymentData.rent.overdue}}</view>
+							</view>
 						</view>
-						<view class="line"></view>
-						<view class="test-item">
-							<view class="name">逾期(元)</view>
-							<view class="number">{{nowPaymentData.hydropower.overdue}}</view>
+					</view>
+					<view class="bill-title">水电</view>
+					<view class="bill-content">
+						<view class="air-item">
+							<view class="test-item">
+								<view class="name">应收(元)</view>
+								<view class="number">{{nowPaymentData.hydropower.receivable}}</view>
+							</view>
+							<view class="line"></view>
+							<view class="test-item">
+								<view class="name">已收(元)</view>
+								<view class="number">{{nowPaymentData.hydropower.received}}</view>
+							</view>
+							<view class="line"></view>
+							<view class="test-item">
+								<view class="name">逾期(元)</view>
+								<view class="number">{{nowPaymentData.hydropower.overdue}}</view>
+							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-		</view>
-		<view class="project-item">
-			<view class="project-title">
-				<view class="title-line"></view>
-				<view class="title-label">提醒管理</view>
-			</view>
-			<view class="project-content">
-				<view class="remind-chart">
-					<qiun-data-charts type="pie" :opts="remindData.option" :chartData="remindData.data" :canvas2d="true"
-						canvasId="remind1">
-					</qiun-data-charts>
+			<view class="project-item">
+				<view class="project-title">
+					<view class="title-line"></view>
+					<view class="title-label">提醒管理</view>
+				</view>
+				<view class="project-content">
+					<view class="remind-chart">
+						<qiun-data-charts type="pie" :opts="remindData.option" :chartData="remindData.data"
+							:canvas2d="true" canvasId="remind1">
+						</qiun-data-charts>
+					</view>
 				</view>
 			</view>
-		</view>
-		<view class="project-item">
-			<view class="project-title">
-				<view class="title-line"></view>
-				<view class="title-label">工单管理</view>
-			</view>
-			<view class="project-content">
-				<view class="order-title">内部工单</view>
-				<view class="order-item">
-					<view class="order-content">
-						<view class="order-item-li">
-							<view class="order-number">
-								{{orderData.internal.totalNumber}}
+			<view class="project-item">
+				<view class="project-title">
+					<view class="title-line"></view>
+					<view class="title-label">工单管理</view>
+				</view>
+				<view class="project-content">
+					<view class="order-title">内部工单</view>
+					<view class="order-item">
+						<view class="order-content">
+							<view class="order-item-li">
+								<view class="order-number">
+									{{orderData.internal.totalNumber}}
+								</view>
+								<view class="order-label">工单数</view>
 							</view>
-							<view class="order-label">工单数</view>
-						</view>
-						<view class="order-item-li">
-							<view class="order-number">
-								{{orderData.internal.completedNumber}}
+							<view class="order-item-li">
+								<view class="order-number">
+									{{orderData.internal.completedNumber}}
+								</view>
+								<view class="order-label">已完成</view>
 							</view>
-							<view class="order-label">已完成</view>
-						</view>
-						<view class="order-item-li">
-							<view class="order-number">
-								{{orderData.internal.incompleteNumber}}
+							<view class="order-item-li">
+								<view class="order-number">
+									{{orderData.internal.incompleteNumber}}
+								</view>
+								<view class="order-label">未完成</view>
 							</view>
-							<view class="order-label">未完成</view>
+						</view>
+						<view class="order-chart">
+							<qiun-data-charts type="arcbar" :opts="internal.option" :chartData="internal.data"
+								:canvas2d="true" canvasId="order1">
+							</qiun-data-charts>
 						</view>
 					</view>
-					<view class="order-chart">
-						<qiun-data-charts type="arcbar" :opts="internal.option" :chartData="internal.data"
-							:canvas2d="true" canvasId="order1">
-						</qiun-data-charts>
+					<view class="order-title">外部工单</view>
+					<view class="order-item">
+						<view class="order-content">
+							<view class="order-item-li">
+								<view class="order-number">{{orderData.external.totalNumber}}</view>
+								<view class="order-label">工单数</view>
+							</view>
+							<view class="order-item-li">
+								<view class="order-number">{{orderData.external.completedNumber}}</view>
+								<view class="order-label">已完成</view>
+							</view>
+							<view class="order-item-li">
+								<view class="order-number">{{orderData.external.incompleteNumber}}</view>
+								<view class="order-label">未完成</view>
+							</view>
+						</view>
+						<view class="order-chart">
+							<qiun-data-charts type="arcbar" :opts="external.option" :chartData="external.data"
+								:canvas2d="true" canvasId="order2">
+							</qiun-data-charts>
+						</view>
 					</view>
 				</view>
-				<view class="order-title">外部工单</view>
-				<view class="order-item">
-					<view class="order-content">
+			</view>
+			<view class="project-item">
+				<view class="project-title">
+					<view class="title-line"></view>
+					<view class="title-label">设备管理</view>
+				</view>
+				<view class="project-content">
+					<view class="device-content">
 						<view class="order-item-li">
-							<view class="order-number">{{orderData.external.totalNumber}}</view>
-							<view class="order-label">工单数</view>
+							<view class="order-number">{{deviceData.device.totalNumber}}</view>
+							<view class="order-label">总设备</view>
 						</view>
+						<view class="line"></view>
 						<view class="order-item-li">
-							<view class="order-number">{{orderData.external.completedNumber}}</view>
-							<view class="order-label">已完成</view>
+							<view class="order-number">{{deviceData.device.onLineNumber}}</view>
+							<view class="order-label">在线</view>
 						</view>
+						<view class="line"></view>
 						<view class="order-item-li">
-							<view class="order-number">{{orderData.external.incompleteNumber}}</view>
-							<view class="order-label">未完成</view>
+							<view class="order-number">{{deviceData.device.offLineNumber}}</view>
+							<view class="order-label">离线</view>
+						</view>
+						<view class="line"></view>
+						<view class="order-item-li">
+							<view class="order-number">{{deviceData.device.faultNumber}}</view>
+							<view class="order-label">故障</view>
 						</view>
 					</view>
-					<view class="order-chart">
-						<qiun-data-charts type="arcbar" :opts="external.option" :chartData="external.data"
-							:canvas2d="true" canvasId="order2">
-						</qiun-data-charts>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="project-item">
-			<view class="project-title">
-				<view class="title-line"></view>
-				<view class="title-label">设备管理</view>
-			</view>
-			<view class="project-content">
-				<view class="device-content">
-					<view class="order-item-li">
-						<view class="order-number">{{deviceData.device.totalNumber}}</view>
-						<view class="order-label">总设备</view>
-					</view>
-					<view class="line"></view>
-					<view class="order-item-li">
-						<view class="order-number">{{deviceData.device.onLineNumber}}</view>
-						<view class="order-label">在线</view>
-					</view>
-					<view class="line"></view>
-					<view class="order-item-li">
-						<view class="order-number">{{deviceData.device.offLineNumber}}</view>
-						<view class="order-label">离线</view>
-					</view>
-					<view class="line"></view>
-					<view class="order-item-li">
-						<view class="order-number">{{deviceData.device.faultNumber}}</view>
-						<view class="order-label">故障</view>
-					</view>
-				</view>
-				<view class="device-content">
-					<view class="order-item-li">
-						<view class="order-number">{{deviceData.alarm.totalNumber}}</view>
-						<view class="order-label">总设备</view>
-					</view>
-					<view class="line"></view>
-					<view class="order-item-li">
-						<view class="order-number">{{deviceData.alarm.dayNumber}}</view>
-						<view class="order-label">在线</view>
-					</view>
-					<view class="line"></view>
-					<view class="order-item-li">
-						<view class="order-number">{{deviceData.alarm.handledNumber}}</view>
-						<view class="order-label">离线</view>
-					</view>
-					<view class="line"></view>
-					<view class="order-item-li">
-						<view class="order-number">{{deviceData.alarm.unhandledNumber}}</view>
-						<view class="order-label">故障</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="project-item">
-			<view class="project-title">
-				<view class="title-line"></view>
-				<view class="title-label">客户管理</view>
-			</view>
-			<view class="project-content">
-				<view class="bill-content" style="margin: 30rpx 0;">
-					<view class="air-item">
-						<view class="test-item">
-							<view class="name">总客户</view>
-							<view class="number">{{clientData.totalNumber}}</view>
+					<view class="device-content">
+						<view class="order-item-li">
+							<view class="order-number">{{deviceData.alarm.totalNumber}}</view>
+							<view class="order-label">总设备</view>
 						</view>
 						<view class="line"></view>
-						<view class="test-item">
-							<view class="name">月新增</view>
-							<view class="number">{{clientData.monthNowAddNumber}}</view>
+						<view class="order-item-li">
+							<view class="order-number">{{deviceData.alarm.dayNumber}}</view>
+							<view class="order-label">在线</view>
 						</view>
 						<view class="line"></view>
-						<view class="test-item">
-							<view class="name">洽商客户</view>
-							<view class="number">{{clientData.negotiateNumber}}</view>
+						<view class="order-item-li">
+							<view class="order-number">{{deviceData.alarm.handledNumber}}</view>
+							<view class="order-label">离线</view>
+						</view>
+						<view class="line"></view>
+						<view class="order-item-li">
+							<view class="order-number">{{deviceData.alarm.unhandledNumber}}</view>
+							<view class="order-label">故障</view>
 						</view>
 					</view>
 				</view>
-				<view class="remind-chart">
-					<qiun-data-charts type="line" :opts="clinetOpts" :chartData="clientChartData" :ontouch="true"
-						:canvas2d="true" canvasId="clent1">
-					</qiun-data-charts>
+			</view>
+			<view class="project-item">
+				<view class="project-title">
+					<view class="title-line"></view>
+					<view class="title-label">客户管理</view>
+				</view>
+				<view class="project-content">
+					<view class="bill-content" style="margin: 30rpx 0;">
+						<view class="air-item">
+							<view class="test-item">
+								<view class="name">总客户</view>
+								<view class="number">{{clientData.totalNumber}}</view>
+							</view>
+							<view class="line"></view>
+							<view class="test-item">
+								<view class="name">月新增</view>
+								<view class="number">{{clientData.monthNowAddNumber}}</view>
+							</view>
+							<view class="line"></view>
+							<view class="test-item">
+								<view class="name">洽商客户</view>
+								<view class="number">{{clientData.negotiateNumber}}</view>
+							</view>
+						</view>
+					</view>
+					<view class="remind-chart">
+						<qiun-data-charts type="line" :opts="clinetOpts" :chartData="clientChartData" :ontouch="true"
+							:canvas2d="true" canvasId="clent1">
+						</qiun-data-charts>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -387,12 +391,32 @@
 							activeType: "hollow"
 						}
 					}
-				}
+				},
+				option: {
+					tip: '暂未加入项目'
+				},
+				isEmpty: true
 			}
 		},
-		onReady() {
-			this.project = this.$store.getters.project;
-			this.init();
+		onShow() {
+			this.isEmpty = true;
+			if (!uni.getStorageSync('token')) {
+				this.option = {
+					tip: '暂未登录',
+					btnText: '点击登录'
+				}
+			} else if (!this.$store.getters.project.id) {
+				this.option = {
+					tip: '暂未加入项目'
+				}
+			} else {
+				this.isEmpty = false;
+				this.option = {
+					tip: '暂无数据'
+				}
+				this.project = this.$store.getters.project;
+				this.init();
+			}
 		},
 		methods: {
 			init() {

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

@@ -1,12 +1,11 @@
 {
   "pages": [
     "pages/highseas/highseas",
+    "pages/message/message",
     "pages/index/index",
-    "pages/data/data",
     "pages/my/my",
+    "pages/projectAdmin/projectAdmin",
     "pages/login/login",
-    "pages/myHouse/myHouse",
-    "pages/message/message",
     "pages/city/city",
     "pages/searchlist/searchlist",
     "pages/project/project",
@@ -14,49 +13,60 @@
     "pages/visitor/visitor",
     "pages/reservation/reservation",
     "pages/chat/chat",
-    "pages/myDetail/myDetail",
     "pages/person/person",
-    "pages/fans/fans",
-    "pages/attention/attention",
-    "pages/collect/collect",
-    "pages/clientDetail/clientDetail",
-    "pages/organization/organization",
-    "pages/client/client",
     "pages/search/search",
-    "pages/projectList/projectList",
-    "pages/order/order",
-    "pages/orderHandle/orderHandle",
-    "pages/orderDetail/orderDetail",
-    "pages/selectUser/selectUser",
-    "pages/contract/contract",
     "pages/pdf/pdf",
     "pages/sign/sign",
     "pages/webview/webview",
-    "pages/contractDetail/contractDetail",
     "pages/requestSeal/requestSeal",
-    "pages/bill/bill",
-    "pages/billDetail/billDetail",
-    "pages/invoice/invoice",
-    "pages/invoiceDetail/invoiceDetail",
-    "pages/billRecord/billRecord",
-    "pages/billInvoice/billInvoice",
     "pages/messageSystem/messageSystem",
     "pages/messageList/messageList",
     "pages/messageDetail/messageDetail",
-    "pages/dataDetail/dataDetail",
-    "pages/download/download",
     "pages/dataOrder/dataOrder",
-    "pages/deviceList/deviceList",
-    "pages/monitor/monitor",
-    "pages/monitorList/monitorList",
-    "pages/deviceDetail/deviceDetail",
-    "pages/bim/bim",
-    "pages/bimShow/bimShow",
-    "pages/myReservation/myReservation",
-    "pages/dataCenter/dataCenter",
     "pages/file/file"
   ],
-  "subPackages": [],
+  "subPackages": [
+    {
+      "root": "pageMy",
+      "pages": [
+        "myDetail/myDetail",
+        "myHouse/myHouse",
+        "fans/fans",
+        "attention/attention",
+        "collect/collect",
+        "clientDetail/clientDetail",
+        "organization/organization",
+        "client/client",
+        "myReservation/myReservation",
+        "download/download",
+        "dataCenter/dataCenter"
+      ]
+    },
+    {
+      "root": "pageIndex",
+      "pages": [
+        "projectList/projectList",
+        "contract/contract",
+        "contractDetail/contractDetail",
+        "bill/bill",
+        "billDetail/billDetail",
+        "invoice/invoice",
+        "invoiceDetail/invoiceDetail",
+        "billRecord/billRecord",
+        "billInvoice/billInvoice",
+        "order/order",
+        "orderHandle/orderHandle",
+        "orderDetail/orderDetail",
+        "selectUser/selectUser",
+        "deviceList/deviceList",
+        "monitor/monitor",
+        "monitorList/monitorList",
+        "deviceDetail/deviceDetail",
+        "bim/bim",
+        "bimShow/bimShow"
+      ]
+    }
+  ],
   "window": {
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "有极智慧园区",
@@ -83,13 +93,13 @@
         "pagePath": "pages/highseas/highseas",
         "iconPath": "static/image/tabbar/highseas.png",
         "selectedIconPath": "static/image/tabbar/highseas-active.png",
-        "text": "公海"
+        "text": "workark"
       },
       {
-        "pagePath": "pages/dataCenter/dataCenter",
+        "pagePath": "pages/projectAdmin/projectAdmin",
         "iconPath": "static/image/tabbar/data.png",
         "selectedIconPath": "static/image/tabbar/data-active.png",
-        "text": "数据"
+        "text": "工作台"
       },
       {
         "pagePath": "pages/my/my",
@@ -101,7 +111,7 @@
   },
   "permission": {
     "scope.userLocation": {
-      "desc": "用于位置"
+      "desc": "用于获取位置，展示相应的房源信息"
     }
   },
   "lazyCodeLoading": "requiredComponents",

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/navbar.wxml

@@ -1 +1 @@
-<view class="navbar data-v-1644d364"><view class="status-bar data-v-1644d364" style="{{'height:'+($root.m0+'px')+';'}}"></view><view class="bar-content data-v-1644d364" style="{{'height:'+($root.m1+'px')+';'}}"><slot></slot></view></view>
+<view class="navbar data-v-20a5ecad"><view class="status-bar data-v-20a5ecad" style="{{'height:'+($root.m0+'px')+';'}}"></view><view class="bar-content data-v-20a5ecad" style="{{'height:'+($root.m1+'px')+';'}}"><slot></slot></view></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/navbar.wxss

@@ -1 +1 @@
-.navbar.data-v-1644d364{position:fixed;top:0;left:0;width:100%;z-index:1996}.navbar .status-bar.data-v-1644d364{background:#fff}.navbar .bar-content.data-v-1644d364{position:relative}
+.navbar.data-v-20a5ecad{position:fixed;top:0;left:0;width:100%;z-index:1996}.navbar .status-bar.data-v-20a5ecad{background:#fff}.navbar .bar-content.data-v-20a5ecad{position:relative}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/contract/clauseDetail.json

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

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/device/environment.json

@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "u-echart": "/components/device/uEchart"
-  }
-}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/device/uEchart.wxml

@@ -1 +0,0 @@
-<block wx:if="{{cid}}"><view class="u-echart data-v-346669e4" id="{{'mybox'+cid}}"><canvas class="u-echart data-v-346669e4" canvas-id="{{'uEchart'+cid}}" id="{{'uEchart'+cid}}" type="2d" data-event-opts="{{[['tap',[['tap',['$event']]]]]}}" bindtap="__e"></canvas></view></block>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/device/uEchart.wxss

@@ -1 +0,0 @@
-.u-echart.data-v-346669e4{width:100%;height:100%}