Merge branch 'dev' of http://gitlab2.dui88.com/fh/20250528_FHQ1 into dev

pages/shengzhangTestResult/shengzhangTestResult.vue

@@ -62,7 +62,7 @@
 						<view class="values-row">
 							<text class="measurement-value">{{assessmentData?.height}}cm</text>
 							<text class="measurement-value">{{assessmentData?.weight}}kg</text>
-							<text class="measurement-value">{{assessmentData?.headCircumference}}cm</text>
+							<text class="measurement-value" v-if="assessmentData?.headCircumference">{{assessmentData?.headCircumference}}cm</text>
 							<text class="measurement-value">{{assessmentData?.bmi}}</text>
 						</view>
 						<view class="labels-row">
@@ -80,7 +80,7 @@
 									<text>{{statusMap[analysisData?.weightStatus]}}</text>
 								</view>
 							</view>
-							<view class="measurement-item">
+							<view class="measurement-item" v-if="analysisData?.headStatus">
 								<text class="measurement-label">头围</text>
 								<view class="measurement-status normal">
 									<image class="status-icon" :src="`${$baseUrl}shengzhangTestResult/1001/duihaoIcon.png`" mode="aspectFit"></image>
@@ -152,7 +152,7 @@
 								<text class="bar-percentage">超过{{analysisData.weightPercentile}}%同龄宝宝</text>
 							</view>
 						</view>
-						<view class="bar-item">
+						<view class="bar-item" v-if="assessmentData?.headCircumference">
 							<view class="value-triangle-container" :style="{marginLeft: statusBarPercentileMap[analysisData.headStatus] + 'rpx'}">
 								<text class="bar-value">{{assessmentData?.headCircumference}}cm {{statusMap[analysisData?.headStatus]}}</text>
 								<image class="triangle" :src="`${$baseUrl}shengzhangTestResult/1001/triangle.png`" mode="aspectFit"></image>
@@ -252,7 +252,7 @@
 							<view class="values-row">
 								<text class="measurement-value">{{item?.height}}cm</text>
 								<text class="measurement-value">{{item?.weight}}kg</text>
-								<text class="measurement-value">{{item?.head}}cm</text>
+								<text class="measurement-value" v-if="item?.head">{{item?.head}}cm</text>
 								<text class="measurement-value">{{item?.bmi}}</text>
 							</view>
 							<view class="labels-row">
@@ -270,7 +270,7 @@
 										<text>{{statusMap[item?.weightStatus]}}</text>
 									</view>
 								</view>
-								<view class="measurement-item">
+								<view class="measurement-item"   v-if="item?.head">
 									<text class="measurement-label">头围</text>
 									<view class="measurement-status normal">
 										<image class="status-icon" :src="`${$baseUrl}shengzhangTestResult/1001/duihaoIcon.png`" mode="aspectFit"></image>
@@ -356,11 +356,6 @@ const analysisData = ref({
 })
 
 const assessmentData = ref({
-	bmi: 13.12,
-	feedingType: "MIXED",
-	headCircumference: 34.5,
-	height: 50.3,
-	weight: 3.32
 })
 
 const contentText = ref({
@@ -641,13 +636,13 @@ onShareAppMessage(() => {
 	return {
 		title: shareText.value,
 		path: `/pages/shengzhangTestResult/shengzhangTestResult`,
-		imageUrl: undefined
+		imageUrl: ''
 	}
 })
 
 const shengzhangStore = useShengzhangStore();
+// const headCircumference = ref(0);
 onMounted(async () => {
-
 	//获取历史记录
 	const historyListData = await getGrowthHistoryList();
 
@@ -748,6 +743,9 @@ onMounted(async () => {
 
 	analysisData.value = shengzhangInfo.analysis;
 	assessmentData.value = shengzhangInfo.assessmentData;
+	// headCircumference.value = assessmentData.headCircumference;
+	// headCircumference.value = null;
+
 
 
 	contentText.value = shengzhangInfo.content;