修改

pagesB/Healthindex/Healthindex.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="app">
-		<view class="health">
+		<view class="health" v-if="healthdata">
 			<view class="health_top">
 				<image image v-if="healthdata.hiEva<650" :src="require('../images/red.png')">
 					<image image v-if="healthdata.hiEva>850" :src="require('../images/green.png')" image>

pagesB/Prescriptionrecords/Prescriptionrecords.vue

@@ -74,7 +74,6 @@
 							this.itemList = res.data
 							this.show=false
 						})
-						
 					})
 				}
 			},

pagesB/threeHundredAndSixty/threeHundredAndSixty.vue

@@ -10,6 +10,8 @@
 		<view class="health" v-if="tabscurrent==0">
 			<healthindex></healthindex>
 		</view>
+
+		<!-- 疾病预警 -->
 		<!-- 健康处方 -->
 		<view class="" v-if="tabscurrent==2">
 			<Precords></Precords>
@@ -17,23 +19,33 @@
 		<!-- 疾病预警 -->
 		<view class="disease" v-if="tabscurrent==1">
 			<view class="btnleftalls">
+				<view class="btnright">
+					<image :src="require('../images/renti.png')" mode=""></image>
+				</view>
+				<view class="left">
 					<view class="btnleftall">
-					<view class="btnleft" @tap="diseasecv(item)">
+
-						脑血管疾病
+						<view class="btnleft" @tap="diseasecv">
+							<img src="../images/zitikuang.png" alt="" />
+							<span class="item" style="left: 101rpx;">脑血管疾病</span>
 						</view>
 						<view class="btnleft" @tap="diseaselc">
-						缺血性心血管疾病风险
+							<img src="../images/zitikuang.png" alt="" />
+							<span class="item" style="left: 52rpx;">缺血性心血管疾病风险</span>
 						</view>
+					</view>
+					<view class="btnleftall">
 						<view class="btnleft" @tap="diseaselu">
-						肺癌风险
+							<img src="../images/zitikuang.png" alt="" />
+							<span class="item" style="left: 101rpx;">肺癌风险</span>
+
 						</view>
 						<view class="btnleft" @tap="diseaseck">
-						肾功能不全风险
+							<img src="../images/zitikuang.png" alt="" />
+							<span class="item" style="left: 80rpx;">肾功能不全风险</span>
 						</view>
 					</view>
 
-				<view class="btnright">
-					<image :src="require('../images/renti.png')" mode=""></image>
 				</view>
 			</view>
 
@@ -295,7 +307,7 @@
 			</u-table>
 		</u-popup>
 
-		<u-toast ref="uToast" />
+
 	</view>
 </template>
 
@@ -336,7 +348,7 @@
 					backgroundColor: '#26A888',
 				},
 				datalist: null,
-				identity: '',
+				identity: '370522196411282177',
 				cvdEvaRecord: {},
 				lcdEvaRecord: {},
 				ckdEvaRecord: {},
@@ -412,61 +424,6 @@
 						}
 		
 					},
-			getServerData() {
-				//模拟从服务器获取数据时的延时
-				setTimeout(() => {
-					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
-					let res = {
-						categories: ["2018", "2019", "2020", "2021", "2022", "2023"],
-						series: [{
-								name: "成交量A",
-								data: [35, 8, 25, 37, 4, 20]
-							},
-							{
-								name: "成交量B",
-								data: [70, 40, 65, 100, 44, 68]
-							},
-							{
-								name: "成交量C",
-								data: [100, 80, 95, 150, 112, 132]
-							}
-						]
-					};
-					this.chartData = JSON.parse(JSON.stringify(res));
-				}, 500);
-			},
-
-			getServerData1() {
-				if (this.echartData) {
-					setTimeout(() => {
-						// let res = {
-						// 	categories: [],
-						// 	series: [{
-						// 		name: "血糖值",
-						// 		data: []
-						// 	}]
-						// }
-						res.series[0].data = this.echartData.list.map(e => e.bg)
-						res.categories = this.echartData.list.map(e => e.timename + e.measureTime)
-						this.datalist = res
-						// let restwo = {
-						// 	series: [{
-						// 		data: [{
-						// 			"name": "偏低" + this.echartData.calc.lowerNum + "次",
-						// 			"value": this.echartData.calc.lowerNum
-						// 		}, {
-						// 			"name": "正常" + this.echartData.calc.normalNum + "次",
-						// 			"value": this.echartData.calc.normalNum
-						// 		}, {
-						// 			"name": "偏高" + this.echartData.calc.higherNum + "次",
-						// 			"value": this.echartData.calc.higherNum
-						// 		}]
-						// 	}]
-						// };
-						this.datalisttwo = restwo
-					}, 500)
-				}
-			},
 			//点击tabs
 			tabschange(index) {
 				console.log(index)
@@ -488,7 +445,12 @@
 	page {
 		background-color: #fff;
 	}
+
 	.app {
+		height: 100%;
+		background-image: url('../images/beijing.png');
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
 		text-align: center;
 		font-size: 36rpx;
 
@@ -545,35 +507,58 @@
 			width: 100%;
 			position: relative;
 			background-color: #fff;
-
 			.btnleftalls {
-				display: flex;
+				// display: flex;
 				width: 100%;
 			}
 
+			.left {
+				height: 30vh;
+			}
+
 			.btnleftall {
-				width: 30%;
+				width: 100%;
+				display: flex;
+				margin-bottom: 30rpx;
 			}
 
 			.btnleft {
-				margin-top: 27%;
+				position: relative;
-				margin-left: 2%;
+				width: 42%;
-				line-height: 100rpx;
+				/* margin-left: 2%; */
+				line-height: 50px;
 				text-align: center;
 				height: 100rpx;
 				font-size: 22rpx;
-				background-color: #F2F2F2;
+				margin: 0 auto;
+
+				img {
+					position: absolute;
+					width: 283rpx;
+					height: 100rpx;
+					left: 21rpx;
+
+				}
+
+				.item {
+					position: absolute;
+					left: 133rpx;
+				}
+
+				// background-color: #F2F2F2;
 			}
 
 			.btnright {
+				height: 70vh;
+
 				// position: absolute;
 				// left: 5%;
-				width: 70%;
+				// width: 70%;
 
 				// height: 100rpx;
 				// background-color: yellow;
 				image {
-					height: 362px;
+					height: 70vh;
 					// position: absolute;
 					display: inline-block;
 					// left: 21%;