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

pages/myinformation/myinformation.vue

@@ -35,30 +35,23 @@
 			<view class="Threecategories">
 				<view class="item" @tap="goBehaviorpoints">
 					<view class="number">
-						0
+						{{appPersonallist.score>=0?appPersonallist.score:0}}
 					</view>
 					<view class="text">
 						行为积分
 					</view>
 				</view>
 				<view class="item" @tap='gointegral'>
-					<view class="number" v-if="!appPersonallist.integral">
-						0
-					</view>
-					<view class="number" v-else>
-						{{appPersonallist.integral}}
+					<view class="number">
+						{{appPersonallist.integral>=0?appPersonallist.integral:0}}
 					</view>
 					<view class="text">
 						健康豆
 					</view>
 				</view>
 				<view class="item" @tap='gocoupon'>
-					<view class="number"
-						v-if="appPersonallist.patientCouponCount==0 ||!appPersonallist.patientCouponCount">
-						0
-					</view>
-					<view class="number" v-else>
-						{{appPersonallist.patientCouponCount}}
+					<view class="number">
+						{{appPersonallist.patientCouponCount>=0?appPersonallist.patientCouponCount:0}}
 					</view>
 					<view class="text">
 						优惠券

pagesB/SelectItem/SelectItem.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="app">
+	<view class="app" v-if="prejectlist.data">
 		<view class="content" v-for="(item,index) in prejectlist" @tap="result(item)">
 			<view class="big">{{item.projectName}}
 			</view>
@@ -8,6 +8,10 @@
 			</view>
 		</view>
 	</view>
+	<view class="app" v-else>
+		<u-empty mode="order" icon-size='220' text="暂无筛查结果"></u-empty>
+	</view>
+
 </template>
 
 <script>

pagesC/Screeningrecords/Screeningrecords.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="app">
+	<view class="app" v-if="prejectlist.data">
 		<view class="content" v-for="(item,index) in prejectlist">
 			<view class="big">{{item.projectName}}
 			</view>
@@ -10,19 +10,9 @@
 				详情
 			</view>
 		</view>
-		<!-- <view class="content">
-			<view class="big">眼底筛查
-
 	</view>
-			<view class="servename">
-				2023-12-12 12:12:12
-			</view>
-			<view class="appoint" @tap="goapponint">
-				详情
-			</view>
-		</view> -->
-
-
+	<view class="app" v-else>
+		<u-empty mode="order" icon-size='220' text="暂无筛查记录"></u-empty>
 	</view>
 </template>
 

pagesC/seekadvicefrom/seekadvicefrom.vue

@@ -18,8 +18,9 @@
 					<view class="doctorSend" v-else>
 						<image class="head" src="@/static/docHead.png"></image>
 						<view class="">
-							<text>{{item.senderName}}</text>
-							<view class="sendBox" v-if="item.content">{{item.content}}</view>
+							<!-- <text>{{item.senderName}}</text> -->
+							<view class="sendBox" v-if="item.messageType==1">{{item.content}}</view>
+							<image v-if="item.messageType==2" :src="baseurl+item.content" class="snedItemimage" />
 						</view>
 					</view>
 					<video v-if="item.video" :src="item.video"></video>
@@ -356,7 +357,6 @@
 							// console.log(JSON.stringify(res.tempFilePaths));
 						}
 					});
-
 				}
 			},
 			//发送图片