Pārlūkot izejas kodu

新增 眼底,居家检查,用药基础资料页面

xklr/wlj 2 gadi atpakaļ
vecāks
revīzija
75be34c4b6

+ 4 - 5
App.vue

@@ -63,9 +63,9 @@
 
 <style>
 	/*每个页面公共css */
-	@import url("@/utils/style/style.css");
-	@import url("@/utils/style/icon.css");
-	@import url("@/utils/style/color.css");
+	@import url("@/static/style/style.css");
+	@import url("@/static/style/icon.css");
+	@import url("@/static/style/color.css");
 
 	page {
 		background: #f5f5f5;
@@ -84,11 +84,10 @@
 		background-color: transparent;
 	}
 	.bule_line{
-		
 		width: 10rpx;
 		height: 30rpx;
 		background-color: #1e8ff9 ;
 		border-radius: 6rpx;
-		box-shadow: 1px 2px 3px 1px #6ba9f9;
+		box-shadow: 0px 2px 4px 0px rgba(121,190,254,0.59);
 	}
 </style>

+ 6 - 2
main.js

@@ -1,5 +1,9 @@
 import App from './App'
-import mf from 'utils/mf.js'
+import mf from 'static/js/mf.js'
+import {md, //
+	regExp, //验证规则
+	ipurl, //ip
+	_try_} from 'static/js/public.js'
 // #ifndef VUE3
 import Vue from 'vue'
 Vue.config.productionTip = false
@@ -8,7 +12,7 @@ const app = new Vue({
     ...App
 })
 app.$mount()
-Vue.prototype.$mf = mf
+Vue.prototype.$mf = { mf,...md,}
 // #endif
 
 // #ifdef VUE3

+ 1 - 1
manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "patient_h5",
-    "appid" : "",
+    "appid" : "__UNI__DBAF99A",
     "description" : "用于患者查看自己慢病就诊随访记录,和检查记录",
     "versionName" : "1.0.0",
     "versionCode" : "100",

+ 28 - 0
package-lock.json

@@ -0,0 +1,28 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "echarts": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.0.tgz",
+      "integrity": "sha512-uPsO9VRUIKAdFOoH3B0aNg7NRVdN7aM39/OjovjO9MwmWsAkfGyeXJhK+dbRi51iDrQWliXV60/XwLA7kg3z0w==",
+      "requires": {
+        "tslib": "2.3.0",
+        "zrender": "5.4.0"
+      }
+    },
+    "tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+    },
+    "zrender": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.0.tgz",
+      "integrity": "sha512-rOS09Z2HSVGFs2dn/TuYk5BlCaZcVe8UDLLjj1ySYF828LATKKdxuakSZMvrDz54yiKPDYVfjdKqcX8Jky3BIA==",
+      "requires": {
+        "tslib": "2.3.0"
+      }
+    }
+  }
+}

+ 29 - 2
pages.json

@@ -11,9 +11,36 @@
 				"navigationBarTitleText": "基础资料",
 				"enablePullDownRefresh": true
 			}
-
+		}, {
+			"path": "pages/medication/medication",
+			"style": {
+				"navigationBarTitleText": "随访用药",
+				"enablePullDownRefresh": true
+			}
+		}, {
+			"path": "pages/eye_ground/eye_ground",
+			"style": {
+				"navigationBarTitleText": "眼底检查",
+				"enablePullDownRefresh": true
+			}
+		},{
+			"path": "pages/home_monitoring/home_monitoring",
+			"style": {
+				"navigationBarTitleText": "健康监测",
+				"enablePullDownRefresh": true
+			}
 		}
-	],
+		
+	    ,{
+            "path" : "pages/chart-model/chart-model",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "慢病报告",

+ 88 - 0
pages/chart-model/chart-model.vue

@@ -0,0 +1,88 @@
+<template>
+	<view>
+		<view 
+		@click="echarts.onClick" 
+		:prop="option" 
+		:change:prop="echarts.updateEcharts" 
+		id="echarts" 
+		class="echarts">
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'chartModel',
+		props: {
+			fatherData: {
+				type: Object,
+				default: function() {
+					return {};
+				}
+			},
+		},
+		data() {
+			return {
+option: {
+					title: {
+						text: 'ECharts 入门示例'
+					},
+					tooltip: {},
+					legend: {
+						data: ['销量']
+					},
+					xAxis: {
+						data: ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
+					},
+					yAxis: {},
+					series: [{
+						name: '销量',
+						type: 'bar',
+						data: [5, 20, 36, 10, 10, 20]
+					}]
+				}
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+<script module="echarts" lang="renderjs">
+	let myChart
+	export default {
+		mounted() {
+			if (typeof window.echarts === 'function') {
+				this.initEcharts()
+			} else {
+				// 动态引入较大类库避免影响页面展示
+				const script = document.createElement('script')
+				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
+				script.src = '/static/js/echarts.js'
+				script.onload = this.initEcharts.bind(this)
+				document.head.appendChild(script)
+			}
+		},
+		methods: {
+			initEcharts() {
+				myChart = echarts.init(document.getElementById('echarts'))
+				// 观测更新的数据在 view 层可以直接访问到
+
+				myChart.setOption(this.option)
+			},
+			updateEcharts(newValue, oldValue, ownerInstance, instance) {
+				// 监听 service 层数据变更
+				myChart.setOption(newValue)
+			},
+			onClick(event, ownerInstance) {
+				// 调用 service 层的方法
+				ownerInstance.callMethod('onViewClick', {
+					test: 'test'
+				})
+			}
+		}
+	}
+</script>
+<style>
+
+</style>

+ 147 - 0
pages/eye_ground/eye_ground.vue

@@ -0,0 +1,147 @@
+<template>
+	<view>
+		<view class="position-relative bghead">
+			<image style="opacity: 0;" src="@/static/other/ydjc.png" mode="widthFix" class="w-100"></image>
+			<view class="position-absolute text-white px-3 mx-3 positionY-50" style="">
+				<view class="centerY">
+					<view class="bw_line line-height1"></view>
+					<view class="ml-1 fs-18 font-bold">
+						眼底检查
+					</view>
+				</view>
+				<view class="mt-2 fs-14">
+					患者检查的眼底片和医生建议记录
+				</view>
+			</view>
+		</view>
+		<view class="px-3 pb-3 mt-n2">
+			<view class="bg-white px-3 py-2 mt-3" style="border-radius: 16rpx;" v-for="(item,index) in 5">
+				<view class="centerY mb-2 text-gry">
+					<text class="iconfont Clock fs-20"></text>
+					<view class="">
+						{{'2022-11-01'}}
+					</view>
+				</view>
+				<view class="">
+					<view class="centerY">
+						<view class="w-50 mx-1">
+							<view class="centerY">
+								<image class="w-15" src="@/static/other/zuo.png" mode="widthFix"></image>
+								<view class="d-inline-block ml-1 fs-14 text-dark">
+									左眼
+								</view>
+							</view>
+							<view class="border mt-2"
+								style="background: #F6F9FE;border-radius: 16rpx;padding: 14rpx;box-sizing: border-box;">
+								<view class="picbox1"
+									style="border: 1px dotted  #E3E3E3;border-radius: 16rpx;box-sizing: border-box;">
+									<view style="background: #F6F9FE;" class="picimg1">
+										<image class="w-100" style="height: 100%;" src="@/static/defult/pic.png"
+											mode="aspectFit"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="w-50 mx-2">
+							<view class="centerY">
+								<image class="w-15" src="@/static/other/you.png" mode="widthFix"></image>
+								<view class="d-inline-block ml-1 fs-14 text-dark">
+									右眼
+								</view>
+							</view>
+							<view class="border mt-2"
+								style="background: #F6F9FE;border-radius: 16rpx;padding: 14rpx;box-sizing: border-box;">
+								<view class="picbox1"
+									style="border: 1px dotted  #E3E3E3;border-radius: 16rpx;box-sizing: border-box;">
+									<view style="background: #F6F9FE;" class="picimg1">
+										<image class="w-100" style="height: 100%;" src="@/static/defult/pic.png"
+											mode="aspectFit"></image>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="mt-3 p-2" style="box-shadow: 0px 2px 13px 2px rgba(211,212,214,0.45);border-radius: 8px;">
+						<view class="centerY">
+							<image class="w-15" src="@/static/other/zjjy.png" mode="widthFix"></image>
+							<view class="fs-14 font-bold ml-2">
+								专家建议
+							</view>
+							<view class=" ml-2 fs-12" style="color: #868687;">
+									无异常。请保持
+							</view>
+						</view>
+						<view class="centerY mt-2">
+							<image class="w-15" src="@/static/other/jcyy.png" mode="widthFix"></image>
+							<view class="fs-14 font-bold ml-2">
+								专家建议
+							</view>
+							<view class=" ml-2 fs-12" style="color: #868687;">
+									宁波第一人民医院
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="text-center text-gry2 fs-10 mt-2">
+					注:本报告内容只针对眼底照片可见范围
+				</view>
+			</view>
+		</view>
+		<view class="">
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		onPullDownRefresh() {
+			setTimeout(()=>{
+				uni.stopPullDownRefresh()
+			},1000)
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #F5F9FF;
+	}
+
+	.picbox1 {
+		width: 100% !important;
+		height: 0;
+		padding-bottom: 70%;
+		margin: 0;
+		position: relative;
+		overflow: hidden;
+	}
+
+	.picbox1 .picimg1 {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+	}
+
+	.bw_line {
+		width: 10rpx;
+		height: 30rpx;
+		background-color: #fff;
+		border-radius: 6rpx;
+
+	}
+
+	.bghead {
+		background-image: url('@/static/other/ydjc.png');
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		background-position: center;
+
+	}
+
+</style>

+ 860 - 0
pages/home_monitoring/home_monitoring.vue

@@ -0,0 +1,860 @@
+<template>
+	<view>
+		<view class="position-relative bghead" style="margin-top: -80rpx;">
+			<image src="@/static/other/tou.png" mode="widthFix" class="w-100"></image>
+		</view>
+		<view class="p-3">
+			<view class="centerY mb-3 w-100 font-bold">
+				<view class="bule_line" style="height: 26rpx;"></view>
+				<text class="font-bold text-dark ml-2 fs-16 line-height1">身体健康数据</text>
+			</view>
+			<view class="bg-white" style="border-radius: 16rpx;overflow: hidden;">
+				<view class="px-2 py-1 centerY" style="background: linear-gradient(180deg, #F6FFFF 0%, #EAFEFF 100%);">
+					<view class="w-15">
+						<view class="picbox">
+							<image class="picimg" src="@/static/other/xy.png" mode="aspectFit"></image>
+						</view>
+					</view>
+					<view class=" ml-2">
+						<view class="fs-14 font-bold line-height1" style="color: #35B79C;">血压</view>
+						<view class="fs-10">
+							<text class="text-gry">测量时间</text>
+						</view>
+					</view>
+					<view class="ml-auto fs-14">
+						<view class="font-bold text-right line-height1" style="color: #868687;">
+							{{'70/150 mmHg'}}
+						</view>
+						<view class="fs-12 centerY" style="color: #868687 ;">
+							<text class="iconfont Clock"></text>
+							<view class="ml-1">
+								{{'2022-11-22 14:20:20'}}
+							</view>
+						</view>
+					</view>
+					<view class="iconfont Chevron-Right fs-24" style="color: #35B79C;"></view>
+				</view>
+				<view class="px-3 py-2">
+					<view class="fs-14 text-gry mb-1">
+						近7次测量记录
+					</view>
+					<view class="">
+						<view id="echarts1" class="echarts"></view>
+					</view>
+					
+					<view class="mt-3 p-2 mb-2" style="box-shadow: 0px 2px 13px 2px rgba(211,212,214,0.45);border-radius: 8px;">
+						<view class="centerY">
+							<image class="w-10" src="@/static/other/xy2.png" mode="widthFix"></image>
+							<view class="fs-14 font-bold ml-2 space-nowrap">
+								血压标准
+							</view>
+							<view class=" ml-2 fs-12" style="color: #868687;">
+								<view class="">
+									收缩压:90~139 mmHg
+								</view>
+								<view class="">
+									舒张压:60~90 mmHg
+								</view>
+							</view>
+						</view>
+						<view class="centerY mt-2">
+							<image class="w-10" src="@/static/other/zjjy.png" mode="widthFix"></image>
+							<view class="fs-14 font-bold ml-2 space-nowrap">
+								专家建议
+							</view>
+							<view class=" ml-2 fs-12" style="color: #868687;">
+									正常
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="bg-white mt-2" style="border-radius: 16rpx;overflow: hidden;">
+				<view class="px-2 py-1 centerY" style="background: linear-gradient(180deg, #ebf6ff 0%, #D4EBFF 100%);">
+					<view class="w-15 ">
+						<view class="picbox">
+							<image class="picimg" src="@/static/other/xuet.png" mode="aspectFit"></image>
+						</view>
+					</view>
+					<view class=" ml-2">
+						<view class="fs-14 font-bold line-height1" style="color: #369FE5;">血糖</view>
+						<view class="fs-10">
+							<text class="text-gry">测量时间</text>
+						</view>
+					</view>
+					<view class="ml-auto fs-14">
+						<view class="font-bold text-right line-height1" style="color: #868687;">
+							{{'4.5 mmol/L'}}
+						</view>
+						<view class=" centerY" style="color: #868687 ;">
+							<text class="iconfont Clock"></text>
+							<view class="fs-12 ml-1">
+								{{'2022-11-22 14:20:20'}}
+							</view>
+						</view>
+					</view>
+					<view class="iconfont Chevron-Right fs-24" style="color: #369FE5;"></view>
+				</view>
+				<view class="px-3 py-2">
+					<view class="fs-14 text-gry mb-1">
+						近7次测量记录
+					</view>
+					<view class="">
+						<view id="echarts2" class="echarts"></view>
+					</view>
+					<view class="mt-3 p-2 mb-2" style="box-shadow: 0px 2px 13px 2px rgba(211,212,214,0.45);border-radius: 8px;">
+							<view class="centerY">
+								<image class="w-10" src="@/static/other/xtfw.png" mode="widthFix"></image>
+								<view class="fs-14 font-bold ml-2 space-nowrap">
+									血糖标准
+								</view>
+								<view class=" ml-2 fs-12" style="color: #868687;">
+									<view class="">
+										3.9~6.9 mmol/L
+									</view>
+								</view>
+							</view>
+							<view class="centerY mt-2">
+								<image class="w-10" src="@/static/other/zjjy.png" mode="widthFix"></image>
+								<view class="fs-14 font-bold ml-2 space-nowrap">
+									专家建议
+								</view>
+								<view class=" ml-2 fs-12" style="color: #868687;">
+										正常
+								</view>
+							</view>
+						</view>
+					
+				</view>
+			</view>
+			<view class="bg-white mt-2" style="border-radius: 16rpx;overflow: hidden;">
+				<view class="px-2 py-1 centerY" style="background: linear-gradient(180deg, #F6FFFF 0%, #EAFEFF 100%);">
+					<view class="w-15 ">
+						<view class="picbox">
+							<image class="picimg" src="@/static/other/xinl.png" mode="aspectFit"></image>
+						</view>
+					</view>
+					<view class=" ml-2">
+						<view class="fs-14 font-bold line-height1" style="color: #35B79C">心率</view>
+						<view class="fs-10">
+							<text class="text-gry">测量时间</text>
+						</view>
+					</view>
+					<view class="ml-auto fs-14">
+						<view class="font-bold text-right line-height1" style="color: #868687;">
+							{{'80 次/分钟'}}
+						</view>
+						<view class="fs-10 centerY" style="color: #868687 ;">
+							<text class="iconfont Clock"></text>
+							<view class="ml-1">
+								{{'2022-11-22 14:20:20'}}
+							</view>
+						</view>
+					</view>
+					<view class="iconfont Chevron-Right fs-24" style="color: #35B79C "></view>
+				</view>
+				<view class="px-3 py-2">
+					<view class="fs-14 text-gry mb-1">
+						近7次测量记录
+					</view>
+					<view class="">
+						<view id="echarts3" class="echarts"></view>
+					</view>
+					<view class="mt-3 p-2 mb-2" style="box-shadow: 0px 2px 13px 2px rgba(211,212,214,0.45);border-radius: 8px;">
+							<view class="centerY">
+								<image class="w-10" src="@/static/other/xlfw.png" mode="widthFix"></image>
+								<view class="fs-14 font-bold ml-2 space-nowrap">
+									心率标准
+								</view>
+								<view class=" ml-2 fs-12" style="color: #868687;">
+									60~100 次/分钟
+								</view>
+							</view>
+							<view class="centerY mt-2">
+								<image class="w-10" src="@/static/other/zjjy.png" mode="widthFix"></image>
+								<view class="fs-14 font-bold ml-2 space-nowrap">
+									专家建议
+								</view>
+								<view class=" ml-2 fs-12" style="color: #868687;">
+										正常
+								</view>
+							</view>
+						</view>
+					
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		onReady() {},
+		methods: {
+			changeOption() {
+				const data = this.option.series[0].data
+				// 随机更新示例数据
+				data.forEach((item, index) => {
+					data.splice(index, 1, Math.random() * 40)
+				})
+			},
+			onViewClick(options) {
+				console.log(options)
+			}
+		},
+		onPullDownRefresh() {
+			setTimeout(()=>{
+				uni.stopPullDownRefresh()
+			},1000)
+		}
+	}
+</script>
+
+<script module="echarts" lang="renderjs">
+	import * as echarts from 'echarts';
+	let dataList = [{
+		"id": 41,
+		"idCard": null,
+		"checkType": "ExamBloodGlucose",
+		"medicalRecordId": null,
+		"authorizationCode": null,
+		"glu": "5.8",
+		"deviceUuid": "355D0003795",
+		"sbp": 110,
+		"rbp": 80,
+		"pulse": 80,
+		"uploadTime": "2022-09-26 07:08:00",
+		"createTime": "2022-09-26T07:06:54",
+		"updateTime": "2022-09-26T07:06:54",
+		"isDelete": 0,
+		"aorB": null
+	}, {
+		"id": 39,
+		"idCard": null,
+		"checkType": "ExamBloodGlucose",
+		"medicalRecordId": null,
+		"authorizationCode": null,
+		"glu": "5.5",
+		"deviceUuid": "355D0003795",
+		"sbp": 130,
+		"rbp": 87,
+		"pulse": 82,
+		"uploadTime": "2022-09-23 06:20:00",
+		"createTime": "2022-09-23T06:19:45",
+		"updateTime": "2022-09-23T06:19:45",
+		"isDelete": 0,
+		"aorB": null
+	}, {
+		"id": 25,
+		"idCard": null,
+		"checkType": "ExamBloodGlucose",
+		"medicalRecordId": null,
+		"authorizationCode": null,
+		"glu": "7.3",
+		"deviceUuid": "355D0003795",
+		"sbp": 125,
+		"rbp": 95,
+		"pulse": 95,
+		"uploadTime": "2022-09-13 06:04:00",
+		"createTime": "2022-09-13T06:04:26",
+		"updateTime": "2022-09-13T06:04:26",
+		"isDelete": 0,
+		"aorB": null
+	}, {
+		"id": 24,
+		"idCard": null,
+		"checkType": "ExamBloodGlucose",
+		"medicalRecordId": null,
+		"authorizationCode": null,
+		"glu": "9.1",
+		"deviceUuid": "355D0003795",
+		"sbp": 135,
+		"rbp": 84,
+		"pulse": 77,
+		"uploadTime": "2022-09-12 07:56:00",
+		"createTime": "2022-09-12T07:56:53",
+		"updateTime": "2022-09-12T07:56:53",
+		"isDelete": 0,
+		"aorB": null
+	}, {
+		"id": 23,
+		"idCard": null,
+		"checkType": "ExamBloodGlucose",
+		"medicalRecordId": null,
+		"authorizationCode": null,
+		"glu": "7.7",
+		"deviceUuid": "355D0003795",
+		"sbp": 143,
+		"rbp": 90,
+		"pulse": 89,
+		"uploadTime": "2022-09-12 05:38:00",
+		"createTime": "2022-09-12T05:38:40",
+		"updateTime": "2022-09-12T05:38:40",
+		"isDelete": 0,
+		"aorB": null
+	}, {
+		"id": 22,
+		"idCard": null,
+		"checkType": "ExamBloodGlucose",
+		"medicalRecordId": null,
+		"authorizationCode": null,
+		"glu": "17.8",
+		"deviceUuid": "355D0003795",
+		"sbp": 133,
+		"rbp": 80,
+		"pulse": 85,
+		"uploadTime": "2022-09-11 15:51:00",
+		"createTime": "2022-09-11T15:52:00",
+		"updateTime": "2022-09-11T15:52:00",
+		"isDelete": 0,
+		"aorB": null
+	}, {
+		"id": 21,
+		"idCard": null,
+		"checkType": "ExamBloodGlucose",
+		"medicalRecordId": null,
+		"authorizationCode": null,
+		"glu": "6.5",
+		"deviceUuid": "355D0003795",
+		"sbp": 123,
+		"rbp": 75,
+		"pulse": 86,
+		"uploadTime": "2022-09-08 07:15:00",
+		"createTime": "2022-09-08T07:13:21",
+		"updateTime": "2022-09-08T07:13:21",
+		"isDelete": 0,
+		"aorB": null
+	}]
+	const config = {
+		pulse: [60, 100],
+		temperature: [36.5, 37.5],
+		shrink: [90, 139],
+		diastole: [60, 90],
+		shrinktop: [90, 149], //大于65
+		shrinklow: [90, 139], //小于65  
+		bmi: [18.50, 23.90],
+		urine1: [
+			[53, 106],
+			[44, 97], "肌酐"
+		],
+		urine2: [0, 30, "微量白蛋白"],
+		urine3: [8.4, 13.2, "尿微/肌酐"],
+		kidney1: [
+			[208, 428],
+			[155, 357], "血尿酸"
+		],
+		kidney2: [
+			[54, 133],
+			[44, 97], "血肌酐"
+		],
+		kidney3: [13.9, 6.1, "尿素氮"],
+		bloodFat1: [0.45, 1.7, "甘油三酯"],
+		bloodFat2: [2.85, 5.69, "总胆固醇"],
+		bloodFat3: [0, 3.4, "低密度脂蛋白"],
+		bloodFat4: [1.16, 1.55, "高密度脂蛋白"],
+		lvision: [1.0, 5.0, '左视力'],
+		rvision: [1.0, 5.0, '右视力'],
+		bloodGlucose: [3.9, 6.9, '血糖'],
+		chol: [2.85, 5.69, '总胆固醇'],
+		ua: [
+			[149, 416],
+			[89, 357], '尿酸'
+		],
+		spo2: [95, 99, '血氧'],
+		rxyl: [0, 0],
+		ryjl: [0, 0],
+	}
+	let info = {
+		"id": 905,
+		"username": "罗桂花",
+		"birthday": "1945-12-28",
+		"age": 77,
+		"sex": 2,
+		"idCard": "330222194512283184",
+		"socialInsurance": "1111",
+		"tod": "[]",
+		"phone": "15854712036",
+		"nation": "汉族",
+		"culture": "高中",
+		"occupation": "自由职业",
+		"marriage": "已婚",
+		"address": "[\"330000\",\"330100\",\"330122\"]",
+		"addressDetail": "111",
+		"province": "浙江省",
+		"city": "杭州市",
+		"area": "桐庐县",
+		"town": "附海镇",
+		"village": "花木村",
+		"healthIndex": null,
+		"complication": "[]",
+		"acutecomplications": null,
+		"medicalInsuranceType": 1,
+		"chronicDiseaseType": 4,
+		"gxyIllTime": null,
+		"tnbIllTime": null,
+		"diseaseHistory": null,
+		"familyHistory": null,
+		"saltiness": "",
+		"hospitalId": 103,
+		"registUserId": 78,
+		"nextVisitTime": null,
+		"newVisitDate": null,
+		"disability": null,
+		"povertySituation": null,
+		"healthImportance": null,
+		"lvhTime": null,
+		"lvh": null,
+		"carotidPlaque": null,
+		"carotidPlaqueTime": null,
+		"hyperhomocysteinemia": null,
+		"mentalIllness": null,
+		"acuteDisease": null,
+		"chronicDisease": null,
+		"chronicConfirmedTime": null,
+		"acuteConfirmedTime": null,
+		"hospitalTime": null,
+		"acuteRiskLevel": null,
+		"chronicRiskLevel": null,
+		"andComplication": "[]",
+		"project": null,
+		"isSend": "0",
+		"createTime": "2022-11-23 13:14:24",
+		"updateTime": "2022-11-23T13:14:24",
+		"isDelete": 0
+	}
+	export default {
+		mounted() {
+			console.log(echarts)
+			this.chartOption1(dataList, 'echarts1')
+			this.chartOption2(dataList, 'echarts2')
+			this.chartOption3(dataList, 'echarts3')
+			// this.initChart('echarts1', this.option)
+			// this.initChart('echarts2', this.option2)
+		},
+		methods: {
+			initChart(dom, option) {
+				let chart = echarts.init(document.getElementById(dom))
+				chart.setOption(option)
+			},
+			// updateEcharts(newValue, oldValue, ownerInstance, instance) {
+			// 	// 监听 service 层数据变更
+			// 	myChart.setOption(newValue)
+			// },
+			onClick(event, ownerInstance) {
+				// 调用 service 层的方法
+				ownerInstance.callMethod('onViewClick', {
+					test: 'test'
+				})
+			},
+
+			check({
+				type,
+				value,
+				age,
+				sex
+			}) {
+				let msg = info
+				let arr = config
+				if (type == 'shrink' && age) {
+					if (msg.age > 65) {
+						if (value > arr['shrinktop'][1]) {
+							return true
+						}
+						if (value < arr['shrinktop'][0]) {
+							return true
+						}
+					} else {
+						if (value > arr['shrinklow'][1]) {
+							return true
+						}
+						if (value < arr['shrinklow'][0]) {
+							return true
+						}
+					}
+				}
+
+				if (sex) {
+					if (msg.sex == 1) {
+						if (value > arr[type][0][1]) {
+							return true
+						}
+						if (value < arr[type][0][0]) {
+							return true
+						}
+					} else {
+						if (value > arr[type][1][1]) {
+							return true
+						}
+			  	if (value < arr[type][1][0]) {
+							return true
+						}
+					}
+				}
+
+				if (value > arr[type][1]) {
+					return true
+				}
+				if (value < arr[type][0]) {
+					return true
+				}
+				return false
+			},
+
+			chartOption1(data, dom) {
+				// console.log(data)
+				let data1 = [],
+					data2 = [],
+					data3 = [],
+					time = []
+				data.map((item) => {
+					time.push(this.$mf.timeTrans({time:item.uploadTime,format:'M.D'}))
+					data1.push(item.sbp)
+					data2.push(item.rbp)
+					data3.push(item.pulse)
+				})
+
+				let arr = []
+				data.map((item, index) => {
+					if (this.check({
+							type: 'shrink',
+							value: data1[index],
+							age: true
+						})) {
+						arr.push({
+							name: '收缩压',
+							value: [item.uploadTime, data1[index]],
+							symbolSize: 8,
+						})
+					}
+					if (this.check({
+							type: 'diastole',
+							value: data2[index]
+						})) {
+						arr.push({
+							name: '舒张压',
+							value: [item.uploadTime, data2[index]],
+							symbolSize: 8,
+						})
+					}
+
+				})
+				// console.log(arr)
+				var option = (option = {
+					legend: {
+						data: ['收缩压', '舒张压', '心率'],
+					},
+					tooltip: {
+						formatter: function(params) {
+							console.log(params)
+							let str =
+								'<view style="padding:0px;width:140px"><view>' +
+								params[0].name +
+								'</view><view class="centerY" style="margin-top:6px"><view style="background:#5470c6;width:10px;height:10px;border-radius: 50%;" ></view><view class="" style="margin-left:4px">' +
+								params[0].seriesName +
+								'</view> <view class="ml-auto font-bold">' +
+								params[0].value +
+								'</view></view> <view class="centerY" style="margin-top:6px"><view style="background:#91cc75;width:10px;height:10px;border-radius: 50%;" ></view><view class="" style="margin-left:4px">' +
+								params[1].seriesName +
+								'</view><view class="ml-auto font-bold">' +
+								params[1].value +
+								'</view></view><view class="centerY" style="margin-top:6px"><view style="background:#fac858;width:10px;height:10px;border-radius: 50%;" ></view><view class="" style="margin-left:4px">' +
+								params[2].seriesName +
+								'</view><view class="ml-auto font-bold">' +
+								params[2].value +
+								'</view></view></view>'
+							return str
+						},
+						trigger: 'axis',
+						axisPointer: {
+							type: 'cross',
+							label: {
+								backgroundColor: '#6a7985',
+							},
+						},
+					},
+					grid: {
+						top: '20%',
+						left: '3%',
+						right: '5%',
+						bottom: '3%',
+						containLabel: true,
+					},
+					xAxis: [{
+						type: 'category',
+						axisPointer: {
+							type: 'shadow',
+						},
+						data: time.reverse(),
+					}, ],
+					yAxis: [{
+						type: 'value',
+					}, ],
+					series: [{
+							name: '收缩压',
+							label: {
+								show: true,
+								formatter: '{@score}',
+								position: 'top'
+							},
+							smooth: true,
+							type: 'line',
+							data: data1.reverse(),
+						},
+						{
+							name: '舒张压',
+							label: {
+								show: true,
+								formatter: '{@score}',
+								position: 'bottom',
+							},
+							smooth: true,
+							type: 'line',
+							data: data2.reverse(),
+						},
+						{
+							type: 'effectScatter',
+							coordinateSystem: 'cartesian2d',
+							data: arr,
+							showEffectOn: 'render',
+							// zlevel:1,
+							rippleEffect: {
+								// 波纹的绘制方式,可选'stroke'和'fill'
+								brushType: 'fill',
+							},
+							itemStyle: {
+								color: '#F2597F'
+							},
+							hoverAnimation: false,
+						},
+					],
+				})
+				if (document.getElementById(dom)) {
+					this.initChart(dom, option)
+				}
+
+			},
+			chartOption2(data) {
+				// console.log(data)
+				let data1 = [],
+					time = []
+				data.map((item) => {
+					time.push(this.$mf.timeTrans({time:item.uploadTime,format:'M.D'}))
+					data1.push(item.glu)
+				})
+
+				let arr = []
+				data.map((item, index) => {
+					if (this.check({
+							type: 'bloodGlucose',
+							value: data1[index],
+							age: true
+						})) {
+						arr.push({
+							name: '血糖',
+							value: [item.uploadTime, data1[index]],
+							symbolSize: 8,
+						})
+					}
+				})
+				var option = (option = {
+					legend: {
+						data: ['血糖'],
+					},
+					tooltip: {
+						trigger: 'axis',
+						axisPointer: {
+							type: 'cross',
+							label: {
+								backgroundColor: '#6a7985',
+							},
+						},
+					},
+					grid: {
+						top: '20%',
+						left: '3%',
+						right: '5%',
+						bottom: '3%',
+						containLabel: true,
+					},
+					xAxis: [{
+						type: 'category',
+						axisPointer: {
+							type: 'shadow',
+						},
+						data: time.reverse(),
+					}, ],
+					yAxis: [{
+						type: 'value',
+					}, ],
+					series: [{
+							name: '血糖',
+							label: {
+								show: true,
+								formatter: '{@score}',
+								position: 'top'
+							},
+							smooth: true,
+							type: 'line',
+							data: data1.reverse(),
+
+							itemStyle: {
+								color: '#369FE5'
+							},
+						},
+						{
+							type: 'effectScatter',
+							coordinateSystem: 'cartesian2d',
+							data: arr,
+							showEffectOn: 'render',
+							// zlevel:1,
+							rippleEffect: {
+								// 波纹的绘制方式,可选'stroke'和'fill'
+								brushType: 'fill',
+							},
+							itemStyle: {
+								color: '#F2597F'
+							},
+							hoverAnimation: false,
+						},
+					],
+				})
+				this.$nextTick(() => {
+					if (document.getElementById('echarts2')) {
+						this.initChart('echarts2', option)
+					}
+				})
+			},
+			chartOption3(data, dom) {
+				// console.log(data)
+				let data1 = [],
+					data2 = [],
+					data3 = [],
+					time = []
+				data.map((item) => {
+					time.push(this.$mf.timeTrans({time:item.uploadTime,format:'M.D'}))
+					data3.push(item.pulse)
+				})
+
+				let arr = []
+				data.map((item, index) => {
+					if (this.check({
+							type: 'pulse',
+							value: data3[index]
+						})) {
+						arr.push({
+							name: '心率',
+							value: [item.uploadTime, data3[index]],
+							symbolSize: 10,
+						})
+					}
+				})
+				// console.log(arr)
+				var option = (option = {
+					legend: {
+						data: ['心率'],
+					},
+					tooltip: {
+						trigger: 'axis',
+						axisPointer: {
+							type: 'cross',
+							label: {
+								backgroundColor: '#6a7985',
+							},
+						},
+					},
+					grid: {
+						top: '20%',
+						left: '3%',
+						right: '5%',
+						bottom: '3%',
+						containLabel: true,
+					},
+					xAxis: [{
+						type: 'category',
+						axisPointer: {
+							type: 'shadow',
+						},
+						data: time.reverse(),
+					}, ],
+					yAxis: [{
+						type: 'value',
+					}, ],
+					series: [{
+							name: '心率',
+							label: {
+								show: true,
+								formatter: '{@score}',
+								position: 'top',
+							},
+							itemStyle: {
+								color: '#35B79C'
+							},
+							smooth: true,
+							type: 'line',
+							data: data3.reverse(),
+							areaStyle: {
+								color: {
+									type: 'linear',
+									x: 0,
+									y: 0,
+									x2: 0,
+							 	y2: 1,
+									global: false,
+									colorStops: [{
+											offset: 0,
+											color: 'rgba(53,183,156,.7)'
+										},
+										{
+											offset: 0.5,
+											color: 'rgba(53,183,156,0.3)'
+										},
+										{
+											offset: 1,
+											color: 'rgba(53,183,156,0)'
+										}
+									]
+								}
+							},
+						},
+						{
+							type: 'effectScatter',
+							coordinateSystem: 'cartesian2d',
+							data: arr,
+							showEffectOn: 'render',
+							// zlevel:1,
+							rippleEffect: {
+								// 波纹的绘制方式,可选'stroke'和'fill'
+								brushType: 'fill',
+							},
+							itemStyle: {
+								color: '#F2597F'
+							},
+							hoverAnimation: false,
+						},
+					],
+				})
+				if (document.getElementById(dom)) {
+					this.initChart(dom, option)
+				}
+
+			},
+		}
+
+	}
+</script>
+<style lang="scss">
+	page {
+		background: #F5F9FF;
+	}
+
+	.echarts {
+		width: 100%;
+		height: 400rpx;
+	}
+</style>

+ 11 - 9
pages/index/index.vue

@@ -7,7 +7,7 @@
 			<view class="centerY mt-2">
 				<view class="w-20 userhead">
 					<view class="picbox">
-						<image src="../../static/家族史.png" mode="widthFix" class="picimg"></image>
+						<image src="@/static/userinfo/jzs.png" mode="widthFix" class="picimg"></image>
 					</view>
 				</view>
 				<view class="w-80 ml-2">
@@ -37,27 +37,24 @@
 					更多
 				</view>
 				<view class="iconfont Chevron-Right text-gry">
-
 				</view>
 			</view>
 			<view class="centerY mt-3">
 				<view class="w-50 pr-2">
-					<image src="../../static/index/grtz.png" mode="widthFix" class="w-100"></image>
+					<image src="@/static/index/grtz.png" mode="widthFix" class="w-100"></image>
 				</view>
 				<view class="w-50 pl-1">
-					<image src="../../static/index/jkbg.png" mode="widthFix" class="w-100"></image>
-					<image src="../../static/index/dqyy.png" mode="widthFix" class="w-100 mt-2"></image>
+					<image src="@/static/index/jkbg.png" mode="widthFix" class="w-100"></image>
+					<image @click="$mf.clickNavto('/pages/medication/medication')" src="@/static/index/dqyy.png" mode="widthFix" class="w-100 mt-2"></image>
 				</view>
 			</view>
 			<view class="mt-2">
-				<image src="../../static/index/ydjc.png" mode="widthFix" class="w-100"></image>
+				<image @click="$mf.clickNavto('/pages/eye_ground/eye_ground')" src="@/static/index/ydjc.png" mode="widthFix" class="w-100"></image>
 			</view>
 			<view class="mt-2">
-				<image src="../../static/index/jjjc.png" mode="widthFix" class="w-100"></image>
+				<image @click="$mf.clickNavto('/pages/home_monitoring/home_monitoring')" src="@/static/index/jjjc.png" mode="widthFix" class="w-100"></image>
 			</view>
-			
 		</view>
-
 	</view>
 </template>
 
@@ -73,6 +70,11 @@
 		},
 		methods: {
 		
+		},
+		onPullDownRefresh() {
+			setTimeout(()=>{
+				uni.stopPullDownRefresh()
+			},1000)
 		}
 	}
 </script>

+ 130 - 0
pages/medication/medication.vue

@@ -0,0 +1,130 @@
+<template>
+	<view>
+		<view class="position-relative bghead">
+			<image style="opacity: 0;" src="@/static/other/med.png" mode="widthFix" class="w-100"></image>
+			<view class="position-absolute text-white px-3 mx-3 positionY-50" style="">
+				<view class="centerY">
+					<view class="bw_line line-height1"></view>
+					<view class="ml-1 fs-18 font-bold">
+						随访用药
+					</view>
+				</view>
+				<view class="mt-2 fs-14">
+					患者每次随访的用药记录
+				</view>
+			</view>
+		</view>
+		<view class="px-3 pb-3 mt-n2">
+			<view class="bg-white px-2 py-3 mt-3" style="border-radius: 16rpx;" v-for="(item,index) in 5">
+				<view class="centerY mb-2 text-gry">
+					<view class="bule_line"></view>
+					<view class="ml-2">
+						{{'糖尿病随访'}}
+					</view>
+					<text class="ml-auto iconfont Clock fs-20"></text>
+					<view class="">
+						{{'2022-11-01'}}
+					</view>
+				</view>
+				<view class="">
+					<view class="mtable-title centerY bg-primary text-white fs-12">
+						<view class="text-left" style="width: 23%;">
+							药名
+						</view>
+						<view class=" text-center" style="width: 15%;">
+							剂量
+						</view>
+						<view class="w-10 text-center">
+							用法
+						</view>
+						<view class="text-center" style="width: 17%;">
+							用药频次
+						</view>
+						<view class="text-center" style="width: 17%;">
+							不良反应
+						</view>
+						<view class=" text-center" style="width: 17%;">
+							用药类型
+						</view>
+					</view>
+					<view class="mtable-body-item centerY fs-12" v-for="(item,index) in 5" style="color: #868687;">
+						<view class="text-left" style="width: 23%;">
+							{{'培哚普利吲达帕胺片4mg'}}
+						</view>
+						<view class=" text-center" style="width: 15%;">
+							{{'1.05mg'}}
+						</view>
+						<view class="w-10 text-center">
+							{{'口服'}}
+						</view>
+						<view class="text-center" style="width: 17%;">
+							{{'1日1次'}}
+						</view>
+						<view class="text-center" style="width: 17%;">
+							{{'无'}}
+						</view>
+						<view class="text-center" style="width: 17%;">
+							{{'糖尿病'}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="">
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		onPullDownRefresh() {
+			setTimeout(()=>{
+				uni.stopPullDownRefresh()
+			},1000)
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #F5F9FF;
+	}
+
+	.bw_line {
+		width: 10rpx;
+		height: 30rpx;
+		background-color: #fff;
+		border-radius: 6rpx;
+	}
+
+	.bghead {
+		background-image: url('@/static/other/med.png');
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		background-position: center;
+
+	}
+
+	.mtable {
+		&-title {
+			border-radius: 50rpx;
+			padding: 20rpx 0 20rpx 20rpx;
+		}
+
+		&-body {
+			&-item {
+				margin-top: 20rpx;
+				border-radius: 50rpx;
+				padding: 14rpx 0 14rpx 20rpx;
+				background-color: #F6F9FE;
+				color: #868687;
+			}
+		}
+	}
+</style>

+ 104 - 18
pages/userinfo/userinfo.vue

@@ -2,12 +2,12 @@
 	<view>
 		<view class="p-3">
 			<view class="d-flex">
-				<view class="w-100 fs-14 font-bold">
-					<view class="centerY">
-						<view class="bule_line" style="height: 26rpx;margin-top: -2rpx;"></view>
-						<text class="font-bold text-dark ml-2 fs-16 line-height1">基本信息</text>
+				<view class="w-100 font-bold">
+					<view class="centerY  mb-3">
+						<view class="bule_line" style="height: 26rpx;"></view>
+						<text class="font-bold text-dark ml-2 fs-18 line-height1">基本信息</text>
 					</view>
-					<view class="centerY border-bottom mb-2 mt-2" style="color: #818181;">
+					<view class="centerY border-bottom mb-2 fs-14" style="color: #818181;">
 						<view class="w-50 mb-2">
 							<view class="mb-2">
 								姓名:{{'王老爷爷'}}
@@ -25,7 +25,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="centerY mb-2" style="color: #818181;">
+					<view class="centerY mb-2 fs-14" style="color: #818181;">
 						<view class="w-50 mb-2">
 							<view class=" mb-2">
 								文化程度:{{'文盲'}}
@@ -46,31 +46,31 @@
 				</view>
 				<view style="position: absolute;right: 20rpx;top: 20rpx;width: 100rpx;">
 					<view class="picbox">
-						<image src="../../static/家族史.png" mode="widthFix" class="picimg"></image>
+						<image src="@/static/userinfo/jzs.png" mode="widthFix" class="picimg"></image>
 					</view>
 				</view>
 			</view>
 			<view class="bg-white px-3 fs-14  font-bold" style="border-radius: 16rpx;color: #818181;">
 				<view class="centerY border-bottom py-2">
-					<image src="../../static/社保.png" mode="widthFix" style="width: 40rpx;"></image>
+					<image src="@/static/userinfo/sb.png" mode="widthFix" style="width: 40rpx;"></image>
 					<view class=" ml-1 line-height1">
 						社保卡号:{{'A1122233333'}}
 					</view>
 				</view>
 				<view class="centerY border-bottom py-2">
-					<image src="../../static/身份证.png" mode="widthFix" style="width: 40rpx;"></image>
+					<image src="@/static/userinfo/sfz.png" mode="widthFix" style="width: 40rpx;"></image>
 					<view class=" ml-1 line-height1">
 						身份证号:{{'542250213151651511'}}
 					</view>
 				</view>
 				<view class="centerY border-bottom py-2">
-					<image src="../../static/电话.png" mode="widthFix" style="width: 40rpx;"></image>
+					<image src="@/static/userinfo/dh.png" mode="widthFix" style="width: 40rpx;"></image>
 					<view class=" ml-1 line-height1">
 						手机号码:{{'18812345678'}}
 					</view>
 				</view>
 				<view class="centerY py-2">
-					<image src="../../static/家庭.png" mode="widthFix" style="width: 40rpx;"></image>
+					<image src="@/static/userinfo/jt.png" mode="widthFix" style="width: 40rpx;"></image>
 					<view class=" ml-1 line-height1">
 						家庭住址:{{'浙江省杭州市西湖区XX街道'}}
 					</view>
@@ -81,7 +81,7 @@
 					医保类型:
 				</view>
 				<view class="fs-10 w-100">
-					<span class="mr-1 text-center py-1 mt-2 d-inline-block w-20" 
+					<span class="mr-1 text-center py-1 mt-2 d-inline-block w-20 line-height1" 
 						:style="{borderRadius:'50rpx',background:index==1?'#1890FF':'#EBEBEB',color:index==1?'#fff':'#A4A4A4'}"
 					 v-for="(item,index) in ['城镇医保','公费医保','系农村','商业保险','自费']">
 						{{item}}
@@ -93,7 +93,7 @@
 					慢病类型:
 				</view>
 				<view class="fs-10 w-100">
-					<span class="mr-1 text-center py-1 mt-2 d-inline-block w-20" 
+					<span class="mr-1 text-center py-1 mt-2 d-inline-block w-20 line-height1" 
 						:style="{borderRadius:'50rpx',background:index==1?'#1890FF':'#EBEBEB',color:index==1?'#fff':'#A4A4A4'}"
 					 v-for="(item,index) in ['高血压','糖尿病','合并症','无']">
 						{{item}}
@@ -105,20 +105,101 @@
 					糖尿病病龄:
 				</view>
 				<view class="fs-10 w-100">
-					<span class="mr-1 text-center py-1 mt-2 d-inline-block w-20" 
+					<span class="mr-1 text-center py-1 mt-2 d-inline-block w-20 line-height1" 
 						:style="{borderRadius:'50rpx',background:index==1?'#1890FF':'#EBEBEB',color:index==1?'#fff':'#A4A4A4'}"
 					 v-for="(item,index) in ['30年']">
 						{{item}}
 					</span>
 				</view>
 			</view>
-			<view class=" mt-2 bg-white p-3 fs-14  font-bold" style="border-radius: 16rpx;color: #818181;">
-				<view class="centerY">
+			<view class=" mt-2 bg-white p-3 fs-14  font-bold" style="border-radius: 16rpx;">
+				<view class="centerY mb-2">
 					<view class="bule_line" style="height: 26rpx;margin-top: -2rpx;"></view>
-					<text class="font-bold text-dark ml-2 fs-16 line-height1">其他信息</text>
+					<text class="font-bold text-dark ml-2 fs-18 line-height1">其他信息</text>
 				</view>
-				<view class="centerY">
+				<view class=" border-bottom pt-2">
+					<view class="w-50 d-inline-block mb-2">
+						<view class="centerY">
+								<view class="w-40">
+										<view class="picbox">
+											<image class="picimg" src="@/static/userinfo/jbs.png" mode=""></image>
+										</view>
+									</view>
+									<view class="w-60 ml-1">
+										<view class="fs-16">
+											疾病史
+										</view>
+										<view class="mt-1"  style="color: #818181;">
+											心脏病
+										</view>
+									</view>
+						</view>
+					</view>
 					
+						<view class="w-50 d-inline-block mb-2">
+							<view class="centerY">
+									<view class="w-40">
+											<view class="picbox">
+												<image class="picimg" src="@/static/userinfo/jzs.png" mode=""></image>
+											</view>
+										</view>
+										<view class="w-60 ml-1">
+											<view class="fs-16">
+												家族史
+											</view>
+											<view class="mt-1"  style="color: #818181;">
+												心脏病
+											</view>
+										</view>
+									
+							</view>
+						</view>
+						<view class="w-50 d-inline-block mb-2">
+							<view class="centerY">
+									<view class="w-40">
+											<view class="picbox">
+												<image class="picimg" src="@/static/userinfo/xd.png" mode=""></image>
+											</view>
+										</view>
+										<view class="w-60 ml-1">
+											<view class="fs-16">
+												咸淡情况
+											</view>
+											<view class="mt-1"  style="color: #818181;">
+												心脏病
+											</view>
+										</view>
+							</view>
+						</view>
+						<view class="w-50 d-inline-block mb-2">
+							<view class="centerY">
+									<view class="w-40">
+											<view class="picbox">
+												<image class="picimg" src="@/static/userinfo/hb.png" mode=""></image>
+											</view>
+										</view>
+										<view class="w-60 ml-1">
+											<view class="fs-16">
+												合并症
+											</view>
+											<view class="mt-1"  style="color: #818181;">
+												心脏病
+											</view>
+										</view>
+							</view>
+						</view>
+					</view>
+				<view class="mt-2">
+					<view class="fs-14 font-bold text-dark">
+							并发症
+					</view>
+					<view class="fs-10 w-100">
+						<span class="mr-1 text-center py-1 px-2 mt-2 d-inline-block line-height1" 
+							:style="{borderRadius:'50rpx',background:'#EBEBEB',color:'#A4A4A4',border:'1px solid #A4A4A4'}"
+						 v-for="(item,index) in ['30年','dasdsaadassa']">
+							{{item}}
+						</span>
+					</view>
 				</view>
 			</view>
 			
@@ -132,6 +213,11 @@
 			return {
 
 			};
+		},
+		onPullDownRefresh() {
+			setTimeout(()=>{
+				uni.stopPullDownRefresh()
+			},1000)
 		}
 	}
 </script>

BIN
static/defult/pic.png


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 97412 - 0
static/js/echarts.js


+ 2 - 0
utils/mf.js

@@ -1,4 +1,6 @@
+
 export default {
+	
 	clickNavto: (path, type) => {
 		// console.log(path, type)
 		if (type == 'redirect') {

utils/js/public.js → static/js/public.js


utils/js/sdk/qqmap-wx-jssdk.min.js → static/js/sdk/qqmap-wx-jssdk.min.js


BIN
static/other/31fanhui2备份.png


BIN
static/other/jcyy.png


BIN
static/other/med.png


BIN
static/other/tou.png


BIN
static/other/xinl.png


BIN
static/other/xl.png


BIN
static/other/xlfw.png


BIN
static/other/xtfw.png


BIN
static/other/xuet.png


BIN
static/other/xuetangjinru.png


BIN
static/other/xy.png


BIN
static/other/xy2.png


BIN
static/other/ydjc.png


BIN
static/other/you.png


BIN
static/other/zjjy.png


BIN
static/other/zuo.png


utils/style/color.css → static/style/color.css


utils/style/color_match.css → static/style/color_match.css


utils/style/h5.css → static/style/h5.css


utils/style/icon.css → static/style/icon.css


utils/style/style.css → static/style/style.css


static/电话.png → static/userinfo/dh.png


static/合并.png → static/userinfo/hb.png


static/疾病史.png → static/userinfo/jbs.png


static/家庭.png → static/userinfo/jt.png


static/家族史.png → static/userinfo/jzs.png


static/社保.png → static/userinfo/sb.png


static/身份证.png → static/userinfo/sfz.png


static/咸淡.png → static/userinfo/xd.png