Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	pagesB/threeHundredAndSixty/threeHundredAndSixty.vue

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>
@@ -282,4 +282,4 @@
 
 		}
 	}
-</style>
+</style>

pagesB/Prescriptionrecords/Prescriptionrecords.vue

@@ -33,7 +33,7 @@
 									</view>
 								</view>
 							</view>
-							
+
 						</view>
 					</u-collapse-item>
 				</u-collapse>
@@ -74,7 +74,6 @@
 							this.itemList = res.data
 							this.show=false
 						})
-						
 					})
 				}
 			},
@@ -87,12 +86,12 @@
 				detail(this.recordCode).then(res => {
 					this.itemList = res.data
 				})
-				
+
 			},
 			tapcollapseleft(item){
 				console.log(item)
 				item.check = !item.check
-				
+
 			}
 
 		}
@@ -115,7 +114,7 @@
 			display: flex;
 			.left {
 				// height: 100vh;
-	
+
 				// background: aliceblue;
 				::v-deep .u-collapse-title {
 					font-size: 26rpx;
@@ -154,7 +153,7 @@
 						padding-bottom: 4rpx;
 					}
 				}
-		
+
 
 				::v-deep .u-collapse-head {
 					width: 96%;
@@ -228,4 +227,4 @@
 			}
 		}
 	}
-</style>
+</style>

pagesB/threeHundredAndSixty/threeHundredAndSixty.vue

@@ -2,14 +2,16 @@
 	<view class="app">
 		<!-- 功能开发中 -->
 		<view class="top">
-			<u-tabs ref="tabs" :scrollable="false" :list="tabslist" bar-height="6" bar-width="60" active-color='#26A888'
+			<u-tabs ref="tabs" :scrollable="false" :list="tabslist" bar-height="6" bar-width="60" active-color="#26A888"
-				:active-item-style="activebgk" :is-scroll="false" :current="tabscurrent" gutter="50"
+				inactive-color="#A09F9F" :active-item-style="activebgk" :is-scroll="false" :current="tabscurrent"
-				@change="tabschange"></u-tabs>
+				gutter="50" @change="tabschange"></u-tabs>
 		</view>
 		<!-- 健康指数 -->
 		<view class="health" v-if="tabscurrent==0">
 			<healthindex></healthindex>
 		</view>
+
+		<!-- 疾病预警 -->
 		<!-- 健康处方 -->
 		<view class="" v-if="tabscurrent==2">
 			<Precords></Precords>
@@ -17,30 +19,40 @@
 		<!-- 疾病预警 -->
 		<view class="disease" v-if="tabscurrent==1">
 			<view class="btnleftalls">
-				<view class="btnleftall">
-					<view class="btnleft" @tap="diseasecv(item)">
-						脑血管疾病
-					</view>
-					<view class="btnleft" @tap="diseaselc">
-						缺血性心血管疾病风险
-					</view>
-					<view class="btnleft" @tap="diseaselu">
-						肺癌风险
-					</view>
-					<view class="btnleft" @tap="diseaseck">
-						肾功能不全风险
-					</view>
-				</view>
-
 				<view class="btnright">
 					<image :src="require('../images/renti.png')" mode=""></image>
 				</view>
+				<view class="left">
+					<view class="btnleftall">
+
+						<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>
 			</view>
 
 		</view>
 		<!-- 心血管 -->
 		<u-popup v-model="lookopen" mode="center" border-radius="30" :closeable='true'>
-			<view class="popuptitle">未来十年心血管发病风险：
+			<view style="font-size: 30rpx;padding: 0 84px 5px 33px;">未来十年心血管发病风险：
 				{{lcdEvaRecord.riskLevel==1?'低危':''}}
 				{{lcdEvaRecord.riskLevel==2?'中危':''}}
 				{{lcdEvaRecord.riskLevel==3?'高危':''}}
@@ -105,7 +117,7 @@
 		</u-popup>
 		<!-- 脑血管 -->
 		<u-popup v-model="open" mode="center" border-radius="30" :closeable='true'>
-			<view class="popuptitle">未来十年脑血管发病风险：
+			<view style="font-size: 30rpx;padding: 0 84px 5px 33px;">未来十年脑血管发病风险：
 				{{cvdEvaRecord.riskLevel==1?'低危':''}}
 				{{cvdEvaRecord.riskLevel==2?'中危':''}}
 				{{cvdEvaRecord.riskLevel==3?'高危':''}}
@@ -187,7 +199,7 @@
 		</u-popup>
 		<!-- 肺癌 -->
 		<u-popup v-model="openfeiai" mode="center" border-radius="30" :closeable='true'>
-			<view class="popuptitle">未来十年肺癌发病风险：
+			<view style="font-size: 30rpx;padding: 0 84px 5px 33px;">未来十年肺癌发病风险：
 				{{lucaEvaRecord.riskLevel==1?'低危':''}}
 				{{lucaEvaRecord.riskLevel==2?'中危':''}}
 				{{lucaEvaRecord.riskLevel==3?'高危':''}}
@@ -233,7 +245,7 @@
 		</u-popup>
 		<!-- 肾功能不全 -->
 		<u-popup v-model="lookopenck" mode="center" border-radius="30" :closeable='true'>
-			<view class="popuptitle">未来十年肾功能不全发病风险：
+			<view style="font-size: 30rpx;padding: 0 84px 5px 33px;">未来十年肾功能不全发病风险：
 				{{ckdEvaRecord.riskLevel==1?'低危':''}}
 				{{ckdEvaRecord.riskLevel==2?'中危':''}}
 				{{ckdEvaRecord.riskLevel==3?'高危':''}}
@@ -295,7 +307,7 @@
 			</u-table>
 		</u-popup>
 
-		<u-toast ref="uToast" />
+
 	</view>
 </template>
 
@@ -329,8 +341,14 @@
 					name: '健康处方',
 					orderStatus: 'WAIT_RECEIVED_GOODS',
 				}],
+				// activebgk: {
+				// 	background: "#00B4CC"
+				// },
+				background: {
+					backgroundColor: '#26A888',
+				},
 				datalist: null,
-				identity: '',
+				identity: '370522196411282177',
 				cvdEvaRecord: {},
 				lcdEvaRecord: {},
 				ckdEvaRecord: {},
@@ -395,72 +413,17 @@
 					})
 				}
 			},
-			diseaseck() {
+					diseaseck() {
-				if (this.ckdEvaRecord) {
+						if (this.ckdEvaRecord) {
-					this.lookopenck = true
+							this.lookopenck = true
-				} else {
+						} else {
-					this.$refs.uToast.show({
+							this.$refs.uToast.show({
-						title: '暂无内容',
+								title: '暂无内容',
-						type: 'error'
+								type: 'error'
-					})
+							})
-				}
+						}
 
-			},
+					},
-			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)
@@ -482,21 +445,12 @@
 	page {
 		background-color: #fff;
 	}
-	::v-deep .u-mode-center-box {
-		width: 94% !important;
-		padding: 40rpx 0;
-	}
-
-	.popuptitle {
-		font-size: 30rpx;
-		padding: 20rpx 50rpx 30rpx;
-		text-align: center;
-	}
 
 	.app {
-		height: 100vh;
+		height: 100%;
-		background-color: #fff;
+		background-image: url('../images/beijing.png');
-		// padding: 100rpx 40rpx;
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
 		text-align: center;
 		font-size: 36rpx;
 
@@ -553,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%;