Merge remote-tracking branch 'origin/master'

src/assets/css/xpwyfyy.css

@@ -1011,8 +1011,7 @@ h3 {
 	left: 15px;
 	width: auto;
 	height: auto;
-	top: 12px;
-	z-index: -1;
+	top: 12px
 }
 
 .vongi-login-btn button {
@@ -3472,6 +3471,9 @@ h3 {
 	color:#FF9474;
 	font-size:12px;
 }
+.mui-bar .mui-icon.mui-icon-trash{
+	color:#FF6666
+}
 .vongi-cytx-time{
 	background:#ffffff;
 	padding:10px 5px
@@ -3602,4 +3604,26 @@ h3 {
 }
 .vongi-xieyii.mui-radio input[type=radio]:before{
 	font-size:16px
+}
+
+.vongi-badge-primary {
+    background-color: #3385FF;
+    color: #ffffff;
+    border-radius: 2px;
+    margin-left: 5px;
+    padding:5px 6px
+}
+.vongi-qqhm .mui-media-object {
+	overflow: hidden;
+	border-radius: 50%;
+	line-height: 56px;
+	max-width: 56px;
+	height: 56px;
+	border: 1px #eee solid;
+}
+
+.vongi-qqhm .mui-media-object img {
+	object-fit: cover;
+	min-height: 100%;
+	width: 100%;
 }

src/projects/business/views/Master/Family/Add.vue

@@ -1,8 +1,56 @@
 <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>
+			<a class="mui-pull-right colorfe616c" href=""><span class="mui-icon mui-icon-trash"></span></a>
+		</header>
+		<div class="mui-content">
+			<div class="mui-content-padded vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>小区名称</label>
+						<span>富润·沙市花园</span>
+					</div>
+					<div class="mui-input-row">
+						<label>房号</label>
+						<span>1-1-2201</span>
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-qingjiadt vongi-editme marginbo">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label style="width:40%">家庭成员姓名<i class="colorfe616c">*</i></label>
+						<span style="width:60%">姓名</span>
+					</div>
+					<div class="mui-input-row">
+						<label>手机号码<i class="colorfe616c">*</i></label>
+						<span>15500001111</span>
+					</div>
+					<div class="mui-input-row">
+						<label>身份证号</label>
+						<input type="text" class="mui-input-clear" placeholder="请输入身份证号">
+					</div>
+					<div class="mui-input-row">
+						<label style="width:50%">人脸识别照片<i class="colorfe616c">*</i><i class="iconfont icon-tishi color4fc5f7"></i></label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+							<img src="~$project/assets/img/audit1.png" /> 
+						</button>
+					</div>
+				</form>
+			</div>
+		</div>
+		<div class="fyy-footer">
+			<div class="bindfyy-btn"><button type="submit" 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/Master/Family/Home.vue

@@ -1,8 +1,47 @@
 <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 vongi-qqhm">
+			<ul class="mui-table-view">
+				<li class="mui-table-view-cell">
+					<a class="mui-navigate-right" href="#">
+						<div class="mui-col-xs-8  mui-pull-left flew-items">
+							<div class="mui-media-object mui-pull-left "><img src="~$project/assets/img/03.jpg" width="50" /></div>
+							<div class="mui-media-body">
+								<h3>赵双龙</h3>
+								<p class='mui-ellipsis'>18600001111</p>
+							</div>
+						</div>
+						<span class=" mui-badge vongi-badge-primary">家属</span>	
+					</a>
+				</li>
+				<li class="mui-table-view-cell">
+					<a class="mui-navigate-right" href="#">
+						<div class="mui-col-xs-8  mui-pull-left flew-items">
+							<div class="mui-media-object mui-pull-left "><img src="~$project/assets/img/03.jpg" width="50" /></div>
+							<div class="mui-media-body">
+								<h3>赵双龙</h3>
+								<p class='mui-ellipsis'>18600001111</p>
+							</div>
+						</div>
+						<span class=" mui-badge vongi-badge-primary">家属</span>	
+					</a>
+				</li>
+			</ul>
+		</div>
+		<div class="fyy-footer">
+			<div class="bindfyy-btn"><button type="submit" 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>