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

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

@@ -1877,7 +1877,7 @@ public class EnergyService {
         }
 
         Map<String, Object> vars = new HashMap<>();
-        vars.put("amount", amount > 0 ? "+" : "") + amount;
+        vars.put("amount", (amount > 0 ? "+" : "") + String.valueOf(amount));
         vars.put("source", sourceType);
         vars.put("description", description);
         notificationDispatchService.sendByTemplate("energy_change", userId, vars, "energyLog", memberId, title, content);
@@ -1908,7 +1908,7 @@ public class EnergyService {
         }
 
         Map<String, Object> vars = new HashMap<>();
-        vars.put("amount", amount > 0 ? "+" : "") + amount;
+        vars.put("amount", (amount > 0 ? "+" : "") + String.valueOf(amount));
         vars.put("source", sourceType);
         vars.put("description", description);
         notificationDispatchService.sendByTemplate("energy_deduction", userId, vars, "energyLog", memberId, title, content);

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

@@ -277,7 +277,7 @@ public class PointsService implements PointsServiceInterface {
         }
 
         Map<String, Object> vars = new HashMap<>();
-        vars.put("amount", amount > 0 ? "+" : "") + amount;
+        vars.put("amount", (amount > 0 ? "+" : "") + String.valueOf(amount));
         vars.put("type", type);
         vars.put("description", description);
         notificationDispatchService.sendByTemplate("points_change", userId, vars, "pointsLog", memberId, title, content);

cfc-web/.last_build_commit

@@ -1 +1 @@
-a6d8f8a8a6e7401aa6dffde2a6a9208231ba1aeb
+822499f1f6927b8d686a91ed37455aff60a74737

cfc-web/package-lock.json

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

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

@@ -4,6 +4,23 @@
 
 ---
 
+## v1.0.1493 (2026-10-04)
+
+### Bug 修复
+- 移除 pages/membership 下无对应 .vue 的失效页面注册
+
+### 其他
+- 但两个 .vue 文件均不存在，且全仓库无任何跳转引用这两条路径：
+- - pages/membership/ 实际仅 benefits / index / pay / result / upgrade 五个文件
+- - 两条注册与 pages/profile 下的同名注册重复
+- 指向不存在文件的注册会触发小程序「Page has not been registered yet」，
+- 并与 pages/profile 下的有效注册重复占用路径。移除后pages.json 恢复与实际文件一致。
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- unpackage/ 已由既有 **/unpackage/ 覆盖。 [skip ci]
+- 
+
+
 ## v1.0.1492 (2026-10-04)
 
 ### 重构

cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.1492
+> 当前版本: v1.0.1493
 
 ## 历史版本
 
@@ -8,6 +8,23 @@
 
 ---
 
+## v1.0.1493 (2026-10-04)
+
+### Bug 修复
+- 移除 pages/membership 下无对应 .vue 的失效页面注册
+
+### 其他
+- 但两个 .vue 文件均不存在，且全仓库无任何跳转引用这两条路径：
+- - pages/membership/ 实际仅 benefits / index / pay / result / upgrade 五个文件
+- - 两条注册与 pages/profile 下的同名注册重复
+- 指向不存在文件的注册会触发小程序「Page has not been registered yet」，
+- 并与 pages/profile 下的有效注册重复占用路径。移除后pages.json 恢复与实际文件一致。
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- unpackage/ 已由既有 **/unpackage/ 覆盖。 [skip ci]
+- 
+
+
 ## v1.0.1492 (2026-10-04)
 
 ### 重构