意见修正

src/components/NullList.vue

@@ -1,28 +1,47 @@
-<template >
-    <div class="mui-slider-group" style="z-index: 8">
-        <div style="text-align: center;margin-top: 100px"  >
-            <img src="~$project/assets/img/no.png" width="50%" style="width: 50%"  >
-            <p>{{remark}}</p>
-        </div>
-
-    </div>
+<template>
+	<div class="mui-slider-group" style="z-index: 8">
+		<div style="text-align: center;margin-top: 100px">
+			<img src="~$project/assets/img/no.png" width="50%" style="width: 50%">
+			<p class="kong-title">{{remark}}</p>
+			<p v-if="type=='relatives'" class="kong-spec">如需邀请家属扫码关联，请<span @click="typeRouteFun">出示二维码</span></p>
+		</div>
+	</div>
 </template>
 
 <script>
-    export default {
-        name: 'nullList',
-        props: {
-            remark: {
-                require: false,
-                default: '',
-            },
-        },
-        methods: {},
-        mounted() {}
-    }
+	export default {
+		name: 'nullList',
+		props: {
+			remark: {
+				require: false,
+				default: '',
+			},
+			type: {
+				require: false,
+				default: 'default',
+			},
+			typeRouteFun: {
+				require: false,
+				type: Function,
+			},
+		},
+		methods: {},
+		mounted() {}
+	}
 </script>
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 
 <style scoped="scoped">
+	.kong-title {
+		font-size: 18px;
+	}
+
+	.kong-spec {
+		font-size: 14px;
+		margin-top: 10px;
+	}
 
+	.kong-spec span {
+		color: #3385FF;
+	}
 </style>

src/projects/business/views/Common/Device/OpenDoor.vue

@@ -22,8 +22,8 @@
 			</div>
 			<div class="vongi-opendoor-bottom">
 				<div v-for="(item,index) in doorList" class="flew-sp">
-					{{item.name}}
-					<button :disabled="!item.isOnline" class="mui-btn mui-btn-primary" @click="open(item.id)">开门</button>
+					{{item.name}}({{item.remoteOpenStartTime}}~{{item.remoteOpenEndTime}})
+					<button :disabled="!item.isOnline || !item.isOpen" class="mui-btn mui-btn-primary" @click="open(item.id)">开门</button>
 				</div>
 			</div>
 		</div>

src/projects/pension/views/Master/Relatives/Home.vue

@@ -20,7 +20,7 @@
 			</ul>
 		</div>
 
-		<NullList :remark="'暂无关联亲属'" v-if="!recordList.length"></NullList>
+		<NullList :remark="'暂未关联家属帐号'" type="relatives" :typeRouteFun="typeRouteFun" v-if="!recordList.length"></NullList>
 
 		<loading :visible="isLoading"></loading>
 	</div>
@@ -70,6 +70,12 @@
 					mui.toast(error);
 				})
 			},
+			//出示二维码
+			typeRouteFun() {
+				this.$router.push({
+					name: 'MasterUserMyCode'
+				})
+			},
 			asynCallBack() {},
 		},
 		mounted() {