admin 样式更改

App.vue

@@ -55,6 +55,7 @@
 			height: 100%;
 			padding-bottom: 120rpx;
 			padding-top: 24rpx;
+			overflow-y: auto;
 			.main{
 				padding: 0 32rpx;
 				background-color: #fff;
@@ -67,6 +68,10 @@
 				background-color: #fff;
 				padding: 16rpx 32rpx;
 				box-sizing: border-box;
+				box-shadow: 0 -6px 12px 0 rgba(153, 153, 153, 0.10);
+			}
+			.u-cell__value{
+				color: #333!important;
 			}
 			
 		}

pages.json

@@ -30,8 +30,8 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				 "enablePullDownRefresh": true,
-				 	"navigationStyle": "custom" // 隐藏系统导航栏
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom" // 隐藏系统导航栏
 			}
 		},
 		// {
@@ -45,7 +45,7 @@
 			"path": "pages/Workorder/Workorder",
 			"style": {
 				"navigationBarTitleText": "工作台",
-					"navigationStyle": "custom" // 隐藏系统导航栏
+				"navigationStyle": "custom" // 隐藏系统导航栏
 			}
 		},
 		// {
@@ -63,339 +63,269 @@
 
 		}
 
-	    ,{
-            "path" : "pages/my/Personalinformation/Personalinformation",
-            "style" :
-            {
-                "navigationBarTitleText": "账号中心",
-                "enablePullDownRefresh": false,
+		, {
+			"path": "pages/my/Personalinformation/Personalinformation",
+			"style": {
+				"navigationBarTitleText": "账号中心",
+				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "white"
-            }
-
-        }
-        ,{
-            "path" : "pages/my/Mydistribution/Mydistribution",
-            "style" :
-            {
-                "navigationBarTitleText": "我的派发",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/my/Mytask/Mytask",
-            "style" :
-            {
-                "navigationBarTitleText": "我的任务",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/my/Commentssuggestions/Commentssuggestions",
-            "style" :
-            {
-                "navigationBarTitleText": "意见建议",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/my/Personalinformation/Informationmodification/Informationmodification",
-            "style" :
-            {
-                "navigationBarTitleText": "个人信息修改",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/my/Changepassword/Changepassword",
-            "style" :
-            {
-                "navigationBarTitleText": "密码修改",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/my/Mytask/Taskdetails/Taskdetails",
-            "style" :
-            {
-                "navigationBarTitleText": "任务详情",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/my/Mydistribution/distributiondetil/distributiondetil",
-            "style" :
-            {
-                "navigationBarTitleText": "派送详情",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/my/Mydistribution/distributionedit/distributionedit",
-            "style" :
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/Workorder/Tenantbill/Tenantbill",
-            "style" :
-            {
-                "navigationBarTitleText": "租户账单",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/Workorder/Remotecontrol/Remotecontrol",
-            "style" :
-            {
-                "navigationBarTitleText": "远程管控",
-                "enablePullDownRefresh": false,
+			}
+
+		}, {
+			"path": "pages/my/Mydistribution/Mydistribution",
+			"style": {
+				"navigationBarTitleText": "我的派发",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my/Mytask/Mytask",
+			"style": {
+				"navigationBarTitleText": "我的任务",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my/Commentssuggestions/Commentssuggestions",
+			"style": {
+				"navigationBarTitleText": "意见建议",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my/Personalinformation/Informationmodification/Informationmodification",
+			"style": {
+				"navigationBarTitleText": "个人信息修改",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my/Changepassword/Changepassword",
+			"style": {
+				"navigationBarTitleText": "密码修改",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my/Mytask/Taskdetails/Taskdetails",
+			"style": {
+				"navigationBarTitleText": "任务详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my/Mydistribution/distributiondetil/distributiondetil",
+			"style": {
+				"navigationBarTitleText": "派送详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my/Mydistribution/distributionedit/distributionedit",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/Workorder/Tenantbill/Tenantbill",
+			"style": {
+				"navigationBarTitleText": "租户账单",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/Workorder/Remotecontrol/Remotecontrol",
+			"style": {
+				"navigationBarTitleText": "远程管控",
+				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#5C8FFF"
-            }
-
-        }
-        ,{
-            "path" : "pages/index/Onlinewarranty/Onlinewarranty",
-            "style" :
-            {
-                "navigationBarTitleText": "线上报修",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/index/Inspectionrecord/Inspectionrecord",
-            "style" :
-            {
-                "navigationBarTitleText": "巡检记录",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/index/Withholdingrecord/Withholdingrecord",
-            "style" :
-            {
-                "navigationBarTitleText": "扣缴记录",
-                "enablePullDownRefresh": false
-            }
-        },
-		  {
-		            "path" : "pages/Workorder/Tenantbill/companybill/companybill",
-		            "style" :
-		            {
-		                "navigationBarTitleText": "",
-		                "enablePullDownRefresh": false,
-								"navigationStyle": "custom" // 隐藏系统导航栏
-		            }
-
-		        },
-        {
-            "path" : "pages/index/Workordertodone/Workordertodone",
-            "style" :
-            {
-                "navigationBarTitleText": "报修工单",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom" // 隐藏系统导航栏
-            }
-
-        },
-        {
-            "path" : "pages/index/Workordertodone/Workorderdetails/Workorderdetails",
-            "style" :
-            {
-                "navigationBarTitleText": "详情",
-                "enablePullDownRefresh": false
-				
-            }
-
-        }
-
-        ,{
-            "path" : "pages/index/Immediatecollection/Immediatecollection",
-            "style" :
-            {
-                "navigationBarTitleText": "欠费待收",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/index/Immediatecollection/Chargedetails/Chargedetails",
-            "style" :
-            {
-                "navigationBarTitleText": "详情",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/Workorder/pay/pay",
-            "style" :
-            {
-                "navigationBarTitleText": "支付",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/index/BillPending/BillPending",
-            "style" :
-            {
-                "navigationBarTitleText": "账单详情",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/index/EquipmentException/EquipmentException",
-            "style" :
-            {
-                "navigationBarTitleText": "设备异常",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/index/Immediateinspection/Immediateinspection",
-            "style" :
-            {
-                "navigationBarTitleText": "巡检打卡",
-                "enablePullDownRefresh": false,
-					"navigationStyle": "custom" // 隐藏系统导航栏
-            }
-
-        }
-        ,{
-            "path" : "pages/my/Myorder/Myorder",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的订单",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/my/Myorder/Orderdetails/Orderdetails",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "订单明细",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/Workorder/Arrearsrecord/Arrearsrecord",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "欠费记录",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/Workorder/Videosurveillance/Videosurveillance",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "视频监控",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-		,{
-		    "path" : "pages/Workorder/AccessControl/AccessControl",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "门禁开关",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/Workorder/Videosurveillance/Videoplayback/Videoplayback",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "摄像头直播",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/Workordertodone/Toberepaired/Toberepaired",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-		,{
-		    "path" : "pages/index/Workordertodone/hasrepaired/hasrepaired",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "已维修",
-		        "enablePullDownRefresh": false
-		    }
-		    
+			}
+
+		}, {
+			"path": "pages/index/Onlinewarranty/Onlinewarranty",
+			"style": {
+				"navigationBarTitleText": "线上报修",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/Inspectionrecord/Inspectionrecord",
+			"style": {
+				"navigationBarTitleText": "巡检记录",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/Withholdingrecord/Withholdingrecord",
+			"style": {
+				"navigationBarTitleText": "扣缴记录",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/Workorder/Tenantbill/companybill/companybill",
+			"style": {
+				"navigationBarTitleText": "账单详情",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/index/Workordertodone/Workordertodone",
+			"style": {
+				"navigationBarTitleText": "报修工单",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/index/Workordertodone/Workorderdetails/Workorderdetails",
+			"style": {
+				"navigationBarTitleText": "详情",
+				"enablePullDownRefresh": false
+
+			}
+
 		}
-        ,
+
+		, {
+			"path": "pages/index/Immediatecollection/Immediatecollection",
+			"style": {
+				"navigationBarTitleText": "欠费待收",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/Immediatecollection/Chargedetails/Chargedetails",
+			"style": {
+				"navigationBarTitleText": "详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/Workorder/pay/pay",
+			"style": {
+				"navigationBarTitleText": "支付",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/BillPending/BillPending",
+			"style": {
+				"navigationBarTitleText": "账单详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/EquipmentException/EquipmentException",
+			"style": {
+				"navigationBarTitleText": "设备异常",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/Immediateinspection/Immediateinspection",
+			"style": {
+				"navigationBarTitleText": "巡检打卡",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my/Myorder/Myorder",
+			"style": {
+				"navigationBarTitleText": "我的订单",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my/Myorder/Orderdetails/Orderdetails",
+			"style": {
+				"navigationBarTitleText": "订单明细",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/Workorder/Arrearsrecord/Arrearsrecord",
+			"style": {
+				"navigationBarTitleText": "欠费记录",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/Workorder/Videosurveillance/Videosurveillance",
+			"style": {
+				"navigationBarTitleText": "视频监控",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/Workorder/AccessControl/AccessControl",
+			"style": {
+				"navigationBarTitleText": "门禁开关",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/Workorder/Videosurveillance/Videoplayback/Videoplayback",
+			"style": {
+				"navigationBarTitleText": "摄像头直播",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/Workordertodone/Toberepaired/Toberepaired",
+			"style": {
+				"navigationBarTitleText": "详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/Workordertodone/hasrepaired/hasrepaired",
+			"style": {
+				"navigationBarTitleText": "已维修",
+				"enablePullDownRefresh": false
+			}
+
+		},
 		{
-            "path" : "pages/Workorder/Intelligentdoorlock/Intelligentdoorlock",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "智能门锁",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/Workorder/Intelligentdoorlock/Tenantdetails/Tenantdetails",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "租户详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/Workorder/Intelligentdoorlock/Dooropeningrecord/Dooropeningrecord",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "开门记录",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/login/Privacyagreement",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "隐私协议",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/login/useragree",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "用户协议",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+			"path": "pages/Workorder/Intelligentdoorlock/Intelligentdoorlock",
+			"style": {
+				"navigationBarTitleText": "智能门锁",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/Workorder/Intelligentdoorlock/Tenantdetails/Tenantdetails",
+			"style": {
+				"navigationBarTitleText": "租户详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/Workorder/Intelligentdoorlock/Dooropeningrecord/Dooropeningrecord",
+			"style": {
+				"navigationBarTitleText": "开门记录",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/login/Privacyagreement",
+			"style": {
+				"navigationBarTitleText": "隐私协议",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/login/useragree",
+			"style": {
+				"navigationBarTitleText": "用户协议",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	],
 	"globalStyle": {
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "white",
@@ -444,18 +374,16 @@
 	// 	]
 
 	// },
-	
+
 	"easycom": {
 		"^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
 	},
-	"condition" : { //模式配置，仅开发期间生效
+	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [
-			{
-				"name": "", //模式名称
-				"path": "", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			}
-		]
+		"list": [{
+			"name": "", //模式名称
+			"path": "", //启动页面，必选
+			"query": "" //启动参数，在页面的onLoad函数里面得到
+		}]
 	}
-}
+}

pages/Workorder/AccessControl/AccessControl.vue

@@ -1,41 +1,27 @@
 <template>
 	<view class="menjin">
 		<view class="mjym" v-for="(item,index) in mjlist" :key="item.id">
-			<view class="mjzt1" v-if="item.status==1">在线</view>
-			<view class="mjzt2" v-if="item.status==0">离线</view>
-
-			<h3 class="mjname">{{item.deviceName}}</h3>
-			<view class="mjlx">{{item.deviceSerial}}</view>
-			<view class="mjsh">{{item.parentCategory}}</view>
+			<view class="top">
+				<view class="status" v-if="item.status==1">在线</view>
+				<view class="status s2" v-if="item.status==0">离线</view>
+				<h3>{{item.deviceName}}</h3>
+				<view class="subtit">{{item.deviceSerial}}</view>
+				<view class="subtit">{{item.parentCategory}}</view>
+			</view>
 
-		
 			<view class="mjkg">
 				<view class="anniu">
-					<u-button  type="primary" :plain="true" text="开启" @click="buttons(item,'open')"></u-button>
+					<u-button type="primary" :plain="true" text="开启" @click="buttons(item,'open')"></u-button>
 				</view>
 				<view class="anniu">
-					<u-button  type="primary" :plain="true" text="关闭" @click="buttons(item,'close')"></u-button>
-				</view>	
-				<view class="anniu">
-					<u-button  type="primary" :plain="true" text="常开" @click="buttons(item,'alwaysOpen')"></u-button>
-				</view>		
+					<u-button type="primary" :plain="true" text="关闭" @click="buttons(item,'close')"></u-button>
+				</view>
 				<view class="anniu">
-					<u-button  type="primary" :plain="true" text="常关" @click="buttons(item,'alwaysClose')"></u-button>
+					<u-button type="primary" :plain="true" text="常开" @click="buttons(item,'alwaysOpen')"></u-button>
 				</view>
-				<!-- <view class="sfkq">
-					<view class="sfkq1">是否开启</view>
-					<view class="sfkq2">
-						<u-switch activeColor="#2979FF" asyncChange @change="asyncChange1(item)"
-							inactiveColor="rgb(230, 230, 230)" v-model="item.value1" size="40"></u-switch>
-					</view>
+				<view class="anniu">
+					<u-button type="primary" :plain="true" text="常关" @click="buttons(item,'alwaysClose')"></u-button>
 				</view>
-				<view class="sfkq">
-					<view class="sfkq1">是否常开</view>
-					<view class="sfkq2">
-						<u-switch activeColor="#2979FF" asyncChange @change="asyncChange2(item)"
-							inactiveColor="rgb(230, 230, 230)" v-model="item.value2" size="40"></u-switch>
-					</view>
-				</view> -->
 			</view>
 		</view>
 
@@ -49,7 +35,6 @@
 		data() {
 			return {
 				mjlist: [],
-				//	postdata:{},
 			}
 		},
 		onLoad() {
@@ -57,8 +42,8 @@
 		},
 
 		methods: {
-			
-			
+
+
 			getalldata() {
 				this.$api.get('/access/page', {})
 					.then(res => {
@@ -67,39 +52,32 @@
 							if (res.data.data.length == 0) {
 								this.mjlist = []
 							} else {
-								// for (let i = 0; i < res.data.data.length; i++) {
-								// 	res.data.data[i].value1 = false;
-								// 	res.data.data[i].value2 = false;
-								// }
-
 								this.mjlist = res.data.data;
 							}
-							//console.log('111111111111111111',this.mjlist)
 						} else {
 							this.$refs.uNotify.error(res.data.msg)
 						}
 					})
 			},
-			
-			buttons(e,fs){
-				  let postdata = {
-				  	cmd:fs,
-				  	deviceSerial: e.deviceSerial
-				  }
-				  //  console.log('111111111111111111',postdata)
-					this.$api.post('/access/operate', postdata)
-						.then(res => {
-							if (res.data.code == 0) {
-								this.$refs.uNotify.success('成功')
-							} else {
-								this.$refs.uNotify.error(res.data.msg)
-							}
-						})
-					
-				  
+
+			buttons(e, fs) {
+				let postdata = {
+					cmd: fs,
+					deviceSerial: e.deviceSerial
+				}
+				this.$api.post('/access/operate', postdata)
+					.then(res => {
+						if (res.data.code == 0) {
+							this.$refs.uNotify.success('成功')
+						} else {
+							this.$refs.uNotify.error(res.data.msg)
+						}
+					})
+
+
 			},
-			
-			
+
+
 			operate(e) {
 				this.$api.post('/access/operate', e)
 					.then(res => {
@@ -168,83 +146,55 @@
 	}
 </script>
 
-<style>
-	.menjin {}
-
-	.sfkq1 {
-		padding-right: 25rpx;
-	}
+<style lang="scss" scoped>
+	.menjin{padding-top: 24rpx;}
+	.mjym {
+		margin: 0 32rpx 24rpx;
+		padding: 24rpx 0 0;
+		background-color: #fff;
+		
+		.top {
+			border-bottom: 1px solid #eee;
+			padding: 0 32rpx 24rpx;
+			position: relative;
+
+			h3 {
+				font-size: 32rpx;
+				margin-bottom: 24rpx;
+			}
 
-	.sfkq {
-		width: 345rpx;
-		height: 40rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
+			.subtit {
+				color: #9DA0AC;
+				font-size: 28rpx;
+			}
+			.status {
+				position: absolute;
+				width: 96rpx;
+				height: 48rpx;
+				border-radius: 0 8rpx 0 20rpx;
+				right: 0;
+				line-height: 48rpx;
+				text-align: center;
+				top: -24rpx;
+				z-index: 1;
+				font-size: 22rpx;
+				background-color: #30D3A2;
+				color: #fff;
+			
+				&.s2 {
+					background-color: #C8C8C8;
+				}
+			}
+			
+		}
 	}
-.anniu{
-	width: 120rpx;
-	margin-left: 30rpx;
-}
 	.mjkg {
 		display: flex;
 		align-items: center;
-		justify-content:flex-end;
-		height: 120rpx;
-		border-top: 2px solid #F6F6F6;
-		margin-top: 20rpx;
-	}
-
-	.mjsh {
-		padding: 0rpx 0 0rpx 30rpx;
-		font-size: 26rpx;
-		font-weight: 400;
-		color: #697081;
-	}
-
-	.mjlx {
-		font-size: 30rpx;
-		padding: 0rpx 0 20rpx 30rpx;
-		font-weight: 600;
-		color: #0c1935;
-	}
-
-	.mjname {
-		padding: 50rpx 0 50rpx 30rpx;
-	}
-
-	.mjym {
-		width: 690rpx;
-		height: 380rpx;
-		background: #fff;
-		margin: 20rpx auto;
-		border-radius: 10px;
-		position: relative;
-	}
-
-	.mjzt1 {
-		position: absolute;
-		right: 10rpx;
-		top: 10rpx;
-		background: #30D3A2;
-		color: #fff;
-		width: 100rpx;
-		height: 50rpx;
-		border-radius: 10px;
-		line-height: 50rpx;
-		text-align: center;
-	}
-
-	.mjzt2 {
-		position: absolute;
-		right: 10rpx;
-		top: 10rpx;
-		background: rgb(105, 112, 129);
-		color: #fff;
-		width: 100rpx;
-		height: 50rpx;
-		border-radius: 10px;
-		line-height: 50rpx;
-		text-align: center;
+		justify-content: flex-end;
+		padding: 20rpx 32rpx;
+		.anniu {
+			margin-left: 24rpx;
+		}
 	}
-</style>
+</style>

pages/Workorder/Intelligentdoorlock/Dooropeningrecord/Dooropeningrecord.vue

@@ -1,15 +1,12 @@
 <template>
 	<view class="billall">
-
 		<view class="u-listdata">
-			<view style="padding:10rpx 0 0 30rpx">
+			<view style="padding:16rpx 0 16rpx 32rpx">
 				共有 <span style="color: red">{{totalnumber}}</span>条记录
 			</view>
-
-			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
+			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true' style="height:400px;flex:1;">
 				<u-list-item v-for="(item, index) in indexList" :key="index">
-
-					<view class="companylist">			
+					<view class="companylist">
 						<h3>{{item.roomName}}</h3>
 						<view class="Currentamount">
 							开锁方式:{{item.openDoorType}}
@@ -23,21 +20,14 @@
 						<view class="Currentamount">
 							开锁人: {{item.operateName}}
 						</view>
-					
 					</view>
-
 				</u-list-item>
 			</u-list>
-
 		</view>
-
-
-
 	</view>
 </template>
 
 <script>
-
 	export default {
 
 		data() {
@@ -49,13 +39,13 @@
 				indexList: [],
 				dataList: [],
 				dataForm: {
-					 "currentPage": 1,
-					  "deviceId": "",
-					  "pageSize": 10,
-					  "roomId": "",
-					  "tempPwd": "",
-					  "tenantsId": "",
-					  "userName": ""
+					"currentPage": 1,
+					"deviceId": "",
+					"pageSize": 10,
+					"roomId": "",
+					"tempPwd": "",
+					"tenantsId": "",
+					"userName": ""
 				},
 
 				showtype: false,
@@ -74,10 +64,10 @@
 			}
 		},
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
-	
+
 		onLoad(options) {
-		    console.log(options.companyOrgId);
-			this.dataForm.roomId= options.companyOrgId;
+			console.log(options.companyOrgId);
+			this.dataForm.roomId = options.companyOrgId;
 			this.getalldata();
 		},
 		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
@@ -97,9 +87,9 @@
 
 
 		methods: {
-			
+
 			scrolltolower() {
-				if (this.pd&&this.dataForm.currentPage>1) {
+				if (this.pd && this.dataForm.currentPage > 1) {
 					this.getalldata();
 				} else {
 					return
@@ -139,126 +129,32 @@
 </script>
 
 <style lang="scss">
-	.Currentamount {
-		padding-left: 30rpx;
-		min-height: 50rpx;
-		line-height: 50rpx;
-		color: #BCB3A7;
-
-		span {
-			color: #FA5555;
-			padding-left: 9rpx;
-		}
-	}
-
-	.Callfee {
-		width: 100rpx;
-		height: 45rpx;
-		text-align: center;
-		line-height: 45rpx;
-		color: #5C8FFF;
-		border: 1px solid #5C8FFF;
-		font-size: 22rpx;
-		position: absolute;
-		bottom: 10rpx;
-		right: 10px;
-		font-weight: bold;
+	.billall{height:100%}
+	.u-listdata{
+		    height: 100%;
+		    display: flex;
+		    flex-direction: column;
 	}
-
 	.companylist {
-		margin: 20rpx 30rpx;
+		margin: 0 32rpx 24rpx;
 		background: #fff;
-		min-height: 290rpx;
-		border-radius: 10px;
+		padding: 24rpx 32rpx;
+		border-radius: 8rpx;
 		position: relative;
-
+	
 		h3 {
-			height: 70rpx;
-			line-height: 70rpx;
-			padding-left: 30rpx;
+			margin-bottom: 16rpx;
 		}
-	}
-
-	.settled {
-		background-color: #09C700;
-		width: 120rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-	.outstanding {
-		background-color: #09C700;
-		width: 120rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 110rpx;
-		right: 0px;
-		border-top-left-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-	.outstanding1 {
-		background-color: #09C700;
-		width: 120rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 215rpx;
-		right: 0px;
-		border-top-left-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-	.outstanding2 {
-		background-color: #09C700;
-		width: 120rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		bottom: 0px;
-		right: 0px;
-		border-top-left-radius: 10rpx;
-		border-bottom-right-radius: 10rpx;
-	}
-
-
-
-
-	.billall {}
-
-	.topbill {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		height: 100rpx;
-		background-color: #e6e6e6;
-	}
-
-	.topbilledit {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-	}
-
-	.changetime1 {
-		padding-right: 10rpx;
+	
+		.Currentamount {
+			margin-bottom: 8rpx;
+			color: #999;
+	
+			span {
+				color: #FA5555;
+				padding-left: 9rpx;
+			}
+		}
+	
 	}
 </style>

pages/Workorder/Intelligentdoorlock/Tenantdetails/Tenantdetails.vue

@@ -1,14 +1,13 @@
 <template>
 	<view class="billall">
-
 		<view class="u-listdata">
-			<view style="padding:10rpx 0 0 30rpx">
+			<view style="padding:16rpx 0 16rpx 32rpx">
 				共有 <span style="color: red">{{totalnumber}}</span>条记录
 			</view>
 
-			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
+			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'
+			 style="height:400px;flex:1;">
 				<u-list-item v-for="(item, index) in indexList" :key="index">
-
 					<view class="companylist">			
 						<h3>{{item.roomName}}</h3>
 						<view class="Currentamount">
@@ -139,126 +138,30 @@
 </script>
 
 <style lang="scss">
-	.Currentamount {
-		padding-left: 30rpx;
-		min-height: 50rpx;
-		line-height: 50rpx;
-		color: #BCB3A7;
-
-		span {
-			color: #FA5555;
-			padding-left: 9rpx;
-		}
+	.billall{height:100%}
+	.u-listdata{
+		    height: 100%;
+		    display: flex;
+		    flex-direction: column;
 	}
-
-	.Callfee {
-		width: 100rpx;
-		height: 45rpx;
-		text-align: center;
-		line-height: 45rpx;
-		color: #5C8FFF;
-		border: 1px solid #5C8FFF;
-		font-size: 22rpx;
-		position: absolute;
-		bottom: 10rpx;
-		right: 10px;
-		font-weight: bold;
-	}
-
 	.companylist {
-		margin: 20rpx 30rpx;
+		margin: 0 32rpx 24rpx;
 		background: #fff;
-		min-height:340rpx;
-		border-radius: 10px;
+		padding: 24rpx 32rpx;
+		border-radius: 8rpx;
 		position: relative;
-
 		h3 {
-			height: 70rpx;
-			line-height: 70rpx;
-			padding-left: 30rpx;
+			margin-bottom: 16rpx;
 		}
-	}
-
-	.settled {
-		background-color: #09C700;
-		width: 120rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-	.outstanding {
-		background-color: #09C700;
-		width: 120rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 110rpx;
-		right: 0px;
-		border-top-left-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-	.outstanding1 {
-		background-color: #09C700;
-		width: 120rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 215rpx;
-		right: 0px;
-		border-top-left-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-	.outstanding2 {
-		background-color: #09C700;
-		width: 120rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		bottom: 0px;
-		right: 0px;
-		border-top-left-radius: 10rpx;
-		border-bottom-right-radius: 10rpx;
-	}
-
-
-
-
-	.billall {}
-
-	.topbill {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		height: 100rpx;
-		background-color: #e6e6e6;
-	}
-
-	.topbilledit {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-	}
-
-	.changetime1 {
-		padding-right: 10rpx;
+		.Currentamount {
+			margin-bottom: 8rpx;
+			color: #999;
+	
+			span {
+				color: #FA5555;
+				padding-left: 9rpx;
+			}
+		}
+	
 	}
 </style>

pages/Workorder/Tenantbill/Tenantbill.vue

@@ -1,133 +1,80 @@
 <template>
-	<view class="billall">
-	<u-cell-group class="toptemplate">
-		<u-cell :title="mytitle"  @click="floorchange">
-			<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>				
-				<u-icon slot="right-icon" size="40" color="#fff" name="search"></u-icon>
-		</u-cell>
-	</u-cell-group>
-		<view class="topbill">
-			<view class="topbilledit">
-				<view class="changetime1">
-					<picker mode="date" :value="myday" fields="month" @change="dateChange">
-						<view class="selestDate">{{myday}}</view>
-					</picker>
+	<view class="page">
+		<view class="contain">
+			<u-cell-group class="toptemplate" style="flex:0">
+				<u-cell :title="mytitle" @click="floorchange">
+					<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>
+					<u-icon slot="right-icon" size="40" color="#fff" name="search"></u-icon>
+				</u-cell>
+			</u-cell-group>
+			<view class="topbill">
+				<view class="topbilledit">
+					<view class="changetime1">
+						<picker mode="date" :value="myday" fields="month" @change="dateChange">
+							<view class="selestDate">{{myday}}</view>
+						</picker>
+					</view>
+					<view class="changetime2">
+						<u-icon name="arrow-down-fill" color="#999" size="20"></u-icon>
+					</view>
 				</view>
-				<view class="changetime2">
-					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
+				<view class="topbilledit" @click="typechange">
+					<view class="changetime1">
+						{{mytype}}
+					</view>
+					<view class="changetime2">
+						<u-icon name="arrow-down-fill" color="#999" size="20"></u-icon>
+					</view>
 				</view>
 			</view>
-			<view class="topbilledit" @click="typechange">
-				<view class="changetime1">
-					{{mytype}}
-				</view>
-				<view class="changetime2">
-					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
+			<view class="u-listdata">
+				<view style="padding:16rpx 0 16rpx 32rpx">
+					共有 <span style="color: red">{{totalnumber}}</span>条记录
 				</view>
-			</view>
-		</view>
-		<!-- 列表 -->
-		<!-- <t-table>
-			<t-tr>
-				<t-th>序号</t-th>
-				<t-th>姓名</t-th>
-				<t-th>年龄</t-th>
-				<t-th>爱好</t-th>
-				<t-th>操作</t-th>
-			</t-tr>
-			<t-tr v-for="item in tableList" :key="item.id">
-				<t-td>{{ item.id + 1 }}</t-td>
-				<t-td>{{ item.name }}</t-td>
-				<t-td>{{ item.age }}</t-td>
-				<t-td>{{ item.hobby }}</t-td>
-				  <t-td align="left"> <u-button @click="edit(item)"  size="small" type="primary" :plain="true" text="编辑"></u-button></t-td>
-				
-			</t-tr>
-		</t-table> -->
-
-		<view class="u-listdata">
-			<view style="padding:10rpx 0 0 30rpx">
-				共有 <span style="color: red">{{totalnumber}}</span>条记录
-			</view>
-
-			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
-				<u-list-item v-for="(item, index) in indexList" :key="index">
-
-					<view class="companylist" @click="seedetail(item)">
-						<view class="settled" v-if="item.status==1">
-							已结清
-						</view>
-						<view class="outstanding" v-if="item.status==0">
-							未结清
+				<u-list @scrolltolower="scrolltolower" :pagingEnabled='true' style="height:400px;flex:1;">
+					<u-list-item v-for="(item, index) in indexList" :key="index">
+						<view class="companylist" @click="seedetail(item)">
+							<view class="settled outstanding" v-if="item.status==1">
+								已结清
+							</view>
+							<view class="outstanding" v-if="item.status==0">
+								未结清
+							</view>
+							<h3>{{item.name}}</h3>
+							<view class="Currentamount">
+								本期金额: <span>￥{{item.feeTotal}}</span>
+							</view>
+							<view class="Currentamount">
+								账户余额:￥{{item.balance}}
+							</view>
+							<view class="Currentamount">
+								联系电话: {{item.tel}}
+							</view>
 						</view>
-						<h3>{{item.name}}</h3>
-						<view class="Currentamount">
-							本期金额: <span>￥{{item.feeTotal}}</span>
-						</view>
-					<!-- 	<view class="Currentamount">
-							欠费天数: {{item.elecAmount}}
-						</view> -->
-						<view class="Currentamount">
-							账户余额:￥{{item.balance}}
-						</view>
-						<view class="Currentamount">
-							联系电话: {{item.tel}}
-						</view>
-						<!-- <view class="Callfee" v-if="item.status==0" @click.stop="handleClick(item.id)">
-							催费
-						</view> -->
-					</view>
-
-				</u-list-item>
-			</u-list>
-
+					</u-list-item>
+				</u-list>
+			</view>
 		</view>
-
-
-
-
-		<u-picker :show="showtype" :itemHeight="80" :columns="columnstype" keyName="label" @confirm="confirmtype" @cancel='canceltype'>
+		<u-picker :show="showtype" :itemHeight="80" :columns="columnstype" keyName="label" @confirm="confirmtype"
+			@cancel='canceltype'>
 		</u-picker>
-		<u-picker :show="showfloor" :itemHeight="80" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
-			:columns="columns" keyName="orgName" @change="changeHandler"></u-picker>
+		<u-picker :show="showfloor" :itemHeight="80" ref="uPicker" :loading="loading" @confirm="confirmfloor"
+			@cancel='cancelfloor' :columns="columns" keyName="orgName" @change="changeHandler"></u-picker>
 		<u-notify ref="uNotify" :show="showdct" message="服务器请求失败"></u-notify>
+
 	</view>
 </template>
 
 <script>
-	// import tTable from '@/components/t-table/t-table.vue';
-	// import tTh from '@/components/t-table/t-th.vue';
-	// import tTr from '@/components/t-table/t-tr.vue';
-	// import tTd from '@/components/t-table/t-td.vue';
 	export default {
-		components: {
-			// tTable,
-			// tTh,
-			// tTr,
-			// tTd
-		},
+		components: {},
 		data() {
 			const currentDate = this.getDate({
 				format: 'yyyy-mm'
 			})
 			return {
 				totalnumber: 0,
-				setyesno: true,
-				// tableList: [{
-				// 		id: 0,
-				// 		name: '张三',
-				// 		age: '19',
-				// 		hobby: '游泳'
-				// 	},
-				// 	{
-				// 		id: 1,
-				// 		name: '李四',
-				// 		age: '21',
-				// 		hobby: '绘画'
-				// 	},				
-				// ],
 				indexList: [],
-				dataList: [],
 				dataForm: {
 					projectId: "",
 					buildingId: "",
@@ -137,7 +84,6 @@
 					page: 1,
 					limit: 10,
 				},
-
 				showtype: false,
 				showdct: false,
 				mytitle: '',
@@ -165,9 +111,6 @@
 						}
 					]
 				],
-
-
-
 			}
 		},
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
@@ -175,12 +118,6 @@
 			this.getfloor();
 
 		},
-		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
-		onReady() {
-			// 微信小程序需要用此写法
-
-		},
-
 		//监听页面隐藏
 		onHide() {},
 		//监听窗口尺寸变化
@@ -189,42 +126,18 @@
 		onUnload() {},
 		//监听用户下拉动作，一般用于下拉刷新
 		onPullDownRefresh() {},
-
-
 		methods: {
 			seedetail(e) {
-				  console.log('222',e)
 				let faltesdata = {
 					name: e.name,
 					id: e.id,
 					cycle: e.cycle
 				}
-				// console.log('111111111111111111',faltesdata)
 				uni.navigateTo({
 					url: "/pages/Workorder/Tenantbill/companybill/companybill?para=" + encodeURIComponent(JSON
 						.stringify(faltesdata))
 				})
 			},
-			handleClick(e) {
-				//console.log('111111111111111111', e)
-				this.$api.post('/expeditrecord/charge',[e])
-					.then(res => {
-						if (res.data.code == 0) {
-							uni.showToast({
-								title: '催费成功',
-								icon: 'none',
-								duration: 1500
-							})
-						} else {
-							uni.showToast({
-								title: res.data.msg,
-								icon: 'none',
-								duration: 1500
-							})
-						}
-
-					})
-			},
 			scrolltolower() {
 				if (this.pd) {
 					this.getalldata();
@@ -232,9 +145,7 @@
 					return
 				}
 			},
-
 			getalldata() {
-
 				this.$api.get('/billinfo/paypage', this.dataForm)
 					.then(res => {
 						this.totalnumber = res.data.data.total;
@@ -253,16 +164,10 @@
 
 					})
 			},
-
-
-
-
-
 			canceltype() {
 				this.showtype = false;
 			},
 			confirmtype(e) {
-					console.log('111111111111111111', e.value[0])
 				this.showtype = false;
 				this.mytype = e.value[0].label;
 				this.dataForm.status = e.value[0].id;
@@ -283,7 +188,7 @@
 			getDate(type) {
 				const date = new Date();
 				let year = date.getFullYear();
-				let month = date.getMonth() ;
+				let month = date.getMonth();
 				if (type === 'start') {
 					year = year - 60;
 				} else if (type === 'end') {
@@ -296,13 +201,10 @@
 			getfloor() {
 				this.$api.get('/control/getOrgStructureTree/', {})
 					.then(res => {
-
 						if (res.data.code == 0) {
 							this.dataForm.projectId = res.data.data[0].orgId;
-
 							this.mytitle = res.data.data[0].orgName;
 							this.alldata = res.data.data[0].childrenList;
-							//console.log('111111111111111111',  res.data.data[0].childrenList)			
 							this.columns = [
 								res.data.data[0].childrenList,
 								res.data.data[0].childrenList[0].childrenList
@@ -311,7 +213,6 @@
 							for (let i = 0; i < res.data.data[0].childrenList.length; i++) {
 								allfloor.push(res.data.data[0].childrenList[i].childrenList)
 							}
-							//  console.log('111111111111111111',allfloor)
 							this.columnData = allfloor;
 							this.indexList = [];
 							this.dataForm.page = 1;
@@ -321,7 +222,6 @@
 						}
 					})
 			},
-
 			floorchange() {
 				this.showfloor = true;
 			},
@@ -337,117 +237,98 @@
 					picker.setColumnValues(1, this.columnData[index])
 					this.loading = false
 				}
-			//	this.getalldata();
 			},
 			confirmfloor(e) {
-				console.log('222222', e.value)
 				this.mytitle = e.value[0].orgName + e.value[1].orgName;
 				this.dataForm.buildingId = e.value[0].orgId;
 				this.dataForm.storeyId = e.value[1].orgId;
-					this.indexList = [];
-					this.dataForm.page = 1;
+				this.indexList = [];
+				this.dataForm.page = 1;
 				this.showfloor = false;
 				this.getalldata();
 			},
 			cancelfloor() {
 				this.showfloor = false;
 			},
-
-
 		}
 	}
 </script>
 
 <style lang="scss">
-	.Currentamount {
-		padding-left: 30rpx;
-		height: 50rpx;
-		line-height: 50rpx;
-		color: #BCB3A7;
-
-		span {
-			color: #FA5555;
-			padding-left: 9rpx;
-		}
-	}
-
-	.Callfee {
-		width: 100rpx;
-		height: 45rpx;
-		text-align: center;
-		line-height: 45rpx;
-		color: #5C8FFF;
-		border: 1px solid #5C8FFF;
-		font-size: 22rpx;
-		position: absolute;
-		bottom: 10rpx;
-		right: 10px;
-		font-weight: bold;
-	}
-
 	.companylist {
-		margin: 20rpx 30rpx;
+		margin: 24rpx 32rpx 0;
 		background: #fff;
-		height: 230rpx;
-		border-radius: 10px;
+		padding: 24rpx 32rpx ;
+		border-radius: 8rpx;
 		position: relative;
-
+	
 		h3 {
-			height: 70rpx;
-			line-height: 70rpx;
-			padding-left: 30rpx;
+			margin-bottom: 24rpx;
 		}
+	
+		.Currentamount {
+			line-height: 40rpx;
+			margin-bottom: 6rpx;
+			color: #999;
+			span {
+				color: #FA5555;
+				padding-left: 9rpx;
+			}
+		}
+		.outstanding{
+			position: absolute;
+			width:96rpx;
+			height: 48rpx;
+			border-radius: 0 8rpx 0 20rpx;
+			right:0;
+			line-height: 48rpx;
+			text-align: center;
+			top:0;
+			z-index: 1;
+			font-size: 22rpx;
+			background-color:#FA5555 ;
+			color: #fff;
+			&.settled{
+				background-color:#09C700 ;
+			}
+		}
+	
 	}
-
-	.settled {
-		background-color: #09C700;
-		width: 100rpx;
-		height: 40rpx;
-		text-align: center;
-		line-height: 40rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-	.outstanding {
-		background-color: #FA5555;
-		width: 100rpx;
-		height: 40rpx;
-		text-align: center;
-		line-height: 40rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-
-
-	.billall {}
-
 	.topbill {
 		display: flex;
 		justify-content: space-around;
 		align-items: center;
-		height: 100rpx;
-		background-color: #e6e6e6;
-	}
+		height: 88rpx;
+		background-color: #fff;
 
-	.topbilledit {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
+		.topbilledit {
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+		}
+
+		.changetime1 {
+			padding-right: 10rpx;
+		}
 	}
 
-	.changetime1 {
-		padding-right: 10rpx;
+	.page {
+		height: 100%;
+		overflow: hidden;
+
+		.contain {
+			height: 100%;
+			padding: 0;
+			display: flex;
+			flex-direction: column;
+
+			.u-listdata {
+				height: 400px;
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+
+			}
+		}
 	}
-</style>
+</style>

pages/Workorder/Videosurveillance/Videosurveillance.vue

@@ -1,22 +1,19 @@
 <template>
 	<view class="billall">
-
 		<view class="u-listdata">
-
-			<view style="padding:10rpx 0 0 30rpx">
+			<view style="padding:16rpx 0 16rpx 32rpx">
 				共有 <span style="color: red">{{totalnumber}}</span>条记录
 			</view>
-			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
+			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'
+			 style="height:400px;flex:1;">
 				<u-list-item v-for="(item, index) in indexList" :key="index">
-
 					<view class="companylist" @click="seedetail(item)">
 						<view class="settled">
 							查看
 						</view>
-
-						<view class="Currentamount" style="margin-top: 20rpx;">
-							通道名: {{item.channelName}}
-						</view>
+						<h3>
+						{{item.channelName}}
+						</h3>
 						<view class="Currentamount">
 							通道号: {{item.channelNo}}
 						</view>
@@ -180,109 +177,44 @@
 </script>
 
 <style lang="scss">
-	.Currentamount {
-		padding-left: 30rpx;
-		min-height: 50rpx;
-		line-height: 50rpx;
-		color: #BCB3A7;
-
-		span {
-			color: #FA5555;
-			padding-left: 9rpx;
-		}
+	.billall{height:100%}
+	.u-listdata{
+		    height: 100%;
+		    display: flex;
+		    flex-direction: column;
 	}
-
-	.Callfee {
-		width: 100rpx;
-		height: 45rpx;
-		text-align: center;
-		line-height: 45rpx;
-		color: #5C8FFF;
-		border: 1px solid #5C8FFF;
-		font-size: 22rpx;
-		position: absolute;
-		bottom: 10rpx;
-		right: 10px;
-		font-weight: bold;
-	}
-
 	.companylist {
-		margin: 20rpx 30rpx;
+		margin: 0 32rpx 24rpx;
 		background: #fff;
-		min-height: 200rpx;
-		border-radius: 10px;
+		padding: 24rpx 32rpx;
+		border-radius: 8rpx;
 		position: relative;
-
+	
 		h3 {
-			height: 70rpx;
-			line-height: 70rpx;
-			padding-left: 30rpx;
+			margin-bottom: 16rpx;
 		}
-	}
-
-	.settled {
-		background-color: #09C700;
-		width: 100rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-	.outstanding {
-		background-color: #30D3A2;
-		width: 100rpx;
-		height: 40rpx;
-		text-align: center;
-		line-height: 40rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-	.guanbi {
-		background-color: red;
-		width: 100rpx;
-		height: 40rpx;
-		text-align: center;
-		line-height: 40rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-
-	.billall {}
-
-	.topbill {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 100rpx;
-		background-color: #e6e6e6;
-	}
-
-	.topbilledit {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-	}
-
-	.changetime1 {
-		padding-right: 10rpx;
+		.settled{
+			width: 96rpx;
+			height: 56rpx;
+			border: 1px solid #2E69EB;
+			color: #2E69EB;
+			font-size: 24rpx;
+			border-radius: 8rpx;
+			text-align: center;
+			line-height: 56rpx;
+			position: absolute;
+			right: 32rpx;
+			bottom: 24rpx;
+		}
+		.Currentamount {
+			margin-bottom: 8rpx;
+			color: #999;
+	
+			span {
+				color: #FA5555;
+				padding-left: 9rpx;
+			}
+		}
+	
 	}
 </style>

pages/Workorder/Workorder.vue

@@ -1,110 +1,91 @@
 <template>
-	<view class="management">
-		<view class="topnames" >
-					工作台
-				</view>
+	<view class="content">
+		<u-cell-group class="toptemplate">
+			<view style="height: 20px;"></view>
+			<u-cell title="电商园四期—B座" :border="false">
+				<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>
+			</u-cell>
+		</u-cell-group>
 		<view class="managelind">
-			<view class="managename" @click="Tenantbill"  v-if="$has('app:TenantBill')">
-				<view class="managename1">
-
-					<u--image  mode="widthFix"  :src="srczuhu" width="48rpx" height="48rpx"></u--image>
-				</view>
-				<view class="managename2">
-					租户账单
+			<view class="managename" >
+				<u-cell title="电表" :isLink="true" arrow-direction="right" :border="false"
+					style="margin: -10px -15px;"></u-cell>
+				<u--image mode="widthFix" :src="elec"  width="96rpx" height="96rpx" style="align-items: center;margin:16rpx 0;"></u--image>
+				<view class="status">
+					<view><text class="circle"></text>在线</view>
+					<view><text class="circle on"></text>离线</view>
 				</view>
 			</view>
-			<view class="managename" @click="Remotecontrol"  v-if="$has('app:RemoteControl')">
-				<view class="managename1">
-					<!-- <img :src='srcyuanc' alt=""> -->
-						<u--image  mode="widthFix"  :src="srcyuanc" width="48rpx" height="48rpx"></u--image>
-				</view>
-				<view class="managename2">
-					远程管控
+			<view class="managename">
+				<u-cell title="水表" :isLink="true" arrow-direction="right" :border="false"
+					style="margin: -10px -15px;"></u-cell>
+				<u--image mode="widthFix" :src="water"  width="96rpx" height="96rpx" style="align-items: center;margin:16rpx 0;"></u--image>
+				<view class="status">
+					<view><text class="circle"></text>在线</view>
+					<view><text class="circle on"></text>离线</view>
 				</view>
 			</view>
-
-	<view class="managename" @click="Videosurveillance"  v-if="$has('app:Videosurveillance')">
-				<view class="managename1">
-					<!-- <img :src='srcyuanc' alt=""> -->
-				<u--image  mode="widthFix"  :src="srcshipin" width="48rpx" height="48rpx"></u--image>
-				</view>
-				<view class="managename2">
-					视频监控
+			<view class="managename" @click="Remotecontrol(1)" v-if="$has('app:TenantBill')">
+				<u-cell title="空调" :isLink="true" arrow-direction="right" :border="false"
+					style="margin: -10px -15px;"></u-cell>
+				<u--image mode="widthFix" :src="ac"  width="96rpx" height="96rpx" style="align-items: center;margin:16rpx 0;"></u--image>
+				<view class="status">
+					<view><text class="circle"></text>开启</view>
+					<view><text class="circle on"></text>关闭</view>
 				</view>
 			</view>
-
-			<view class="managename" @click="AccessControl"  v-if="$has('app:AccessControl')">
-				<view class="managename1">
-					<!-- <img :src='srcyuanc' alt=""> -->
-					<u--image  mode="widthFix"  :src="srcmj" width="48rpx" height="48rpx"></u--image>
-				</view>
-				<view class="managename2">
-					门禁管理
+			<view class="managename" @click="Remotecontrol(2)" v-if="$has('app:TenantBill')">
+				<u-cell title="照明" :isLink="true" arrow-direction="right" :border="false"
+					style="margin: -10px -15px;"></u-cell>
+				<u--image mode="widthFix" :src="light"  width="96rpx" height="96rpx" style="align-items: center;margin:16rpx 0;"></u--image>
+				<view class="status">
+					<view><text class="circle"></text>开启</view>
+					<view><text class="circle on"></text>关闭</view>
 				</view>
 			</view>
-
-	<view class="managename" @click="Intelligentdoorlock"  v-if="$has('app:Intelligentdoorlock')">
-				<view class="managename1">
-					<!-- <img :src='srcyuanc' alt=""> -->
-					<u--image  mode="widthFix"  :src="srcms" width="48rpx" height="48rpx"></u--image>
-				</view>
-				<view class="managename2">
-					智能门锁
+			<view class="managename" @click="AccessControl" v-if="$has('app:TenantBill')">
+				<u-cell title="门禁" :isLink="true" arrow-direction="right" :border="false"
+					style="margin: -10px -15px;"></u-cell>
+				<u--image mode="widthFix" :src="door"  width="96rpx" height="96rpx" style="align-items: center;margin:16rpx 0;"></u--image>
+				<view class="status">
+					<view><text class="circle"></text>在线</view>
+					<view><text class="circle on"></text>离线</view>
 				</view>
 			</view>
-
-			<!-- v-if="$has('app:Arrearsrecord')" -->
-			<!--<view class="managename" @click="Arrearsrecord" >-->
-				<!--<view class="managename1">-->
-					<!--&lt;!&ndash; <img :src='srcyuanc' alt=""> &ndash;&gt;-->
-						<!--<u&#45;&#45;image  mode="widthFix"  :src="srcjilu" width="48rpx" height="48rpx"></u&#45;&#45;image>-->
-				<!--</view>-->
-				<!--<view class="managename2">-->
-					<!--欠费记录-->
-				<!--</view>-->
-			<!--</view>-->
-
-			<!-- <view class="managename" @click="pay">
-				<view class="managename1">
-					 <img :src='srcyuanc' alt="">
-						<u--image  mode="widthFix"  :src="srcyuanc" width="48rpx" height="48rpx"></u--image>
+			<view class="managename" @click="Intelligentdoorlock" v-if="$has('app:TenantBill')">
+				<u-cell title="智能门锁" :isLink="true" arrow-direction="right" :border="false"
+					style="margin: -10px -15px;"></u-cell>
+				<u--image mode="widthFix" :src="lock"  width="96rpx" height="96rpx" style="align-items: center;margin:16rpx 0;"></u--image>
+				<view class="status">
+					<view><text class="circle"></text>在线</view>
+					<view><text class="circle on"></text>离线</view>
 				</view>
-				<view class="managename2">
-					支付功能
+			</view>
+			<view class="managename"  @click="Videosurveillance" v-if="$has('app:TenantBill')">
+				<u-cell title="视频监控" :isLink="true" arrow-direction="right" :border="false"
+					style="margin: -10px -15px;"></u-cell>
+				<u--image mode="widthFix" :src="video"  width="96rpx" height="96rpx" style="align-items: center;margin:16rpx 0;"></u--image>
+				<view class="status">
+					<view><text class="circle"></text>在线</view>
+					<view><text class="circle on"></text>离线</view>
 				</view>
-			</view> -->
+			</view>
 		</view>
-
-<!-- 
-		<u-tabbar
-				:value="value1"
-				:fixed="true"
-				:placeholder="true"
-				@change="name => value1 = name"
-				activeColor="#2E69EB"
-				:safeAreaInsetBottom="true"
-		>
-			<u-tabbar-item text="首页" icon="home" @click="click1" ></u-tabbar-item>
-			<u-tabbar-item  v-if="$has('app:worktable')"  text="工作台" icon="list" @click="click2" ></u-tabbar-item>
-			<u-tabbar-item text="我的" icon="account" @click="click3" ></u-tabbar-item>
-		</u-tabbar> -->
-		
 		<u-tabbar class="tabberall" :value="value1" :fixed="true" :placeholder="true" @change="name => value1 = name"
 			:safeAreaInsetBottom="true">
 			<u-tabbar-item text="首页" @click="click1">
 				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg1"></image>
 				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg2"></image>
 			</u-tabbar-item>
-		
-			<u-tabbar-item v-if="$has('app:worktable')" text="工作台"  @click="click2">
+
+			<u-tabbar-item  text="租户账单" v-if="$has('app:TenantBill')"  @click="click2">
 				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg3"></image>
 				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg4"></image>
-		
+
 			</u-tabbar-item>
-			<u-tabbar-item text="我的" @click="click3">
+			<u-tabbar-item text="远程管控" v-if="$has('app:RemoteControl')" @click="click3">
 				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg5"></image>
 				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg6"></image>
-		
 			</u-tabbar-item>
 		</u-tabbar>
 	</view>
@@ -120,109 +101,106 @@
 				tabimg4: require('@/static/tab/w1.png'),
 				tabimg5: require('@/static/tab/y2.png'),
 				tabimg6: require('@/static/tab/y1.png'),
-				
 				value1: 1,
-					srczuhu: require('@/static/management/zd.png'),
-					srcyuanc: require('@/static/management/yc.png'),
-					srcjilu: require('@/static/management/jl.png'),
-					srcshipin: require('@/static/management/sp.png'),
-					
-						srcms: require('@/static/management/ms.png'),
-						srcmj: require('@/static/management/mj.png'),
+				elec: require('@/static/imgs/elec.png'),
+				water: require('@/static/imgs/water.png'),
+				ac: require('@/static/imgs/ac.png'),
+				light: require('@/static/imgs/light.png'),
+				door: require('@/static/imgs/door.png'),
+				lock: require('@/static/imgs/lock.png'),
+				video: require('@/static/imgs/video.png')
 			}
 		},
 		methods: {
-			click1(){
+			click1() {
 				uni.navigateTo({
 					url: '/pages/index/index'
 				})
 			},
-			click2(){
+			click2() {
 				uni.navigateTo({
-					url: '/pages/Workorder/Workorder'
-				})
-			},
-			click3(){
-				uni.navigateTo({
-					url: '/pages/my/my'
+					url: '/pages/Workorder/Tenantbill/Tenantbill'
 				})
 			},
-
-			Tenantbill(){
+			click3() {
 				uni.navigateTo({
-					url: '/pages/Workorder/Tenantbill/Tenantbill'
+					url: '/pages/Workorder/Workorder'
 				})
 			},
-			Remotecontrol(){
+			Remotecontrol() {
 				uni.navigateTo({
 					url: '/pages/Workorder/Remotecontrol/Remotecontrol'
 				})
 			},
-			Intelligentdoorlock(){
+			Intelligentdoorlock() {
 				uni.navigateTo({
 					url: '/pages/Workorder/Intelligentdoorlock/Intelligentdoorlock'
 				})
 			},
-			// Arrearsrecord(){
-			// 	uni.navigateTo({
-			// 		url: '/pages/Workorder/Arrearsrecord/Arrearsrecord'
-			// 	})
-			// },
-			Videosurveillance(){
+			Videosurveillance() {
 				uni.navigateTo({
 					url: '/pages/Workorder/Videosurveillance/Videosurveillance'
 				})
 			},
-			
-			AccessControl(){
+			AccessControl() {
 				uni.navigateTo({
 					url: '/pages/Workorder/AccessControl/AccessControl'
 				})
 			},
-
-			// pay(){
-			// 	uni.navigateTo({
-			// 		url: '/pages/Workorder/pay/pay'
-			// 	})
-			// },
 		}
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.toptemplate {
+		color: #fff;
+	}
+
 	.u-page__item__slot-icon {
 		width: 40rpx;
 		height: 40rpx;
 	}
-.management{}
-.managelind{
-	display: flex;
-	//justify-content: space-around;
-	align-items: center;
-	flex-wrap: wrap;
-	width: 690rpx;
-	min-height: 130rpx;
-	margin: 20rpx auto;
-	background: #fff;
-	border-radius: 10px;
-}
-.managename{
-	width: 345rpx;
-	height: 170rpx;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-.managename1 img{
-		width: 40rpx;
-		height: 40rpx;
-}
-.managename2{
-	padding-top: 15rpx;
-	color: #666;
-	font-size: 20rpx;
-}
 
+	.managelind {
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+		padding: 32rpx;
+		justify-content: space-between;
+		.managename {
+			padding: 24rpx 32rpx;
+			width: 50%;
+			min-width: 328rpx;
+			max-width: 328rpx;
+			background: #fff;
+			flex: 1;
+			margin-bottom: 32rpx;
+		
+			&:nth-child(2n+1) {
+				margin-right: 30rpx;
+			}
+		
+			.status {
+				display: flex;
+				justify-content: space-between;
+				font-size: 24rpx;
+		
+				.circle {
+					display: inline-block;
+					width: 8rpx;
+					height: 8rpx;
+					border-radius: 100%;
+					background-color: #999;
+					vertical-align: middle;
+					margin-right: 3px;
+		
+					&.on {
+						background-color: #09C700;
+					}
+				}
+		
+			}
+		}
 
-</style>
+	}
+</style>

pages/index/BillPending/BillPending.vue

@@ -1,10 +1,8 @@
 <template>
+	
 	<view class="page">
 		<u-tabs :list="tabs" @click="sectionChange" style="background-color: #fff;" :current=current
 			:itemStyle="{'width':'375rpx','padding':'24rpx'}" lineHeight="2px" lineWidth="30px"></u-tabs>
-		<!-- <view class="subsection">
-			<u-subsection :list="list" fontSize="30rpx" :current="current" @change="sectionChange"></u-subsection>
-		</view> -->
 		<!-- 账单明细 -->
 		<view class="contain" v-show="cdshow==0">
 			<view class="topbilledit">
@@ -159,7 +157,6 @@
 						<u-form-item label="¥" prop="userInfo.amount" ref="item1">
 							<u--input v-model="model1.userInfo.amount" border="none" placeholder="点击输入金额"></u--input>
 						</u-form-item>
-
 					</u--form>
 				</view>
 				<view style="margin:0 32rpx">
@@ -309,11 +306,8 @@
 				this.zhifucanvas = true;
 				this.$refs.uForm.validate().then(res => {
 					uni.$u.toast('校验通过')
-					// console.log('111111111111111111', this.model1.userInfo.amount)
 					this.showpayjine = false;
 					this.Predepositshow = false;
-					//  this.Immediatepayment();
-
 					let postdata = {
 						totalFee: this.model1.userInfo.amount,
 						tenantId: this.dataForm.tenantId,
@@ -329,7 +323,6 @@
 							"token": uni.getStorageSync('tokendata'),
 						},
 						success: (res) => {
-							//	window.open(res.codeUrl, '_blank);
 							let qrcode = new QRCode('canvas', {
 								text: res.data.codeUrl, // weixin://wxpay/bizpayurl?pr=sZz****
 								width: 213,
@@ -338,11 +331,6 @@
 								colorLight: "white",
 								correctLevel: QRCode.CorrectLevel.H,
 							});
-							//   10秒之后调取查询订单
-							// let that = this;
-							// setTimeout(function () {
-							//     that.queryOrder2();
-							// }, 15000);
 
 						}
 					});

pages/index/EquipmentException/EquipmentException.vue

@@ -107,10 +107,7 @@
 		onUnload() {},
 		//监听用户下拉动作，一般用于下拉刷新
 		onPullDownRefresh() {},
-
-
 		methods: {
-
 			scrolltolower() {
 				if (this.pd) {
 					this.getalldata();
@@ -118,13 +115,10 @@
 					return
 				}
 			},
-
 			getalldata() {
 				this.$api.get('/home/actualAlertList', this.dataForm)
 					.then(res => {
-						//	this.totalnumber = res.data.data.total;
 						if (res.data.code == 0) {
-							console.log('111111111111111111', res.data.data)
 							if (res.data.data == null) {
 								this.totalnumber = 0;
 								this.indexList = [];
@@ -139,18 +133,6 @@
 								duration: 1500
 							})
 						}
-						// if (res.data.data.list.length != 0) {
-						// 	this.indexList.push(...res.data.data.list);
-						// 	this.dataForm.page = this.dataForm.page + 1;
-						// 	this.pd = true;
-						// } else {
-						// 	uni.showToast({
-						// 		title: '暂无更多数据了',
-						// 		icon: 'none',
-						// 		duration: 1500
-						// 	})
-						// 	this.pd = false;
-						// }
 					})
 			},
 
@@ -160,11 +142,8 @@
 					.then(res => {
 
 						if (res.data.code == 0) {
-							//	this.dataForm.projectId = res.data.data[0].orgId;
-
 							this.mytitle = res.data.data[0].orgName;
 							this.alldata = res.data.data[0].childrenList;
-							//console.log('111111111111111111',  res.data.data[0].childrenList)
 							this.columns = [
 								res.data.data[0].childrenList,
 								res.data.data[0].childrenList[0].childrenList
@@ -173,9 +152,7 @@
 							for (let i = 0; i < res.data.data[0].childrenList.length; i++) {
 								allfloor.push(res.data.data[0].childrenList[i].childrenList)
 							}
-							//  console.log('111111111111111111',allfloor)
 							this.columnData = allfloor;
-							//	this.dataForm.page = 1;
 							this.getalldata();
 						} else {
 							this.showdct = true

pages/index/Immediateinspection/Immediateinspection.vue

@@ -1,20 +1,8 @@
 <template>
-	<view class="">
-		<view class="" style="width: 750rpx;height: 50rpx;">
-			
-		</view>
-		<view class="topname">
-			<view class="topname1" @click="goback">
-				<u-icon name="arrow-left" color="#000000" size="36"></u-icon>
-			</view>
-			<view class="topname2">
-				巡检打卡
-			</view>
-		</view>
-		
+	<view class="pad16">
 		<view class="getuserInfo">
 			<view class="getuserInfoimg">
-				<u--image :src="src" width="120rpx" height="120rpx"></u--image>
+				<u--image :src="src" width="96rpx" height="96rpx" style="border-radius: 4px;"></u--image>
 			</view>
 			<view class="getuserInfoname">
 				<h3>{{getuserInfo.realName}}</h3>
@@ -44,10 +32,10 @@
 		</view>
 		<view class="dakajilv">今日打卡记录</view>
 		<view class="u-listdata">
-			<view style="padding:10rpx 0 0 30rpx">
+			<view style="padding:16rpx 0 16rpx 32rpx">
 				共有 <span style="color: red">{{totalnumber}}</span>条记录
 			</view>
-			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
+			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true' style="height: 100px;flex:1;">
 				<u-list-item v-for="(item, index) in indexList" :key="index">
 					<view class="companylist">
 						<h3>{{item.position}}</h3>
@@ -240,6 +228,14 @@
 </script>
 
 <style lang="scss">
+	page{height:100%}
+	.pad16{
+		height:100%;
+		padding: 32rpx;
+		    display: flex;
+		    flex-direction: column;
+	}
+	.u-listdata{height:100px;flex:1;display:flex;flex-direction: column;}
 	.dakajilv {
 		color: #666;
 		font-size: 32rpx;
@@ -263,31 +259,6 @@
 		display: flex;
 		align-items: center;
 	}
-
-	.topname1 {
-		width: 50rpx;
-		padding-left: 10rpx;
-	}
-
-	.topname2 {
-		width: 700rpx;
-		text-align: center;
-		font-weight: bold;
-	}
-	.Callfee {
-		width: 100rpx;
-		height: 45rpx;
-		text-align: center;
-		line-height: 45rpx;
-		color: #5C8FFF;
-		border: 1px solid #5C8FFF;
-		font-size: 22rpx;
-		position: absolute;
-		bottom: 10rpx;
-		right: 10px;
-		font-weight: bold;
-	}
-
 	.companylist {
 		margin: 20rpx 30rpx;
 		background: #fff;
@@ -382,33 +353,29 @@
 		align-items: center;
 		justify-content: center;
 		width: 690rpx;
-		height: 300rpx;
+		height: 270rpx;
 	}
 
 	.Punchin {
 		width: 690rpx;
-		margin: 30rpx auto;
+		margin: 32rpx auto 40rpx;
 		background: #fff;
 		height: 690rpx;
 	}
 
 	.getuserInfo {
 		display: flex;
-		align-items: center;
-		width: 690rpx;
-		margin: 0 auto;
-		background: #fff;
-		height: 160rpx;
-		border-radius: 10rpx;
+		    background: #fff;
+		    border-radius: 4px;
+		    padding: 24rpx 32rpx;
 	}
 
 	.getuserInfoimg {
-		margin-left: 20rpx;
-		margin-right: 30rpx;
+		margin-right: 24rpx;
+		
 	}
 
 	.getuserInfoname {
-		height: 120rpx;
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
@@ -426,7 +393,6 @@
 	}
 
 	.getuserInfophone {
-		height: 120rpx;
 		display: flex;
 		align-items: flex-start;
 	}

pages/index/Inspectionrecord/Inspectionrecord.vue

@@ -1,54 +1,55 @@
 <template>
-	<view class="billall">
-		<u-cell-group class="toptemplate">
-			<u-cell :title="mytitle" @click="floorchange">
-				<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>
-				<u-icon slot="right-icon" size="40" color="#fff" name="search"></u-icon>
-			</u-cell>
-		</u-cell-group>
-		<view class="topbill">
-			<view class="topbilledit" @click="xunjianchange">
-				<view class="changetime1">
-					{{xjlx}}
+	<view class="page">
+		<view class="billall">
+			<u-cell-group class="toptemplate">
+				<u-cell :title="mytitle" @click="floorchange">
+					<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>
+					<u-icon slot="right-icon" size="40" color="#fff" name="search"></u-icon>
+				</u-cell>
+			</u-cell-group>
+			<view class="topbill">
+				<view class="topbilledit" @click="xunjianchange">
+					<view class="changetime1">
+						{{xjlx}}
+					</view>
+					<view class="changetime2">
+						<u-icon name="arrow-down-fill" color="#999" size="20"></u-icon>
+					</view>
 				</view>
-				<view class="changetime2">
-					<u-icon name="arrow-down-fill" color="#999" size="20"></u-icon>
+				<view class="topbilledit" @click="typechange">
+					<view class="changetime1">
+						{{xjry}}
+					</view>
+					<view class="changetime2">
+						<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
+					</view>
 				</view>
 			</view>
-			<view class="topbilledit" @click="typechange">
-				<view class="changetime1">
-					{{xjry}}
-				</view>
-				<view class="changetime2">
-					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
+			<view class="u-listdata">
+				<view style="padding:16rpx 0 16rpx 32rpx">
+					共有 <span style="color: red">{{totalnumber}}</span>条记录
 				</view>
-			</view>
-		</view>
-		<view class="u-listdata">
-			<view style="padding:16rpx 0 16rpx 32rpx">
-				共有 <span style="color: red">{{totalnumber}}</span>条记录
-			</view>
-			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
-				<u-list-item v-for="(item, index) in indexList" :key="index">
-					<view class="companylist">
-						<h3>{{item.position}}</h3>
-						<view class="Currentamount">
-							巡检类型: 安保
-						</view>
-						<view class="Currentamount">
-							巡检人员: {{item.circuitPerson.realName}}
-						</view>
-						<view class="Currentamount">
-							联系电话:￥{{item.circuitPerson.mobile}}
+				<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
+					<u-list-item v-for="(item, index) in indexList" :key="index">
+						<view class="companylist">
+							<h3>{{item.position}}</h3>
+							<view class="Currentamount">
+								巡检类型: 安保
+							</view>
+							<view class="Currentamount">
+								巡检人员: {{item.circuitPerson.realName}}
+							</view>
+							<view class="Currentamount">
+								联系电话:￥{{item.circuitPerson.mobile}}
+							</view>
+							<view class="Currentamount">
+								巡检时间: {{item.circuitTime}}
+							</view>
 						</view>
-						<view class="Currentamount">
-							巡检时间: {{item.circuitTime}}
-						</view>
-					</view>
-
-				</u-list-item>
-			</u-list>
 
+					</u-list-item>
+				</u-list>
+			</view>
 		</view>
 		<u-picker :show="showtypexunjian" :itemHeight="80" :columns="columnstypexunjian" keyName="dictLabel"
 			@confirm="confirmxunjian" @cancel='cancelxunjian'>
@@ -286,8 +287,21 @@
 </script>
 
 <style lang="scss">
+	.billall {
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.u-listdata {
+		height: 400px;
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
+
 	.companylist {
-		margin: 24rpx 32rpx 0;
+		margin: 0 32rpx 24rpx;
 		background: #fff;
 		padding: 24rpx 32rpx;
 		border-radius: 8rpx;

pages/index/Onlinewarranty/Onlinewarranty.vue

@@ -55,8 +55,6 @@
 								size="30px" name="camera-fill"></u-icon></span>
 					</view>
 				</u-form-item>
-
-
 			</u--form>
 
 
@@ -422,6 +420,7 @@
 			height: 160rpx;
 			margin-right: 10rpx;
 		}
+
 		.mytrash {
 			position: absolute;
 			top: 2px;

pages/index/Workordertodone/Toberepaired/Toberepaired.vue

@@ -1,316 +1,186 @@
 <template>
-	<view class="OutermostLayer">
-		<h3 class="baoxiu">报修信息</h3>
-		<u-cell-group>
-			<u-cell icon="integral-fill" title="报修时间"  :value="details.shijian" >
-				<u-icon slot="icon" size="40" name="calendar"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="报修位置" :value="details.weizhi" >
-				<u-icon slot="icon" size="40" name="map"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="报修区域" :value="details.quyu" >
-				<u-icon slot="icon" size="40" name="grid"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="报修类型" :value="details.leixing" >
-				<u-icon slot="icon" size="40" name="pushpin"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="联系人" :value="details.lxr" >
-				<u-icon slot="icon" size="40" name="man-add"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="联系电话" :value="details.lxdh">
-				<u-icon slot="icon" size="40" name="phone"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="故障描述" :value="details.gzms" >
-				<u-icon slot="icon" size="40" name="order"></u-icon>
-			</u-cell>
-
-			<u-cell icon="integral-fill" title="故障照片" >
-				<u-icon slot="icon" size="40" name="photo"></u-icon>
-				<view
-						slot="title"
-						class="guzhang"
-				>
-					<view class="">
-						故障照片
-					</view>
-					<view class="albumcontent">
-						<u-album :urls="details.gzimg"></u-album>
+	<view class="contain">
+		<view class="main" style="padding: 0;">
+			<view class="baoxiu"><span></span>报修信息</view>
+			<u-cell-group>
+				<u-cell title="报修时间" :value="details.shijian">
+				</u-cell>
+				<u-cell title="报修位置" :value="details.weizhi">
+				</u-cell>
+				<u-cell title="报修区域" :value="details.quyu">
+				</u-cell>
+				<u-cell title="报修类型" :value="details.leixing">
+				</u-cell>
+				<u-cell title="联系人" :value="details.lxr">
+				</u-cell>
+				<u-cell title="联系电话" :value="details.lxdh">
+				</u-cell>
+				<u--form labelPosition="left" >
+				<u-form-item labelWidth='180' style="padding:0 32rpx;" label="故障描述:">
+				</u-form-item>
+				<u-form-item labelWidth='180' borderBottom style="padding:0 32rpx;">
+					<view style="width:100%;padding: 0 20rpx;height:80px">{{details.gzms}}</view>
+				</u-form-item>
+				<u-form-item labelWidth='180' label="故障照片" style="padding:0 32rpx;">
+				</u-form-item>
+				<u-form-item labelWidth='180' borderBottom style="padding:0 32rpx;">
+					<view class="uploadPart">
+						<view class="allimg" v-for="img in details.gzimg">
+							<image :src="img" mode="aspectFill" class="newimg"></image>
+						</view>
 					</view>
-				</view>
-			</u-cell>
-
-		</u-cell-group>
-
-		<h3 class="baoxiu">维修信息</h3>
-		<u-cell-group>
-			<u-cell icon="integral-fill" title="紧急程度"  :value="details.jinji" >
-				<u-icon slot="icon" size="40" name="bell"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="维修人员" :value="details.weixiury" >
-				<u-icon slot="icon" size="40" name="man-add"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="联系电话" :value="details.weixiudh" >
-				<u-icon slot="icon" size="40" name="phone"></u-icon>
-			</u-cell>
-
-
-
-
-
-		</u-cell-group>
-		<view class="returndata">
-			<view  v-if="$has('app:MaintenanceCompleted')">
-				<u-button type="primary"  text="维修完成" @click="returndata"></u-button>
+				</u-form-item>
+				</u--form>
+			</u-cell-group>
+			<view class="baoxiu"><span></span>维修信息</view>
+			<u-cell-group>
+				<u-cell title="紧急程度" :value="details.jinji">
+				</u-cell>
+				<u-cell title="维修人员" :value="details.weixiury">
+				</u-cell>
+				<u-cell title="联系电话" :value="details.weixiudh">
+				</u-cell>
+			</u-cell-group>
+		</view>
+		<view class="tijiao">
+			<view v-if="$has('app:MaintenanceCompleted')">
+				<u-button type="primary" text="维修完成" @click="returndata"></u-button>
 			</view>
-			<!--<view class="Maintenancepersonnel">-->
-				<!--<u-button type="primary"  text="指派维修人员"  @click="Maintenancepersonnel"></u-button>-->
-			<!--</view>-->
 		</view>
 		<!--确定弹窗-->
-		<u-modal :show="showqd" title="提示" content='请问是否确定维修完成?' :showCancelButton="true"
-				 @confirm="weixiuyes"  @cancel="weixiuno"
-		></u-modal>
+		<u-modal :show="showqd" title="提示" content='请问是否确定维修完成?' :showCancelButton="true" @confirm="weixiuyes"
+			@cancel="weixiuno"></u-modal>
+		<u-notify ref="uNotify" message=""></u-notify>
 
-
-		<u-notify ref="uNotify" message="" ></u-notify>
 	</view>
 </template>
 
 <script>
-
 	export default {
 		data() {
 			return {
-				columnsrenyuan:[],
-				columnsrenjinji:[],
-				model1: {
-					userInfo: {
-						repairPersonId: '',
-						urgency:'',
-					},
-				},
-
-				rules: {
-					'userInfo.repairPersonId': {
-						type: 'string',
-						required: true,
-						message: '请选择维修人员',
-						trigger: ['blur', 'change']
-					},
-					'userInfo.urgency': {
-						type: 'string',
-						required: true,
-						message: '请选择紧急程度',
-						trigger: ['blur', 'change']
-					},
-				},
-
-				showjinji:false,
-				showSex:false,
-				showqd:false,
-				showweixiu:false,
-				companyOrgId:'',
-				renyuanid:'',
-				jjcd:'',
-
-				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
-				details:{
-					shijian:'',
-					weizhi:'',
-					quyu:'',
-					leixing:'',
-					lxr:'',
-					lxdh:'',
-					gzms:'',
-					gzimg:[],
-
-					jinji:'',
-					weixiury:'',
-					weixiudh:''
+				showqd: false,
+				companyOrgId: '',
+				details: {
+					shijian: '',
+					weizhi: '',
+					quyu: '',
+					leixing: '',
+					lxr: '',
+					lxdh: '',
+					gzms: '',
+					gzimg: [],
+					jinji: '',
+					weixiury: '',
+					weixiudh: ''
 				},
-				albumWidth: 0,
-
 			}
 		},
-		onReady() {
-			//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
-			//this.$refs.uForm.setRules(this.rules)
-		},
 		onLoad(options) {
 			this.companyOrgId = options.id;
-			//  console.log(options.id);
-		//	let getDictDataList = uni.getStorageSync('getDictDataList');
-
-
-			this.getUserList();
 			this.getdata();
-
 		},
 		methods: {
-			getUserList() {
-				this.$api.get('/user/list',{ page: 1,
-					limit: 100,})
-						.then(res=>{
-							//	console.log('111111111111111111',res.data.data)
-							this.columnsrenyuan=res.data.data;
-						})
-			},
-			getdata(){
-				this.$api.get('/repairorder/'+this.companyOrgId,{})
-						.then(res=>{
-
-							this.details.shijian=res.data.data.createDate;
-							this.details.weizhi=res.data.data.repairPosition;
-							this.details.lxr=res.data.data.contactPerson;
-							this.details.lxdh=res.data.data.contactPhone;
-							this.details.gzms=res.data.data.faultDes;
-							this.details.weixiury=res.data.data.repairPersonName;
-							res.data.data.faultPics=res.data.data.faultPics.split(",");
-
-							this.details.gzimg=res.data.data.faultPics;
-							//  console.log('111111111111111111', this.details.gzimg)
-
-							if(res.data.data.repairRegion==1){
-								this.details.quyu='公共区域';
-							}else if(res.data.data.repairRegion==2){
-								this.details.quyu='室内';
-							}
-
-							if(res.data.data.repairType==1){
-								this.details.leixing='水';
-							}else if(res.data.data.repairType==2){
-								this.details.leixing='电';
-							}else if(res.data.data.repairType==3){
-								this.details.leixing='其他';
-							}
-
-							if(res.data.data.urgency==1){
-								this.details.jinji='非常紧急';
-							}else if(res.data.data.urgency==2){
-								this.details.jinji='紧急';
-							}else if(res.data.data.urgency==3){
-								this.details.jinji='普通';
-							}
-
+			getdata() {
+				this.$api.get('/repairorder/' + this.companyOrgId, {})
+					.then(res => {
+						this.details.shijian = res.data.data.createDate;
+						this.details.weizhi = res.data.data.repairPosition;
+						this.details.lxr = res.data.data.contactPerson;
+						this.details.lxdh = res.data.data.contactPhone;
+						this.details.gzms = res.data.data.faultDes;
+						this.details.weixiury = res.data.data.repairPersonName;
+						res.data.data.faultPics = res.data.data.faultPics.split(",");
+						this.details.gzimg = res.data.data.faultPics;
+						if (res.data.data.repairRegion == 1) {
+							this.details.quyu = '公共区域';
+						} else if (res.data.data.repairRegion == 2) {
+							this.details.quyu = '室内';
+						}
+
+						if (res.data.data.repairType == 1) {
+							this.details.leixing = '水';
+						} else if (res.data.data.repairType == 2) {
+							this.details.leixing = '电';
+						} else if (res.data.data.repairType == 3) {
+							this.details.leixing = '其他';
+						}
+						if (res.data.data.urgency == 1) {
+							this.details.jinji = '非常紧急';
+						} else if (res.data.data.urgency == 2) {
+							this.details.jinji = '紧急';
+						} else if (res.data.data.urgency == 3) {
+							this.details.jinji = '普通';
+						}
 
-							for(let i=0;i<this.columnsrenyuan.length;i++){
-								if(this.columnsrenyuan[i].id==res.data.data.repairPersonId){
-									console.log('111111111111111111',this.columnsrenyuan[i])
-									this.details.weixiudh=this.columnsrenyuan[i].mobile
-								}
-							}
-
-
-						})
-			},
-			quxiao(){
-				this.showweixiu=false;
-			},
-			queding(){
-				this.$refs.uForm.validate().then(res => {
-					//	uni.$u.toast('校验通过')
-					//  jjcd  renyuanid  companyOrgId
-					//console.log('111111111111111111',this.jjcd,this.renyuanid,this.companyOrgId)
-					this.$api.put('/repairorder',{
-						id: this.companyOrgId,
-						repairPersonId: this.renyuanid,
-						urgency: this.jjcd,
 					})
-							.then(res=>{
-								//console.log('111111111111111111',res)
-								if(res.data.code==0){
-									this.$refs.uNotify.success('指派成功')
-
-									setTimeout(function(){uni.navigateTo({
-										url: '/pages/index/Workordertodone/Workordertodone'
-									})},1000);
-
-								}else{
-									this.$refs.uNotify.error(res.data.msg)
-									// uni.navigateBack({
-									// 	delta: 1
-									// });
-								}
-							})
-
-				}).catch(errors => {
-					uni.$u.toast('校验失败')
-				})
 			},
-			returndata(){
-				this.showqd=true;
+			returndata() {
+				this.showqd = true;
 			},
-			weixiuyes(){
-				this.$api.post('/repairorder/finish/'+this.companyOrgId,{})
-						.then(res=>{
-							//console.log('111111111111111111',res)
-							if(res.data.code==0){
-								this.$refs.uNotify.success('维修成功')
-								setTimeout(function(){uni.navigateTo({
+			weixiuyes() {
+				this.$api.post('/repairorder/finish/' + this.companyOrgId, {})
+					.then(res => {
+						if (res.data.code == 0) {
+							this.$refs.uNotify.success('维修成功')
+							setTimeout(function() {
+								uni.navigateTo({
 									url: '/pages/index/Workordertodone/Workordertodone'
-								})},1000);
-							}else{
-								this.$refs.uNotify.error(res.data.msg)
-							}
-						})
-				this.showqd=false;
+								})
+							}, 1000);
+						} else {
+							this.$refs.uNotify.error(res.data.msg)
+						}
+					})
+				this.showqd = false;
 			},
-			weixiuno(){
-				this.showqd=false;
+			weixiuno() {
+				this.showqd = false;
 			},
-
-
-
-
-
-
 		}
 	}
 </script>
 
 <style lang="scss">
-	.guidang{
-		display: flex;
-		align-items: center;
-		justify-content: space-around;
-		margin-top: 80rpx;
+	.baoxiu {
+		padding: 18rpx 32rpx;
+		font-size: 36rpx;
+
+		span {
+			display: inline-block;
+			margin-right: 16rpx;
+			width: 8rpx;
+			height: 32rpx;
+			background-color: #5776E6;
+			border-radius: 5rpx;
+		}
 	}
-	.queding{
-		width: 300rpx;
 
-	}
-	.baoxiu{
-		padding: 30rpx;
-	}
-	.albumcontent{
+	.uploadPart {
 		display: flex;
-		.u-album{
+		justify-content: center;
+		width: 100%;
+
+		.uploadBtn {
+			width: 160rpx;
+			height: 160rpx;
+			background-color: #ECF0FF;
+			text-align: center;
+			border-radius: 4rpx;
 			display: flex;
-			flex-direction: row;
-			flex-wrap: wrap;
+			align-items: center;
+			justify-content: center;
 		}
-	}
-	.guzhang{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-	.returndata{
-		padding: 30rpx;
-	}
-	.Maintenancepersonnel{
-		margin-top: 15rpx;
-	}
-	.weixiudc{
-		width: 750rpx;
-		height: 450rpx;
-		h3{
-			font-size: 30rpx;
-			font-weight: bold;
-			width: 750rpx;
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: center;
+
+		.allimg {
+			position: relative;
+		}
+
+		.newimg {
+			width: 160rpx;
+			height: 160rpx;
+			margin-right: 10rpx;
+			border: 1px solid #eee;
 		}
 	}
-</style>
+</style>

pages/index/Workordertodone/Workorderdetails/Workorderdetails.vue

@@ -1,146 +1,93 @@
 <template>
-	<view class="OutermostLayer">
-		
-
+	<view class="contain">
+		<view class="main" style="padding: 0;">
 			<u-cell-group>
-				<u-cell icon="integral-fill" title="报修时间"  :value="details.shijian" >
-					<u-icon slot="icon" size="40" name="calendar"></u-icon>
+				<u-cell title="报修时间" :value="details.shijian">
 				</u-cell>
-				<u-cell icon="integral-fill" title="报修位置" :value="details.weizhi" >
-					<u-icon slot="icon" size="40" name="map"></u-icon>
+				<u-cell title="报修位置" :value="details.weizhi">
 				</u-cell>
-				<u-cell icon="integral-fill" title="报修区域" :value="details.quyu" >
-					<u-icon slot="icon" size="40" name="grid"></u-icon>
+				<u-cell title="报修区域" :value="details.quyu">
 				</u-cell>
-				<u-cell icon="integral-fill" title="报修类型" :value="details.leixing" >
-					<u-icon slot="icon" size="40" name="pushpin"></u-icon>
+				<u-cell title="报修类型" :value="details.leixing">
 				</u-cell>
-				<u-cell icon="integral-fill" title="联系人" :value="details.lxr" >
-					<u-icon slot="icon" size="40" name="man-add"></u-icon>
+				<u-cell title="联系人" :value="details.lxr">
 				</u-cell>
-				<u-cell icon="integral-fill" title="联系电话" :value="details.lxdh">
-					<u-icon slot="icon" size="40" name="phone"></u-icon>
+				<u-cell title="联系电话" :value="details.lxdh">
 				</u-cell>
-				<u-cell icon="integral-fill" title="故障描述" :value="details.gzms" >
-					<u-icon slot="icon" size="40" name="order"></u-icon>
-				</u-cell>
-
-				 <u-cell icon="integral-fill" title="故障照片" >
-					 <u-icon slot="icon" size="40" name="photo"></u-icon>
-				    	<view
-				    	    slot="title"
-				    	    class="guzhang"
-				    	>
-						<view class="">
-							故障照片
+				<u--form labelPosition="left" >
+				<u-form-item labelWidth='180' style="padding:0 32rpx;" label="故障描述:">
+				</u-form-item>
+				<u-form-item labelWidth='180' borderBottom style="padding:0 32rpx;">
+					<view style="width:100%;padding: 0 20rpx;height:80px">{{details.gzms}}</view>
+				</u-form-item>
+				<u-form-item labelWidth='180' label="故障照片" style="padding:0 32rpx;">
+				</u-form-item>
+				<u-form-item labelWidth='180' borderBottom style="padding:0 32rpx;">
+					<view class="uploadPart">
+						<view class="allimg" v-for="img in details.gzimg">
+							<image :src="img" mode="aspectFill" class="newimg"></image>
 						</view>
-				    		<view class="albumcontent">
-				    		  <u-album :urls="details.gzimg"></u-album>
-				    		</view>
-				    	</view>
-				    </u-cell>
-
+					</view>
+				</u-form-item>
+				</u--form>
 			</u-cell-group>
-		<view class="returndata">
-			<!--<view>-->
-				<!--<u-button type="primary"  text="维修完成" @click="returndata"></u-button>-->
-			<!--</view>-->
-			<view class="Maintenancepersonnel"  v-if="$has('app:AssignmaintenancePersonnel')">
-				<u-button type="primary"  text="指派维修人员"  @click="Maintenancepersonnel"></u-button>
+			<view class="tijiao">
+				<view class="" v-if="$has('app:AssignmaintenancePersonnel')">
+					<u-button type="primary" text="指派维修人员" @click="Maintenancepersonnel"></u-button>
+				</view>
 			</view>
-		</view>
-<!--确定弹窗-->
-		<u-modal :show="showqd" title="提示" content='请问是否确定维修完成?' :showCancelButton="true"
-		@confirm="weixiuyes"  @cancel="weixiuno"
-		></u-modal>
-		<!--指派维修人员弹窗-->
-		<u-popup :show="showweixiu" :round="10" @close="closewx" @open="openwx"  mode="bottom" >
-			<view class="weixiudc">
-				<h3>工单指派</h3>
-				<u--form
-						labelPosition="left"
-						:model="model1"
-						:rules="rules"
-						ref="uForm">
-
-					<u-form-item
-							labelWidth="150"
-							label="维修人员"
-							prop="userInfo.repairPersonId"
-							borderBottom
-							@click="showSex = true;"
-							ref="item1"
-					>
-						<u--input
-								v-model="model1.userInfo.repairPersonId"
-								disabled
-								disabledColor="#ffffff"
-								placeholder="请选择维修人员"
-								border="none"
-						></u--input>
-						<u-icon
-								slot="right"
-								name="arrow-right"
-						></u-icon>
-					</u-form-item>
-
-					<u-form-item
-							labelWidth="150"
-							label="紧急程度"
-							prop="userInfo.urgency"
-							borderBottom
-							@click="showjinji = true;"
-							ref="item1"
-					>
-						<u--input
-								v-model="model1.userInfo.urgency"
-								disabled
-								disabledColor="#ffffff"
-								placeholder="请选择紧急程度"
-								border="none"
-						></u--input>
-						<u-icon
-								slot="right"
-								name="arrow-right"
-						></u-icon>
-					</u-form-item>
-				</u--form>
-
-
-				<u-picker :show="showSex" keyName="realName" @cancel="showSex=false"
-				:itemHeight="80"
-						  @confirm="confirmry"  :columns="columnsrenyuan" ></u-picker>
-
-				<u-picker :show="showjinji" keyName="dictLabel" @cancel="showjinji=false" :itemHeight="80"
-						  @confirm="confirmjinji"  :columns="columnsrenjinji" ></u-picker>
-
-				<view class="guidang">
-					<view class="queding">
-						<u-button type="primary" :plain="true" text="取消" @click="quxiao"></u-button>
-					</view>
-					<view class="queding">
-						<u-button type="primary" text="确定" @click="queding"></u-button>
+			<!--指派维修人员弹窗-->
+			<u-popup :show="showweixiu" :round="10" @close="closewx" @open="openwx" mode="bottom">
+				<view class="weixiudc">
+					<view class="tit">工单指派</view>
+					<u--form labelPosition="left" :model="model1" :rules="rules" ref="uForm">
+						<u-form-item labelWidth="150" label="维修人员" prop="userInfo.repairPersonId" borderBottom
+							@click="showSex = true;" ref="item1">
+							<u--input v-model="model1.userInfo.repairPersonId" disabled disabledColor="#ffffff"
+								placeholder="请选择维修人员" border="none"></u--input>
+							<u-icon slot="right" name="arrow-right"></u-icon>
+						</u-form-item>
+
+						<u-form-item labelWidth="150" label="紧急程度" prop="userInfo.urgency" borderBottom
+							@click="showjinji = true;" ref="item1">
+							<u--input v-model="model1.userInfo.urgency" disabled disabledColor="#ffffff"
+								placeholder="请选择紧急程度" border="none"></u--input>
+							<u-icon slot="right" name="arrow-right"></u-icon>
+						</u-form-item>
+					</u--form>
+
+
+					<u-picker :show="showSex" keyName="realName" @cancel="showSex=false" :itemHeight="80"
+						@confirm="confirmry" :columns="columnsrenyuan"></u-picker>
+
+					<u-picker :show="showjinji" keyName="dictLabel" @cancel="showjinji=false" :itemHeight="80"
+						@confirm="confirmjinji" :columns="columnsrenjinji"></u-picker>
+
+					<view class="guidang">
+						<view class="queding">
+							<u-button type="primary" :plain="true" text="取消" @click="quxiao"></u-button>
+						</view>
+						<view class="queding">
+							<u-button type="primary" text="确定" @click="queding"></u-button>
+						</view>
 					</view>
 				</view>
-			</view>
-		</u-popup>
-
-
-		<u-notify ref="uNotify" message="" ></u-notify>
+			</u-popup>
+			<u-notify ref="uNotify" message=""></u-notify>
 		</view>
+	</view>
 </template>
 
 <script>
-
 	export default {
 		data() {
 			return {
-				columnsrenyuan:[],
-				columnsrenjinji:[],
+				columnsrenyuan: [],
+				columnsrenjinji: [],
 				model1: {
 					userInfo: {
 						repairPersonId: '',
-						urgency:'',
+						urgency: '',
 					},
 				},
 
@@ -159,26 +106,26 @@
 					},
 				},
 
-				showjinji:false,
-				showSex:false,
-				showqd:false,
-				showweixiu:false,
-				companyOrgId:'',
-				renyuanid:'',
-				jjcd:'',
+				showjinji: false,
+				showSex: false,
+				showqd: false,
+				showweixiu: false,
+				companyOrgId: '',
+				renyuanid: '',
+				jjcd: '',
 
 				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
-				details:{
-					shijian:'',
-					weizhi:'',
-					quyu:'',
-					leixing:'',
-					lxr:'',
-					lxdh:'',
-					gzms:'',
-					gzimg:[],
+				details: {
+					shijian: '',
+					weizhi: '',
+					quyu: '',
+					leixing: '',
+					lxr: '',
+					lxdh: '',
+					gzms: '',
+					gzimg: [],
 				},
-				 albumWidth: 0,
+				albumWidth: 0,
 			}
 		},
 		onReady() {
@@ -186,8 +133,8 @@
 			//this.$refs.uForm.setRules(this.rules)
 		},
 		onLoad(options) {
-		    this.companyOrgId = options.id;
-		  //  console.log(options.id);
+			this.companyOrgId = options.id;
+			//  console.log(options.id);
 			let getDictDataList = uni.getStorageSync('getDictDataList');
 
 
@@ -202,101 +149,106 @@
 		},
 		methods: {
 			getUserList() {
-				this.$api.get('/user/list',{ page: 1,limit: 100,})
-						.then(res=>{
-						
-               this.columnsrenyuan=[res.data.data]
-						})
+				this.$api.get('/user/list', {
+						page: 1,
+						limit: 100,
+					})
+					.then(res => {
+
+						this.columnsrenyuan = [res.data.data]
+					})
 			},
-			getdata(){
-				this.$api.get('/repairorder/'+this.companyOrgId,{})
-				.then(res=>{
+			getdata() {
+				this.$api.get('/repairorder/' + this.companyOrgId, {})
+					.then(res => {
 
-				  this.details.shijian=res.data.data.createDate;
-				    this.details.weizhi=res.data.data.repairPosition;
-					  this.details.lxr=res.data.data.contactPerson;
-					 this.details.lxdh=res.data.data.contactPhone;
-					 this.details.gzms=res.data.data.faultDes;
-				res.data.data.faultPics=res.data.data.faultPics.split(",");
+						this.details.shijian = res.data.data.createDate;
+						this.details.weizhi = res.data.data.repairPosition;
+						this.details.lxr = res.data.data.contactPerson;
+						this.details.lxdh = res.data.data.contactPhone;
+						this.details.gzms = res.data.data.faultDes;
+						res.data.data.faultPics = res.data.data.faultPics.split(",");
 
-					 this.details.gzimg=res.data.data.faultPics;
-					//  console.log('111111111111111111', this.details.gzimg)
+						this.details.gzimg = res.data.data.faultPics;
+						//  console.log('111111111111111111', this.details.gzimg)
 
-				  if(res.data.data.repairRegion==1){
-					   this.details.quyu='公共区域';
-				  }else if(res.data.data.repairRegion==2){
-					     this.details.quyu='室内';
-				  }
+						if (res.data.data.repairRegion == 1) {
+							this.details.quyu = '公共区域';
+						} else if (res.data.data.repairRegion == 2) {
+							this.details.quyu = '室内';
+						}
 
-				  if(res.data.data.repairType==1){
-				  					   this.details.leixing='水';
-				  }else if(res.data.data.repairType==2){
-				  					     this.details.leixing='电';
-				  }else if(res.data.data.repairType==3){
-				  					     this.details.leixing='其他';
-				  }
+						if (res.data.data.repairType == 1) {
+							this.details.leixing = '水';
+						} else if (res.data.data.repairType == 2) {
+							this.details.leixing = '电';
+						} else if (res.data.data.repairType == 3) {
+							this.details.leixing = '其他';
+						}
 
 
 
-				})
+					})
 			},
-			quxiao(){
-this.showweixiu=false;
+			quxiao() {
+				this.showweixiu = false;
 			},
-			queding(){
+			queding() {
 				this.$refs.uForm.validate().then(res => {
-				//	uni.$u.toast('校验通过')
+					//	uni.$u.toast('校验通过')
 					//  jjcd  renyuanid  companyOrgId
 					//console.log('111111111111111111',this.jjcd,this.renyuanid,this.companyOrgId)
-					this.$api.put('/repairorder',{
-						id: this.companyOrgId,
-						repairPersonId: this.renyuanid,
-						urgency: this.jjcd,
-					})
-							.then(res=>{
-								//console.log('111111111111111111',res)
-								if(res.data.code==0){
-									this.$refs.uNotify.success('指派成功')
+					this.$api.put('/repairorder', {
+							id: this.companyOrgId,
+							repairPersonId: this.renyuanid,
+							urgency: this.jjcd,
+						})
+						.then(res => {
+							//console.log('111111111111111111',res)
+							if (res.data.code == 0) {
+								this.$refs.uNotify.success('指派成功')
 
-									setTimeout(function(){uni.navigateTo({
+								setTimeout(function() {
+									uni.navigateTo({
 										url: '/pages/index/Workordertodone/Workordertodone'
-									})},1000);
+									})
+								}, 1000);
 
-								}else{
-									this.$refs.uNotify.error(res.data.msg)
-									// uni.navigateBack({
-									// 	delta: 1
-									// });
-								}
-							})
+							} else {
+								this.$refs.uNotify.error(res.data.msg)
+								// uni.navigateBack({
+								// 	delta: 1
+								// });
+							}
+						})
 
 				}).catch(errors => {
 					uni.$u.toast('校验失败')
 				})
 			},
-			returndata(){
-				this.showqd=true;
-			},
-			weixiuyes(){
-				this.$api.post('/repairorder/finish/'+this.companyOrgId,{})
-						.then(res=>{
-							//console.log('111111111111111111',res)
-							if(res.data.code==0){
-								this.$refs.uNotify.success('维修成功')
-								setTimeout(function(){uni.navigateTo({
+
+			weixiuyes() {
+				this.$api.post('/repairorder/finish/' + this.companyOrgId, {})
+					.then(res => {
+						//console.log('111111111111111111',res)
+						if (res.data.code == 0) {
+							this.$refs.uNotify.success('维修成功')
+							setTimeout(function() {
+								uni.navigateTo({
 									url: '/pages/index/Workordertodone/Workordertodone'
-								})},1000);
-							}else{
-								this.$refs.uNotify.error(res.data.msg)
-							}
-						})
-				this.showqd=false;
+								})
+							}, 1000);
+						} else {
+							this.$refs.uNotify.error(res.data.msg)
+						}
+					})
+				this.showqd = false;
 			},
-			weixiuno(){
-				this.showqd=false;
+			weixiuno() {
+				this.showqd = false;
 			},
-			Maintenancepersonnel(){
-this.showweixiu=true;
+			Maintenancepersonnel() {
+				this.showweixiu = true;
 			},
 			openwx() {
 				// console.log('open');
@@ -309,62 +261,87 @@ this.showweixiu=true;
 			confirmry(e) {
 				console.log('confirm', e.value[0])
 				this.model1.userInfo.repairPersonId = e.value[0].realName;
-				this.renyuanid= e.value[0].id;
+				this.renyuanid = e.value[0].id;
 				this.showSex = false
 			},
 			confirmjinji(e) {
 				console.log('confirm', e.value[0])
 				this.model1.userInfo.urgency = e.value[0].dictLabel;
-				this.jjcd=e.value[0].dictValue;
+				this.jjcd = e.value[0].dictValue;
 				this.showjinji = false
 			},
-			
-			
+
+
 		}
 	}
 </script>
 
 <style lang="scss">
+	.baoxiu {
+		padding: 18rpx 32rpx;
+		font-size: 36rpx;
 	
-	.guidang{
-		display: flex;
-		align-items: center;
-		justify-content: space-around;
-		margin-top: 80rpx;
-	}
-	.queding{
-		width: 300rpx;
-
+		span {
+			display: inline-block;
+			margin-right: 16rpx;
+			width: 8rpx;
+			height: 32rpx;
+			background-color: #5776E6;
+			border-radius: 5rpx;
+		}
 	}
-	.albumcontent{
+	
+	.uploadPart {
 		display: flex;
-		.u-album{
+		justify-content: center;
+		width: 100%;
+	
+		.uploadBtn {
+			width: 160rpx;
+			height: 160rpx;
+			background-color: #ECF0FF;
+			text-align: center;
+			border-radius: 4rpx;
 			display: flex;
-			flex-direction: row;
-			flex-wrap: wrap;
+			align-items: center;
+			justify-content: center;
+		}
+	
+		.allimg {
+			position: relative;
+		}
+	
+		.newimg {
+			width: 160rpx;
+			height: 160rpx;
+			margin-right: 10rpx;
+			border: 1px solid #eee;
 		}
 	}
-.guzhang{
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-}
-	.returndata{
-		padding: 30rpx;
-	}
-	.Maintenancepersonnel{
-		margin-top: 15rpx;
+	.guidang {
+		display: flex;
+		    align-items: center;
+		    justify-content: space-around;
+		    border-top: 24rpx solid #f8f8f8;
+		    padding: 16rpx 0;
+		.queding {
+			width: 300rpx;
+			height: 88rpx;
+		
+		}
 	}
-.weixiudc{
-	width: 750rpx;
-	height: 450rpx;
-	h3{
-		font-size: 30rpx;
-		font-weight: bold;
+	.weixiudc {
 		width: 750rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		text-align: center;
+		height: 450rpx;
+
+		.tit {
+			    font-size: 18px;
+			    text-align: center;
+			    padding: 12px 0;
+			    border-bottom: 1px solid #eee;
+		}
+		.u-form{
+			padding: 0 32rpx;
+		}
 	}
-}
-</style>
+</style>

pages/index/Workordertodone/Workordertodone.vue

@@ -1,44 +1,28 @@
 <template>
-	<view class="">
-<view class="" style="width: 750rpx;height: 50rpx;">
-			
-		</view>
-		<view class="topname">
-			<view class="topname1" @click="goback">
-				<u-icon name="arrow-left" color="#000000" size="36"></u-icon>
-			</view>
-			<view class="topname2">
-				报修工单
-			</view>
-		</view>
-
-		<view class="subsection">
-			<u-subsection :list="list" fontSize="30rpx" :current="current" @change="sectionChange"></u-subsection>
-		</view>
-
-
+	<view class="page">
+		<u-tabs :list="list" @click="sectionChange" style="background-color: #fff;" :current=current
+			:itemStyle="{'width':'250rpx','padding':'24rpx'}" lineHeight="2px" lineWidth="30px"></u-tabs>
 		<!-- 待指派 -->
-		<view class="" v-show="cdshow==0">
-			<view style="padding:20rpx 0 0 30rpx">
+		<view class="contain" v-show="cdshow==0">
+			<view style="padding:16rpx 0 16rpx 32rpx">
 				共有 <span style="color: red">{{totalnumber}}</span>条记录
 			</view>
-
-			<view class="u-listdata" >
-				<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
+			<view class="u-listdata">
+				<u-list @scrolltolower="scrolltolower" :pagingEnabled='true' style="height:400px;flex:1;">
 					<u-list-item v-for="(item, index) in indexList" :key="index">
-						<view class="paisong"  @click="Workorderdetails1(item)">
-							<h3>{{item.repairPosition}}</h3>
-							<view class="Currentamount1" v-if='item.repairType==1'>
+						<view class="paisong" @click="Workorderdetails1(item)">
+							<view class="title">{{item.repairPosition}}</view>
+							<view class="submit" v-if='item.repairType==1'>
 								报修类型: 水
 							</view>
-							<view class="Currentamount1" v-if='item.repairType==2'>
+							<view class="submit" v-if='item.repairType==2'>
 								报修类型: 电
 							</view>
-							<view class="Currentamount1" v-if='item.repairType==3'>
+							<view class="submit" v-if='item.repairType==3'>
 								报修类型: 其他
 							</view>
 
-							<view class="Currentamount1">
+							<view class="submit">
 								报修时间: {{item.createDate}}
 							</view>
 						</view>
@@ -48,110 +32,99 @@
 			</view>
 		</view>
 		<!-- 已派送(待维修) -->
-		<view class="" v-show="cdshow==1">
-		<!-- 	列表 -->
-			<view class="u-listdata" >
-				<view style="padding:20rpx 0 0 30rpx">
+		<view class="contain" v-show="cdshow==1">
+			<!-- 	列表 -->
+			<view class="u-listdata">
+				<view style="padding:16rpx 0 16rpx 32rpx">
 					共有 <span style="color: red">{{totalnumber}}</span>条记录
 				</view>
-
-				<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
+				<u-list @scrolltolower="scrolltolower" :pagingEnabled='true' style="height:400px;flex:1;">
 					<u-list-item v-for="(item, index) in indexList" :key="index">
-
-						<view class="paisong"  @click="Workorderdetails2(item)">
-							<view class="settled1" v-if="item.urgency==1">
+						<view class="paisong" @click="Workorderdetails2(item)">
+							<view class="status bg3" v-if="item.urgency==1">
 								非常紧急
 							</view>
-							<view class="settled2" v-if="item.urgency==2">
+							<view class="status bg2" v-if="item.urgency==2">
 								紧急
 							</view>
-							<view class="settled3" v-if="item.urgency==3">
+							<view class="status bg1" v-if="item.urgency==3">
 								普通
 							</view>
-
-							<h3>{{item.repairPosition}}</h3>
-							<view class="Currentamount1" v-if='item.repairType==1'>
+							<view class="title">{{item.repairPosition}}</view>
+							<view class="subtit" v-if='item.repairType==1'>
 								报修类型: 水
 							</view>
-							<view class="Currentamount1" v-if='item.repairType==2'>
+							<view class="subtit" v-if='item.repairType==2'>
 								报修类型: 电
 							</view>
-							<view class="Currentamount1" v-if='item.repairType==3'>
+							<view class="subtit" v-if='item.repairType==3'>
 								报修类型: 其他
 							</view>
-							<view class="Currentamount1">
+							<view class="subtit">
 								派送时间:{{ item.updateDate }}
 							</view>
-
 						</view>
-
 					</u-list-item>
 				</u-list>
 			</view>
-
 		</view>
-
-<!--已维修 -->
-		<view class="" v-show="cdshow==2">
-		<!-- 	列表 -->
-			<view class="u-listdata" >
-				<view style="padding:20rpx 0 0 30rpx">
+		<!--已维修 -->
+		<view class="contain" v-show="cdshow==2">
+			<!-- 	列表 -->
+			<view class="u-listdata">
+				<view style="padding:16rpx 0 16rpx 32rpx">
 					共有 <span style="color: red">{{totalnumber}}</span>条记录
 				</view>
-
-				<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
+				<u-list @scrolltolower="scrolltolower" :pagingEnabled='true' style="height:400px;flex:1">
 					<u-list-item v-for="(item, index) in indexList" :key="index">
 
-						<view class="paisong"   @click="Workorderdetails3(item)">
-							<view class="settled1" v-if="item.urgency==1">
+						<view class="paisong" @click="Workorderdetails3(item)">
+							<view class="status bg3" v-if="item.urgency==1">
 								非常紧急
 							</view>
-							<view class="settled2" v-if="item.urgency==2">
+							<view class="status bg2" v-if="item.urgency==2">
 								紧急
 							</view>
-							<view class="settled3" v-if="item.urgency==3">
+							<view class="status bg1" v-if="item.urgency==3">
 								普通
 							</view>
 
-							<h3>{{item.repairPosition}}</h3>
-							<view class="Currentamount1" v-if='item.repairType==1'>
+							<view class="title">{{item.repairPosition}}</view>
+							<view class="subtit" v-if='item.repairType==1'>
 								报修类型: 水
 							</view>
-							<view class="Currentamount1" v-if='item.repairType==2'>
+							<view class="subtit" v-if='item.repairType==2'>
 								报修类型: 电
 							</view>
-							<view class="Currentamount1" v-if='item.repairType==3'>
+							<view class="subtit" v-if='item.repairType==3'>
 								报修类型: 其他
 							</view>
-							<view class="Currentamount1">
+							<view class="subtit">
 								维修完成时间:{{ item.repairFinishTime }}
 							</view>
-
 						</view>
-
 					</u-list-item>
 				</u-list>
 			</view>
 		</view>
-
 	</view>
 </template>
 
 <script>
-//	import { isEmpty, getDictDataList } from "@/utils/index";
+	//	import { isEmpty, getDictDataList } from "@/utils/index";
 
 	export default {
-		name:'Workordertodone',
+		name: 'Workordertodone',
 		data() {
 			return {
-				totalnumber:0,
-				jfnodata:false,
+				totalnumber: 0,
+				jfnodata: false,
 				showtype: false,
 				cdshow: 0,
 				fatherparameter: {},
-				expensedata:'全部',
+				expensedata: '全部',
 				list: [],
-				gly:true,
+				gly: true,
 				current: 0,
 				dataForm: {
 					status: "1",
@@ -160,361 +133,208 @@
 				},
 				indexList: [],
 				payStatusList: [],
-				nodata:true,
-				pd:true,
+				nodata: true,
+				pd: true,
 				columnstype: [],
-				repairTypeList:[],
-				UrgencyTypelist:[],
+				repairTypeList: [],
+				UrgencyTypelist: [],
 			}
 		},
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
 		onLoad: function(options) { //option为object类型，会序列化上个页面传递的参数
-		let permissions = uni.getStorageSync('ButtonPermissions');
-	
-		let isHave = permissions.includes('app:Tobeassigned');
-		this.gly=permissions.includes('app:Tobeassigned');
-		//  console.log('2222',isHave)
-		if(isHave){
-			this.list= ['待指派', '已指派(待维修)','已维修' ];
-			this.cdshow = 0;
-			 this.indexList=[];
-			 this.dataForm.page = 1;
-			 this.dataForm.status = 1;
-			 this.getpaisongdata();
-		}else{
-			this.list= [ '已指派(待维修)','已维修' ];
-			this.cdshow = 1;
-			this.indexList=[];
-			this.dataForm.page = 1;
-			this.dataForm.status = 2;
-			this.getpaisongdata();
-		}
-		
-
-			//this.getRepairTypeList();
-
-		//	this.getpaisongdata();
-
+			let permissions = uni.getStorageSync('ButtonPermissions');
+
+			let isHave = permissions.includes('app:Tobeassigned');
+			this.gly = permissions.includes('app:Tobeassigned');
+			//  console.log('2222',isHave)
+			if (isHave) {
+				this.list = [{
+					name: '待指派'
+				}, {
+					name: '已指派(待维修)'
+				}, {
+					name: '已维修'
+				}];
+				this.cdshow = 0;
+				this.indexList = [];
+				this.dataForm.page = 1;
+				this.dataForm.status = 1;
+				this.getpaisongdata();
+			} else {
+				this.list = [{
+					name: '已指派(待维修)'
+				}, {
+					name: '已维修'
+				}];
+				this.cdshow = 1;
+				this.indexList = [];
+				this.dataForm.page = 1;
+				this.dataForm.status = 2;
+				this.getpaisongdata();
+			}
 		},
-		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
-		onReady() {},
-
-		//监听页面隐藏
-		onHide() {},
-		//监听窗口尺寸变化
-		onResize() {},
-		//监听页面卸载
-		onUnload() {},
-		//监听用户下拉动作，一般用于下拉刷新
-		onPullDownRefresh() {},
-
-
 		methods: {
-			   getRepairTypeList() {
-				   //  console.log('9999', getDictDataList("UrgencyType"))
-					// this.UrgencyTypelist=getDictDataList("UrgencyType");
-					//   console.log('888', getDictDataList("RepairType"))
-			   //   this.repairTypeList = getDictDataList("RepairType");
-			    },
-			Workorderdetails1(e){
-				//  console.log('111111111111111111',e)
-				   uni.navigateTo({
-				             url: `/pages/index/Workordertodone/Workorderdetails/Workorderdetails?id=${e.id}`
-				          });
+			Workorderdetails1(e) {
+				uni.navigateTo({
+					url: `/pages/index/Workordertodone/Workorderdetails/Workorderdetails?id=${e.id}`
+				});
 			},
-			Workorderdetails2(e){
-				//  console.log('111111111111111111',e)
-				   uni.navigateTo({
-				             url: `/pages/index/Workordertodone/Toberepaired/Toberepaired?id=${e.id}`
-				          });
+			Workorderdetails2(e) {
+				uni.navigateTo({
+					url: `/pages/index/Workordertodone/Toberepaired/Toberepaired?id=${e.id}`
+				});
 			},
-			Workorderdetails3(e){
-				//  console.log('111111111111111111',e)
-				   uni.navigateTo({
-				             url: `/pages/index/Workordertodone/hasrepaired/hasrepaired?id=${e.id}`
-				          });
+			Workorderdetails3(e) {
+				uni.navigateTo({
+					url: `/pages/index/Workordertodone/hasrepaired/hasrepaired?id=${e.id}`
+				});
 			},
-
-			sectionChange(index) {
-				//this.gly
-				  console.log('111111111111111111',index)
-				if(this.gly){
-					this.current = index;
-					if (index == 0) {
+			sectionChange(val) {
+				if (this.gly) {
+					this.current = val.index;
+					if (val.index == 0) {
 						this.cdshow = 0;
-						 this.indexList=[];
-						 this.dataForm.page = 1;
-						 this.dataForm.status = 1;
-						 this.getpaisongdata();
-					} else if(index == 1) {
+						this.indexList = [];
+						this.dataForm.page = 1;
+						this.dataForm.status = 1;
+						this.getpaisongdata();
+					} else if (val.index == 1) {
 						this.cdshow = 1;
-						this.indexList=[];
+						this.indexList = [];
 						this.dataForm.page = 1;
 						this.dataForm.status = 2;
 						this.getpaisongdata();
-					} else if(index == 2) {
+					} else if (val.index == 2) {
 						this.cdshow = 2;
-						this.indexList=[];
+						this.indexList = [];
 						this.dataForm.page = 1;
 						this.dataForm.status = 3;
 						this.getpaisongdata();
 					}
-				}else{
-					this.current = index;
-					if (index == 0) {
+				} else {
+					this.current = val.index;
+					if (val.index == 0) {
 						this.cdshow = 1;
-						this.indexList=[];
+						this.indexList = [];
 						this.dataForm.page = 1;
 						this.dataForm.status = 2;
 						this.getpaisongdata();
-					} else if(index == 1) {
+					} else if (index == 1) {
 						this.cdshow = 2;
-						this.indexList=[];
+						this.indexList = [];
 						this.dataForm.page = 1;
 						this.dataForm.status = 3;
 						this.getpaisongdata();
 					}
-					
-				}							
+
+				}
 			},
 			scrolltolower() {
-				if(this.pd){
+				if (this.pd) {
 					this.getpaisongdata();
-				}else{
-					 return
+				} else {
+					return
 				}
 			},
-			    // dict_filter(val, list) {
-			    //   if (isEmpty(val)) {
-			    //     return {};
-			    //   }
-			    //   return this[list].find((item) => item.dictValue == val);
-			    // },
-			getpaisongdata(){
+			getpaisongdata() {
 				this.$api.get('/repairorder/page', this.dataForm)
 					.then(res => {
-						 this.totalnumber=res.data.data.total;
-
+						this.totalnumber = res.data.data.total;
 						if (res.data.data.list.length != 0) {
 							this.indexList.push(...res.data.data.list);
-								this.dataForm.page = this.dataForm.page + 1;
-								this.pd=true;
-								this.jfnodata=false;
+							this.dataForm.page = this.dataForm.page + 1;
+							this.pd = true;
+							this.jfnodata = false;
 						} else {
 							uni.showToast({
-								title:'暂无更多数据了',
+								title: '暂无更多数据了',
 								icon: 'none',
 								duration: 1500
 							})
-							this.pd=false;
-							//this.jfnodata=true
+							this.pd = false;
 						}
 
 					})
 			},
-goback() {
-				uni.navigateTo({
-					url: '/pages/index/index'
-				})
-			},
-
-
-
 		}
 	}
 </script>
 
 <style lang="scss">
-
-.topname {
-		height: 44px;
-		width: 750rpx;
-		display: flex;
-		align-items: center;
-	}
-	
-	.topname1 {
-		width: 50rpx;
-		padding-left: 10rpx;
-	}
-	
-	.topname2 {
-		width: 700rpx;
-		text-align: center;
-		font-weight: bold;
-	}
-
-	.nodata{
+	.nodata {
 		text-align: center;
 		padding-top: 400rpx;
 
 	}
-	.paisong{
-		display: flex;
-		flex-direction: column;
-		justify-content:center;
-		height:170rpx;
-		background-color: #fff;
-		margin: 30rpx;
-		border-radius: 9rpx;
-		position: relative;
-		h3 {
-			height: 70rpx;
-			line-height: 70rpx;
-			padding-left: 30rpx;
-		}
-	}
-
-
-	.companylist {
-		margin: 20rpx 30rpx;
-		background: #fff;
-		height: 280rpx;
-		border-radius: 10px;
-		position: relative;
-
-		h3 {
-			height: 70rpx;
-			line-height: 70rpx;
-			padding-left: 30rpx;
-		}
-	}
-	.settled1 {
-		background-color: #ED3A25;
-		width: 100rpx;
-		height: 40rpx;
-		text-align: center;
-		line-height: 40rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-	.settled2 {
-		background-color: #FF9C27;
-		width: 100rpx;
-		height: 40rpx;
-		text-align: center;
-		line-height: 40rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-	.settled3 {
-		background-color: #30D3A2;
-		width: 100rpx;
-		height: 40rpx;
-		text-align: center;
-		line-height: 40rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
 
+	.page {
+		height: 100%;
+		overflow: hidden;
 
-	.Currentamount {
-		padding-left: 30rpx;
-		height: 50rpx;
-		line-height: 50rpx;
-		color: #BCB3A7;
-
-		span {
-			color: #FA5555;
-			padding-left: 9rpx;
-		}
-	}
+		.contain {
+			height: calc(100% - 44px);
+			padding: 0;
+			display: flex;
+			flex-direction: column;
 
-	.Currentamount1 {
-		padding-left: 30rpx;
-		height: 40rpx;
-		line-height: 40rpx;
-		color: #BCB3A7;
+			.u-listdata {
+				height: 400px;
+				flex: 1;
+				display: flex;
+				flex-direction: column;
 
-		span {
-			color: #FA5555;
-			padding-left: 9rpx;
+			}
 		}
 	}
 
-	.records1{
-		background-color: #FA5555;
-		width: 100rpx;
-		height: 40rpx;
-		text-align: center;
-		line-height: 40rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-	.records{
+	.paisong {
 		display: flex;
 		flex-direction: column;
-		// justify-content: center;
-		position: relative;
-		width: 690rpx;
-		height: 210rpx;
-		background: #fff;
-		margin: 0 auto;
-		border-radius: 9rpx;
-	}
-	.onerecord{
-		width: 750rpx;
-		height: 90rpx;
-		line-height: 90rpx;
-		padding-left: 30rpx;
-		color: #999;
-		span{
-			color: red;
-		}
-	}
-	.topbilledit {
-		display: flex;
 		justify-content: center;
-		align-items: center;
-		background: #fff;
-		height: 60rpx;
-	}
+		background-color: #fff;
+		margin: 0 16px 24rpx;
+		padding: 12px 16px;
+		border-radius: 4px;
+		position: relative;
 
-	.changetime2 {
-		padding-left: 10rpx;
-	}
+		.title {
+			font-size: 32rpx;
+			color: #0C1935;
+			margin-bottom: 16rpx;
 
-	.subsection {
-		padding: 30rpx;
-		background: #fff;
-	}
+			span {
+				color: #FA5555;
+				font-weight: 600;
+			}
+		}
 
-	.topname {
-		height: 44px;
-		width: 750rpx;
-		display: flex;
-		align-items: center;
-	}
+		.subtit {
+			color: #9DA0AC;
+			margin-bottom: 6rpx;
+		}
 
-	.topname1 {
-		width: 50rpx;
-		padding-left: 10rpx;
-	}
+		.status {
+			position: absolute;
+			padding: 1px 5px;
+			border-radius: 0 8rpx 0 24rpx;
+			right: 0;
+			line-height: 48rpx;
+			text-align: center;
+			top: 0;
+			z-index: 1;
+			font-size: 22rpx;
+			background-color: rgba(48, 211, 162, .16);
+			color: rgba(48, 211, 162, 1);
+
+			&.bg2 {
+				background-color: rgba(255, 156, 39, .16);
+				color: rgba(255, 156, 39, 1);
+			}
 
-	.topname2 {
-		width: 700rpx;
-		text-align: center;
-		font-weight: bold;
+			&.bg3 {
+				background-color: rgba(237, 58, 37, .16);
+				color: rgba(237, 58, 37, 1);
+			}
+		}
 	}
-</style>
+</style>

pages/index/Workordertodone/hasrepaired/hasrepaired.vue

@@ -1,321 +1,158 @@
 <template>
-	<view class="OutermostLayer">
-		<h3 class="baoxiu">报修信息</h3>
-		<u-cell-group>
-			<u-cell icon="integral-fill" title="报修时间"  :value="details.shijian" >
-				<u-icon slot="icon" size="40" name="calendar"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="报修位置" :value="details.weizhi" >
-				<u-icon slot="icon" size="40" name="map"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="报修区域" :value="details.quyu" >
-				<u-icon slot="icon" size="40" name="grid"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="报修类型" :value="details.leixing" >
-				<u-icon slot="icon" size="40" name="pushpin"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="联系人" :value="details.lxr" >
-				<u-icon slot="icon" size="40" name="man-add"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="联系电话" :value="details.lxdh">
-				<u-icon slot="icon" size="40" name="phone"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="故障描述" :value="details.gzms" >
-				<u-icon slot="icon" size="40" name="order"></u-icon>
-			</u-cell>
-
-			<u-cell icon="integral-fill" title="故障照片" >
-				<u-icon slot="icon" size="40" name="photo"></u-icon>
-				<view
-						slot="title"
-						class="guzhang"
-				>
-					<view class="">
-						故障照片
-					</view>
-					<view class="albumcontent">
-						<u-album :urls="details.gzimg"></u-album>
+	<view class="contain" style="padding-bottom: 0;">
+		<view class="main" style="padding: 0;">
+			<view class="baoxiu"><span></span>报修信息</view>
+			<u-cell-group>
+				<u-cell title="报修时间" :value="details.shijian">
+				</u-cell>
+				<u-cell title="报修位置" :value="details.weizhi">
+				</u-cell>
+				<u-cell title="报修区域" :value="details.quyu">
+				</u-cell>
+				<u-cell title="报修类型" :value="details.leixing">
+				</u-cell>
+				<u-cell title="联系人" :value="details.lxr">
+				</u-cell>
+				<u-cell title="联系电话" :value="details.lxdh">
+					
+				</u-cell>
+				<u--form labelPosition="left" >
+				<u-form-item labelWidth='180' style="padding:0 32rpx;" label="故障描述:">
+				</u-form-item>
+				<u-form-item labelWidth='180' borderBottom style="padding:0 32rpx;">
+					<view style="width:100%;padding: 0 20rpx;height:80px">{{details.gzms}}</view>
+				</u-form-item>
+				<u-form-item labelWidth='180' label="故障照片" style="padding:0 32rpx;">
+				</u-form-item>
+				<u-form-item labelWidth='180' borderBottom style="padding:0 32rpx;">
+					<view class="uploadPart">
+						<view class="allimg" v-for="img in details.gzimg">
+							<image :src="img" mode="aspectFill" class="newimg"></image>
+						</view>
 					</view>
-				</view>
-			</u-cell>
-
-		</u-cell-group>
-
-		<h3 class="baoxiu">维修信息</h3>
-		<u-cell-group>
-			<u-cell icon="integral-fill" title="紧急程度"  :value="details.jinji" >
-				<u-icon slot="icon" size="40" name="bell"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="维修人员" :value="details.weixiury" >
-				<u-icon slot="icon" size="40" name="man-add"></u-icon>
-			</u-cell>
-			<u-cell icon="integral-fill" title="联系电话" :value="details.weixiudh" >
-				<u-icon slot="icon" size="40" name="phone"></u-icon>
-			</u-cell>
-	<u-cell icon="integral-fill" title="维修完成时间" :value="details.repairFinishTime" >
-				<u-icon slot="icon" size="40" name="bell"></u-icon>
-			</u-cell>
-
-
-
-
-		</u-cell-group>
-		<view class="returndata">
-			<!--<view>-->
-				<!--<u-button type="primary"  text="维修完成" @click="returndata"></u-button>-->
-			<!--</view>-->
-			<!--<view class="Maintenancepersonnel">-->
-			<!--<u-button type="primary"  text="指派维修人员"  @click="Maintenancepersonnel"></u-button>-->
-			<!--</view>-->
+				</u-form-item>
+				</u--form>
+			</u-cell-group>
+
+			<view class="baoxiu"><span></span>维修信息</view>
+			<u-cell-group>
+				<u-cell title="紧急程度" :value="details.jinji">
+				</u-cell>
+				<u-cell title="维修人员" :value="details.weixiury">
+				</u-cell>
+				<u-cell title="联系电话" :value="details.weixiudh">
+				</u-cell>
+			</u-cell-group>
 		</view>
 		<!--确定弹窗-->
-		<u-modal :show="showqd" title="提示" content='请问是否确定维修完成?' :showCancelButton="true"
-				 @confirm="weixiuyes"  @cancel="weixiuno"
-		></u-modal>
-
-
-		<u-notify ref="uNotify" message="" ></u-notify>
 	</view>
 </template>
 
 <script>
-
 	export default {
 		data() {
 			return {
-				columnsrenyuan:[],
-				columnsrenjinji:[],
-				model1: {
-					userInfo: {
-						repairPersonId: '',
-						urgency:'',
-					},
+				companyOrgId: '',
+				details: {
+					shijian: '',
+					weizhi: '',
+					quyu: '',
+					leixing: '',
+					lxr: '',
+					lxdh: '',
+					gzms: '',
+					gzimg: [],
+					repairFinishTime: '',
+					jinji: '',
+					weixiury: '',
+					weixiudh: ''
 				},
 
-				rules: {
-					'userInfo.repairPersonId': {
-						type: 'string',
-						required: true,
-						message: '请选择维修人员',
-						trigger: ['blur', 'change']
-					},
-					'userInfo.urgency': {
-						type: 'string',
-						required: true,
-						message: '请选择紧急程度',
-						trigger: ['blur', 'change']
-					},
-				},
-
-				showjinji:false,
-				showSex:false,
-				showqd:false,
-				showweixiu:false,
-				companyOrgId:'',
-				renyuanid:'',
-				jjcd:'',
-
-				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
-				details:{
-					shijian:'',
-					weizhi:'',
-					quyu:'',
-					leixing:'',
-					lxr:'',
-					lxdh:'',
-					gzms:'',
-					gzimg:[],
-repairFinishTime:'',
-
-					jinji:'',
-					weixiury:'',
-					weixiudh:''
-				},
-				albumWidth: 0,
-
 			}
 		},
-		onReady() {
-			//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
-			//this.$refs.uForm.setRules(this.rules)
-		},
+		onReady() {},
 		onLoad(options) {
 			this.companyOrgId = options.id;
-			//  console.log(options.id);
-			//	let getDictDataList = uni.getStorageSync('getDictDataList');
-
-
-			this.getUserList();
 			this.getdata();
-
 		},
 		methods: {
-			getUserList() {
-				this.$api.get('/user/list',{ page: 1,
-					limit: 100,})
-						.then(res=>{
-							//	console.log('111111111111111111',res.data.data)
-							this.columnsrenyuan=res.data.data;
-						})
-			},
-			getdata(){
-				this.$api.get('/repairorder/'+this.companyOrgId,{})
-						.then(res=>{
-
-							this.details.shijian=res.data.data.createDate;
-							this.details.weizhi=res.data.data.repairPosition;
-							this.details.lxr=res.data.data.contactPerson;
-							this.details.lxdh=res.data.data.contactPhone;
-							this.details.gzms=res.data.data.faultDes;
-							this.details.weixiury=res.data.data.repairPersonName;
-								this.details.repairFinishTime=res.data.data.repairFinishTime;
-							
-							res.data.data.faultPics=res.data.data.faultPics.split(",");
-
-							this.details.gzimg=res.data.data.faultPics;
-							//  console.log('111111111111111111', this.details.gzimg)
-
-							if(res.data.data.repairRegion==1){
-								this.details.quyu='公共区域';
-							}else if(res.data.data.repairRegion==2){
-								this.details.quyu='室内';
-							}
-
-							if(res.data.data.repairType==1){
-								this.details.leixing='水';
-							}else if(res.data.data.repairType==2){
-								this.details.leixing='电';
-							}else if(res.data.data.repairType==3){
-								this.details.leixing='其他';
-							}
-
-							if(res.data.data.urgency==1){
-								this.details.jinji='非常紧急';
-							}else if(res.data.data.urgency==2){
-								this.details.jinji='紧急';
-							}else if(res.data.data.urgency==3){
-								this.details.jinji='普通';
-							}
-
-
-							for(let i=0;i<this.columnsrenyuan.length;i++){
-								if(this.columnsrenyuan[i].id==res.data.data.repairPersonId){
-									console.log('111111111111111111',this.columnsrenyuan[i])
-									this.details.weixiudh=this.columnsrenyuan[i].mobile
-								}
-							}
-
-
-						})
-			},
-			quxiao(){
-				this.showweixiu=false;
-			},
-			queding(){
-				this.$refs.uForm.validate().then(res => {
-					//	uni.$u.toast('校验通过')
-					//  jjcd  renyuanid  companyOrgId
-					//console.log('111111111111111111',this.jjcd,this.renyuanid,this.companyOrgId)
-					this.$api.put('/repairorder',{
-						id: this.companyOrgId,
-						repairPersonId: this.renyuanid,
-						urgency: this.jjcd,
+			getdata() {
+				this.$api.get('/repairorder/' + this.companyOrgId, {})
+					.then(res => {
+						this.details.shijian = res.data.data.createDate;
+						this.details.weizhi = res.data.data.repairPosition;
+						this.details.lxr = res.data.data.contactPerson;
+						this.details.lxdh = res.data.data.contactPhone;
+						this.details.gzms = res.data.data.faultDes;
+						this.details.weixiury = res.data.data.repairPersonName;
+						this.details.repairFinishTime = res.data.data.repairFinishTime;
+						res.data.data.faultPics = res.data.data.faultPics.split(",");
+						this.details.gzimg = res.data.data.faultPics;
+						if (res.data.data.repairRegion == 1) {
+							this.details.quyu = '公共区域';
+						} else if (res.data.data.repairRegion == 2) {
+							this.details.quyu = '室内';
+						}
+						if (res.data.data.repairType == 1) {
+							this.details.leixing = '水';
+						} else if (res.data.data.repairType == 2) {
+							this.details.leixing = '电';
+						} else if (res.data.data.repairType == 3) {
+							this.details.leixing = '其他';
+						}
+
+						if (res.data.data.urgency == 1) {
+							this.details.jinji = '非常紧急';
+						} else if (res.data.data.urgency == 2) {
+							this.details.jinji = '紧急';
+						} else if (res.data.data.urgency == 3) {
+							this.details.jinji = '普通';
+						}
 					})
-							.then(res=>{
-								//console.log('111111111111111111',res)
-								if(res.data.code==0){
-									this.$refs.uNotify.success('指派成功')
-
-									setTimeout(function(){uni.navigateTo({
-										url: '/pages/index/Workordertodone/Workordertodone'
-									})},1000);
-
-								}else{
-									this.$refs.uNotify.error(res.data.msg)
-									// uni.navigateBack({
-									// 	delta: 1
-									// });
-								}
-							})
-
-				}).catch(errors => {
-					uni.$u.toast('校验失败')
-				})
-			},
-			returndata(){
-				this.showqd=true;
 			},
-			weixiuyes(){
-				this.$api.post('/repairorder/finish/'+this.companyOrgId,{})
-						.then(res=>{
-							//console.log('111111111111111111',res)
-							if(res.data.code==0){
-								this.$refs.uNotify.success('维修成功')
-								setTimeout(function(){uni.navigateTo({
-									url: '/pages/index/Workordertodone/Workordertodone'
-								})},1000);
-							}else{
-								this.$refs.uNotify.error(res.data.msg)
-							}
-						})
-				this.showqd=false;
-			},
-			weixiuno(){
-				this.showqd=false;
-			},
-
-
-
-
-
-
 		}
 	}
 </script>
 
 <style lang="scss">
-	.guidang{
-		display: flex;
-		align-items: center;
-		justify-content: space-around;
-		margin-top: 80rpx;
-	}
-	.queding{
-		width: 300rpx;
-
-	}
-	.baoxiu{
-		padding: 30rpx;
-	}
-	.albumcontent{
-		display: flex;
-		.u-album{
-			display: flex;
-			flex-direction: row;
-			flex-wrap: wrap;
+	.baoxiu {
+		padding: 18rpx 32rpx;
+		font-size: 36rpx;
+	
+		span {
+			display: inline-block;
+			margin-right: 16rpx;
+			width: 8rpx;
+			height: 32rpx;
+			background-color: #5776E6;
+			border-radius: 5rpx;
 		}
 	}
-	.guzhang{
+	.uploadPart {
 		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-	.returndata{
-		padding: 30rpx;
-	}
-	.Maintenancepersonnel{
-		margin-top: 15rpx;
-	}
-	.weixiudc{
-		width: 750rpx;
-		height: 450rpx;
-		h3{
-			font-size: 30rpx;
-			font-weight: bold;
-			width: 750rpx;
-			height: 80rpx;
-			line-height: 80rpx;
+		justify-content: center;
+		width: 100%;
+	
+		.uploadBtn {
+			width: 160rpx;
+			height: 160rpx;
+			background-color: #ECF0FF;
 			text-align: center;
+			border-radius: 4rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	
+		.allimg {
+			position: relative;
+		}
+	
+		.newimg {
+			width: 160rpx;
+			height: 160rpx;
+			margin-right: 10rpx;
+			border: 1px solid #eee;
 		}
 	}
-</style>
+</style>

pages/index/index.vue

@@ -248,16 +248,15 @@
 				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg1"></image>
 				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg2"></image>
 			</u-tabbar-item>
-
-			<u-tabbar-item v-if="$has('app:worktable')" text="工作台" @click="click2">
+		
+			<u-tabbar-item  text="租户账单" v-if="$has('app:TenantBill')"  @click="click2">
 				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg3"></image>
 				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg4"></image>
-
+		
 			</u-tabbar-item>
-			<u-tabbar-item text="我的" @click="click3">
+			<u-tabbar-item text="远程管控" v-if="$has('app:RemoteControl')" @click="click3">
 				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg5"></image>
 				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg6"></image>
-
 			</u-tabbar-item>
 		</u-tabbar>
 
@@ -314,7 +313,6 @@
 					url: '/pages/my/Personalinformation/Personalinformation'
 				})
 			},
-			
 			click1() {
 				uni.navigateTo({
 					url: '/pages/index/index'
@@ -322,12 +320,12 @@
 			},
 			click2() {
 				uni.navigateTo({
-					url: '/pages/Workorder/Workorder'
+					url: '/pages/Workorder/Tenantbill/Tenantbill'
 				})
 			},
 			click3() {
 				uni.navigateTo({
-					url: '/pages/my/my'
+					url: '/pages/Workorder/Workorder'
 				})
 			},
 			toUser(){