Merge remote-tracking branch 'origin/master'

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

@@ -1,8 +1,41 @@
 <template>
+<div>
+    <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">关联新设备</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content">			
+			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>设备名称</label>
+						<span>居家养老001</span>
+					</div>
+					<div class="mui-input-row">
+						<label>设备序列号</label>
+						<span>E59676248</span>
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>分配人员ID<i class="colorfe616c">*</i></label>
+						<input type="text" class="mui-input-clear" placeholder="0">
+					</div>
+				</form>
+			</div>
+			<div class="vongi-btn vongi-login-btn">
+				<button class="mui-btn mui-btn-primary">保  存</button>
+			</div>			
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

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

@@ -1,8 +1,34 @@
 <template>
+<div>
+    <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">设备维护</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content">
+			<div class="mui-content-padded">
+				<ul class="mui-table-view vongi-jy-ul">
+					<li class="mui-table-view-cell">
+						<a class="mui-navigate-right" href="#">
+							居家养老001
+							<span class="mui-pull-right">10016</span>
+						</a>
+					</li>
+					<li class="mui-table-view-cell">
+						<a class="mui-navigate-right" href="#">
+							居家养老001
+							<span class="mui-pull-right">10016</span>
+						</a>
+					</li>
+				</ul>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/pension/views/Master/Health/Archives.vue

@@ -61,6 +61,7 @@
 					</div>
 				</li>
 			</ul>
+			<div class="vongi-center">设备最后更新时间：2020年10月31日 12:00:00</div>
 		</div>
 
 		<loading :visible="isLoading"></loading>

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

@@ -8,6 +8,7 @@
 				<div class="vongi-center">
 					<div class="mui-media-object"><img src="~$project/assets/img/03.jpg" width="50" /></div>
 					<h1>赵刚</h1>
+                    <button type="button" class="mui-btn  mui-btn-danger mui-btn-outlined">紧急联系人</button>
 				</div>
 				<div class='flew-sp mui-h1'>
 					15500001111<span class="iconfont icon-ziyuan1 color55f868"></span>

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

@@ -4,11 +4,12 @@
 			<h1 class="mui-title">联系人</h1>
 			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
 		</header>
-		<div class="mui-content vongi-qqhm">
+		<div class="mui-content margin60">
 			<ul class="mui-table-view">
 				<li class="mui-table-view-cell">
 					<a class="mui-navigate-right" href="#">
 						<h1>赵双龙</h1>
+                        <button type="button" class="mui-btn  mui-btn-danger mui-btn-outlined">紧急联系人</button>
 					</a>
 				</li>
 				<li class="mui-table-view-cell">

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

@@ -17,6 +17,12 @@
 						<!--<input type="text" class="mui-input-clear" placeholder="请填写联系人手机号码">-->
 						<span>15500001111</span>
 					</div>
+                    <div class="mui-input-row">
+						<label style="width:50%">设为紧急联系人</label>
+						<div id="autoLogin" class="mui-switch mui-active">
+							<div class="mui-switch-handle"></div>
+						</div>	
+					</div>
 				</form>
 			</div>
 			<div class="vongi-btn vongi-login-btn">