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

cfc-frontend/components/FamilyMemberStrip.vue

@@ -186,7 +186,7 @@ export default {
       var steps = Math.max(total - 1, 1)
       var angle = -angleRange + (index / steps) * angleRange * 2
       var rad = angle * Math.PI / 180
-      var radius = 280
+      var radius = 220
       var dx = Math.cos(rad) * radius
       var dy = Math.sin(rad) * radius
       var rotation = angle * 0.3
@@ -483,12 +483,13 @@ export default {
 }
 
 /* ===== 扇形展开 ===== */
+/* fan-wrap 用 fixed 覆盖整个视口,避免 absolute 套小容器导致位置错乱 */
 .fan-wrap {
-  position: absolute;
+  position: fixed;
   top: 0;
   left: 0;
-  width: 100%;
-  height: 100vh;
+  right: 0;
+  bottom: 0;
   z-index: 999;
   pointer-events: none;
 }
@@ -509,23 +510,29 @@ export default {
 .fan-wrap.show .fan-overlay {
   opacity: 1;
 }
+/* fan-container 锚定到 FAB 坐标(FAB 在 left:16rpx, bottom:33.33%),零尺寸做原点 */
 .fan-container {
   position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
+  bottom: 33.33%;
+  left: 16rpx;
+  top: auto;
+  right: auto;
+  width: 0;
+  height: 0;
   padding: 0;
+  overflow: visible;
 }
 
 .fan-card {
   position: absolute;
   top: 0;
   left: 0;
-  width: 100rpx;
+  width: 110rpx;
+  pointer-events: auto;
   transform: translate(0, 0) rotate(0deg);
   transition: transform 0.4s cubic-bezier(0.34, 1.56, 0.64, 1), opacity 0.3s ease;
   opacity: 0;
+  z-index: 1000;
 }
 .fan-wrap.show .fan-card {
   opacity: 1;

cfc-web/.last_build_commit

@@ -1 +1 @@
-f578470dc222baf922fc5bf7693941c9478ba1da
+cb181559ccf9efacfe330bba3731694a61af1668

cfc-web/package-lock.json

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

cfc-web/package.json

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

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

@@ -4,6 +4,22 @@
 
 ---
 
+## v1.0.860 (2026-08-08)
+
+### Bug 修复
+- 家庭成员扇形展开 - fan-wrap 改 fixed 修复成员错位+不可点击; 半径 280→220rpx
+
+
+## v1.0.859 (2026-08-07)
+
+### Bug 修复
+- 修复 FamilyChallengeService.getTemplates 数组越界 Index 7 out of bounds
+
+### 其他
+- 导致 ArrayIndexOutOfBoundsException: Index 7 out of bounds for length 7
+- 
+
+
 ## v1.0.858 (2026-08-07)
 
 ### Bug 修复

cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.858
+> 当前版本: v1.0.860
 
 ## 历史版本
 
@@ -8,6 +8,22 @@
 
 ---
 
+## v1.0.860 (2026-08-08)
+
+### Bug 修复
+- 家庭成员扇形展开 - fan-wrap 改 fixed 修复成员错位+不可点击; 半径 280→220rpx
+
+
+## v1.0.859 (2026-08-07)
+
+### Bug 修复
+- 修复 FamilyChallengeService.getTemplates 数组越界 Index 7 out of bounds
+
+### 其他
+- 导致 ArrayIndexOutOfBoundsException: Index 7 out of bounds for length 7
+- 
+
+
 ## v1.0.858 (2026-08-07)
 
 ### Bug 修复