diff --git a/pagesB/threeHundredAndSixty/threeHundredAndSixty.vue b/pagesB/threeHundredAndSixty/threeHundredAndSixty.vue
index 12819a7..bfa5086 100644
--- a/pagesB/threeHundredAndSixty/threeHundredAndSixty.vue
+++ b/pagesB/threeHundredAndSixty/threeHundredAndSixty.vue
@@ -18,36 +18,315 @@
 		<view class="" v-if="tabscurrent==2">
 			<Precords></Precords>
 		</view>
-		<!-- 健康指数弹出层 -->
-		<u-popup v-model="showhealth" mode="center" border-radius="14" closeable width="80%" height="550rpx">
-			<view class="toppopup">
-				<view class="rightpopup">
-					1
+		<!-- 疾病预警 -->
+		<view class="disease" v-if="tabscurrent==1">
+			<view class="btnleftalls">
+				<view class="btnleftall">
+					<view class="btnleft" @tap="diseasecv">
+						脑血管疾病
+					</view>
+					<view class="btnleft" @tap="diseaselc">
+						缺血性心血管疾病风险
+					</view>
+					<view class="btnleft" @tap="diseaselu">
+						肺癌风险
+					</view>
+					<view class="btnleft" @tap="diseaseck">
+						肾功能不全风险
+					</view>
 				</view>
-				<view class="numbers">
-					680
+
+				<view class="btnright">
+					<image :src="require('../images/renti.png')" mode=""></image>
 				</view>
 			</view>
-			<view class="text">
-				说明
+
+		</view>
+		<!-- 心血管 -->
+		<u-popup v-model="lookopen" mode="center" border-radius="30" :closeable='true'>
+			<view style="font-size: 30rpx;padding: 0 84px 5px 33px;">未来十年心血管发病风险：
+				{{lcdEvaRecord.riskLevel==1?'低危':''}}
+				{{lcdEvaRecord.riskLevel==2?'中危':''}}
+				{{lcdEvaRecord.riskLevel==3?'高危':''}}
 			</view>
-			<view class="words">
-				85分以上为绿色，
-				85分以上为绿色，
-				85分以上为绿色，85分以上为绿色，
-				85分以上为绿色，
-				85分以上为绿色，85分以上为绿色，
-				85分以上为绿色，
-				85分以上为绿色，85分以上为绿色，
+			<view style="font-size: 30rpx;">
+				危险因素：
 			</view>
+			<u-table>
+				<u-tr>
+					<u-th>危险因素</u-th>
+					<u-th>结果</u-th>
+					<u-th>参考值</u-th>
+				</u-tr>
+				<u-tr>
+					<u-td>年龄</u-td>
+					<u-td v-if="lcdEvaRecord.age">{{lcdEvaRecord.age}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>-</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>糖尿病病史</u-td>
+					<u-td v-if="lcdEvaRecord.disChd">
+						{{lcdEvaRecord.disChd==1?'有':''}}
+						{{lcdEvaRecord.disChd==0?'无':''}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>无</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>BMI</u-td>
+					<u-td v-if="lcdEvaRecord.bmi">{{lcdEvaRecord.bmi}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>
+						大于等于18.5小于等于24
+
+					</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>总胆固醇</u-td>
+					<!-- 	<u-td>{{cvdEvaRecord.tc}}</u-td> -->
+					<u-td v-if="lcdEvaRecord.tc">{{lcdEvaRecord.tc}}</u-td>
+					<u-td v-else></u-td>
+					<u-td> 小于5.18mmol/L</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>收缩压</u-td>
+
+					<u-td v-if="lcdEvaRecord.sbp">{{lcdEvaRecord.sbp}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>小于140mmHg</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>吸烟情况</u-td>
+					<u-td v-if="lcdEvaRecord.smoke">
+						{{lcdEvaRecord.smoke==0?'不吸烟':''}}
+						{{lcdEvaRecord.smoke==1?'偶尔吸烟':''}}
+						{{lcdEvaRecord.smoke==2?'经常吸烟':''}}</u-td>
+
+					<u-td v-else></u-td>
+					<u-td>不吸烟</u-td>
+				</u-tr>
+			</u-table>
+		</u-popup>
+		<!-- 脑血管 -->
+		<u-popup v-model="open" mode="center" border-radius="30" :closeable='true'>
+			<view style="font-size: 30rpx;padding: 0 84px 5px 33px;">未来十年脑血管发病风险：
+				{{cvdEvaRecord.riskLevel==1?'低危':''}}
+				{{cvdEvaRecord.riskLevel==2?'中危':''}}
+				{{cvdEvaRecord.riskLevel==3?'高危':''}}
+			</view>
+			<view style="font-size: 30rpx;">
+				危险因素：
+			</view>
+			<u-table>
+				<u-tr>
+					<u-th>危险因素</u-th>
+					<u-th>结果</u-th>
+					<u-th>参考值</u-th>
+				</u-tr>
+				<u-tr>
+					<u-td>年龄</u-td>
+					<u-td v-if="cvdEvaRecord.age">{{cvdEvaRecord.age}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>-</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>冠心病病史</u-td>
+					<u-td v-if="cvdEvaRecord.disChd">
+						{{cvdEvaRecord.riskLevel==1?'有':''}}
+						{{cvdEvaRecord.riskLevel==0?'无':''}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>无</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>脑血管疾病家族史</u-td>
+					<u-td v-if="cvdEvaRecord.famDisCvd">
+						{{cvdEvaRecord.famDisCvd==1?'有':''}}
+						{{cvdEvaRecord.famDisCvd==0?'无':''}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>无</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>BMI</u-td>
+					<u-td v-if="cvdEvaRecord.bmi">{{cvdEvaRecord.bmi}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>
+						大于等于18.5小于等于24
+
+					</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>总胆固醇</u-td>
+					<!-- 	<u-td>{{cvdEvaRecord.tc}}</u-td> -->
+					<u-td v-if="cvdEvaRecord.tc">{{cvdEvaRecord.tc}}</u-td>
+					<u-td v-else></u-td>
+					<u-td> 小于5.18mmol/L</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>收缩压</u-td>
+
+					<u-td v-if="cvdEvaRecord.sbp">{{cvdEvaRecord.sbp}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>小于140mmHg</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>吸烟情况</u-td>
+					<u-td v-if="cvdEvaRecord.smoke">
+						{{cvdEvaRecord.smoke==0?'不吸烟':''}}
+						{{cvdEvaRecord.smoke==1?'偶尔吸烟':''}}
+						{{cvdEvaRecord.smoke==2?'经常吸烟':''}}</u-td>
+
+					<u-td v-else></u-td>
+					<u-td>不吸烟</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>饮酒情况</u-td>
+					<u-td v-if="cvdEvaRecord.smoke">
+						{{cvdEvaRecord.drink==0?'不饮酒':''}}
+						{{cvdEvaRecord.drink==1?'偶尔饮酒':''}}
+						{{cvdEvaRecord.drink==2?'经常饮酒':''}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>不饮酒</u-td>
+				</u-tr>
+			</u-table>
+		</u-popup>
+		<!-- 肺癌 -->
+		<u-popup v-model="openfeiai" mode="center" border-radius="30" :closeable='true'>
+			<view style="font-size: 30rpx;padding: 0 84px 5px 33px;">未来十年肺癌发病风险：
+				{{lucaEvaRecord.riskLevel==1?'低危':''}}
+				{{lucaEvaRecord.riskLevel==2?'中危':''}}
+				{{lucaEvaRecord.riskLevel==3?'高危':''}}
+			</view>
+			<view style="font-size: 30rpx;">
+				危险因素：
+			</view>
+			<u-table>
+				<u-tr>
+					<u-th>危险因素</u-th>
+					<u-th>结果</u-th>
+					<u-th>参考值</u-th>
+				</u-tr>
+
+				<u-tr>
+					<u-td>肺癌家族史</u-td>
+					<u-td v-if="lucaEvaRecord.famDisLuca">
+						{{lucaEvaRecord.famDisLuca==1?'有':''}}
+						{{lucaEvaRecord.famDisLuca==0?'无':''}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>无</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>慢支炎/肺气肿疾病史</u-td>
+					<u-td v-if="lucaEvaRecord.disCopd">
+						{{lucaEvaRecord.disCopd==1?'有':''}}
+						{{lucaEvaRecord.disCopd==0?'无':''}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>无</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>吸烟情况</u-td>
+					<u-td v-if="lucaEvaRecord.smoke">
+						{{lucaEvaRecord.smoke==0?'不吸烟':''}}
+						{{lucaEvaRecord.smoke==1?'偶尔吸烟':''}}
+						{{lucaEvaRecord.smoke==2?'经常吸烟':''}}</u-td>
+
+					<u-td v-else></u-td>
+					<u-td>不吸烟</u-td>
+				</u-tr>
+
+			</u-table>
+		</u-popup>
+		<!-- 肾功能不全 -->
+		<u-popup v-model="lookopenck" mode="center" border-radius="30" :closeable='true'>
+			<view style="font-size: 30rpx;padding: 0 84px 5px 33px;">未来十年肾功能不全发病风险：
+				{{ckdEvaRecord.riskLevel==1?'低危':''}}
+				{{ckdEvaRecord.riskLevel==2?'中危':''}}
+				{{ckdEvaRecord.riskLevel==3?'高危':''}}
+			</view>
+			<view style="font-size: 30rpx;">
+				危险因素：
+			</view>
+			<u-table>
+				<u-tr>
+					<u-th>危险因素</u-th>
+					<u-th>结果</u-th>
+					<u-th>参考值</u-th>
+				</u-tr>
+
+				<u-tr>
+					<u-td>肾脏疾病家族史</u-td>
+					<u-td v-if="ckdEvaRecord.famDisKd">
+						{{ckdEvaRecord.famDisKd==1?'有':''}}
+						{{ckdEvaRecord.famDisKd==0?'无':''}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>无</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>高血压疾病史</u-td>
+					<u-td v-if="ckdEvaRecord.disHbp">
+						{{ckdEvaRecord.disHbp==1?'有':''}}
+						{{ckdEvaRecord.disHbp==0?'无':''}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>无</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>糖尿病疾病史</u-td>
+					<u-td v-if="ckdEvaRecord.disDm">
+						{{ckdEvaRecord.disDm==1?'有':''}}
+						{{ckdEvaRecord.disDm==0?'无':''}}</u-td>
+					<u-td v-else></u-td>
+					<u-td>无</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>吸烟情况</u-td>
+					<u-td v-if="ckdEvaRecord.smoke">
+						{{ckdEvaRecord.smoke==0?'不吸烟':''}}
+						{{ckdEvaRecord.smoke==1?'偶尔吸烟':''}}
+						{{ckdEvaRecord.smoke==2?'经常吸烟':''}}</u-td>
+
+					<u-td v-else></u-td>
+					<u-td>不吸烟</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td>饮酒情况</u-td>
+					<u-td v-if="ckdEvaRecord.drink">
+						{{ckdEvaRecord.drink==0?'不饮酒':''}}
+						{{ckdEvaRecord.drink==1?'偶尔饮酒':''}}
+						{{ckdEvaRecord.drink==2?'经常饮酒':''}}</u-td>
+
+					<u-td v-else></u-td>
+					<u-td>不吸烟</u-td>
+				</u-tr>
+			</u-table>
+		</u-popup>
+
+		<view class="toppopup">
+			<view class="rightpopup">
+				1
+			</view>
+			<view class="numbers">
+				680
+			</view>
+		</view>
+		<view class="text">
+			说明
+		</view>
+		<view class="words">
+			85分以上为绿色，
+			85分以上为绿色，
+			85分以上为绿色，85分以上为绿色，
+			85分以上为绿色，
+			85分以上为绿色，85分以上为绿色，
+			85分以上为绿色，
+			85分以上为绿色，85分以上为绿色，
+		</view>
 		</u-popup>
 	</view>
 </template>
 
 <script>
-import {
-  riskWarning,
-} from '@/api/pagesB/threeHundredAndSixty/threeHundredAndSixty.js'
+	import {
+		riskWarning,
+	} from '@/api/pagesB/threeHundredAndSixty/threeHundredAndSixty.js'
 	import Precords from '../Precords/Precords.vue'
 	import Healthindex from '../Healthindex/Healthindex.vue'
 	export default {
@@ -63,59 +342,6 @@ import {
 				openfeiai: false,
 				lookopenck: false,
 				chartData: {},
-				opts: {
-					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
-						"#ea7ccc"
-					],
-					padding: [15, 10, 0, 15],
-					enableScroll: false,
-					legend: {},
-					xAxis: {
-						disableGrid: true
-					},
-					yAxis: {
-						gridType: "dash",
-						dashLength: 2
-					},
-					extra: {
-						line: {
-							type: "straight",
-							width: 2,
-							activeType: "hollow"
-						}
-					}
-				},
-				line_opts: {
-					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
-						"#ea7ccc"
-					],
-					dataLabel: true,
-					enableScroll: true,
-					touchMoveLimit: 24,
-					padding: [15, 10, 0, 15],
-					xAxis: {
-						lineHeight: 40,
-						disableGrid: true,
-						boundaryGap: "center",
-						fontSize: 10,
-						type: 'grid',
-						gridType: 'dash',
-						itemCount: 3, //x轴单屏显示数据的数量，默认为5个
-						scrollShow: true, //新增是否显示滚动条，默认false
-						scrollAlign: 'left', //滚动条初始位置
-					},
-					yAxis: {
-						gridType: "dash",
-						dashLength: 2
-					},
-					extra: {
-						line: {
-							type: "straight",
-							width: 2,
-							activeType: "hollow"
-						}
-					}
-				},
 				tabscurrent: 0,
 				tabslist: [{
 					name: '健康指数',
@@ -141,8 +367,7 @@ import {
 				lucaEvaRecord: {},
 			};
 		},
-		onReady() {
-		},
+		onReady() {},
 
 		methods: {
 			goodsOrderinfo() {
@@ -272,34 +497,34 @@ import {
 
 
 
-		.disease {}
 
-					.healths {
-						font-size: 22rpx;
-					}
-				}
 
-			}
+		// .healths {
+		// 	font-size: 22rpx;
+		// }
+		// }
 
-			.health_body {
-				width: 100%;
+		// }
 
-				.healthitem {
-					text-align: left;
-					padding: 0 0 40rpx 62rpx;
+		.health_body {
+			width: 100%;
 
-				}
+			.healthitem {
+				text-align: left;
+				padding: 0 0 40rpx 62rpx;
 
 			}
 
-			.zx {
-				width: 100%;
-				height: 300rpx;
-				// background: red;
-			}
-
 		}
 
+		.zx {
+			width: 100%;
+			height: 300rpx;
+			// background: red;
+		}
+
+		// }
+
 		.disease {
 			width: 100%;
 			position: relative;
@@ -340,4 +565,4 @@ import {
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file