租户管理

pages/deductionRecord/billingRules.vue

@@ -11,7 +11,7 @@
 			</view>
 		</view>
 		<!-- 标签弹出层 -->
-		<u-popup v-model="popShow" duration="10" mode="top" :negative-top="188" border-radius="16">
+		<u-popup v-model="popShow"  length="80%" duration="10" mode="top" :negative-top="188" border-radius="32">
 			<u-navbar title="计费规则"  title-color="#101010" >
 				
 			</u-navbar>
@@ -26,20 +26,26 @@
 				</view>
 			</view>
 			<view class="tabs-options">
-				<view class="item" v-for="(item, index) in tenantList" :key="index"
+				<view class="item" v-for="(item, index) in tenantList"
+				 :class="{
+				 	'item-index' : item.id==formData.tenantId
+				 }"
+				 :key="index"
 					@click="merchantChange(item,index)">
 					{{item.name}}
 				</view>
+				<u-divider   nonetext="没有找到相关内容"
+					border-color="#CFD2D5">已经到底了</u-divider>
 			</view>
 		</u-popup>
 		<view class="background">
 			<!-- 单位 -->
-			<view class="unit">
+			<view class="unit"  v-if="queryList.length" >
 				<view class="title">
 					物业方：
 				</view>
 				<view class="value">
-					{{companyInfo.propertyManagement}}
+					{{queryList[0].propertyManagement}}
 				</view>
 			</view>
 			
@@ -56,7 +62,7 @@
 					
 					</view>
 					<view class="name">
-						{{tenantInfo.name}}
+						{{item.tenantName}}
 			
 					</view>
 					
@@ -446,13 +452,19 @@
 	}
 	
 	.tabs-options {
-		display: flex;
-		padding: 24rpx 32rpx 0;
+		//display: flex;
+		padding: 24rpx 32rpx ;
 		flex-wrap: wrap;
 	
 		.item {
-			width: 25%;
-			margin-bottom: 40rpx;
+			//width: 25%;
+			color:rgb(119, 119, 119);
+			margin-bottom: 24rpx;
+			font-size: 32rpx;
+		}
+		.item-index{
+			    color: rgb(51, 51, 51);
+				font-weight: bold;
 		}
 	}
 	

pages/deductionRecord/deductionRecord.vue

@@ -13,7 +13,7 @@
 			</view>
 		</view>
 		<!-- 标签弹出层 -->
-		<u-popup v-model="popShow" duration="10" mode="top" :negative-top="188" border-radius="16">
+		<u-popup v-model="popShow"  length="80%"  duration="10" mode="top" :negative-top="188" border-radius="32">
 			<u-navbar title="扣费记录"  title-color="#101010" >
 				
 			</u-navbar>
@@ -28,10 +28,16 @@
 				</view>
 			</view>
 			<view class="tabs-options">
-				<view class="item" v-for="(item, index) in tenantList" :key="index"
+				<view class="item" v-for="(item, index) in tenantList"
+				 :class="{
+				 	'item-index' : item.id==formData.tenantId
+				 }"
+				 :key="index"
 					@click="merchantChange(item,index)">
 					{{item.name}}
 				</view>
+				<u-divider   nonetext="没有找到相关内容"
+					border-color="#CFD2D5">已经到底了</u-divider>
 			</view>
 		</u-popup>
 		<!-- 折线图
@@ -338,8 +344,10 @@
 				this.tabsFrom.show2Text='全部时间'
 				this.tabsFrom.show2Index='';
 				
-				
+				var date=new Date()
 				this.formData.startDate=date.getFullYear()+"-"+(date.getMonth() + 1) +"-1"
+				this.formData.endDate=""
+				
 				this.queryMonth=date.getFullYear()+"年"+(date.getMonth() + 1)+"月" 
 				this.deductionRecord()
 			},
@@ -632,13 +640,19 @@
 	}
 	
 	.tabs-options {
-		display: flex;
-		padding: 24rpx 32rpx 0;
+		//display: flex;
+		padding: 24rpx 32rpx ;
 		flex-wrap: wrap;
 	
 		.item {
-			width: 25%;
-			margin-bottom: 40rpx;
+			//width: 25%;
+			color:rgb(119, 119, 119);
+			margin-bottom: 24rpx;
+			font-size: 32rpx;
+		}
+		.item-index{
+			    color: rgb(51, 51, 51);
+				font-weight: bold;
 		}
 	}
 	

pages/tenantList/remoteControl.vue

@@ -16,7 +16,7 @@
 		</view>
 	</view>
 	<!-- 标签弹出层 -->
-	<u-popup v-model="popShow" duration="10" mode="top" :negative-top="188" border-radius="16">
+	<u-popup v-model="popShow"  length="80%"  duration="10" mode="top" :negative-top="188" border-radius="32">
 		<u-navbar title="远程控制"  title-color="#101010" >
 			<view class="u-nav-slot" slot="right" v-if="0" >
 				 操作日志
@@ -33,10 +33,16 @@
 			</view>
 		</view>
 		<view class="tabs-options">
-			<view class="item" v-for="(item, index) in tenantList" :key="index"
+			<view class="item" v-for="(item, index) in tenantList"
+			 :class="{
+			 	'item-index' : item.id==formData.tenantId
+			 }"
+			 :key="index"
 				@click="merchantChange(item,index)">
 				{{item.name}}
 			</view>
+			<u-divider   nonetext="没有找到相关内容"
+				border-color="#CFD2D5">已经到底了</u-divider>
 		</view>
 	</u-popup>
 		
@@ -365,16 +371,22 @@
   	flex: none !important;
   }
   
-  .tabs-options {
-  	display: flex;
-  	padding: 24rpx 32rpx 0;
-  	flex-wrap: wrap;
-  
-  	.item {
-  		width: 25%;
-  		margin-bottom: 40rpx;
-  	}
-  }
+	.tabs-options {
+		//display: flex;
+		padding: 24rpx 32rpx ;
+		flex-wrap: wrap;
+	
+		.item {
+			//width: 25%;
+			color:rgb(119, 119, 119);
+			margin-bottom: 24rpx;
+			font-size: 32rpx;
+		}
+		.item-index{
+			    color: rgb(51, 51, 51);
+				font-weight: bold;
+		}
+	}
   .spanClass{
 	  margin: 2px 0;
 	  padding: 2rpx 8rpx;