Merge remote-tracking branch 'origin/master'

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

@@ -1,6 +1,61 @@
 <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-color">
+			<ul class="mui-table-view vongi-ylfuwu">
+				<li class="mui-table-view-cell mui-col-xs-6">
+					<div class="vongi-color-block block-violet">
+						<div class="mui-h1 iconfont icon-shouye3"></div>
+						<div class="mui-media-body">在线问诊</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6">
+					<div class="vongi-color-block block-greene">
+						<div class="mui-h1 iconfont icon-riqi"></div>
+						<div class="mui-media-body">挂号预约</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6">
+					<div class="vongi-color-block block-yellowe">
+						<div class="mui-h1 iconfont icon-diancan"></div>
+						<div class="mui-media-body">点餐服务</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6">
+					<div class="vongi-color-block block-pink">
+						<div class="mui-h1 iconfont icon-jiazhengfuwu"></div>
+						<div class="mui-media-body">家政服务</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6">
+					<div class="vongi-color-block block-blue">
+						<div class="mui-h1 iconfont icon-weixiu"></div>
+						<div class="mui-media-body">家电维修</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6">
+					<div class="vongi-color-block block-greene">
+						<div class="mui-h1 iconfont icon-liliao"></div>
+						<div class="mui-media-body">康复理疗</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6">
+					<div class="vongi-color-block block-light">
+						<div class="mui-h1 iconfont icon-xin"></div>
+						<div class="mui-media-body">生活照料</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-6">
+					<div class="vongi-color-block block-blue">
+						<div class="mui-h1 iconfont icon-renshu"></div>
+						<div class="mui-media-body">陪同就医</div>
+					</div>
+				</li>
+			</ul>
+		</div>
 </div>
 </template>
 

src/projects/pension/views/Master/User/MyCode.vue

@@ -1,6 +1,24 @@
 <template>
 <div>
-
+    <header class="mui-bar mui-bar-nav">
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+			<h1 class="mui-title">二维码</h1>
+		</header>
+		<div class="mui-content">
+			<div class="vongi-qrcode-main">
+				<div class="vongi-qrcode-head">
+					<div class="vongi-qrcode-img">
+						<img src="~$project/assets/img/02.jpg" alt="">
+					</div>
+					<span>郭麒麟</span>
+				</div>
+				<div class="vongi-qrcode-content">
+					<h4>我的家长关联二维码</h4>
+					<img src="~$project/assets/img/02.jpg" alt="">
+					<p>使用微信扫一扫 </br> 关注公众号补全家长信息</p>
+				</div>
+			</div>
+		</div>
 </div>
 </template>
 

src/projects/pension/views/Master/User/RelationPerson.vue

@@ -1,6 +1,81 @@
 <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">
+			<div class="mui-content-padded">
+				<h5>长者信息</h5>
+				<ul class="mui-table-view openfyy-list">
+					<li class="mui-table-view-cell">
+						<a href="#">
+							<div class="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 mui-h4'>金色家园老年公寓 颐养楼 1-201</p>
+								</div>
+							</div>
+						</a>
+					</li>
+				</ul>
+			</div>
 
+			<div class="mui-content-padded vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>姓名<i class="colorfe616c">*</i></label>
+						<span>赵刚</span>
+					</div>
+					<div class="mui-input-row">
+						<label>手机号码<i class="colorfe616c">*</i></label>
+						<span>18600001111</span>
+					</div>
+					<div class="mui-input-row vongi-yzm">
+						<input type="text" class="mui-input-clear" placeholder="请输入验证码">
+						<a href="" class="mui-pull-right">发送验证码</a>
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
+				<form class="mui-input-group">
+
+					<div class="mui-input-row">
+						<label>身份证号</label>
+						<input type="text" class="mui-input-clear" placeholder="请输入身份证号">
+					</div>
+					<div class="mui-input-row">
+						<label>身份证号</label>
+						<input type="text" class="mui-input-clear" placeholder="请填写联系人居住实际地址">
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>我是长者的<i class="colorfe616c">*</i></label>
+						<button class="mui-btn mui-btn-block mui-navigate-right mui-ellipsis" type='button' style="width:65%">
+							儿子
+						</button>
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label style="width:50%">人脸识别照片</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-pink ">保  存</button></div>
+		</div>
 </div>
 </template>