Merge remote-tracking branch 'origin/master'

src/assets/css/pension.css

@@ -284,7 +284,8 @@
 	background:#FF9474
 }
 .vongi-index-top a,
-.mui-content .vongi-icon-gear a{
+.mui-content .vongi-icon-gear a,
+.mui-bar-tab .mui-tab-item.mui-active, .mui-bar .mui-active .mui-icon{
 	color:#FF9474
 }
 .vongi-ylqhsf .mui-media-object {

src/projects/pension/components/NavMenu.vue

@@ -55,6 +55,8 @@
 	}
 </script>
 
+<style scoped src="$project/assets/css/pension.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
 <style scoped>
 </style>

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

@@ -1,8 +1,70 @@
 <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">
+				<li class="mui-table-view-cell mui-col-xs-4">
+					<div class="vongi-color-block block-yellow">
+						<span class="vongi-color-unit">mmHg</span>
+						<div class="mui-h1">140/78</div>
+						<div class="mui-media-body">血压</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-8">
+					<div class="vongi-color-block block-red">
+						<span class="vongi-color-unit">次/分</span>
+						<div class="mui-h1">94</div>
+						<div class="mui-media-body">心率</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-4">
+					<div class="vongi-color-block block-green">
+						<span class="vongi-color-unit">浓度</span>
+						<div class="mui-h1">98</div>
+						<div class="mui-media-body">血氧</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-8">
+					<div class="vongi-color-block block-green">
+						<span class="vongi-color-unit">摄氏度</span>
+						<div class="mui-h1">36.3℃</div>
+						<div class="mui-media-body">体温</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-4">
+					<div class="vongi-color-block block-blue">
+						<span class="vongi-color-unit"></span>
+						<div class="mui-h1">68%</div>
+						<div class="mui-media-body">电量</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-8">
+					<div class="vongi-color-block block-yellowe">
+						<span class="vongi-color-unit"></span>
+						<div class="mui-h1">无</div>
+						<div class="mui-media-body">运动</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-col-xs-12">
+					<div class="vongi-color-block block-green">
+						<span class="vongi-color-unit"></span>
+						<div class="mui-h1">湖北省荆州市沙市</div>
+						<div class="mui-media-body">定位</div>
+					</div>
+				</li>
+			</ul>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/pension.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/pension/views/Master/Mine/Center.vue

@@ -42,7 +42,7 @@
 				<ul class="mui-table-view mui-table-view-chevron vongi-news">
 					<li class="mui-table-view-cell">
 						<router-link :to="{name:'MasterMineFeedback'}" class="mui-navigate-right">
-							<img src="~$project/assets/img/set.png" width="18" /> 问题反馈
+							<img src="~$project/assets/img/change.png" width="18" /> 切换为长者模式
 						</router-link>
 					</li>
 					<li class="mui-table-view-cell">

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

@@ -1,8 +1,14 @@
 <template>
+<div>
+
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/pension.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

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

@@ -1,8 +1,14 @@
 <template>
+<div>
+
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/pension.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

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

@@ -1,8 +1,14 @@
 <template>
+<div>
+
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/pension.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>