feat: 解决合并冲突

.gitignore

@@ -23,7 +23,6 @@ node_modules
 package-lock.json
 # Added by code-review-graph
 .code-review-graph/
-<<<<<<< HEAD
 
 .claude
 # 本地重复脚本（不提交仓库）
@@ -39,8 +38,6 @@ backend/**/*.exe
 
 # 浏览器远程调试临时文件
 .tmp-browser/
-=======
 .claude/
 hookify.*.local.md
 .mcp.json
->>>>>>> 0284bd6951fafc8a3862644ede979dc44eb6efe8

backend/gateway/config/config.go

@@ -8,7 +8,6 @@ import (
 
 // Config 网关配置
 type Config struct {
-<<<<<<< HEAD
 	Server         ServerConfig
 	Dubbo          DubboConfig
 	JWT            JWTConfig
@@ -37,7 +36,6 @@ type LaserCompositorConfig struct {
 type DifyConfig struct {
 	APIBase string
 	APIKey  string
-=======
 	Server       ServerConfig
 	Dubbo        DubboConfig
 	JWT          JWTConfig
@@ -45,7 +43,6 @@ type DifyConfig struct {
 	Redis        RedisConfig
 	WebSocket    WebSocketConfig
 	Root         string
->>>>>>> 0284bd6951fafc8a3862644ede979dc44eb6efe8
 }
 
 // RedisConfig Redis 配置
@@ -178,19 +175,8 @@ func Load() *Config {
 			Password: getEnv("REDIS_PASSWORD", ""),
 			DB:       getEnvInt("REDIS_DB", 0),
 		},
-<<<<<<< HEAD
-		DB: DBConfig{
-			Host:     getEnv("DB_HOST", "localhost"),
-			Port:     getEnvInt("DB_PORT", 5432),
-			User:     getEnv("DB_USER", "postgres"),
-			Password: getEnv("DB_PASSWORD", ""),
-			DBName:   getEnv("DB_NAME", "top-fans"),
-			SSLMode:  getEnv("DB_SSLMODE", "disable"),
-			TimeZone: getEnv("DB_TIMEZONE", "Asia/Shanghai"),
-=======
 		WebSocket: WebSocketConfig{
 			AIChatPath: getEnv("WS_AI_CHAT_PATH", "/ws/ai-chat"),
->>>>>>> 0284bd6951fafc8a3862644ede979dc44eb6efe8
 		},
 	}
 }

backend/gateway/router/router.go

@@ -86,16 +86,13 @@ func SetupRouter(userClient *client.Client, socialClient *client.Client, assetCl
 		return nil, err
 	}
 
-<<<<<<< HEAD
 	segmentCtrl := controller.NewSegmentController()
 
 	laserGenCtrl := controller.NewLaserGenerateController(config.Load())
-=======
 	aiChatCtrl, err := controller.NewAIChatController(aiChatClient)
 	if err != nil {
 		return nil, err
 	}
->>>>>>> 0284bd6951fafc8a3862644ede979dc44eb6efe8
 
 	// API v1 路由组
 	v1 := r.Group("/api/v1")

docker/docker-compose.local.yml

@@ -318,12 +318,9 @@ services:
       DUBBO_ACTIVITY_SERVICE_URL: tri://activityservice:20005
       DUBBO_TASK_SERVICE_URL: tri://taskservice:20006
       DUBBO_STARBOOK_SERVICE_URL: tri://starbookservice:20007
-<<<<<<< HEAD
       DIFY_API_BASE: ${DIFY_API_BASE:-http://host.docker.internal:8081/v1}
       DIFY_API_KEY: ${DIFY_API_KEY:-}
-=======
       DUBBO_AI_CHAT_SERVICE_URL: tri://aichatservice:20008
->>>>>>> 0284bd6951fafc8a3862644ede979dc44eb6efe8
     depends_on:
       userservice:
         condition: service_healthy

docker/docker-compose.prod.yml

@@ -446,12 +446,9 @@ services:
       DUBBO_ACTIVITY_SERVICE_URL: tri://activityservice:20004
       DUBBO_TASK_SERVICE_URL: tri://taskservice:20006
       DUBBO_STARBOOK_SERVICE_URL: tri://starbookservice:20005
-<<<<<<< HEAD
       DIFY_API_BASE: ${DIFY_API_BASE:-http://dify-api:8081/v1}
       DIFY_API_KEY: ${DIFY_API_KEY:-}
-=======
       DUBBO_AI_CHAT_SERVICE_URL: tri://aichatservice:20008
->>>>>>> 0284bd6951fafc8a3862644ede979dc44eb6efe8
       REDIS_HOST: topfans-redis
       REDIS_PORT: 6379
       REDIS_PASSWORD: ${REDIS_PASSWORD:-123456}

frontend/pages/castlove/craft-select.vue

@@ -97,7 +97,6 @@ export default {
         this.applyType(val);
       },
     },
-<<<<<<< HEAD
     computed: {
         currentCardList() {
             const categoryName = this.categoryList[this.selectedCategoryIndex].name
@@ -240,21 +239,6 @@ export default {
             }
 
         }
-=======
-  },
-  created() {
-    // 组件创建时立即应用一次 type,避免 mall.vue 在 onLoad 才设置 initialType
-    // 导致首次渲染拿到默认 "" 而 watch 错过的情况
-    this.applyType(this.type);
-  },
-  onLoad(options) {
-    // 作为页面被直接打开时,隐藏右侧分类菜单栏(根据用户需求)
-    this.showMenu = false;
-    // 接收从主Tab(square.vue / CastloveContent.vue)传入的 type,自动定位到对应分类
-    // type 取值:star_card | badge | poster
-    if (options && options.type) {
-      this.applyType(options.type);
->>>>>>> 0284bd6951fafc8a3862644ede979dc44eb6efe8
     }
   },
   onShow() {

frontend/pages/dashboard/components/DashboardHeader.vue

@@ -26,7 +26,7 @@
             src="/static/dashboard/crystal-bg.png"
             mode="aspectFit"
           />
-          <text class="tab-title">水晶相关</text>
+          <text class="tab-title">收益总览</text>
         </view>
         <view
           :class="['tab', activeTab === 'season' ? 'tab-active' : '']"