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

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

@@ -0,0 +1,53 @@
+package com.etotem.cfc.controller.admin;
+
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.dto.TaskReminderConfigDTO;
+import com.etotem.cfc.service.TaskReminderConfigService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/api/admin/task/reminder-config")
+public class AdminTaskReminderConfigController {
+
+    @Resource
+    private TaskReminderConfigService taskReminderConfigService;
+
+    @PostMapping("/get")
+    public Result<TaskReminderConfigDTO> getConfig(@RequestParam("userId") Long userId) {
+        if (userId == null) {
+            return Result.error("缺少 userId");
+        }
+        return Result.success(taskReminderConfigService.getConfig(userId));
+    }
+
+    @PostMapping("/save")
+    public Result<Void> saveConfig(@RequestBody AdminTaskReminderConfigSaveDTO dto) {
+        if (dto == null || dto.getUserId() == null) {
+            return Result.error("缺少 userId");
+        }
+        try {
+            taskReminderConfigService.saveConfig(dto.getUserId(), dto);
+            return Result.success(null);
+        } catch (IllegalArgumentException e) {
+            return Result.error(e.getMessage());
+        }
+    }
+
+    public static class AdminTaskReminderConfigSaveDTO extends TaskReminderConfigDTO {
+        private Long userId;
+
+        public Long getUserId() {
+            return userId;
+        }
+
+        public void setUserId(Long userId) {
+            this.userId = userId;
+        }
+    }
+}

cfc-web/.last_build_commit

@@ -1 +1 @@
-f310938a73b29c04b6f80bbf2adb9ff88cb77d71
+7aedcb464a3c1eb8694f1a5298535e74cb4b83c8

cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.1562",
+  "version": "1.0.1565",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.1562",
+      "version": "1.0.1565",
       "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.1563",
+  "version": "1.0.1566",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

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

@@ -4,6 +4,19 @@
 
 ---
 
+## v1.0.1565 (2026-10-10)
+
+### Bug 修复
+- 商品编辑页超长内容超出屏幕无法滚动（el-card 弹性约束导致裁剪）
+- Replace missing human-body.png with inline SVG silhouette for knowledge base page - Removed reference to nonexistent img/human-body.png, added inline SVG body silhouette with dimension markers, maintains existing marker positioning logic
+
+
+## v1.0.1564 (2026-10-10)
+
+### Bug 修复
+- Replace missing human-body.png with inline SVG silhouette for knowledge base page - Removed reference to nonexistent img/human-body.png, added inline SVG body silhouette with dimension markers, maintains existing marker positioning logic
+
+
 ## v1.0.1563 (2026-10-10)
 
 ### 其他

cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.1563
+> 当前版本: v1.0.1565
 
 ## 历史版本
 
@@ -8,6 +8,19 @@
 
 ---
 
+## v1.0.1565 (2026-10-10)
+
+### Bug 修复
+- 商品编辑页超长内容超出屏幕无法滚动（el-card 弹性约束导致裁剪）
+- Replace missing human-body.png with inline SVG silhouette for knowledge base page - Removed reference to nonexistent img/human-body.png, added inline SVG body silhouette with dimension markers, maintains existing marker positioning logic
+
+
+## v1.0.1564 (2026-10-10)
+
+### Bug 修复
+- Replace missing human-body.png with inline SVG silhouette for knowledge base page - Removed reference to nonexistent img/human-body.png, added inline SVG body silhouette with dimension markers, maintains existing marker positioning logic
+
+
 ## v1.0.1563 (2026-10-10)
 
 ### 其他

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

@@ -1361,6 +1361,15 @@ async loadGiftRule(productId) {
   border-radius: 8px;
   border: 1px solid #f0f0f0;
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.03);
+  /* 覆盖全局 .admin-page > .el-card 的 flex:1;min-height:0（会裁剪超长内容）
+     改为由内容撑开高度，超出时由 el-main 滚动显示 */
+  flex: none;
+  flex-shrink: 0;
+  min-height: auto;
+}
+.product-edit /deep/ .el-card__body {
+  flex: none;
+  min-height: auto;
 }
 .product-edit /deep/ .el-card__header {
   padding: 20px 24px;