Merge branch 'cfclub' of http://git.iwintrue.com/liaoxg/cfc into cfclub

cfc-backend/src/main/java/com/etotem/cfc/controller/admin/ReportParserAdminController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.etotem.cfc.common.Result;
 import com.etotem.cfc.entity.*;
 import com.etotem.cfc.mapper.*;
+import com.etotem.cfc.service.DanReportUploadService;
 import com.etotem.cfc.service.ReportImportService;
 import com.etotem.cfc.service.ReportScriptGeneratorService;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -44,6 +45,9 @@ public class ReportParserAdminController {
     @Resource
     private ReportImportService reportImportService;
 
+    @Resource
+    private DanReportUploadService danReportUploadService;
+
     @Resource
     private ReportScriptGeneratorService reportScriptGeneratorService;
 
@@ -333,4 +337,14 @@ public class ReportParserAdminController {
             return Result.error("生成失败: " + e.getMessage());
         }
     }
+
+    @PostMapping("/dan/reparse")
+    public Result<Map<String, Object>> reparseDan(@RequestBody Map<String, Object> params) {
+        Object uploadId = params.get("uploadId");
+        Object dimension = params.get("dimension");
+        if (uploadId == null || dimension == null) {
+            return Result.error("uploadId/dimension 必填");
+        }
+        return danReportUploadService.reparseUpload(((Number) uploadId).longValue(), String.valueOf(dimension));
+    }
 }

cfc-backend/src/main/java/com/etotem/cfc/service/DanReportUploadService.java

@@ -21,7 +21,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.LinkedHashMap;
@@ -49,6 +52,9 @@ public class DanReportUploadService {
     @Resource
     private FileStorageService fileStorageService;
 
+    @Resource
+    private StorageService storageService;
+
     @Resource
     private DimensionScoreService dimensionScoreService;
 
@@ -282,6 +288,95 @@ if (!DanReportUpload.DIM_MIND.equals(dimension) && !DanReportUpload.DIM_WISDOM.e
         return Result.success(vo);
     }
 
+    // 维护：按正确维度重新解析已入库 DAN 上传，并刷新关联结果/展示块/汇总/五维能量
+    @Transactional(rollbackFor = Exception.class)
+    public Result<Map<String, Object>> reparseUpload(Long uploadId, String dimension) {
+        DanReportUpload upload = uploadMapper.selectById(uploadId);
+        if (upload == null || upload.getDeletedAt() != null) {
+            return Result.error("上传记录不存在");
+        }
+        if (!DanReportUpload.DIM_MIND.equals(dimension) && !DanReportUpload.DIM_WISDOM.equals(dimension)
+                && !DanReportUpload.DIM_COGNITION.equals(dimension) && !DanReportUpload.DIM_LEARNING.equals(dimension)
+                && !DanReportUpload.DIM_BEHAVIOR.equals(dimension) && !DanReportUpload.DIM_CAREER.equals(dimension)
+                && !DanReportUpload.DIM_CAMPUS.equals(dimension) && !DanReportUpload.DIM_ADOLESCENT.equals(dimension)) {
+            return Result.error("dimension 非法: " + dimension);
+        }
+        File pdf;
+        try {
+            pdf = new File(storageService.getFilePath(upload.getFileUrl()));
+        } catch (Exception e) {
+            return Result.error("文件路径解析失败: " + e.getMessage());
+        }
+        if (!pdf.exists()) {
+            return Result.error("文件不存在: " + pdf.getAbsolutePath());
+        }
+        DanReportParseService.DanParsedReport parsed;
+        try (InputStream in = new FileInputStream(pdf)) {
+            parsed = danReportParseService.parse(in, dimension);
+        } catch (Exception e) {
+            log.error("DAN重解析失败 uploadId={}", uploadId, e);
+            return Result.error("解析失败: " + e.getMessage());
+        }
+        if (parsed == null || parsed.getItems() == null || parsed.getItems().isEmpty()) {
+            return Result.error("未能提取有效指标");
+        }
+        try {
+            upload.setParsedItems(objectMapper.writeValueAsString(parsed.getItems()));
+            upload.setParsedExtra(objectMapper.writeValueAsString(parsed.getExtra()));
+        } catch (Exception e) {
+            return Result.error("序列化失败: " + e.getMessage());
+        }
+        upload.setDimension(dimension);
+        upload.setReportType(parsed.getReportType());
+        upload.setParsedSummary(parsed.getSummary());
+        upload.setParsedSuggestions(parsed.getSuggestions());
+        upload.setParsedAt(new Date());
+        upload.setUpdatedAt(new Date());
+        uploadMapper.updateById(upload);
+
+        Long resultId = upload.getLinkedResultId();
+        if (resultId != null) {
+            DanAssessmentResult result = resultMapper.selectById(resultId);
+            if (result != null) {
+                result.setDimension(dimension);
+                result.setStructuredAnalysis(upload.getParsedItems());
+                result.setAnalysisReport(upload.getParsedSummary());
+                result.setGrowthSuggestions(upload.getParsedSuggestions());
+                Integer overall = extractOverallScore(upload.getParsedItems());
+                if (overall != null) {
+                    result.setOverallScore(overall);
+                    result.setDanLevel(mapScoreToDanLevel(overall));
+                }
+                result.setUpdatedAt(new Date());
+                resultMapper.updateById(result);
+            }
+        }
+        try {
+            reportBlockService.save("dan", upload.getId(),
+                    reportBlockAssembler.assembleDanByType(upload.getParsedItems(),
+                            upload.getParsedSummary(), upload.getParsedSuggestions()));
+        } catch (Exception e) {
+            log.warn("DAN重解析保存展示块失败 uploadId={}: {}", uploadId, e.getMessage());
+        }
+        try {
+            reportSummaryService.syncFromDanReport(upload);
+        } catch (Exception e) {
+            log.warn("DAN重解析同步汇总失败 uploadId={}: {}", uploadId, e.getMessage());
+        }
+        if (resultId != null) {
+            try {
+                dimensionScoreService.refreshFromDanAssessment(upload.getFamilyMemberId(), resultId, dimension);
+            } catch (Exception ignored) {
+            }
+        }
+        Map<String, Object> data = new LinkedHashMap<>();
+        data.put("uploadId", upload.getId());
+        data.put("dimension", dimension);
+        data.put("reportType", upload.getReportType());
+        data.put("itemCount", parsed.getItems().size());
+        return Result.success(data);
+    }
+
     /**
      * DAN 确认后自动生成方案，维度按测评维度映射（mind→mind，wisdom→wisdom）。
      * 失败仅记日志，不阻断确认主流程。

cfc-backend/src/main/java/com/etotem/cfc/service/ReportCollectService.java

@@ -302,15 +302,28 @@ public class ReportCollectService {
         }
     }
 
-    /** dan 家族 typeId → 测评维度：dan_a2 → mind；已知 dan_<dim> 直接映射，否则默认 mind */
+    /** dan 家族 typeId → 测评维度：dan_a2 → mind、dan_b4 → wisdom 等；兼容 dan_<dim> 语义名，否则默认 mind */
     private String resolveDanDimension(String typeId) {
         if (typeId != null && typeId.startsWith("dan_")) {
-            String dim = typeId.substring(4);
-            if (DanReportUpload.DIM_MIND.equals(dim) || DanReportUpload.DIM_WISDOM.equals(dim)
-                    || DanReportUpload.DIM_COGNITION.equals(dim) || DanReportUpload.DIM_LEARNING.equals(dim)
-                    || DanReportUpload.DIM_BEHAVIOR.equals(dim) || DanReportUpload.DIM_CAREER.equals(dim)
-                    || DanReportUpload.DIM_CAMPUS.equals(dim) || DanReportUpload.DIM_ADOLESCENT.equals(dim)) {
-                return dim;
+            String code = typeId.substring(4);
+            // 兼容语义维度名（如 dan_mind / dan_wisdom）
+            if (DanReportUpload.DIM_MIND.equals(code) || DanReportUpload.DIM_WISDOM.equals(code)
+                    || DanReportUpload.DIM_COGNITION.equals(code) || DanReportUpload.DIM_LEARNING.equals(code)
+                    || DanReportUpload.DIM_BEHAVIOR.equals(code) || DanReportUpload.DIM_CAREER.equals(code)
+                    || DanReportUpload.DIM_CAMPUS.equals(code) || DanReportUpload.DIM_ADOLESCENT.equals(code)) {
+                return code;
+            }
+            // report_type_registry.typeId 编码 → 测评维度
+            switch (code) {
+                case "a1": return DanReportUpload.DIM_COGNITION;
+                case "a2": return DanReportUpload.DIM_MIND;
+                case "b2": return DanReportUpload.DIM_BEHAVIOR;
+                case "b3": return DanReportUpload.DIM_LEARNING;
+                case "b4": return DanReportUpload.DIM_WISDOM;
+                case "b5": return DanReportUpload.DIM_ADOLESCENT;
+                case "b6": return DanReportUpload.DIM_CAREER;
+                case "c1": return DanReportUpload.DIM_CAMPUS;
+                default: break;
             }
         }
         return DanReportUpload.DIM_MIND;

cfc-backend/src/main/java/com/etotem/cfc/task/PortraitDailyUpdateTask.java

@@ -0,0 +1,77 @@
+package com.etotem.cfc.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.etotem.cfc.entity.User;
+import com.etotem.cfc.mapper.UserMapper;
+import com.etotem.cfc.service.PortraitService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 每日自动更新用户画像。
+ * <p>
+ * 基于「原画像 + 最新使用数据」由 AI 重新生成（{@link PortraitService#regeneratePortrait}）：
+ * 用户手动编辑过的画像同样以编辑后的内容作为"原画像"参与生成，不会被直接丢弃；
+ * 尚未生成过画像（portrait_prompt 为空）的用户跳过——首次画像由前端打开"我的画像"页面时触发生成。
+ * 为避免 AI 网关单日负载过大，每日最多处理 200 个用户。
+ */
+@Slf4j
+@Component
+public class PortraitDailyUpdateTask {
+
+    /** 单日最多刷新用户数，防止 AI 网关过载 */
+    private static final int DAILY_LIMIT = 200;
+
+    @Resource
+    private PortraitService portraitService;
+
+    @Resource
+    private UserMapper userMapper;
+
+    /**
+     * 每天 04:45 执行（避开 00:05/01:00/02:00/03:00/03:30/04:00/05:00 的既有任务）
+     */
+    @Scheduled(cron = "0 45 4 * * ?")
+    public void dailyRefresh() {
+        log.info("开始执行每日用户画像自动更新任务");
+        try {
+            // 仅刷新已经生成过画像的用户（有原画像可作参考）；@TableLogic 自动过滤已删除
+            List<User> users = userMapper.selectList(
+                    new LambdaQueryWrapper<User>()
+                            .isNotNull(User::getPortraitPrompt)
+                            .last("LIMIT " + DAILY_LIMIT)
+            );
+            if (users.isEmpty()) {
+                log.info("每日用户画像自动更新：暂无需要更新的用户");
+                return;
+            }
+
+            int successCount = 0;
+            int failureCount = 0;
+            int skipCount = 0;
+            for (User user : users) {
+                String currentPortrait = user.getPortraitPrompt();
+                if (currentPortrait == null || currentPortrait.trim().isEmpty()) {
+                    skipCount++;
+                    continue;
+                }
+                try {
+                    // regeneratePortrait 以旧画像为上下文 + 最新使用数据重新生成，AI 失败时回退旧画像（安全空操作）
+                    portraitService.regeneratePortrait(user.getId(), null);
+                    successCount++;
+                } catch (Exception e) {
+                    failureCount++;
+                    log.warn("每日用户画像更新失败: userId={}", user.getId(), e);
+                }
+            }
+            log.info("每日用户画像自动更新完成: 待处理={}, 成功={}, 失败={}, 跳过={}",
+                    users.size(), successCount, failureCount, skipCount);
+        } catch (Exception e) {
+            log.error("每日用户画像自动更新任务执行失败", e);
+        }
+    }
+}

cfc-frontend/pages/health/report-upload.vue

@@ -425,8 +425,8 @@ if (options.type === 'a2' || options.reportKind === 'a2') {
           var reportType = data.reportType || 'gut_flora'
           setTimeout(function() {
             if (reportId) {
-              // 后端指纹识别后统一入库：dan_a2 → DAN 报告页，其余 → 健康报告详情页
-              if (reportType === 'dan_a2') {
+              // 后端指纹识别后统一入库：dan_* → DAN 报告页，其余 → 健康报告详情页
+              if (reportType && reportType.indexOf('dan_') === 0) {
                 uni.redirectTo({ url: '/pages/dan-assessment/report-result?reportId=' + reportId })
               } else if (reportType === 'gut_flora') {
                 uni.redirectTo({ url: '/pages/health/gut-flora-detail?reportId=' + reportId })

cfc-frontend/pages/profile-main/profile.vue

@@ -102,33 +102,6 @@
         </view>
       </view>
 
-      <!-- 用户画像 - 五维能量概览 -->
-      <view class="portrait-section" v-if="portrait">
-        <view class="section-header-row">
-          <text class="section-title">🧭 用户画像</text>
-          <text class="section-sub">{{ portrait.tierLabel }}</text>
-        </view>
-        <view class="portrait-summary">
-          <text class="portrait-desc">{{ portrait.summary }}</text>
-        </view>
-        <view class="portrait-dimensions">
-          <view class="portrait-dim-item" v-for="dim in portrait.dims" :key="dim.code">
-            <view class="portrait-dim-header">
-              <view class="portrait-dim-icon" :style="{ background: dim.color }">{{ dim.icon }}</view>
-              <text class="portrait-dim-name">{{ dim.name }}</text>
-              <text class="portrait-dim-score">{{ dim.score }}</text>
-            </view>
-            <view class="portrait-dim-bar-track">
-              <view class="portrait-dim-bar-fill" :style="{ width: dim.score + '%', background: dim.color }"></view>
-            </view>
-            <text class="portrait-dim-desc">{{ dim.desc }}</text>
-          </view>
-        </view>
-        <view class="portrait-tip" v-if="portrait.tip">
-          <text class="portrait-tip-text">{{ portrait.tip }}</text>
-        </view>
-      </view>
-
       <!-- 个人成就统计 -->
       <view class="achievement-section">
         <view class="section-header-row">
@@ -292,6 +265,11 @@
 
       <!-- 设置 + 退出 -->
       <view class="bottom-menu-section">
+        <view class="menu-row" @click="goToMessageHistory">
+          <text class="menu-row-icon">📨</text>
+          <text class="menu-row-text">历史消息</text>
+          <text class="menu-row-arrow">›</text>
+        </view>
         <view class="menu-row" @click="goToSettings">
           <text class="menu-row-icon">⚙️</text>
           <text class="menu-row-text">设置</text>
@@ -330,7 +308,8 @@ import {
   cartCount, getOrderCounts, getReferralSummary,
   getProfileStats, getMyReferrer, getTeamConsumption,
   getTeacherInfo, getTeacherPendingTasks, getTeacherUnreadCount,
-  getReferralCode, extractReferralCode, getShareQrCode, getEnergySandbox
+  getReferralCode, extractReferralCode, getShareQrCode, getEnergySandbox,
+  vendorStatus
 } from '../../utils/api.js'
 
 export default {
@@ -366,10 +345,8 @@ export default {
       pendingTasks: 0,
       unreadMessages: 0,
       teacherStatus: 'pending',
+      isVendor: false,
       profileProgress: 0,
-      // 五维能量
-      dimensionScores: { body: 0, mind: 0, wisdom: 0, action: 0, wealth: 0 },
-      portrait: null,
       myReferrer: null,
       // 分享推广码
       showSharePoster: false,
@@ -426,6 +403,9 @@ export default {
     this.isSwitchedChild = uni.getStorageSync('isSwitchedChild') || false
     this.nickname = (uni.getStorageSync('userInfo') || {}).nickname || ''
 
+    // 服务商身份判断（成就区「我的团队」入口按此分发）
+    this.checkVendorStatus()
+
     // 规划师加载额外数据
     if (role === 'teacher') {
       this.loadTeacherStatus()
@@ -436,6 +416,15 @@ export default {
     }
   },
   methods: {
+    // 服务商身份：vendorStatus 返回 approved 即为已通过审核的服务商
+    checkVendorStatus() {
+      var self = this
+      vendorStatus().then(function(res) {
+        self.isVendor = !!(res && res.data && res.data.vendorStatus === 'approved')
+      }).catch(function() {
+        self.isVendor = false
+      })
+    },
     loadTeacherStatus() {
       var self = this
       getTeacherInfo().then(function(res) {
@@ -472,7 +461,6 @@ export default {
       this.loadProfileStats()
       this.loadReferralEarnings()
       this.loadTeamInfo()
-      this.loadDimensionEnergy()
     },
     loadUserInfo() {
       var self = this
@@ -562,39 +550,6 @@ export default {
       }).catch(function() {})
     },
 
-    loadDimensionEnergy() {
-      var self = this
-      getEnergySandbox('family').then(function(res) {
-        if (res && res.code === 200 && res.data) {
-          var d = res.data.familyData || null
-          if (!d) {
-            if (res.data.personalData) {
-              // 个人数据模式：使用个人数据
-              d = res.data.personalData
-            } else {
-              self.portrait = null
-              return
-            }
-          }
-          if (!d || typeof d !== 'object') return
-          
-          // 设置五维能量分数
-          self.dimensionScores = {
-            body: d.bodyScore ?? d.body_score ?? 0,
-            mind: d.mindScore ?? d.mind_score ?? 0,
-            wisdom: d.wisdomScore ?? d.wisdom_score ?? 0,
-            action: d.actionScore ?? d.action_score ?? 0,
-            wealth: d.wealthScore ?? d.wealth_score ?? 0
-          }
-          
-          // 生成用户画像
-          self.portrait = self.mapToPortrait(d)
-        }
-      }).catch(function(e) {
-        console.error('获取五维能量沙盘失败', e)
-        self.portrait = null
-      })
-    },
     loadReferralEarnings() {
       var self = this
       getReferralSummary().then(function(res) {
@@ -701,72 +656,6 @@ export default {
       return { label: '我们家的能量', overall: Number(overall), dims: dims }
     },
 
-    mapToPortrait(d) {
-      // 计算总分和平均分
-      var scores = { body: 0, mind: 0, wisdom: 0, action: 0, wealth: 0 }
-      var dims = []
-      var total = 0
-      var count = 0
-      
-      var defs = [
-        { key: 'body', label: '身', color: '#FF8C42', desc: '身体健康状况，体质好坏的综合反映' },
-        { key: 'mind', label: '心', color: '#FF6B9D', desc: '情绪与心理状态，情绪波动与心理平衡' },
-        { key: 'wisdom', label: '智', color: '#6366F1', desc: '智力与知识水平，认知能力与知识储备' },
-        { key: 'action', label: '行', color: '#10B981', desc: '行动力与执行力，计划与行动的落实情况' },
-        { key: 'wealth', label: '富', color: '#F59E0B', desc: '财富与资源，物质丰富程度与创富能力' }
-      ]
-      
-      for (var i = 0; i < defs.length; i++) {
-        var raw = d[defs[i].key + 'Score']
-        var n = 0
-        if (raw != null && !isNaN(raw)) {
-          n = Math.max(0, Math.min(100, Number(raw)))
-        }
-        scores[defs[i].key] = n
-        total += n
-        count++
-        dims.push({
-          code: defs[i].key,
-          name: defs[i].label,
-          score: n,
-          color: defs[i].color,
-          desc: defs[i].desc
-        })
-      }
-      
-      var overall = count > 0 ? Math.round(total / count) : 0
-      
-      // 确定等级和描述
-      var tierLabel = ''
-      var summary = ''
-      var tip = ''
-      
-      if (overall >= 80) {
-        tierLabel = '卓越守护者'
-        summary = '你的五维能量处于卓越水平，身心健康，知行合一。家庭成员都受益于你的正向能量场。'
-        tip = '保持当前的良好习惯，继续关注家庭成员的需求'
-      } else if (overall >= 60) {
-        tierLabel = '进取者'
-        summary = '你的五维能量处于良好水平，各方面有所提升，但仍有提升空间。'
-        tip = '可以尝试在其中一个维度上突破瓶颈，带动全家进步'
-      } else if (overall >= 40) {
-        tierLabel = '探索者'
-        summary = '你的五维能量处于起步水平，正在探索和学习中。这是成长的起点。'
-        tip = '从关注最容易改进的维度开始，每一点进步都很重要'
-      } else {
-        tierLabel = '起步者'
-        summary = '你的五维能量处于起始水平，正处于开始关注全家健康的阶段。'
-        tip = '从现在开始，每天关注一项小健康行动，逐步建立五维能量基础'
-      }
-      
-      return {
-        overall: overall,
-        tierLabel: tierLabel,
-        summary: summary,
-        dims: dims,
-        tip: tip
-      }
-    },
     async loadReferralCode() {
       if (this.referralCodeLoaded) return
       var self = this
@@ -783,7 +672,22 @@ export default {
       uni.navigateTo({ url: '/pages/service-center/index' })
     },
     goTeamTree() {
-      uni.navigateTo({ url: '/pages/profile/team-tree' })
+      // 服务商 → 服务商团队；非服务商 → 引导申请
+      if (this.isVendor) {
+        uni.navigateTo({ url: '/pages/vendor/team-system/team-system' })
+        return
+      }
+      uni.showModal({
+        title: '提示',
+        content: '您不是平台服务提供商，是否申请成为服务提供商',
+        confirmText: '去申请',
+        cancelText: '取消',
+        success: function(res) {
+          if (res.confirm) {
+            uni.navigateTo({ url: '/pages/profile/service-role-apply' })
+          }
+        }
+      })
     },
     goLogin: function() {
       uni.navigateTo({ url: '/pages/login/login' })
@@ -852,6 +756,9 @@ export default {
     goToAddress: function() {
       uni.navigateTo({ url: '/pages/shop/address/address' })
     },
+    goToMessageHistory: function() {
+      uni.navigateTo({ url: '/pages/profile/message-history' })
+    },
     goToSettings: function() {
       uni.showActionSheet({
         itemList: ['完善信息', '家庭成员', '隐私政策', '用户协议', '我的画像', '提醒设置'],

cfc-frontend/pages/profile/portrait-edit.vue

@@ -1,43 +1,87 @@
 <template>
-  <view class="portrait-edit-page">
-    <view class="section">
-      <view class="section-title">我的画像描述</view>
-      <view class="hint">请输入你的个人画像描述，AI 会根据这些信息提供更有针对性的建议（最多 2000 字）</view>
+  <view class="portrait-edit-page" :class="{ 'no-scroll': editing }" v-if="!editing">
+    <!-- 五维画像（原我的页面内容迁移至此） -->
+    <view class="section" v-if="portrait">
+      <view class="section-header-row">
+        <text class="section-title">🧭 用户画像</text>
+        <text class="section-sub">{{ portrait.tierLabel }}</text>
+      </view>
+      <view class="portrait-summary">
+        <text class="portrait-desc">{{ portrait.summary }}</text>
+      </view>
+      <view class="portrait-dimensions">
+        <view class="portrait-dim-item" v-for="dim in portrait.dims" :key="dim.code">
+          <view class="portrait-dim-header">
+            <view class="portrait-dim-icon" :style="{ background: dim.color }">{{ dim.icon }}</view>
+            <text class="portrait-dim-name">{{ dim.name }}</text>
+            <text class="portrait-dim-score">{{ dim.score }}</text>
+          </view>
+          <view class="portrait-dim-bar-track">
+            <view class="portrait-dim-bar-fill" :style="{ width: dim.score + '%', background: dim.color }"></view>
+          </view>
+          <text class="portrait-dim-desc">{{ dim.desc }}</text>
+        </view>
+      </view>
+      <view class="portrait-tip" v-if="portrait.tip">
+        <text class="portrait-tip-text">{{ portrait.tip }}</text>
+      </view>
+    </view>
 
-      <textarea
-        class="portrait-textarea"
-        :value="portraitPrompt"
-        placeholder="例如：我家孩子 8 岁，偏瘦，挑食，容易积食，睡眠不足..."
-        maxlength="2000"
-        @input="onInput"
-        auto-height
-      ></textarea>
-      <view class="char-count">{{ portraitPrompt.length }}/2000</view>
+    <!-- 画像描述（可编辑） -->
+    <view class="section">
+      <view class="section-header-row">
+        <text class="section-title">我的画像描述</text>
+        <text class="edit-btn" @click="enterEdit">编辑</text>
+      </view>
+      <view class="hint">AI 会根据这些信息提供更有针对性的建议（最多 2000 字）。每日自动基于最新使用情况更新。 </view>
+      <view class="portrait-prompt-text" v-if="portraitPrompt">{{ portraitPrompt }}</view>
+      <view class="portrait-prompt-empty" v-else>暂无画像描述，点击「编辑」填写或由 AI 自动生成</view>
     </view>
 
+    <!-- 参考指标（自动生成） -->
     <view class="section" v-if="renderedSnapshot">
       <view class="section-title">参考指标（自动生成）</view>
       <view class="snapshot-text">{{ renderedSnapshot }}</view>
     </view>
+  </view>
 
-    <view class="save-bar">
-      <button class="save-btn" :loading="saving" @click="onSave">保存</button>
+  <!-- 全屏编辑模式 -->
+  <view class="editor-fullscreen" v-else>
+    <view class="editor-topbar">
+      <text class="editor-cancel" @click="cancelEdit">取消</text>
+      <text class="editor-title">编辑画像</text>
+      <text class="editor-save" @click="saveEdit">保存</text>
+    </view>
+    <view class="editor-body">
+      <textarea
+        class="editor-textarea"
+        :value="editingText"
+        placeholder="例如：我家孩子 8 岁，偏瘦，挑食，容易积食，睡眠不足..."
+        maxlength="2000"
+        :focus="editing"
+        @input="onEditInput"
+      ></textarea>
+      <view class="char-count">{{ editingText.length }}/2000</view>
     </view>
   </view>
 </template>
 
 <script>
-import { getPortrait, editPortrait } from '../../utils/api.js'
+import { getPortrait, editPortrait, getEnergySandbox } from '../../utils/api.js'
 export default {
   data() {
     return {
+      portrait: null,
       portraitPrompt: '',
       renderedSnapshot: '',
-      saving: false
+      saving: false,
+      editing: false,
+      editingText: ''
     }
   },
   onLoad() {
     this.loadPortrait()
+    this.loadEnergy()
   },
   methods: {
     async loadPortrait() {
@@ -51,16 +95,110 @@ export default {
         console.error('加载画像失败', e)
       }
     },
-    onInput(e) {
-      this.portraitPrompt = e.detail.value
+    loadEnergy() {
+      var self = this
+      getEnergySandbox('family').then(function(res) {
+        if (res && res.code === 200 && res.data) {
+          var d = res.data.familyData || null
+          if (!d && res.data.personalData) {
+            // 个人数据模式：使用个人数据
+            d = res.data.personalData
+          }
+          if (!d || typeof d !== 'object') return
+          self.portrait = self.mapToPortrait(d)
+        }
+      }).catch(function(e) {
+        console.error('获取五维能量沙盘失败', e)
+        self.portrait = null
+      })
+    },
+    mapToPortrait(d) {
+      // 计算总分和平均分
+      var scores = { body: 0, mind: 0, wisdom: 0, action: 0, wealth: 0 }
+      var dims = []
+      var total = 0
+      var count = 0
+
+      var defs = [
+        { key: 'body', label: '身', icon: '💪', color: '#FF8C42', desc: '身体健康状况，体质好坏的综合反映' },
+        { key: 'mind', label: '心', icon: '💖', color: '#FF6B9D', desc: '情绪与心理状态，情绪波动与心理平衡' },
+        { key: 'wisdom', label: '智', icon: '📚', color: '#6366F1', desc: '智力与知识水平，认知能力与知识储备' },
+        { key: 'action', label: '行', icon: '🚀', color: '#10B981', desc: '行动力与执行力，计划与行动的落实情况' },
+        { key: 'wealth', label: '富', icon: '💰', color: '#F59E0B', desc: '财富与资源，物质丰富程度与创富能力' }
+      ]
+
+      for (var i = 0; i < defs.length; i++) {
+        var raw = d[defs[i].key + 'Score']
+        var n = 0
+        if (raw != null && !isNaN(raw)) {
+          n = Math.max(0, Math.min(100, Number(raw)))
+        }
+        scores[defs[i].key] = n
+        total += n
+        count++
+        dims.push({
+          code: defs[i].key,
+          name: defs[i].label,
+          icon: defs[i].icon,
+          score: n,
+          color: defs[i].color,
+          desc: defs[i].desc
+        })
+      }
+
+      var overall = count > 0 ? Math.round(total / count) : 0
+
+      // 确定等级和描述
+      var tierLabel = ''
+      var summary = ''
+      var tip = ''
+
+      if (overall >= 80) {
+        tierLabel = '卓越守护者'
+        summary = '你的五维能量处于卓越水平，身心健康，知行合一。家庭成员都受益于你的正向能量场。'
+        tip = '保持当前的良好习惯，继续关注家庭成员的需求'
+      } else if (overall >= 60) {
+        tierLabel = '进取者'
+        summary = '你的五维能量处于良好水平，各方面有所提升，但仍有提升空间。'
+        tip = '可以尝试在其中一个维度上突破瓶颈，带动全家进步'
+      } else if (overall >= 40) {
+        tierLabel = '探索者'
+        summary = '你的五维能量处于起步水平，正在探索和学习中。这是成长的起点。'
+        tip = '从关注最容易改进的维度开始，每一点进步都很重要'
+      } else {
+        tierLabel = '起步者'
+        summary = '你的五维能量处于起始水平，正处于开始关注全家健康的阶段。'
+        tip = '从现在开始，每天关注一项小健康行动，逐步建立五维能量基础'
+      }
+
+      return {
+        overall: overall,
+        tierLabel: tierLabel,
+        summary: summary,
+        dims: dims,
+        tip: tip
+      }
+    },
+    enterEdit() {
+      this.editingText = this.portraitPrompt
+      this.editing = true
     },
-    async onSave() {
+    cancelEdit() {
+      this.editing = false
+      this.editingText = ''
+    },
+    onEditInput(e) {
+      this.editingText = e.detail.value
+    },
+    async saveEdit() {
       this.saving = true
       try {
-        const res = await editPortrait({ portraitPrompt: this.portraitPrompt })
+        const res = await editPortrait({ portraitPrompt: this.editingText })
         if (res.code === 200) {
           uni.showToast({ title: '保存成功', icon: 'success' })
-          this.loadPortrait()
+          this.portraitPrompt = this.editingText
+          this.editing = false
+          this.editingText = ''
         } else {
           uni.showToast({ title: res.message || '保存失败', icon: 'none' })
         }
@@ -77,43 +215,126 @@ export default {
 <style scoped>
 .portrait-edit-page {
   padding: 24rpx;
-  padding-bottom: 160rpx;
+  padding-bottom: 60rpx;
   min-height: 100vh;
   background: #f5f5f5;
   box-sizing: border-box;
 }
+.no-scroll {
+  overflow: hidden;
+  height: 100vh;
+}
 .section {
   background: #fff;
   border-radius: 16rpx;
   padding: 24rpx;
   margin-bottom: 24rpx;
 }
+.section-header-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12rpx;
+}
 .section-title {
   font-size: 32rpx;
   font-weight: bold;
-  margin-bottom: 12rpx;
   color: #333;
 }
+.section-sub {
+  font-size: 24rpx;
+  color: #F97316;
+}
 .hint {
   font-size: 24rpx;
   color: #999;
   margin-bottom: 16rpx;
+  line-height: 1.5;
 }
-.portrait-textarea {
-  width: 100%;
-  min-height: 500rpx;
-  border: 1rpx solid #eee;
-  border-radius: 8rpx;
-  padding: 16rpx;
-  font-size: 28rpx;
-  box-sizing: border-box;
+.edit-btn {
+  font-size: 26rpx;
+  color: #F97316;
+  padding: 6rpx 24rpx;
+  border: 1rpx solid #F97316;
+  border-radius: 30rpx;
+}
+.portrait-summary {
+  margin-bottom: 16rpx;
+}
+.portrait-desc {
+  font-size: 26rpx;
+  color: #555;
   line-height: 1.6;
 }
-.char-count {
-  text-align: right;
+.portrait-dimensions {
+  margin-bottom: 12rpx;
+}
+.portrait-dim-item {
+  margin-bottom: 20rpx;
+}
+.portrait-dim-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 8rpx;
+}
+.portrait-dim-icon {
+  width: 44rpx;
+  height: 44rpx;
+  line-height: 44rpx;
+  text-align: center;
+  border-radius: 50%;
+  font-size: 24rpx;
+  margin-right: 12rpx;
+}
+.portrait-dim-name {
+  font-size: 28rpx;
+  color: #333;
+  flex: 1;
+}
+.portrait-dim-score {
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #333;
+}
+.portrait-dim-bar-track {
+  height: 16rpx;
+  background: #eee;
+  border-radius: 8rpx;
+  overflow: hidden;
+  margin-bottom: 8rpx;
+}
+.portrait-dim-bar-fill {
+  height: 100%;
+  border-radius: 8rpx;
+}
+.portrait-dim-desc {
   font-size: 22rpx;
   color: #999;
+  line-height: 1.5;
+  display: block;
+}
+.portrait-tip {
   margin-top: 8rpx;
+  background: rgba(249, 115, 22, 0.08);
+  border-radius: 12rpx;
+  padding: 16rpx 20rpx;
+}
+.portrait-tip-text {
+  font-size: 24rpx;
+  color: #d97706;
+  line-height: 1.5;
+}
+.portrait-prompt-text {
+  font-size: 28rpx;
+  color: #333;
+  white-space: pre-wrap;
+  line-height: 1.7;
+  word-break: break-all;
+}
+.portrait-prompt-empty {
+  font-size: 26rpx;
+  color: #999;
+  line-height: 1.6;
 }
 .snapshot-text {
   font-size: 26rpx;
@@ -121,24 +342,66 @@ export default {
   white-space: pre-wrap;
   line-height: 1.6;
 }
-.save-bar {
+
+/* ===== 全屏编辑模式 ===== */
+.editor-fullscreen {
   position: fixed;
+  top: 0;
   left: 0;
   right: 0;
   bottom: 0;
-  padding: 20rpx 24rpx;
-  padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+  width: 100%;
+  height: 100%;
   background: #fff;
-  box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.08);
+  z-index: 999;
+  display: flex;
+  flex-direction: column;
   box-sizing: border-box;
-  z-index: 100;
 }
-.save-btn {
-  background: #F97316;
-  color: #fff;
-  border-radius: 44rpx;
+.editor-topbar {
   height: 88rpx;
-  line-height: 88rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 24rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+  flex-shrink: 0;
+}
+.editor-cancel {
+  font-size: 30rpx;
+  color: #666;
+}
+.editor-title {
   font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+}
+.editor-save {
+  font-size: 30rpx;
+  color: #F97316;
+  font-weight: bold;
+}
+.editor-body {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  position: relative;
+}
+.editor-textarea {
+  width: 100%;
+  height: calc(100vh - 88rpx);
+  padding: 24rpx;
+  font-size: 30rpx;
+  line-height: 1.6;
+  box-sizing: border-box;
+  color: #333;
+}
+.char-count {
+  position: absolute;
+  right: 24rpx;
+  bottom: 16rpx;
+  font-size: 22rpx;
+  color: #999;
 }
-</style>
+</style>

cfc-web/src/styles/admin-tokens.css

@@ -464,4 +464,120 @@
 
 /* 浮动 */
 .pull-right { float: right; }
-.clearfix::after { content: ""; display: table; clear: both; }
+.clearfix::after { content: ""; display: table; clear: both; }
+
+/* ==== 企业级设计系统（Ant Design 5 规范，对齐 design-tokens.md） ==== */
+/* 作用域：.admin-page 及其后代 —— 覆盖全部 B 端管理页（admin / teacher / 顶层共享页） */
+/* 原则：克制、干净、留白分区、状态色仅承载语义、主色覆盖率 < 5% */
+
+:root {
+  --adm-primary: #1677FF;
+  --adm-primary-hover: #4096FF;
+  --adm-primary-active: #0958D9;
+  --adm-success: #52C41A;
+  --adm-success-text: #389E0D;
+  --adm-warning: #FAAD14;
+  --adm-warning-text: #D48806;
+  --adm-error: #FF4D4F;
+  --adm-error-text: #CF1322;
+  --adm-info: #1677FF;
+  --adm-info-text: #0958D9;
+  --adm-text-88: rgba(0, 0, 0, 0.88);
+  --adm-text-65: rgba(0, 0, 0, 0.65);
+  --adm-text-45: rgba(0, 0, 0, 0.45);
+  --adm-text-25: rgba(0, 0, 0, 0.25);
+  --adm-border-base: #D9D9D9;
+  --adm-border-split: #F0F0F0;
+  --adm-fill: #F5F5F5;
+  --adm-bg-container: #FFFFFF;
+  --adm-bg-header: #FAFAFA;
+  --adm-radius-sm: 2px;
+  --adm-radius-control: 6px;
+  --adm-radius-card: 8px;
+  --adm-shadow-card: 0 1px 2px 0 rgba(0, 0, 0, 0.03);
+}
+
+/* 主色按钮统一为 Ant 蓝（覆盖 Element 默认 #409EFF） */
+.admin-page .el-button--primary { background-color: var(--adm-primary); border-color: var(--adm-primary); color: #fff; }
+.admin-page .el-button--primary:hover,
+.admin-page .el-button--primary:focus { background-color: var(--adm-primary-hover); border-color: var(--adm-primary-hover); }
+.admin-page .el-button--primary:active { background-color: var(--adm-primary-active); border-color: var(--adm-primary-active); }
+.admin-page .el-button--primary.is-disabled,
+.admin-page .el-button--primary.is-disabled:hover { background-color: #A0C4FF; border-color: #A0C4FF; color: #fff; }
+
+/* 卡片：1px 描边 + 极轻阴影，替代重投影 */
+.admin-page .el-card { border: 1px solid var(--adm-border-split); border-radius: var(--adm-radius-card); box-shadow: var(--adm-shadow-card); }
+.admin-page .el-card__header { padding: 20px 24px; border-bottom: 1px solid var(--adm-border-split); }
+.admin-page .el-card__body { padding: 24px; }
+
+/* 页面标题区：唯一主操作居右 */
+.admin-page .admin-page-header { display: flex; align-items: center; justify-content: space-between; margin-bottom: 24px; flex-shrink: 0; }
+.admin-page .admin-page-title { font-size: 20px; font-weight: 600; line-height: 1.4; color: var(--adm-text-88); }
+.admin-page .admin-page-subtitle { font-size: 12px; color: var(--adm-text-45); margin-left: 12px; }
+.admin-page .admin-page-actions { display: flex; align-items: center; gap: 8px; flex-shrink: 0; }
+
+/* 筛选区：去卡片化，改底部 1px 分割线分区 */
+.admin-page .filter-bar {
+  display: flex; align-items: flex-end; flex-wrap: wrap; gap: 16px;
+  padding: 0 0 16px; margin-bottom: 16px;
+  background: transparent; border-radius: 0; box-shadow: none;
+  border-bottom: 1px solid var(--adm-border-split);
+}
+
+/* 区块标题：3px 主色竖条 */
+.admin-page .admin-section-title {
+  font-size: 14px; font-weight: 500; color: var(--adm-text-88);
+  padding-left: 8px; border-left: 3px solid var(--adm-primary);
+  margin: 24px 0 12px; line-height: 1.2;
+}
+
+/* 表格：表头浅底、行高舒适、单元格留白 */
+.admin-page .el-table { font-size: 14px; border-radius: var(--adm-radius-card); }
+.admin-page .el-table th { background-color: var(--adm-bg-header) !important; color: var(--adm-text-88); font-weight: 500; height: 46px; padding: 0; }
+.admin-page .el-table td { padding: 12px 0; }
+.admin-page .el-table .cell { padding-left: 16px; padding-right: 16px; }
+.admin-page .el-table--border, .admin-page .el-table--group { border-color: var(--adm-border-split); }
+.admin-page .el-table td, .admin-page .el-table th.is-leaf { border-color: var(--adm-border-split); }
+
+/* 数值列：右对齐 + 等宽数字 */
+.admin-page .el-table .cell-num,
+.admin-page .el-table .is-right .cell { text-align: right; font-variant-numeric: tabular-nums; font-feature-settings: "tnum"; }
+
+/* 状态标签：浅底 + 深字 + 同色描边（语义化，替代纯文字着色） */
+.admin-page .el-tag { border-radius: var(--adm-radius-sm); }
+.admin-page .el-tag--success { background: #F6FFED; border-color: #B7EB8F; color: var(--adm-success-text); }
+.admin-page .el-tag--warning { background: #FFFBE6; border-color: #FFE58F; color: var(--adm-warning-text); }
+.admin-page .el-tag--info { background: #E6F4FF; border-color: #91CAFF; color: var(--adm-info-text); }
+.admin-page .el-tag--danger { background: #FFF1F0; border-color: #FFCCC7; color: var(--adm-error-text); }
+
+/* 标准化状态徽标（自定义 span，替代纯文字着色） */
+.admin-page .adm-status { display: inline-flex; align-items: center; gap: 6px; padding: 2px 8px; font-size: 12px; line-height: 20px; border-radius: var(--adm-radius-sm); white-space: nowrap; }
+.admin-page .adm-status::before { content: ""; width: 6px; height: 6px; border-radius: 50%; background: currentColor; }
+.admin-page .adm-status--success { background: #F6FFED; color: var(--adm-success-text); }
+.admin-page .adm-status--info { background: #E6F4FF; color: var(--adm-info-text); }
+.admin-page .adm-status--warning { background: #FFFBE6; color: var(--adm-warning-text); }
+.admin-page .adm-status--error { background: #FFF1F0; color: var(--adm-error-text); }
+.admin-page .adm-status--default { background: var(--adm-fill); color: var(--adm-text-65); }
+
+/* 对话框 */
+.admin-page .el-dialog__header { padding: 16px 24px; border-bottom: 1px solid var(--adm-border-split); }
+.admin-page .el-dialog__title { font-size: 16px; font-weight: 500; color: var(--adm-text-88); }
+.admin-page .el-dialog__body { padding: 24px; }
+.admin-page .el-dialog__footer { padding: 12px 24px; border-top: 1px solid var(--adm-border-split); }
+
+/* 分页 */
+.admin-page .el-pagination { padding: 16px 0 0; text-align: right; font-weight: normal; flex-shrink: 0; }
+
+/* 表单 */
+.admin-page .el-form-item__label { font-size: 14px; color: var(--adm-text-65); font-weight: 500; }
+.admin-page .el-divider__text { font-size: 14px; font-weight: 500; color: var(--adm-text-88); }
+.admin-page .el-divider--horizontal { margin: 24px 0; }
+
+/* 表格容器：弹性撑满（替代 JS 计算 max-height），仅表格自身滚动 */
+.admin-page .adm-table-wrap { flex: 1; min-height: 0; display: flex; flex-direction: column; }
+.admin-page .adm-table-wrap > .el-table { flex: 1; min-height: 0; height: 100%; }
+
+/* 通用辅助 */
+.admin-page .text-muted { color: var(--adm-text-45); }
+.admin-page .adm-num { font-variant-numeric: tabular-nums; font-feature-settings: "tnum"; }
+.admin-page > .header { flex-shrink: 0; }

cfc-web/src/views/admin/OrderManage.vue

@@ -30,8 +30,8 @@
       </div>
     </div>
 
-    <div class="table-scroll-wrap-lg">
-      <el-table :max-height="tableHeight" :data="list" v-loading="loading" border stripe>
+    <div class="adm-table-wrap">
+      <el-table height="100%" :data="list" v-loading="loading" border stripe>
       <el-table-column prop="orderNo" label="订单号" width="180">
         <template slot="header">
           <span class="sort-header" @click.stop="onSortClick('orderNo', $event)" @dblclick.stop="onSortToggle('orderNo')">订单号<span v-if="sortIndex('orderNo') !== null" class="sort-index" :class="sortClass('orderNo') === 'sort-asc' ? 'sort-asc-badge' : 'sort-desc-badge'">{{ sortIndex('orderNo') }}</span>{{ sortIcon('orderNo') }}</span>
@@ -191,11 +191,6 @@ import { getOrderList, shipOrder, closeOrder, approveRefund, rejectRefund, vendo
 export default {
   mixins: [SortMixin],
   name: 'OrderManage',
-  computed: {
-    tableHeight() {
-      return window.innerHeight - 340
-    }
-  },
   data() {
     return {
       list: [],