冲突合并

.idea/workspace.xml

@@ -2,19 +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/AccessControl/AccessControl.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.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/Videosurveillance/Videosurveillance.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Videosurveillance/Videosurveillance.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/BillPending/BillPending.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/BillPending/BillPending.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/Immediateinspection/Immediateinspection.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Immediateinspection/Immediateinspection.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/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$/uni.scss" beforeDir="false" afterPath="$PROJECT_DIR$/uni.scss" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/index/Immediatecollection/Immediatecollection.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Immediatecollection/Immediatecollection.vue" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -30,8 +21,8 @@
       <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">
-              <caret line="221" column="19" selection-start-line="221" selection-start-column="19" selection-end-line="221" selection-end-column="19" />
+            <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>
@@ -39,8 +30,8 @@
       <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">
-              <caret line="111" column="114" selection-start-line="111" selection-start-column="114" selection-end-line="111" selection-end-column="114" />
+            <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>
@@ -48,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="333" column="6" selection-start-line="333" selection-start-column="6" selection-end-line="333" 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>
@@ -57,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>
@@ -81,8 +66,8 @@
       <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">
-              <caret line="41" selection-start-line="43" selection-start-column="2" selection-end-line="45" selection-end-column="3" />
+            <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>
         </entry>
@@ -389,11 +374,16 @@
       <workItem from="1681862208704" duration="24333000" />
       <workItem from="1682035999607" duration="2001000" />
       <workItem from="1682208706300" duration="592000" />
+      <workItem from="1682296331955" duration="593000" />
+      <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="98434000" />
+    <option name="totallyTimeSpent" value="101398000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-8" width="1936" height="1056" extended-state="1" />
@@ -585,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">
-          <caret line="221" column="19" selection-start-line="221" selection-start-column="19" selection-end-line="221" selection-end-column="19" />
+        <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">
-          <caret line="111" column="114" selection-start-line="111" selection-start-column="114" selection-end-line="111" selection-end-column="114" />
+        <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="333" column="6" selection-start-line="333" selection-start-column="6" selection-end-line="333" 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>
@@ -626,8 +610,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/uni.scss">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1230">
-          <caret line="41" selection-start-line="43" selection-start-column="2" selection-end-line="45" selection-end-column="3" />
+        <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>
     </entry>

pages.json

@@ -29,7 +29,8 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				 "enablePullDownRefresh": true
+				 "enablePullDownRefresh": true,
+				 	"navigationStyle": "custom" // 隐藏系统导航栏
 			}
 		},
 		// {
@@ -42,7 +43,8 @@
 		{
 			"path": "pages/Workorder/Workorder",
 			"style": {
-				"navigationBarTitleText": "工作台"
+				"navigationBarTitleText": "工作台",
+					"navigationStyle": "custom" // 隐藏系统导航栏
 			}
 		},
 		// {
@@ -54,7 +56,8 @@
 		{
 			"path": "pages/my/my",
 			"style": {
-				"navigationBarTitleText": "我的"
+				"navigationBarTitleText": "我的",
+				"navigationStyle": "custom" // 隐藏系统导航栏
 			}
 
 		}
@@ -201,7 +204,8 @@
             "style" :
             {
                 "navigationBarTitleText": "报修工单",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": false,
+				"navigationStyle": "custom" // 隐藏系统导航栏
             }
 
         },
@@ -211,6 +215,7 @@
             {
                 "navigationBarTitleText": "详情",
                 "enablePullDownRefresh": false
+				
             }
 
         }
@@ -333,6 +338,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/Arrearsrecord/Arrearsrecord.vue

@@ -65,7 +65,7 @@
 
 
 
-		<u-picker :show="showtype" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype"
+		<u-picker :show="showtype" :itemHeight="80" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype"
 			@cancel='canceltype'>
 		</u-picker>
 

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/Tenantbill/Tenantbill.vue

@@ -86,9 +86,9 @@
 
 
 
-		<u-picker :show="showtype" :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" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
+		<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>

pages/Workorder/Tenantbill/companybill/companybill.vue

@@ -119,7 +119,7 @@
 	</view> -->
 </view>
 
-		<u-picker :show="showtype" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype" @cancel='canceltype'>	</u-picker>
+		<u-picker :show="showtype" :itemHeight="80" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype" @cancel='canceltype'>	</u-picker>
 			
 			
 			<u-popup :show="showpayjine" @close="closepay1" @open="openpay1" mode="bottom" :round="10" :closeable=true :closeOnClickOverlay=true>

pages/Workorder/Videosurveillance/Videoplayback/Videoplayback.vue

@@ -19,7 +19,7 @@
 		    this.urls = options.companyOrgId;
 	
 		//	this.accessToken();
-			this.width = uni.getSystemInfoSync().screenWidth;
+		//	this.width = uni.getSystemInfoSync().screenWidth;
 		//  console.log('111111111111111111', uni.getSystemInfoSync().screenWidth)	 
 		},
 		 onShow() {
@@ -27,14 +27,11 @@
 		    },
 		
 		methods: {
-			 selectVideoValue(){
-				 
+			 selectVideoValue(){		 
 				  var postdata ={
 				                     'appKey': 'bf1fe258e25b4556af2889b53cf2d835',
 				                     'appSecret': 'f814b3ce1653f7f909b6ccc358563fb3'
-				                 };
-				  
-				  
+				                 };			  				  
 				 uni.request({
 				     url:'https://open.ys7.com/api/lapp/token/get',
 				     method: "POST",
@@ -45,17 +42,9 @@
 				     success: (res) => {
 				       //  console.log('111111111111111111',res.data.data.accessToken)
 				 		
-				 let that = this;
-				// var currentWebview = this.$scope.$getAppWebview() 
-			//	 setTimeout(function() {
-				 	that.url = "../../../../static/sp.html?url="+ this.urls+"&accessToken="+res.data.data.accessToken;
-				 //	var wv = currentWebview.children()[0]
-				 // 	wv.setStyle({
-				 // 		top:200,
-				 // 		height:400,
-				 // 	})
-				//  }, 500);		
-				 
+				// let that = this;
+				 	this.url = "../../../../static/sp.html?url="+ this.urls+"&accessToken="+res.data.data.accessToken;
+								 
 				     }
 				 });
 				 
@@ -103,7 +92,12 @@
 				
 				
 			}
-		}
+		},
+		//监听页面卸载
+				onUnload(){
+					
+				},
+		
 	}
 </script>
 

pages/Workorder/Workorder.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="management">
+		<view class="topnames" >
+					工作台
+				</view>
 		<view class="managelind">
 			<view class="managename" @click="Tenantbill"  v-if="$has('app:TenantBill')">
 				<view class="managename1">
@@ -33,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">-->
@@ -113,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: {
@@ -142,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/EquipmentException/EquipmentException.vue

@@ -38,7 +38,7 @@
 		</view>
 
 
-		<u-picker :show="showfloor" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
+		<u-picker :itemHeight="80" :show="showfloor" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
 				  :columns="columns" keyName="orgName" @change="changeHandler"></u-picker>
 
 

pages/index/Immediatecollection/Immediatecollection.vue

@@ -79,13 +79,13 @@
 
 
 
-		<u-picker :show="showtype" :columns="columnstype" keyName="label" @confirm="confirmtype" @cancel='canceltype'>
+		<u-picker :itemHeight="80" :show="showtype" :columns="columnstype" keyName="label" @confirm="confirmtype" @cancel='canceltype'>
 		</u-picker>
-		<u-picker :show="showtypes" :columns="columnstypes" keyName="dictLabel" @confirm="confirmtypes"
+		<u-picker :itemHeight="80" :show="showtypes" :columns="columnstypes" keyName="dictLabel" @confirm="confirmtypes"
 			@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') {

pages/index/Inspectionrecord/Inspectionrecord.vue

@@ -10,7 +10,6 @@
 			<view class="topbilledit" @click="xunjianchange">
 				<view class="changetime1">
 					{{xjlx}}
-
 				</view>
 				<view class="changetime2">
 					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
@@ -19,7 +18,6 @@
 			<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>
@@ -74,14 +72,14 @@
 		</view>
 
 
-		<u-picker :show="showtypexunjian" :columns="columnstypexunjian" keyName="dictLabel" @confirm="confirmxunjian"
+		<u-picker :show="showtypexunjian" :itemHeight="80" :columns="columnstypexunjian" keyName="dictLabel" @confirm="confirmxunjian"
 			@cancel='cancelxunjian'>
 		</u-picker>
 
-		<u-picker :show="showtype" :columns="columnstype" keyName="realName" @confirm="confirmtype" @cancel='canceltype'>
+		<u-picker :show="showtype" :itemHeight="80" :columns="columnstype" keyName="realName" @confirm="confirmtype" @cancel='canceltype'>
 		</u-picker>
 
-		<u-picker :show="showfloor" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
+		<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>
@@ -128,14 +126,11 @@
 
 				dataList: [],
 				dataForm: {
-					projectId: "",
+					//projectId: "",
 					buildingId: "",
 					storeyId: "",
 					circuitType: "",
-
-					cycle: "",
-					//status: "",
-
+					circuitPersonId: "",			
 					page: 1,
 					limit: 10,
 				},
@@ -172,7 +167,6 @@
 						dictValue: "",
 					}
 					getDictDataList[i].dataList.unshift(pushdata)
-
 					this.columnstypexunjian = [getDictDataList[i].dataList]
 				}
 			}
@@ -200,7 +194,7 @@
 		methods: {
 			getUserList() {
 				this.$api.get('/user/list',{ page: 1,
-					limit: 100,})
+					limit: 999999,})
 						.then(res=>{
 							//	console.log('111111111111111111',res.data.data)
 							this.columnstype=[res.data.data]
@@ -221,7 +215,7 @@
 			},
 			confirmxunjian(e) {
 				  console.log('111111111111111111',e)
-				this.xjlx = e.value[0].dictLabel;
+				this.xjry = e.value[0].dictLabel;
 				 this.dataForm.circuitType = e.value[0].dictValue;
 				this.indexList=[];
 				this.dataForm.page = 1;
@@ -258,9 +252,10 @@
 				this.showtype = false;
 			},
 			confirmtype(e) {
+				  console.log('111111111111111111',e)
 				this.showtype = false;
-				this.xjry = e.value[0].label;
-				this.dataForm.cycle = e.value[0].id;
+				this.xjry = e.value[0].realName;
+				this.dataForm.circuitPersonId = e.value[0].id;
 				this.indexList=[];
 				this.dataForm.page = 1;
 				this.getalldata();
@@ -268,13 +263,7 @@
 			typechange() {
 				this.showtype = true;
 			},
-			dateChange(e) {
-				this.myday = e.target.value;
-				this.dataForm.cycle = e.target.value;
-				this.indexList=[];
-				this.dataForm.page = 1;
-				this.getalldata();
-			},
+			
 			getDate(type) {
 				const date = new Date();
 				let year = date.getFullYear();
@@ -293,7 +282,7 @@
 					.then(res => {
 
 						if (res.data.code == 0) {
-							this.dataForm.projectId = res.data.data[0].orgId;
+							//this.dataForm.projectId = res.data.data[0].orgId;
 
 							this.mytitle = res.data.data[0].orgName;
 							this.alldata = res.data.data[0].childrenList;

pages/index/Onlinewarranty/Onlinewarranty.vue

@@ -69,15 +69,15 @@
 		</view>
 
 
-		<u-picker @cancel='showtaskdegree = false' @confirm='degreeconfirm' :show="showtaskdegree"
+		<u-picker @cancel='showtaskdegree = false' :itemHeight="80" @confirm='degreeconfirm' :show="showtaskdegree"
 			:columns="columnshowtaskdegree" keyName="label">
 		</u-picker>
 
-		<u-picker @cancel='showSex = false' @confirm='typeconfirm' :show="showSex" :columns="columnsquyu"
+		<u-picker @cancel='showSex = false' :itemHeight="80" @confirm='typeconfirm' :show="showSex" :columns="columnsquyu"
 			keyName="label">
 		</u-picker>
 
-		<u-picker :show="showfloor" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
+		<u-picker :show="showfloor" ref="uPicker" :itemHeight="80" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
 			keyName="orgName" :columns="columns" @change="changeHandler"></u-picker>
 
 

pages/index/Withholdingrecord/Withholdingrecord.vue

@@ -64,11 +64,11 @@
 
 
 
-		<u-picker :show="showtype" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype"
+		<u-picker :show="showtype" :itemHeight="80" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype"
 			@cancel='canceltype'></u-picker>
 
 
-		<u-picker :show="showfloor" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
+		<u-picker :show="showfloor" :itemHeight="80" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
 			:columns="columns" keyName="orgName" @change="changeHandler"></u-picker>
 
 

pages/index/Workordertodone/Workorderdetails/Workorderdetails.vue

@@ -1,5 +1,7 @@
 <template>
 	<view class="OutermostLayer">
+		
+
 			<u-cell-group>
 				<u-cell icon="integral-fill" title="报修时间"  :value="details.shijian" >
 					<u-icon slot="icon" size="40" name="calendar"></u-icon>
@@ -106,9 +108,10 @@
 
 
 				<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"
+				<u-picker :show="showjinji" keyName="dictLabel" @cancel="showjinji=false" :itemHeight="80"
 						  @confirm="confirmjinji"  :columns="columnsrenjinji" ></u-picker>
 
 				<view class="guidang">
@@ -230,8 +233,8 @@ this.columnsrenyuan=[res.data.data]
 				  					   this.details.leixing='水';
 				  }else if(res.data.data.repairType==2){
 				  					     this.details.leixing='电';
-				  }else if(res.data.data.repairType==2){
-				  					     this.details.qleixinguyu='其他';
+				  }else if(res.data.data.repairType==3){
+				  					     this.details.leixing='其他';
 				  }
 
 
@@ -315,12 +318,15 @@ this.showweixiu=true;
 				this.model1.userInfo.urgency = e.value[0].dictLabel;
 				this.jjcd=e.value[0].dictValue;
 				this.showjinji = false
-			}
+			},
+			
+			
 		}
 	}
 </script>
 
 <style lang="scss">
+	
 	.guidang{
 		display: flex;
 		align-items: center;

pages/index/Workordertodone/Workordertodone.vue

@@ -1,5 +1,16 @@
 <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>
@@ -91,7 +102,7 @@
 				<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
 					<u-list-item v-for="(item, index) in indexList" :key="index">
 
-						<view class="paisong"  @click="Workorderdetails3(item)">
+						<view class="paisong"   @click="Workorderdetails2(item)">
 							<view class="settled1" v-if="item.urgency==1">
 								非常紧急
 							</view>
@@ -196,12 +207,12 @@
 				             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){
+			// 	//  console.log('111111111111111111',e)
+			// 	   uni.navigateTo({
+			// 	             url: `/pages/index/Workordertodone/hasrepaired/hasrepaired?id=${e.id}`
+			// 	          });
+			// },
 
 			sectionChange(index) {
 				this.current = index;
@@ -261,7 +272,11 @@
 
 					})
 			},
-
+goback() {
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			},
 
 
 
@@ -271,7 +286,23 @@
 
 <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{
 		text-align: center;

pages/index/index.vue

@@ -1,21 +1,23 @@
 <template>
 	<view class="content">
-
+<view class="topnames" >
+			首页
+		</view>
 		<!--<view class="Homepage_header">-->
 
 		<!--</view>-->
 
 		<view class="Homepage_suspension"
-			v-if="$has('app:InspectionRecord')&&$has('app:OnlineReport')&&$has('app:WithholdingRecord')">
+			v-if="$has('app:InspectionRecord')||$has('app:OnlineReport')||$has('app:WithholdingRecord')">
 			<view class="Suspension">
-				<view class="online" @click="Onlinewarranty" v-if="$has('app:InspectionRecord')">
+				<view class="online" @click="Onlinewarranty" v-if="$has('app:OnlineReport')">
 					<view>
 						<!-- <img :src="srcxianshang1" alt="" style="margin-left: 5rpx;"> -->
 						<u--image mode="widthFix" :src="srcxianshang1" width="80rpx" height="80rpx"></u--image>
 					</view>
 					<view style="font-size: 28rpx;color: #697081;">线上报修</view>
 				</view>
-				<view class="online" @click="Inspectionrecord" v-if="$has('app:OnlineReport')">
+				<view class="online" @click="Inspectionrecord" v-if="$has('app:InspectionRecord')">
 					<view>
 						<u--image mode="widthFix" :src="srcxianshang2" width="80rpx" height="80rpx"></u--image>
 
@@ -64,7 +66,7 @@
 			</view>
 		</view>
 
-		<view class="pending" v-if="$has('app:Tobeassigned')&&$has('app:Toberepaired')&&$has('app:hasrepaired')">
+		<view class="pending" v-if="$has('app:Tobeassigned')||$has('app:Toberepaired')||$has('app:hasrepaired')">
 			<view class="pending_middle">
 				<view class="all">
 					<view class="work">

pages/login/login.vue

@@ -9,11 +9,11 @@
 			<view class="row-input">
 
 				<u-icon name="account" color="#2979ff" size="50" style="padding: 0 20rpx;"></u-icon>
-				<input v-model="account" placeholder="请输入用户账号" maxlength="18" />
+				<input v-model="account" placeholder="请输入用户账号" maxlength="18" clearable />
 			</view>
 			<view class="row-input">
 				<u-icon name="lock" color="#2979ff" size="50" style="padding: 0 20rpx;"></u-icon>
-				<input v-model="password" placeholder="登陆密码" :password="!isShowPassword" />
+				<input v-model="password" placeholder="登陆密码" clearable :password="!isShowPassword" />
 				<u-icon name="eye-fill" color="#2979ff" size="50" style="padding-right:20rpx" v-if="isShowPassword"
 					@click="showOrHide"></u-icon>
 				<u-icon name="eye-off" color="#2979ff" size="50" style="padding-right:0rpx" v-else @click="showOrHide">

pages/my/Mydistribution/distributionedit/distributionedit.vue

@@ -49,15 +49,15 @@
 
 
 		<u-picker @cancel='showtaskpeople = false' @confirm='peopleconfirm' :show="showtaskpeople"
-			:columns="columnspeople" keyName="label">
+			:columns="columnspeople" keyName="label" :itemHeight="80">
 		</u-picker>
 
 
 		<u-picker @cancel='showtaskdegree = false' @confirm='degreeconfirm' :show="showtaskdegree"
-			:columns="columnshowtaskdegree" keyName="label">
+			:columns="columnshowtaskdegree" keyName="label" :itemHeight="80">
 		</u-picker>
 
-		<u-picker @cancel='showSex = false' @confirm='typeconfirm' :show="showSex" :columns="columns" keyName="label">
+		<u-picker @cancel='showSex = false' :itemHeight="80" @confirm='typeconfirm' :show="showSex" :columns="columns" keyName="label">
 		</u-picker>
 
 		<mx-date-picker :show="showPicker" type="date" :value="model1.userInfo.mydays" :show-tips="true"

pages/my/Myorder/Myorder.vue

@@ -57,7 +57,7 @@
 
 
 
-		<u-picker :show="showtype" :columns="columnstype" keyName="label" @confirm="confirmtype" @cancel='canceltype'>
+		<u-picker :show="showtype" :itemHeight="80" :columns="columnstype" keyName="label" @confirm="confirmtype" @cancel='canceltype'>
 		</u-picker>
 
 

pages/my/Mytask/Taskdetails/Taskdetails.vue

@@ -59,7 +59,7 @@
 				</view>
 			</view>
 			
-			<u-picker :show="show" title='转办人' @cancel='closezb' @confirm="confirm" :columns="columns" keyName="label">
+			<u-picker :show="show" :itemHeight="80" title='转办人' @cancel='closezb' @confirm="confirm" :columns="columns" keyName="label">
 			</u-picker>
 		</view>
 	</view>

pages/my/Personalinformation/Informationmodification/Informationmodification.vue

@@ -100,7 +100,7 @@
 			</view>
 		<u-notify ref="uNotify" message="" ></u-notify>
 
-		<u-picker :show="showSex" @cancel="showSex = false"  @confirm="sexSelect" :columns="actions" keyName="name"></u-picker>
+		<u-picker :show="showSex" :itemHeight="80" @cancel="showSex = false"  @confirm="sexSelect" :columns="actions" keyName="name"></u-picker>
 	</view>
 </template>
 

pages/my/my.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="mainview">
+		<view class="topnames" >
+					我的
+				</view>
 		<view class="topimg">
 			<view class="touxiang">
 				<u-upload :fileList="fileList" @afterRead="afterRead" name="6" :multiple='false' :maxCount="1"

static/sp.html

@@ -2,10 +2,12 @@
 <script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
 <title></title>
 <body>
-  <div id="myPlayer">
+  <div id="myPlayer" style="width:100%;height: 100%">
   </div>
   <script>
+	  var player=null;
 	window.onload=()=>{
+	let windowWidth=document.documentElement.clientWidth;
 		
 		//标题设置为空，如果不设置为空，会与uni-app自带标题冲突
 		document.title='\u200E';
@@ -18,17 +20,28 @@
 		
 		function init(url,accessToken) 
 		{
-			var player = new EZUIKit.EZUIKitPlayer({
+			 player = new EZUIKit.EZUIKitPlayer({
 				id: 'myPlayer',
 				url: url,
-				template: 'standard',
+			 template: 'simple',
 				accessToken: accessToken,
 				autoplay: true,
-				width: 750,
-				height: 400,
+				width: windowWidth,
+				height: windowWidth * 2 / 3,
 			});	
 		}
 	}
  
+ // window.pagehide=function(e){  
+	//    console.log('111111111111111111',e)
+ // 　　var e = window.event||e;  
+ // 　　e.returnValue=("确定离开当前页面吗？");
+ // }
+  window.addEventListener('pageshow', function (e) {
+	    console.log('111111111111111111',e)
+      if (e.persisted) {
+          window.location.reload()
+      }
+ })
   </script>
 </body>

uni.scss

@@ -12,6 +12,14 @@
  * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
  */
 @import '@/uni_modules/uview-ui/theme.scss';
+.topnames{
+	width: 750rpx;
+	height: 80rpx;
+	line-height: 80rpx;
+	text-align: center;
+	font-weight: bold;
+	font-size: 38rpx;
+}
 
 .OutermostLayer {
 		width: 690rpx;