修改一些bug

pages/eye_ground/eye_ground.vue

@@ -19,11 +19,11 @@
 				<view class="centerY mb-2 text-gry">
 					<text class="iconfont Clock fs-20"></text>
 					<view class="">
-						{{item.createTime}}
+						{{item.eyeData.createTime}}
 					</view>
 					<view class="">
-						<span :class="{'text-green':item.isRead==1}">
-							({{item.isRead==0?'未阅片':'已阅片'}})
+						<span :class="{'text-green':item.eyeData.isRead==1}">
+							({{item.eyeData.isRead==0?'未阅片':'已阅片'}})
 						</span>
 					</view>
 				</view>
@@ -41,17 +41,17 @@
 								<view class="picbox1"
 									style="border: 1px dotted  #E3E3E3;border-radius: 16rpx;box-sizing: border-box;">
 									<view style="background: #F6F9FE;" class="picimg1">
-										<image @click="pic(	item.leftImg || item.localLeftImg
+										<image @click="pic(	item.eyeData.leftImg || item.eyeData.localLeftImg
 										  ? img_host +
 										    (accessType == 1
-										      ? item.leftImg
-										      : item.localLeftImg)
+										      ? item.eyeData.leftImg
+										      : item.eyeData.localLeftImg)
 										  : '@/static/img/other/you.png')" class="w-100" style="height: 100%;" :src="
-										item.leftImg || item.localLeftImg
+										item.eyeData.leftImg || item.eyeData.localLeftImg
 										  ? img_host +
 										    (accessType == 1
-										      ? item.leftImg
-										      : item.localLeftImg)
+										      ? item.eyeData.leftImg
+										      : item.eyeData.localLeftImg)
 										  : '@/static/img/other/you.png'
 										" mode="scaleToFill"></image>
 									</view>
@@ -70,17 +70,17 @@
 								<view class="picbox1"
 									style="border: 1px dotted  #E3E3E3;border-radius: 16rpx;box-sizing: border-box;">
 									<view style="background: #F6F9FE;" class="picimg1">
-										<image @click="pic(	item.rightImg || item.localRightImg
+										<image @click="pic(	item.eyeData.rightImg || item.eyeData.localRightImg
 										  ? img_host +
 										    (accessType == 1
-										      ? item.rightImg
-										      : item.localRightImg)
+										      ? item.eyeData.rightImg
+										      : item.eyeData.localRightImg)
 										  : '@/static/img/other/you.png')" class="w-100" style="height: 100%;" :src="
-										item.rightImg || item.localRightImg
+										item.eyeData.rightImg || item.eyeData.localRightImg
 										  ? img_host +
 										    (accessType == 1
-										      ? item.rightImg
-										      : item.localRightImg)
+										      ? item.eyeData.rightImg
+										      : item.eyeData.localRightImg)
 										  : '@/static/img/other/you.png'" mode="scaleToFill"></image>
 									</view>
 								</view>
@@ -103,15 +103,14 @@
 							<view class="fs-14 font-bold ml-2 space-nowrap">
 								专家建议
 							</view>
-							<view v-if="item.isRead==1" class="ml-2 fs-12" style="color: #868687;">
-								<span>左眼:{{item.leftNote||'无'}};</span>
-								<span>右眼:{{item.rightNote||'无'}}</span>
+							<view v-if="item.eyeData.isRead==1" class="ml-2 fs-12" style="color: #868687;">
+								<span>左眼:{{item.eyeData.leftNote||(item.aiEyeData&&item.aiEyeData.leftNote)||'无'}};</span>
+								<span>右眼:{{item.eyeData.rightNote||(item.aiEyeData&&item.aiEyeData.rightNote)||'无'}}</span>
 							</view>
-							<view v-if="item.isRead==0" class="ml-2 fs-12" style="color: #868687;">
+							<view v-if="item.eyeData.isRead==0" class="ml-2 fs-12" style="color: #868687;">
 								暂未阅片
 							</view>
 						</view>
-
 					</view>
 				</view>
 				<view class="text-center text-gry2 fs-10 mt-2 mb-2">

pages/health_report/component/report.vue

@@ -55,7 +55,7 @@
 					<view class="bule_line"></view>
 					<text class="font-bold text-dark ml-2 fs-16 line-height1">高血压管理等级</text>
 				</view>
-				<view class="centerY"  v-if="propData.gljb.gxyVisit&&propData.gljb.gxyVisit.id">
+				<view class="centerY" v-if="propData.gljb.gxyVisit&&propData.gljb.gxyVisit.id">
 					<view class="fs-12 w-75 mr-2"
 						style="line-height:1.5;border: 1px solid #1890ff;border-radius:4px;background:#fff;">
 						<view class="text-center fs-12 font-bold "
@@ -97,7 +97,7 @@
 					<view class="bule_line"></view>
 					<text class="font-bold text-dark ml-2 fs-16 line-height1">血糖管理等级</text>
 				</view>
-				<view class="centerY"  v-if="propData.gljb.tnbVisit&&propData.gljb.tnbVisit.id">
+				<view class="centerY" v-if="propData.gljb.tnbVisit&&propData.gljb.tnbVisit.id">
 					<view class="fs-12 w-75 mr-2"
 						style="line-height:1.5;border: 1px solid #1890ff;border-radius:4px;background:#fff;">
 
@@ -107,7 +107,7 @@
 								{{propData.gljb.tnbVisit.gljb}}
 							</view>
 							<view class="" style="padding:8px;">
-								<view v-if="propData.gljb.tnbVisit.gljb!=='常规管理'" style="text-indent: 20px;">
+								<view v-if="propData.gljb.tnbVisit.gljb=='常规管理'" style="text-indent: 20px;">
 									3个月随访一次，监测血糖控制情况，空腹血糖2周进行一次就检测，合理用药，强化非药物治疗，提高患者自我管理和自我检测水平。
 									<span v-if="0>=5">眼底、糖足、肾病并发症筛查每年至少一次。</span>
 								</view>
@@ -143,7 +143,8 @@
 				<view class="bule_line"></view>
 				<text class="font-bold text-dark ml-2 fs-16 line-height1">体征</text>
 			</view>
-			<view class="card mb-2 fs-14 mt-3 p-3" style="color: #818181;"  v-if="propData.physical&&propData.physical.length>0">
+			<view class="card mb-2 fs-14 mt-3 p-3" style="color: #818181;"
+				v-if="propData.physical&&propData.physical.length>0">
 				<view class=" p-3" style="background-color: #F5F9FF;border-radius: 16rpx;">
 					<view id="echarts1" class="echarts"></view>
 					<view id="echarts2" class="echarts"></view>
@@ -287,16 +288,17 @@
 				<view class="bule_line"></view>
 				<text class="font-bold text-dark ml-2 fs-16 line-height1">眼底检查</text>
 			</view>
-			<view class="card mb-2 fs-14 mt-3 p-3" style="color: #818181;" v-if="propData.eye&&propData.eye.id">
+			<view class="card mb-2 fs-14 mt-3 p-3" style="color: #818181;"
+				v-if="propData.eye.eyeData&&propData.eye.eyeData.id">
 				<view class="bg-white" style="border-radius: 16rpx;">
 					<view class="centerY mb-2 text-gry">
 						<text class="iconfont Clock fs-20"></text>
 						<view class="">
-							{{propData.eye.createTime}}
+							{{propData.eye.eyeData.createTime}}
 						</view>
 						<view class="">
-							<span :class="{'text-green':propData.eye.isRead==1}">
-								({{propData.eye.isRead==0?'未阅片':'已阅片'}})
+							<span :class="{'text-green':propData.eye.eyeData.isRead==1}">
+								({{propData.eye.eyeData.isRead==0?'未阅片':'已阅片'}})
 							</span>
 						</view>
 					</view>
@@ -314,17 +316,17 @@
 									<view class="picbox1"
 										style="border: 1px dotted  #E3E3E3;border-radius: 16rpx;box-sizing: border-box;">
 										<view style="background: #F6F9FE;" class="picimg1">
-											<image @click="pic(	propData.eye.leftImg || propData.eye.localLeftImg
+											<image @click="pic(	propData.eye.eyeData.leftImg || propData.eye.eyeData.localLeftImg
 											  ? img_host +
 											    (accessType == 1
-											      ? propData.eye.leftImg
-											      : propData.eye.localLeftImg)
+											      ? propData.eye.eyeData.leftImg
+											      : propData.eye.eyeData.localLeftImg)
 											  : '@/static/img/other/you.png')" class="w-100" style="height: 100%;" :src="
-											propData.eye.leftImg || propData.eye.localLeftImg
+											propData.eye.eyeData.leftImg || propData.eye.eyeData.localLeftImg
 											  ? img_host +
 											    (accessType == 1
-											      ? propData.eye.leftImg
-											      : propData.eye.localLeftImg)
+											      ? propData.eye.eyeData.leftImg
+											      : propData.eye.eyeData.localLeftImg)
 											  : '@/static/img/other/you.png'
 											" mode="scaleToFill"></image>
 										</view>
@@ -343,17 +345,17 @@
 									<view class="picbox1"
 										style="border: 1px dotted  #E3E3E3;border-radius: 16rpx;box-sizing: border-box;">
 										<view style="background: #F6F9FE;" class="picimg1">
-											<image @click="pic(	propData.eye.rightImg || propData.eye.localRightImg
+											<image @click="pic(	propData.eye.eyeData.rightImg || propData.eye.eyeData.localRightImg
 											  ? img_host +
 											    (accessType == 1
-											      ? propData.eye.rightImg
-											      : propData.eye.localRightImg)
+											      ? propData.eye.eyeData.rightImg
+											      : propData.eye.eyeData.localRightImg)
 											  : '@/static/img/other/you.png')" class="w-100" style="height: 100%;" :src="
-											propData.eye.rightImg || propData.eye.localRightImg
+											propData.eye.eyeData.rightImg || propData.eye.eyeData.localRightImg
 											  ? img_host +
 											    (accessType == 1
-											      ? propData.eye.rightImg
-											      : propData.eye.localRightImg)
+											      ? propData.eye.eyeData.rightImg
+											      : propData.eye.eyeData.localRightImg)
 											  : '@/static/img/other/you.png'" mode="scaleToFill"></image>
 										</view>
 									</view>
@@ -376,11 +378,11 @@
 								<view class="fs-14 font-bold ml-2 space-nowrap">
 									专家建议
 								</view>
-								<view v-if="propData.eye.isRead==1" class="ml-2 fs-12" style="color: #868687;">
-									<span>左眼:{{propData.eye.leftNote||'无'}};</span>
-									<span>右眼:{{propData.eye.rightNote||'无'}}</span>
+								<view v-if="propData.eye.eyeData.isRead==1" class="ml-2 fs-12" style="color: #868687;">
+									<span>左眼:{{item.eyeData.leftNote||(item.aiEyeData&&item.aiEyeData.leftNote)||'无'}};</span>
+									<span>右眼:{{item.eyeData.rightNote||(item.aiEyeData&&item.aiEyeData.rightNote)||'无'}}</span>
 								</view>
-								<view v-if="propData.eye.isRead==0" class="ml-2 fs-12" style="color: #868687;">
+								<view v-if="propData.eye.eyeData.isRead==0" class="ml-2 fs-12" style="color: #868687;">
 									暂未阅片
 								</view>
 							</view>
@@ -398,7 +400,8 @@
 				<text class="font-bold text-dark ml-2 fs-16 line-height1">用药情况</text> <span
 					class="text-gry">（最近随访用药）</span>
 			</view>
-			<view class="card mb-2 fs-14 mt-3 p-3" style="color: #818181;"  v-if="propData.medicinal&&propData.medicinal.length>0">
+			<view class="card mb-2 fs-14 mt-3 p-3" style="color: #818181;"
+				v-if="propData.medicinal&&propData.medicinal.length>0">
 				<view class="">
 					<view class="mtable-title centerY bg-primary text-white fs-12">
 						<view class="text-left" style="width: 23%;">

pages/index/index.vue

@@ -128,6 +128,21 @@
 					</view>
 				</view>
 			</uni-popup>
+			
+			<uni-popup ref="popup2" type="center" :mask-click="false">
+				<view class="bg-white p-3 w-100" style="border-radius: 16rpx;">
+					<view class="text-center mb-3 fs-14 font-bold py-2">
+						查询
+					</view>
+					<view class=" centerY mb-3"
+						style="border-radius: 14rpx;border: 1px solid #007aff;overflow: hidden;">
+						<input type="text" v-model="valueId" class="px-2 fs-12" placeholder="请输入身份证号码"
+							placeholder-class="fs-12">
+						<button type="primary" class="d-inline-block fs-12 px-3 ml-auto mr-0" style="padding: 4rpx ;"
+							@click="search">搜索</button>
+					</view>
+				</view>
+			</uni-popup>
 		</view>
 	</view>
 </template>