From b4d3a034baa8ebf36e8b307a630b4500460dc15e Mon Sep 17 00:00:00 2001
From: 17792275749 <812100002@qq.com>
Date: Wed, 26 Aug 2026 16:08:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(detailedReport):=20=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E6=97=B6=E9=9A=90=E8=97=8F=E6=95=B4?=
 =?UTF-8?q?=E5=8D=A1=EF=BC=8Cwx:if=20=E7=BB=9F=E4=B8=80=E5=86=99=20block?=
 =?UTF-8?q?=20=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除多余的 isEightElectrode 字段
- 各指标卡片 rows 为空时不渲染标题
- wx:if 统一移到 block 上，符合 wxml 规范

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../pages/detailedReport/detailedReport.ts    |   2 -
 .../pages/detailedReport/detailedReport.wxml  | 142 +++++++++++-------
 2 files changed, 86 insertions(+), 58 deletions(-)

diff --git a/miniprogram/pages/detailedReport/detailedReport.ts b/miniprogram/pages/detailedReport/detailedReport.ts
index 2cada97..40db345 100644
--- a/miniprogram/pages/detailedReport/detailedReport.ts
+++ b/miniprogram/pages/detailedReport/detailedReport.ts
@@ -189,7 +189,6 @@ Page({
         weightControl: { title: '体重管控', rows: [] } as MetricCard,
 
         // 以下卡片为 8 电极专属
-        isEightElectrode: false,
         cellWater: { title: '细胞液分析', rows: [] } as MetricCard,
         advancedComposition: { title: '进阶成分', rows: [] } as MetricCard,
         bodyFat: { title: '躯干/四肢脂肪', rows: [] } as BodyPartsCard,
@@ -347,7 +346,6 @@ Page({
             fatAnalysis,
             physique,
             weightControl,
-            isEightElectrode: isEight,
             cellWater,
             advancedComposition,
             bodyFat,
diff --git a/miniprogram/pages/detailedReport/detailedReport.wxml b/miniprogram/pages/detailedReport/detailedReport.wxml
index ef55a86..8a898d9 100644
--- a/miniprogram/pages/detailedReport/detailedReport.wxml
+++ b/miniprogram/pages/detailedReport/detailedReport.wxml
@@ -28,8 +28,12 @@
                             <view class="weight-unit">kg</view>
                         </view>
                         <view class="header-info">
-                            <view class="header-bmi" wx:if="{{ header.bmiText }}">{{ header.bmiText }}</view>
-                            <view class="header-change" wx:if="{{ header.changeText }}">{{ header.changeText }}</view>
+                            <block wx:if="{{ header.bmiText }}">
+                                <view class="header-bmi">{{ header.bmiText }}</view>
+                            </block>
+                            <block wx:if="{{ header.changeText }}">
+                                <view class="header-change">{{ header.changeText }}</view>
+                            </block>
                         </view>
                     </view>
                 </view>
@@ -47,7 +51,9 @@
                                     <view class="basicIndicatorsLabel">{{ cell.label }}</view>
                                     <view class="basicIndicatorsValueRow">
                                         <view class="basicIndicatorsValue">{{ cell.value }}</view>
-                                        <view class="basicIndicatorsUnit" wx:if="{{ cell.unit }}">{{ cell.unit }}</view>
+                                        <block wx:if="{{ cell.unit }}">
+                                            <view class="basicIndicatorsUnit">{{ cell.unit }}</view>
+                                        </block>
                                     </view>
                                 </block>
                             </view>
@@ -77,68 +83,83 @@
                 </view>
 
                 <!-- 身体成分 -->
-                <view class="metricCard">
-                    <view class="metricCardTitle">
-                        <view class="metricCardBar"></view>
-                        <view class="metricCardTitleText">{{ bodyComposition.title }}</view>
-                    </view>
-                    <view class="metricCardList">
-                        <view class="metricCardRow" wx:for="{{ bodyComposition.rows }}" wx:key="label">
-                            <view class="metricCardLabel">{{ item.label }}</view>
-                            <view class="metricCardValue">{{ item.value }}{{ item.unit }}</view>
-                            <view class="metricCardStatus" wx:if="{{ item.status }}" style="background-color: {{ item.color }};">{{ item.status }}</view>
+                <block wx:if="{{ bodyComposition.rows.length }}">
+                    <view class="metricCard">
+                        <view class="metricCardTitle">
+                            <view class="metricCardBar"></view>
+                            <view class="metricCardTitleText">{{ bodyComposition.title }}</view>
+                        </view>
+                        <view class="metricCardList">
+                            <view class="metricCardRow" wx:for="{{ bodyComposition.rows }}" wx:key="label">
+                                <view class="metricCardLabel">{{ item.label }}</view>
+                                <view class="metricCardValue">{{ item.value }}{{ item.unit }}</view>
+                                <block wx:if="{{ item.status }}">
+                                    <view class="metricCardStatus" style="background-color: {{ item.color }};">{{ item.status }}</view>
+                                </block>
+                            </view>
                         </view>
                     </view>
-                </view>
+                </block>
 
                 <!-- 脂肪分析 -->
-                <view class="metricCard">
-                    <view class="metricCardTitle">
-                        <view class="metricCardBar"></view>
-                        <view class="metricCardTitleText">{{ fatAnalysis.title }}</view>
-                    </view>
-                    <view class="metricCardList">
-                        <view class="metricCardRow" wx:for="{{ fatAnalysis.rows }}" wx:key="label">
-                            <view class="metricCardLabel">{{ item.label }}</view>
-                            <view class="metricCardValue">{{ item.value }}{{ item.unit }}</view>
-                            <view class="metricCardStatus" wx:if="{{ item.status }}" style="background-color: {{ item.color }};">{{ item.status }}</view>
+                <block wx:if="{{ fatAnalysis.rows.length }}">
+                    <view class="metricCard">
+                        <view class="metricCardTitle">
+                            <view class="metricCardBar"></view>
+                            <view class="metricCardTitleText">{{ fatAnalysis.title }}</view>
+                        </view>
+                        <view class="metricCardList">
+                            <view class="metricCardRow" wx:for="{{ fatAnalysis.rows }}" wx:key="label">
+                                <view class="metricCardLabel">{{ item.label }}</view>
+                                <view class="metricCardValue">{{ item.value }}{{ item.unit }}</view>
+                                <block wx:if="{{ item.status }}">
+                                    <view class="metricCardStatus" style="background-color: {{ item.color }};">{{ item.status }}</view>
+                                </block>
+                            </view>
                         </view>
                     </view>
-                </view>
+                </block>
 
                 <!-- 体态管理 -->
-                <view class="metricCard">
-                    <view class="metricCardTitle">
-                        <view class="metricCardBar"></view>
-                        <view class="metricCardTitleText">{{ physique.title }}</view>
-                    </view>
-                    <view class="metricCardList">
-                        <view class="metricCardRow" wx:for="{{ physique.rows }}" wx:key="label">
-                            <view class="metricCardLabel">{{ item.label }}</view>
-                            <view class="metricCardValue">{{ item.value }}{{ item.unit }}</view>
-                            <view class="metricCardStatus" wx:if="{{ item.status }}" style="background-color: {{ item.color }};">{{ item.status }}</view>
+                <block wx:if="{{ physique.rows.length }}">
+                    <view class="metricCard">
+                        <view class="metricCardTitle">
+                            <view class="metricCardBar"></view>
+                            <view class="metricCardTitleText">{{ physique.title }}</view>
+                        </view>
+                        <view class="metricCardList">
+                            <view class="metricCardRow" wx:for="{{ physique.rows }}" wx:key="label">
+                                <view class="metricCardLabel">{{ item.label }}</view>
+                                <view class="metricCardValue">{{ item.value }}{{ item.unit }}</view>
+                                <block wx:if="{{ item.status }}">
+                                    <view class="metricCardStatus" style="background-color: {{ item.color }};">{{ item.status }}</view>
+                                </block>
+                            </view>
                         </view>
                     </view>
-                </view>
+                </block>
 
                 <!-- 体重管控 -->
-                <view class="metricCard">
-                    <view class="metricCardTitle">
-                        <view class="metricCardBar"></view>
-                        <view class="metricCardTitleText">{{ weightControl.title }}</view>
-                    </view>
-                    <view class="metricCardList">
-                        <view class="metricCardRow" wx:for="{{ weightControl.rows }}" wx:key="label">
-                            <view class="metricCardLabel">{{ item.label }}</view>
-                            <view class="metricCardValue">{{ item.value }}{{ item.unit }}</view>
-                            <view class="metricCardStatus" wx:if="{{ item.status }}" style="background-color: {{ item.color }};">{{ item.status }}</view>
+                <block wx:if="{{ weightControl.rows.length }}">
+                    <view class="metricCard">
+                        <view class="metricCardTitle">
+                            <view class="metricCardBar"></view>
+                            <view class="metricCardTitleText">{{ weightControl.title }}</view>
+                        </view>
+                        <view class="metricCardList">
+                            <view class="metricCardRow" wx:for="{{ weightControl.rows }}" wx:key="label">
+                                <view class="metricCardLabel">{{ item.label }}</view>
+                                <view class="metricCardValue">{{ item.value }}{{ item.unit }}</view>
+                                <block wx:if="{{ item.status }}">
+                                    <view class="metricCardStatus" style="background-color: {{ item.color }};">{{ item.status }}</view>
+                                </block>
+                            </view>
                         </view>
                     </view>
-                </view>
+                </block>
 
-                <block wx:if="{{ isEightElectrode }}">
-
-                    <!-- 细胞液分析 -->
+                <!-- 细胞液分析 -->
+                <block wx:if="{{ cellWater.rows.length }}">
                     <view class="metricCard">
                         <view class="metricCardTitle">
                             <view class="metricCardBar"></view>
@@ -148,12 +169,16 @@
                             <view class="metricCardRow" wx:for="{{ cellWater.rows }}" wx:key="label">
                                 <view class="metricCardLabel">{{ item.label }}</view>
                                 <view class="metricCardValue">{{ item.value }}{{ item.unit }}</view>
-                                <view class="metricCardStatus" wx:if="{{ item.status }}" style="background-color: {{ item.color }};">{{ item.status }}</view>
+                                <block wx:if="{{ item.status }}">
+                                    <view class="metricCardStatus" style="background-color: {{ item.color }};">{{ item.status }}</view>
+                                </block>
                             </view>
                         </view>
                     </view>
+                </block>
 
-                    <!-- 进阶成分 -->
+                <!-- 进阶成分 -->
+                <block wx:if="{{ advancedComposition.rows.length }}">
                     <view class="metricCard">
                         <view class="metricCardTitle">
                             <view class="metricCardBar"></view>
@@ -163,12 +188,16 @@
                             <view class="metricCardRow" wx:for="{{ advancedComposition.rows }}" wx:key="label">
                                 <view class="metricCardLabel">{{ item.label }}</view>
                                 <view class="metricCardValue">{{ item.value }}{{ item.unit }}</view>
-                                <view class="metricCardStatus" wx:if="{{ item.status }}" style="background-color: {{ item.color }};">{{ item.status }}</view>
+                                <block wx:if="{{ item.status }}">
+                                    <view class="metricCardStatus" style="background-color: {{ item.color }};">{{ item.status }}</view>
+                                </block>
                             </view>
                         </view>
                     </view>
+                </block>
 
-                    <!-- 躯干/四肢脂肪 -->
+                <!-- 躯干/四肢脂肪 -->
+                <block wx:if="{{ bodyFat.rows.length }}">
                     <view class="metricCard">
                         <view class="metricCardTitle">
                             <view class="metricCardBar"></view>
@@ -189,8 +218,10 @@
                             </view>
                         </view>
                     </view>
+                </block>
 
-                    <!-- 躯干/四肢肌肉 -->
+                <!-- 躯干/四肢肌肉 -->
+                <block wx:if="{{ bodyMuscle.rows.length }}">
                     <view class="metricCard">
                         <view class="metricCardTitle">
                             <view class="metricCardBar"></view>
@@ -211,7 +242,6 @@
                             </view>
                         </view>
                     </view>
-
                 </block>
 
             </view>