add

.idea/workspace.xml

@@ -2,38 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b14f9fe1-d3c3-496a-8ebb-4789fe400212" name="默认更改列表" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/http/baseApi.js" beforeDir="false" afterPath="$PROJECT_DIR$/http/baseApi.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages.json" beforeDir="false" afterPath="$PROJECT_DIR$/pages.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/Workorder/Arrearsrecord/Arrearsrecord.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Arrearsrecord/Arrearsrecord.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/Workorder/Remotecontrol/Remotecontrol.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Remotecontrol/Remotecontrol.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/Workorder/Tenantbill/Tenantbill.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Tenantbill/Tenantbill.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/Workorder/Tenantbill/companybill/companybill.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Tenantbill/companybill/companybill.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/Workorder/Videosurveillance/Videoplayback/Videoplayback.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Videosurveillance/Videoplayback/Videoplayback.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/Workorder/Workorder.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Workorder.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/EquipmentException/EquipmentException.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/EquipmentException/EquipmentException.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/index/Immediatecollection/Immediatecollection.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Immediatecollection/Immediatecollection.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/Inspectionrecord/Inspectionrecord.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Inspectionrecord/Inspectionrecord.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/Onlinewarranty/Onlinewarranty.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Onlinewarranty/Onlinewarranty.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/Withholdingrecord/Withholdingrecord.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Withholdingrecord/Withholdingrecord.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/Workordertodone/Workorderdetails/Workorderdetails.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Workordertodone/Workorderdetails/Workorderdetails.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/login/login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/login/login.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/my/Mydistribution/distributionedit/distributionedit.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/Mydistribution/distributionedit/distributionedit.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/my/Myorder/Myorder.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/Myorder/Myorder.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/my/Mytask/Taskdetails/Taskdetails.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/Mytask/Taskdetails/Taskdetails.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/my/Personalinformation/Informationmodification/Informationmodification.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/Personalinformation/Informationmodification/Informationmodification.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/my/my.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/my.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/sp.html" beforeDir="false" afterPath="$PROJECT_DIR$/static/sp.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/uni.scss" beforeDir="false" afterPath="$PROJECT_DIR$/uni.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-config-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-config-service.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-service.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-view.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-view.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/manifest.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-config-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-config-service.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-service.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-view.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-view.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/manifest.json" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -49,7 +21,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/index/index.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="6630">
+            <state relative-caret-position="6690">
               <caret line="223" column="19" selection-start-line="223" selection-start-column="19" selection-end-line="223" selection-end-column="19" />
             </state>
           </provider>
@@ -58,7 +30,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3330">
+            <state relative-caret-position="3420">
               <caret line="114" column="114" selection-start-line="114" selection-start-column="114" selection-end-line="114" selection-end-column="114" />
             </state>
           </provider>
@@ -67,8 +39,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="9990">
-              <caret line="337" column="6" selection-start-line="337" selection-start-column="6" selection-end-line="337" selection-end-column="6" />
+            <state relative-caret-position="10110">
+              <caret line="365" column="6" selection-start-line="365" selection-start-column="6" selection-end-line="365" selection-end-column="6" />
             </state>
           </provider>
         </entry>
@@ -76,14 +48,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/index/Workordertodone/Workordertodone.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4950">
-              <caret line="165" column="10" selection-start-line="158" selection-start-column="8" selection-end-line="165" selection-end-column="10" />
-              <folding>
-                <element signature="n#style#0;n#view#0;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#view#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
-              </folding>
+            <state relative-caret-position="5280">
+              <caret line="176" column="10" selection-start-line="176" selection-start-column="10" selection-end-line="176" selection-end-column="10" />
             </state>
           </provider>
         </entry>
@@ -100,7 +66,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/uni.scss">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1230">
+            <state relative-caret-position="1470">
               <caret line="49" selection-start-line="51" selection-start-column="2" selection-end-line="53" selection-end-column="3" />
             </state>
           </provider>
@@ -412,11 +378,12 @@
       <workItem from="1682382351913" duration="595000" />
       <workItem from="1682468371664" duration="591000" />
       <workItem from="1682554138603" duration="592000" />
+      <workItem from="1682641765071" duration="593000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="100805000" />
+    <option name="totallyTimeSpent" value="101398000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-8" width="1936" height="1056" extended-state="1" />
@@ -608,35 +575,29 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/index/index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6630">
+        <state relative-caret-position="6690">
           <caret line="223" column="19" selection-start-line="223" selection-start-column="19" selection-end-line="223" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3330">
+        <state relative-caret-position="3420">
           <caret line="114" column="114" selection-start-line="114" selection-start-column="114" selection-end-line="114" selection-end-column="114" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="9990">
-          <caret line="337" column="6" selection-start-line="337" selection-start-column="6" selection-end-line="337" selection-end-column="6" />
+        <state relative-caret-position="10110">
+          <caret line="365" column="6" selection-start-line="365" selection-start-column="6" selection-end-line="365" selection-end-column="6" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/index/Workordertodone/Workordertodone.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4950">
-          <caret line="165" column="10" selection-start-line="158" selection-start-column="8" selection-end-line="165" selection-end-column="10" />
-          <folding>
-            <element signature="n#style#0;n#view#0;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#2;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#view#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#view#0;n#view#0;n#view#3;n#view#0;n#template#0;n#!!top" expanded="true" />
-          </folding>
+        <state relative-caret-position="5280">
+          <caret line="176" column="10" selection-start-line="176" selection-start-column="10" selection-end-line="176" selection-end-column="10" />
         </state>
       </provider>
     </entry>
@@ -649,7 +610,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/uni.scss">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1230">
+        <state relative-caret-position="1470">
           <caret line="49" selection-start-line="51" selection-start-column="2" selection-end-line="53" selection-end-column="3" />
         </state>
       </provider>

http/baseApi.js

@@ -1,6 +1,6 @@
 const BaseApi = 'http://gpu.ringzle.com:8082/witcarbon-app/app'
 //严工
-//const BaseApi = 'http://192.168.1.16:9016/witcarbon-app/app'
+//const BaseApi = 'http://192.168.1.16:9013/witcarbon-app/app'
 
 
 

pages.json

@@ -336,6 +336,33 @@
             }
             
         }
+        ,{
+            "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
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/Workorder/Intelligentdoorlock/Dooropeningrecord/Dooropeningrecord.vue

@@ -0,0 +1,263 @@
+<template>
+	<view class="billall">
+
+		<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">			
+						<h3>{{item.roomName}}</h3>
+						<view class="Currentamount">
+							开锁方式:{{item.openDoorType}}
+						</view>
+						<view class="Currentamount">
+							开锁时间: {{item.openDoorDate}}
+						</view>
+						<view class="Currentamount">
+							区域:￥{{item.areaname}}
+						</view>
+						<view class="Currentamount">
+							开锁人: {{item.operateName}}
+						</view>
+					
+					</view>
+
+				</u-list-item>
+			</u-list>
+
+		</view>
+
+
+
+	</view>
+</template>
+
+<script>
+
+	export default {
+
+		data() {
+
+			return {
+				totalnumber: 0,
+				setyesno: true,
+
+				indexList: [],
+				dataList: [],
+				dataForm: {
+					 "currentPage": 0,
+					  "deviceId": "",
+					  "pageSize": 10,
+					  "roomId": "",
+					  "tempPwd": "",
+					  "tenantsId": "",
+					  "userName": ""
+				},
+
+				showtype: false,
+				showdct: false,
+				mytitle: '',
+				alldata: [],
+				showfloor: false,
+				loading: false,
+				columns: [],
+				pd: true,
+				columnData: [],
+				myday: '',
+				mytype: '全部',
+				showPicker: false,
+
+			}
+		},
+		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
+	
+		onLoad(options) {
+		    console.log(options.companyOrgId);
+			this.dataForm.roomId= options.companyOrgId;
+			this.getalldata();
+		},
+		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
+		onReady() {
+			// 微信小程序需要用此写法
+
+		},
+
+		//监听页面隐藏
+		onHide() {},
+		//监听窗口尺寸变化
+		onResize() {},
+		//监听页面卸载
+		onUnload() {},
+		//监听用户下拉动作，一般用于下拉刷新
+		onPullDownRefresh() {},
+
+
+		methods: {
+			
+			scrolltolower() {
+				if (this.pd) {
+					this.getalldata();
+				} else {
+					return
+				}
+			},
+
+			getalldata() {
+				this.$api.post('/lock/doorOpeatePage', this.dataForm)
+					.then(res => {
+						this.totalnumber = res.data.data.total;
+						if (res.data.data.list.length != 0) {
+							this.indexList.push(...res.data.data.list);
+							this.dataForm.currentPage = this.dataForm.currentPage + 1;
+							this.pd = true;
+						} else {
+							uni.showToast({
+								title: '暂无更多数据了',
+								icon: 'none',
+								duration: 1500
+							})
+							this.pd = false;
+						}
+
+					})
+			},
+
+
+
+
+
+
+
+
+		}
+	}
+</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;
+	}
+
+	.companylist {
+		margin: 20rpx 30rpx;
+		background: #fff;
+		min-height: 290rpx;
+		border-radius: 10px;
+		position: relative;
+
+		h3 {
+			height: 70rpx;
+			line-height: 70rpx;
+			padding-left: 30rpx;
+		}
+	}
+
+	.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;
+	}
+</style>

pages/Workorder/Intelligentdoorlock/Intelligentdoorlock.vue

@@ -0,0 +1,374 @@
+<template>
+	<view class="billall">
+
+		<!-- 列表 -->
+		<!-- <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">
+						<view class="settled" @click="kaimen(item)">
+							开门记录
+						</view>
+					<!-- 	<view class="outstanding" @click="mensuo(item)">
+							门锁信息
+						</view> -->
+						<view class="outstanding1" @click="mima(item)">
+							临时密码
+						</view>
+						<view class="outstanding2" @click="seedetail(item)">
+							查看租户
+						</view>
+
+						<h3>{{item.name}}</h3>
+						<view class="Currentamount">
+							房间编号:{{item.roomid}}
+						</view>
+						<view class="Currentamount">
+							用户总数量: {{item.usernum}}
+						</view>
+						<view class="Currentamount">
+							设备编号:￥{{item.deviceId}}
+						</view>
+						<view class="Currentamount">
+							网关编号: {{item.deviceno}}
+						</view>
+						<view class="Currentamount">
+							安装时间: {{item.installationtime}}
+						</view>
+					</view>
+
+				</u-list-item>
+			</u-list>
+
+		</view>
+
+		<!-- 门锁信息 -->
+		<u-popup :show="showms" mode="bottom" @close="closems" :closeable='true'>
+			<view class="mensuoxx">
+				<h3>临时密码</h3>
+
+				<u-cell-group>
+					<u-cell icon="lock-opened-fill" title="临时密码"  :value='lsmima'></u-cell>
+				
+				</u-cell-group>
+			</view>
+		</u-popup>
+
+
+	</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
+		},
+		data() {
+
+			return {
+				showms: false,
+
+				totalnumber: 0,
+				setyesno: true,
+lsmima:'',
+				indexList: [],
+				dataList: [],
+				dataForm: {
+					"currentPage": 0,
+					"deviceId": "",
+					"pageSize": 10,
+					"roomId": "",
+					"tempPwd": "",
+					"tenantsId": "",
+					"userName": ""
+				},
+
+				showtype: false,
+				showdct: false,
+				mytitle: '',
+				alldata: [],
+				showfloor: false,
+				loading: false,
+				columns: [],
+				pd: true,
+				columnData: [],
+				myday: '',
+				mytype: '全部',
+				showPicker: false,
+
+
+
+
+			}
+		},
+		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
+		onLoad() {
+			this.getalldata();
+
+		},
+		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
+		onReady() {
+			// 微信小程序需要用此写法
+
+		},
+
+		//监听页面隐藏
+		onHide() {},
+		//监听窗口尺寸变化
+		onResize() {},
+		//监听页面卸载
+		onUnload() {},
+		//监听用户下拉动作，一般用于下拉刷新
+		onPullDownRefresh() {},
+
+
+		methods: {
+			seedetail(e) {
+				uni.navigateTo({
+					url: `/pages/Workorder/Intelligentdoorlock/Tenantdetails/Tenantdetails?companyOrgId=${e.roomid}`
+				});
+			},
+			kaimen(e) {
+				uni.navigateTo({
+					url: `/pages/Workorder/Intelligentdoorlock/Dooropeningrecord/Dooropeningrecord?companyOrgId=${e.roomid}`
+				});
+			},
+			mima(e) {			
+			
+				
+				let postdata={
+  "currentPage": 0,
+  "deviceId": "",
+  "pageSize": 10,
+  "roomId": e.roomid,
+  "tempPwd": "",
+  "tenantsId": "",
+  "userName": ""
+};
+				this.$api.post('/lock/getTempPwd',postdata)
+					.then(res => {
+					
+						if (res.data.code == 0) {
+								this.showms = true;
+this.lsmima=res.data.data;
+  console.log('111111111111111111',this.lsmima)
+						} else {
+
+						}
+					})
+
+			},
+			closems() {
+				this.showms = false
+				// console.log('close');
+			},
+
+
+		
+
+			scrolltolower() {
+				if (this.pd) {
+					this.getalldata();
+				} else {
+					return
+				}
+			},
+
+			getalldata() {
+				this.$api.post('/lock/page', this.dataForm)
+					.then(res => {
+						this.totalnumber = res.data.data.total;
+						if (res.data.data.list.length != 0) {
+							this.indexList.push(...res.data.data.list);
+							this.dataForm.currentPage = this.dataForm.currentPage + 1;
+							this.pd = true;
+						} else {
+							uni.showToast({
+								title: '暂无更多数据了',
+								icon: 'none',
+								duration: 1500
+							})
+							this.pd = false;
+						}
+
+					})
+			},
+
+
+
+
+
+
+
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.mensuoxx {
+		width: 750rpx;
+		height: 500rpx;
+
+		h3 {
+			width: 100%;
+			height: 80rpx;
+			text-align: center;
+			line-height: 80rpx;
+			margin-bottom: 50rpx;
+		}
+	}
+
+	.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;
+	}
+
+	.companylist {
+		margin: 20rpx 30rpx;
+		background: #fff;
+		min-height: 380rpx;
+		border-radius: 10px;
+		position: relative;
+
+		h3 {
+			height: 70rpx;
+			line-height: 70rpx;
+			padding-left: 30rpx;
+		}
+	}
+
+	.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:42%;
+		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;
+	}
+</style>

pages/Workorder/Intelligentdoorlock/Tenantdetails/Tenantdetails.vue

@@ -0,0 +1,265 @@
+<template>
+	<view class="billall">
+
+		<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">			
+						<h3>{{item.roomName}}</h3>
+						<view class="Currentamount">
+							房间编号:{{item.roomId}}
+						</view>
+						<view class="Currentamount">
+							租户名称: {{item.tenantsName}}
+						</view>
+						<view class="Currentamount">
+							门锁密码:{{item.issuedData}}
+						</view>
+						<view class="Currentamount">
+							区域名称: {{item.areaName}}
+						</view>
+					<view class="Currentamount">
+						更新时间: {{item.updateDate}}
+					</view>
+					</view>
+
+				</u-list-item>
+			</u-list>
+
+		</view>
+
+
+
+	</view>
+</template>
+
+<script>
+
+	export default {
+
+		data() {
+
+			return {
+				totalnumber: 0,
+				setyesno: true,
+
+				indexList: [],
+				dataList: [],
+				dataForm: {
+					 "currentPage": 0,
+					  "deviceId": "",
+					  "pageSize": 10,
+					  "roomId": "",
+					  "tempPwd": "",
+					  "tenantsId": "",
+					  "userName": ""
+				},
+
+				showtype: false,
+				showdct: false,
+				mytitle: '',
+				alldata: [],
+				showfloor: false,
+				loading: false,
+				columns: [],
+				pd: true,
+				columnData: [],
+				myday: '',
+				mytype: '全部',
+				showPicker: false,
+
+			}
+		},
+		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
+	
+		onLoad(options) {
+		    console.log(options.companyOrgId);
+			this.dataForm.roomId= options.companyOrgId;
+			this.getalldata();
+		},
+		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
+		onReady() {
+			// 微信小程序需要用此写法
+
+		},
+
+		//监听页面隐藏
+		onHide() {},
+		//监听窗口尺寸变化
+		onResize() {},
+		//监听页面卸载
+		onUnload() {},
+		//监听用户下拉动作，一般用于下拉刷新
+		onPullDownRefresh() {},
+
+
+		methods: {
+			
+			scrolltolower() {
+				if (this.pd) {
+					this.getalldata();
+				} else {
+					return
+				}
+			},
+
+			getalldata() {
+				this.$api.post('/lock/userPage', this.dataForm)
+					.then(res => {
+						this.totalnumber = res.data.data.total;
+						if (res.data.data.list.length != 0) {
+							this.indexList.push(...res.data.data.list);
+							this.dataForm.currentPage = this.dataForm.currentPage + 1;
+							this.pd = true;
+						} else {
+							uni.showToast({
+								title: '暂无更多数据了',
+								icon: 'none',
+								duration: 1500
+							})
+							this.pd = false;
+						}
+
+					})
+			},
+
+
+
+
+
+
+
+
+		}
+	}
+</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;
+	}
+
+	.companylist {
+		margin: 20rpx 30rpx;
+		background: #fff;
+		min-height:340rpx;
+		border-radius: 10px;
+		position: relative;
+
+		h3 {
+			height: 70rpx;
+			line-height: 70rpx;
+			padding-left: 30rpx;
+		}
+	}
+
+	.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;
+	}
+</style>

pages/Workorder/Workorder.vue

@@ -36,13 +36,23 @@
 			<view class="managename" @click="AccessControl"  v-if="$has('app:AccessControl')">
 				<view class="managename1">
 					<!-- <img :src='srcyuanc' alt=""> -->
-					<u--image  mode="widthFix"  :src="srcshipin" width="48rpx" height="48rpx"></u--image>
+					<u--image  mode="widthFix"  :src="srcmj" width="48rpx" height="48rpx"></u--image>
 				</view>
 				<view class="managename2">
 					门禁管理
 				</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>
+			</view>
+
 			<!-- v-if="$has('app:Arrearsrecord')" -->
 			<!--<view class="managename" @click="Arrearsrecord" >-->
 				<!--<view class="managename1">-->
@@ -116,6 +126,9 @@
 					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'),
 			}
 		},
 		methods: {
@@ -145,6 +158,11 @@
 					url: '/pages/Workorder/Remotecontrol/Remotecontrol'
 				})
 			},
+			Intelligentdoorlock(){
+				uni.navigateTo({
+					url: '/pages/Workorder/Intelligentdoorlock/Intelligentdoorlock'
+				})
+			},
 			// Arrearsrecord(){
 			// 	uni.navigateTo({
 			// 		url: '/pages/Workorder/Arrearsrecord/Arrearsrecord'

pages/index/Immediatecollection/Immediatecollection.vue

@@ -85,7 +85,7 @@
 			@cancel='canceltypes'>
 		</u-picker>
 
-		<u-notify ref="uNotify" :show="showdct" message="服务器请求失败"></u-notify>
+		<u-notify ref="uNotify" message="" ></u-notify>
 	</view>
 </template>
 
@@ -204,21 +204,29 @@
 				this.$api.post('/expeditrecord/charge', finallydata)
 					.then(res => {
 						if (res.data.code == 0) {
-							uni.showToast({
-								title: '催费成功',
-								icon: 'none',
-								duration: 1500
-							})
+							// uni.showToast({
+							// 	title: '催费成功',
+							// 	icon: 'none',
+							// 	duration: 1500
+							// })
+							this.$refs.uNotify.success('催费成功')	
+							
 						} else {
-							uni.showToast({
-								title: res.data.msg,
-								icon: 'none',
-								duration: 1500
-							})
+							// uni.showToast({
+							// 	title: res.data.msg,
+							// 	icon: 'none',
+							// 	duration: 1500
+							// })
+							this.$refs.uNotify.error(res.data.msg)	
 						}
-						this.dataForm.page = 1;
-						this.indexList = [];
-						this.getalldata();
+						 let that=this;
+						  setTimeout(function(){
+							  that.dataForm.page = 1;
+						that.indexList = [];
+						that.getalldata();
+						},1000);
+						
+						
 					})
 			},
 			scrolltolower() {
@@ -305,7 +313,7 @@
 			getDate(type) {
 				const date = new Date();
 				let year = date.getFullYear();
-				let month = date.getMonth() + 1;
+				let month = date.getMonth();
 				if (type === 'start') {
 					year = year - 60;
 				} else if (type === 'end') {