Procházet zdrojové kódy

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

李宇 před 2 měsíci
rodič
revize
fee9c1fde0

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-88bdfb6a014ade9a76c5d249ffafc141482e62d2
+7aa3496d92c9cda70f7d7cf183ae6d2ae4251df2

+ 2 - 2
cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.414",
+  "version": "1.0.416",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.414",
+      "version": "1.0.416",
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",

+ 1 - 1
cfc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfc-web",
-  "version": "1.0.415",
+  "version": "1.0.416",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

+ 60 - 0
cfc-web/public/CHANGELOG-v1.0.md

@@ -4,6 +4,66 @@
 
 ---
 
+## v1.0.416 (2026-07-20)
+
+### Bug 修复
+- 修复体检报告详情页小程序编译失败
+- add wx:key to v-for placeholder loop in DimensionArticles
+- product-detail 移除 memberPrice 价格回退
+- FamilyRelationGraph 齿轮/+号/高度自适应被误回退,重新实现
+- navigateBack instead of deleted plans page
+- add ProductService.getById() to resolve pre-existing compile error
+- break circular dependency between HealthReportService and DimensionScoreServiceImpl
+- remove duplicate closing brace in CSS
+- 解决 git stash 合并冲突残留标记(body/index, gut-index, report-list)
+
+### 其他
+- - 修复空状态条件引用不存在的 indicatorGroups,改为 indicators.length
+- 
+- to wx:key. Changed to :key="i" which compiles to wx:key="*this",
+- eliminating the WXML runtime warning.
+- 
+- 
+- ProductService was missing this delegation method. Pre-existing bug
+- uncovered when running mvn compile for v1.1 verification.
+- 
+- to resolve Spring Boot 2.7+ circular reference rejection.
+- The cycle was:
+-   HealthReportService → DimensionScoreService → DimensionScoreServiceImpl → HealthReportService
+- 
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- - 重写 admin-butler-review 用 13800138000 账号 + admin-auth/login-by-password 取 token
+- - 新增 health-knowledge-base / nutritionist-apply 覆盖 HealthKnowledgeBaseController (3 endpoints) 与 NutritionistController (2 endpoints)
+- - 附带 mass-create-users 脚本 + create-role-users.sql + 上一次批量建号结果 create-result.json 用于手动复现
+- 
+-    - pages/parent/plans/index.vue, detail.vue
+-    - pages/guide/plans/index.vue, detail.vue
+-    - pages/guide/training-plans/index.vue, detail.vue
+- 2. pages.json 中移除对应的路由注册
+- 3. 新增 components/RecommendedFeed.vue:
+-    - 将商品和活动混合为交替排列的信息流 (商品/活动/商品/活动...)
+-    - 统一展示:封面图 + 类型标签 + 标题 + 价格 + 状态
+-    - 点击统一跳转到对应详情页
+- 4. parent-index.vue:
+-    - 替换 DimensionActivities + DimensionProducts 为 RecommendedFeed
+-    - 新增 onFeedItemClick 和 goMoreDiscover 方法
+- 5. child-index.vue:
+-    - 替换 DimensionActivities + DimensionProducts 为 RecommendedFeed
+-    - 新增 onFeedItemClick 和 goMoreDiscover 方法
+- 6. member-detail.vue:
+-    - 替换 DimensionActivities + DimensionProducts 为 RecommendedFeed
+-    - 新增 onFeedItemClick 和 goMoreDiscover 方法
+- 
+
+### 重构
+- redesign card UI with cover gradient and badge layout
+- 删除成长计划页面并合并推荐商品与活动为统一信息流
+
+### 测试
+- admin/health/nutrition 覆盖新增控制器
+
+
 ## v1.0.415 (2026-07-19)
 
 ### 新功能

+ 61 - 1
cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.415
+> 当前版本: v1.0.416
 
 ## 历史版本
 
@@ -8,6 +8,66 @@
 
 ---
 
+## v1.0.416 (2026-07-20)
+
+### Bug 修复
+- 修复体检报告详情页小程序编译失败
+- add wx:key to v-for placeholder loop in DimensionArticles
+- product-detail 移除 memberPrice 价格回退
+- FamilyRelationGraph 齿轮/+号/高度自适应被误回退,重新实现
+- navigateBack instead of deleted plans page
+- add ProductService.getById() to resolve pre-existing compile error
+- break circular dependency between HealthReportService and DimensionScoreServiceImpl
+- remove duplicate closing brace in CSS
+- 解决 git stash 合并冲突残留标记(body/index, gut-index, report-list)
+
+### 其他
+- - 修复空状态条件引用不存在的 indicatorGroups,改为 indicators.length
+- 
+- to wx:key. Changed to :key="i" which compiles to wx:key="*this",
+- eliminating the WXML runtime warning.
+- 
+- 
+- ProductService was missing this delegation method. Pre-existing bug
+- uncovered when running mvn compile for v1.1 verification.
+- 
+- to resolve Spring Boot 2.7+ circular reference rejection.
+- The cycle was:
+-   HealthReportService → DimensionScoreService → DimensionScoreServiceImpl → HealthReportService
+- 
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- - 重写 admin-butler-review 用 13800138000 账号 + admin-auth/login-by-password 取 token
+- - 新增 health-knowledge-base / nutritionist-apply 覆盖 HealthKnowledgeBaseController (3 endpoints) 与 NutritionistController (2 endpoints)
+- - 附带 mass-create-users 脚本 + create-role-users.sql + 上一次批量建号结果 create-result.json 用于手动复现
+- 
+-    - pages/parent/plans/index.vue, detail.vue
+-    - pages/guide/plans/index.vue, detail.vue
+-    - pages/guide/training-plans/index.vue, detail.vue
+- 2. pages.json 中移除对应的路由注册
+- 3. 新增 components/RecommendedFeed.vue:
+-    - 将商品和活动混合为交替排列的信息流 (商品/活动/商品/活动...)
+-    - 统一展示:封面图 + 类型标签 + 标题 + 价格 + 状态
+-    - 点击统一跳转到对应详情页
+- 4. parent-index.vue:
+-    - 替换 DimensionActivities + DimensionProducts 为 RecommendedFeed
+-    - 新增 onFeedItemClick 和 goMoreDiscover 方法
+- 5. child-index.vue:
+-    - 替换 DimensionActivities + DimensionProducts 为 RecommendedFeed
+-    - 新增 onFeedItemClick 和 goMoreDiscover 方法
+- 6. member-detail.vue:
+-    - 替换 DimensionActivities + DimensionProducts 为 RecommendedFeed
+-    - 新增 onFeedItemClick 和 goMoreDiscover 方法
+- 
+
+### 重构
+- redesign card UI with cover gradient and badge layout
+- 删除成长计划页面并合并推荐商品与活动为统一信息流
+
+### 测试
+- admin/health/nutrition 覆盖新增控制器
+
+
 ## v1.0.415 (2026-07-19)
 
 ### 新功能