Просмотр исходного кода

chore: auto bump version and changelog [skip ci]

iwt 2 месяцев назад
Родитель
Сommit
0cdbf506f2

+ 14 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/PointsService.java

@@ -125,6 +125,20 @@ public class PointsService implements PointsServiceInterface {
         return newSystemPoints;
     }
 
+    /**
+     * 心愿兑换扣除积分(家长审批通过后调用)
+     * @param childId 孩子ID
+     * @param amount 扣除数量
+     * @return true=扣除成功, false=余额不足
+     */
+    @Transactional
+    public boolean deductForWish(Long childId, Integer amount) {
+        if (amount == null || amount <= 0) {
+            return false;
+        }
+        return deductSystemPoints(childId, amount, "心愿兑换扣除") >= 0;
+    }
+
     /** @return 扣除后余额,余额不足返回-1 */
     @Transactional
     public int deductSystemPoints(Long childId, int amount, String reason) {

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-54be32b511f4fcff8c23021f73fbe86f223690ee
+5f682c1ebf9ead487f074117e6fdb9321a6304fc

+ 23 - 0
cfc-web/CHANGELOG.md

@@ -1,6 +1,29 @@
 # 更新日志 (Changelog)
 
 此文件记录所有构建版本的变更。
+## v1.0.35 (2026-07-08)
+
+### Bug 修复
+- add missing wangEditor Toolbar component to enable rich text editing
+- add overflow:auto scroll wrapper to all 58 pages with fixed=right columns
+
+### 其他
+- - Fix prop name from :config to :defaultConfig (wangEditor Vue2 API)
+- - Add toolbarConfig for Toolbar component initialization
+- - Add missing @wangeditor/editor CSS import to ArticleEdit and ActivityEdit
+- - Add editor CSS styles (rich-editor border, toolbar wrap, text-container min-height)
+- 
+- - All 58 Vue pages with fixed="right" columns now have horizontal scroll container
+- - Pattern: div wrapper with overflow:auto;max-height:calc(100vh - 300px)
+- 
+
+
+## v1.0.31 (2026-07-08)
+
+### 工程化
+- auto bump version and changelog [skip ci]
+
+
 ## v1.0.29 (2026-07-08)
 
 ### 工程化

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

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