diff --git a/RuoYi-Vue/.github/FUNDING.yml b/RuoYi-Vue/.github/FUNDING.yml
deleted file mode 100644
index fbcab77..0000000
--- a/RuoYi-Vue/.github/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-custom: http://doc.ruoyi.vip/ruoyi-vue/other/donate.html
diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreRoomController.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreRoomController.java
index be69b83..2d34eaa 100644
--- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreRoomController.java
+++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreRoomController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.scoring;
 
+import java.util.Collections;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -60,15 +61,32 @@ public class ScoreRoomController extends BaseController
     }
 
     /**
-     * 获取【请填写功能名称】详细信息
+     * 获取【roomId】详细信息
      */
     @PreAuthorize("@ss.hasPermi('system:room:query')")
-    @GetMapping(value = "/{roomId}")
+    @GetMapping(value = "/id/{roomId}")
     public AjaxResult getInfo(@PathVariable("roomId") Long roomId)
     {
         return success(scoreRoomService.selectScoreRoomByRoomId(roomId));
     }
 
+
+    /**
+     * 获取【createUser】详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:room:query1')")
+    @GetMapping(value = "/createUser/{createUser}")
+    public AjaxResult getByCreateUser(@PathVariable("createUser") Long createUser)
+    {
+        List<ScoreRoom> rooms = scoreRoomService.selectScoreRoomBycreateUser(createUser);
+        if (rooms == null || rooms.isEmpty()) {
+            return AjaxResult.success("无历史记录，创建新房间", Collections.emptyList());
+        }
+        return AjaxResult.success(rooms);
+    }
+
+
+
     /**
      * 新增【请填写功能名称】
      */
diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreRoomDetailController.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreRoomDetailController.java
index 7095100..1741830 100644
--- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreRoomDetailController.java
+++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreRoomDetailController.java
@@ -75,9 +75,9 @@ public class ScoreRoomDetailController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:detail:add')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ScoreRoomDetail scoreRoomDetail)
+    public AjaxResult add(@RequestBody List<ScoreRoomDetail> scoreRoomDetails)
     {
-        return toAjax(scoreRoomDetailService.insertScoreRoomDetail(scoreRoomDetail));
+        return toAjax(scoreRoomDetailService.insertScoreRoomDetail(scoreRoomDetails));
     }
 
     /**
diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreRoomUserController.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreRoomUserController.java
index e95747e..af88666 100644
--- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreRoomUserController.java
+++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreRoomUserController.java
@@ -34,6 +34,20 @@ public class ScoreRoomUserController extends BaseController
     @Autowired
     private IScoreRoomUserService scoreRoomUserService;
 
+    /**
+     * 获取房间内所有用户及其详细对局记录
+     */
+    @GetMapping("/user-details/{roomId}")
+    public AjaxResult getUserScoresWithDetails(@PathVariable("roomId") Long roomId) {
+        try {
+            List<ScoreRoomUser> result = scoreRoomUserService.getUserScoresWithDetails(roomId);
+            return AjaxResult.success(result);
+        } catch (Exception e) {
+            logger.error("查询房间{}用户得分详情失败", roomId, e);
+            return AjaxResult.error("查询失败: " + e.getMessage());
+        }
+    }
+
     /**
      * 查询【请填写功能名称】列表
      */
@@ -62,13 +76,26 @@ public class ScoreRoomUserController extends BaseController
     /**
      * 获取【请填写功能名称】详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
-    @GetMapping(value = "/{roomUserId}")
-    public AjaxResult getInfo(@PathVariable("roomUserId") Long roomUserId)
+    @PreAuthorize("@ss.hasPermi('system:user:query1')")
+    @GetMapping(value = "/userid/{UserId}")
+    public AjaxResult getInfo(@PathVariable("UserId") Long UserId)
     {
-        return success(scoreRoomUserService.selectScoreRoomUserByRoomUserId(roomUserId));
+        return success(scoreRoomUserService.selectScoreRoomUserByUserId(UserId));
     }
 
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping(value = "/RoomUserId/{RoomUserId}")
+    public AjaxResult getInfo1(@PathVariable("RoomUserId") Long RoomUserId)
+    {
+        return success(scoreRoomUserService.selectScoreRoomUserByRoomUserId(RoomUserId));
+    }
+
+
+
     /**
      * 新增【请填写功能名称】
      */
@@ -83,12 +110,18 @@ public class ScoreRoomUserController extends BaseController
     /**
      * 修改【请填写功能名称】
      */
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @PreAuthorize("@ss.hasPermi('system:user:edit1')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody ScoreRoomUser scoreRoomUser)
+    public AjaxResult edit(@RequestBody List<ScoreRoomUser> scoreRoomUsers)
     {
-        return toAjax(scoreRoomUserService.updateScoreRoomUser(scoreRoomUser));
+        try {
+            int result = scoreRoomUserService.updateScoreRoomUser(scoreRoomUsers);
+            return  AjaxResult.success("得分提交成功！", result);
+        } catch (Exception e) {
+            logger.error("得分提交成功: {}", e.getMessage());
+            return AjaxResult.error("得分提交成功: " + e.getMessage());
+        }
     }
 
     /**
@@ -96,7 +129,7 @@ public class ScoreRoomUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{roomUserIds}")
+    @DeleteMapping("/{roomUserIds}")
     public AjaxResult remove(@PathVariable Long[] roomUserIds)
     {
         return toAjax(scoreRoomUserService.deleteScoreRoomUserByRoomUserIds(roomUserIds));
diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreUserController.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreUserController.java
index 6706f4d..00c9749 100644
--- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreUserController.java
+++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scoring/ScoreUserController.java
@@ -1,6 +1,8 @@
 package com.ruoyi.web.controller.scoring;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.utils.SimpleResult;
@@ -66,7 +68,7 @@ public class ScoreUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = "/{userId}")
-    public AjaxResult getInfo(@PathVariable("userId") Long userId)
+    public AjaxResult getInfo(@PathVariable("userId") String userId)
     {
         return success(scoreUserService.selectScoreUserByUserId(userId));
     }
@@ -79,7 +81,19 @@ public class ScoreUserController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody ScoreUser scoreUser)
     {
-        return toAjax(scoreUserService.insertScoreUser(scoreUser));
+        try {
+            ScoreUser newUser = scoreUserService.insertScoreUser(scoreUser);
+            // 构建返回数据
+            Map<String, Object> data = new HashMap<>();
+            data.put("userId", newUser.getUserId());
+            data.put("nickName", newUser.getNickName());
+            data.put("avatars", newUser.getAvatars());
+            data.put("openId", newUser.getOpenId());
+            return AjaxResult.success("用户添加成功", data);
+
+        } catch (Exception e) {
+            return AjaxResult.error("用户添加失败: " + e.getMessage());
+        }
     }
 
     /**
diff --git a/RuoYi-Vue/ruoyi-system/pom.xml b/RuoYi-Vue/ruoyi-system/pom.xml
index 53b6309..4730e69 100644
--- a/RuoYi-Vue/ruoyi-system/pom.xml
+++ b/RuoYi-Vue/ruoyi-system/pom.xml
@@ -31,6 +31,10 @@
             <artifactId>okhttp</artifactId>
             <version>4.11.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
 
     </dependencies>
 
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreRoom.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreRoom.java
index d8d9cfa..17d9322 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreRoom.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreRoom.java
@@ -32,7 +32,10 @@ public class ScoreRoom extends BaseEntity
 
     /** 房主id */
     @Excel(name = "房主id")
-    private Long boosId;
+    private Long bossId;
+
+    @Excel(name = "房间名称")
+    private String roomName;
 
     public void setRoomId(Long roomId)
     {
@@ -74,14 +77,22 @@ public class ScoreRoom extends BaseEntity
         return roomStatus;
     }
 
-    public void setBoosId(Long boosId)
+    public void setBossId(Long bossId)
     {
-        this.boosId = boosId;
+        this.bossId = bossId;
     }
 
-    public Long getBoosId()
+    public Long getBossId()
     {
-        return boosId;
+        return bossId;
+    }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName;
     }
 
     @Override
@@ -91,7 +102,8 @@ public class ScoreRoom extends BaseEntity
             .append("createUser", getCreateUser())
             .append("odds", getOdds())
             .append("roomStatus", getRoomStatus())
-            .append("boosId", getBoosId())
+            .append("roomName", getRoomName())
+            .append("bossId", getBossId())
             .toString();
     }
 }
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreRoomDetail.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreRoomDetail.java
index b0f26e8..318d9e3 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreRoomDetail.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreRoomDetail.java
@@ -30,7 +30,7 @@ public class ScoreRoomDetail extends BaseEntity
 
     /** 详情分数 */
     @Excel(name = "详情分数")
-    private Long score;
+    private Long detailScore;
 
     /** 触发时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -41,9 +41,17 @@ public class ScoreRoomDetail extends BaseEntity
     @Excel(name = "0 胜 1 负")
     private Long detailType;
 
-    /** 目标玩家id 多人模式给分使用 */
-    @Excel(name = "目标玩家id 多人模式给分使用")
-    private Long getterId;
+    /** 局次 */
+    @Excel(name = "局次")
+    private Long gameTime;
+
+    public Long getGameTime() {
+        return gameTime;
+    }
+
+    public void setGameTime(Long gameTime) {
+        this.gameTime = gameTime;
+    }
 
     public void setDetailId(Long detailId)
     {
@@ -75,16 +83,6 @@ public class ScoreRoomDetail extends BaseEntity
         return userId;
     }
 
-    public void setScore(Long score)
-    {
-        this.score = score;
-    }
-
-    public Long getScore()
-    {
-        return score;
-    }
-
     public void setCreatedTime(Date createdTime)
     {
         this.createdTime = createdTime;
@@ -105,15 +103,6 @@ public class ScoreRoomDetail extends BaseEntity
         return detailType;
     }
 
-    public void setGetterId(Long getterId)
-    {
-        this.getterId = getterId;
-    }
-
-    public Long getGetterId()
-    {
-        return getterId;
-    }
 
     @Override
     public String toString() {
@@ -121,10 +110,18 @@ public class ScoreRoomDetail extends BaseEntity
             .append("detailId", getDetailId())
             .append("roomId", getRoomId())
             .append("userId", getUserId())
-            .append("score", getScore())
+            .append("detailScore", getDetailScore())
             .append("createdTime", getCreatedTime())
             .append("detailType", getDetailType())
-            .append("getterId", getGetterId())
+            .append("gameTime", getGameTime())
             .toString();
     }
+
+    public Long getDetailScore() {
+        return detailScore;
+    }
+
+    public void setDetailScore(Long detailScore) {
+        this.detailScore = detailScore;
+    }
 }
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreRoomUser.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreRoomUser.java
index 319d64a..dee47e9 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreRoomUser.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreRoomUser.java
@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】对象 score_room_user
  *
@@ -28,7 +30,7 @@ public class ScoreRoomUser extends BaseEntity
 
     /** 得分 */
     @Excel(name = "得分")
-    private Long score;
+    private Long totalScore;
 
     /** 三个值 {'user', 'boot', 'business'} */
     @Excel(name = "三个值 {'user', 'boot', 'business'}")
@@ -42,6 +44,17 @@ public class ScoreRoomUser extends BaseEntity
     @Excel(name = "玩家头像")
     private String avatars;
 
+    //    详细对局记录
+    private List<ScoreRoomDetail> details;
+
+    public List<ScoreRoomDetail> getDetails() {
+        return details;
+    }
+
+    public void setDetails(List<ScoreRoomDetail> details) {
+        this.details = details;
+    }
+
     public void setRoomUserId(Long roomUserId)
     {
         this.roomUserId = roomUserId;
@@ -72,16 +85,6 @@ public class ScoreRoomUser extends BaseEntity
         return userId;
     }
 
-    public void setScore(Long score)
-    {
-        this.score = score;
-    }
-
-    public Long getScore()
-    {
-        return score;
-    }
-
     public void setPlayerType(String playerType)
     {
         this.playerType = playerType;
@@ -118,10 +121,19 @@ public class ScoreRoomUser extends BaseEntity
             .append("roomUserId", getRoomUserId())
             .append("roomId", getRoomId())
             .append("userId", getUserId())
-            .append("score", getScore())
+            .append("totalScore", getTotalScore())
             .append("playerType", getPlayerType())
             .append("nickName", getNickName())
             .append("avatars", getAvatars())
+            .append("details", getDetails())
             .toString();
     }
+
+    public Long getTotalScore() {
+        return totalScore;
+    }
+
+    public void setTotalScore(Long totalScore) {
+        this.totalScore = totalScore;
+    }
 }
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreUser.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreUser.java
index 983de7a..11f7695 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreUser.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/domain/ScoreUser.java
@@ -16,7 +16,7 @@ public class ScoreUser extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 用户id */
-    private Long userId;
+    private String  userId;
 
     /** 微信id */
     @Excel(name = "微信id")
@@ -30,12 +30,12 @@ public class ScoreUser extends BaseEntity
     @Excel(name = "用户头像")
     private String avatars;
 
-    public void setUserId(Long userId)
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId()
+    public String getUserId()
     {
         return userId;
     }
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreRoomDetailMapper.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreRoomDetailMapper.java
index ed61aef..f3308f6 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreRoomDetailMapper.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreRoomDetailMapper.java
@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
 
 import java.util.List;
 import com.ruoyi.system.domain.ScoreRoomDetail;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -30,10 +31,10 @@ public interface ScoreRoomDetailMapper
     /**
      * 新增【请填写功能名称】
      *
-     * @param scoreRoomDetail 【请填写功能名称】
+     * @param scoreRoomDetails 【请填写功能名称】
      * @return 结果
      */
-    public int insertScoreRoomDetail(ScoreRoomDetail scoreRoomDetail);
+    public int insertScoreRoomDetail(@Param("scoreRoomDetails") List<ScoreRoomDetail> scoreRoomDetails);
 
     /**
      * 修改【请填写功能名称】
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreRoomMapper.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreRoomMapper.java
index 3f1b361..1f47d08 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreRoomMapper.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreRoomMapper.java
@@ -58,4 +58,8 @@ public interface ScoreRoomMapper
      * @return 结果
      */
     public int deleteScoreRoomByRoomIds(Long[] roomIds);
+
+
+
+    public List<ScoreRoom> selectScoreRoomBycreateUser(Long createUser);
 }
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreRoomUserMapper.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreRoomUserMapper.java
index f5c99b8..0ca97c9 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreRoomUserMapper.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreRoomUserMapper.java
@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
 
 import java.util.List;
 import com.ruoyi.system.domain.ScoreRoomUser;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -19,6 +20,20 @@ public interface ScoreRoomUserMapper
      */
     public ScoreRoomUser selectScoreRoomUserByRoomUserId(Long roomUserId);
 
+
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param UserId 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    public ScoreRoomUser selectScoreRoomUserByUserId(Long UserId);
+
+
+
+    public ScoreRoomUser selectScoreRoomUserPrescore(@Param("userId") Long UserId, @Param("roomId") Long RoomId);
+
+
     /**
      * 查询【请填写功能名称】列表
      *
@@ -27,6 +42,7 @@ public interface ScoreRoomUserMapper
      */
     public List<ScoreRoomUser> selectScoreRoomUserList(ScoreRoomUser scoreRoomUser);
 
+
     /**
      * 新增【请填写功能名称】
      *
@@ -35,13 +51,7 @@ public interface ScoreRoomUserMapper
      */
     public int insertScoreRoomUser(ScoreRoomUser scoreRoomUser);
 
-    /**
-     * 修改【请填写功能名称】
-     *
-     * @param scoreRoomUser 【请填写功能名称】
-     * @return 结果
-     */
-    public int updateScoreRoomUser(ScoreRoomUser scoreRoomUser);
+    public int updateScoreRoomUser(@Param("scoreRoomUsers") List<ScoreRoomUser> scoreRoomUsers);
 
     /**
      * 删除【请填写功能名称】
@@ -58,4 +68,10 @@ public interface ScoreRoomUserMapper
      * @return 结果
      */
     public int deleteScoreRoomUserByRoomUserIds(Long[] roomUserIds);
+
+    /**
+     * 通过JOIN查询获取房间内所有用户及其详细对局记录
+     */
+    public List<ScoreRoomUser> selectUserScoresWithDetails(Long roomId);
+
 }
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreUserMapper.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreUserMapper.java
index aa1e188..77f4878 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreUserMapper.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScoreUserMapper.java
@@ -17,7 +17,7 @@ public interface ScoreUserMapper
      * @param userId 【请填写功能名称】主键
      * @return 【请填写功能名称】
      */
-    public ScoreUser selectScoreUserByUserId(Long userId);
+    public ScoreUser selectScoreUserByUserId(String userId);
 
     /**
      * 查询【请填写功能名称】列表
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreRoomDetailService.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreRoomDetailService.java
index 1535cef..8f64a64 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreRoomDetailService.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreRoomDetailService.java
@@ -30,10 +30,10 @@ public interface IScoreRoomDetailService
     /**
      * 新增【请填写功能名称】
      * 
-     * @param scoreRoomDetail 【请填写功能名称】
+     * @param scoreRoomDetails 【请填写功能名称】
      * @return 结果
      */
-    public int insertScoreRoomDetail(ScoreRoomDetail scoreRoomDetail);
+    public int insertScoreRoomDetail(List<ScoreRoomDetail> scoreRoomDetails);
 
     /**
      * 修改【请填写功能名称】
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreRoomService.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreRoomService.java
index 33d6d7b..8cb5a01 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreRoomService.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreRoomService.java
@@ -58,4 +58,5 @@ public interface IScoreRoomService
      * @return 结果
      */
     public int deleteScoreRoomByRoomId(Long roomId);
+    public List<ScoreRoom> selectScoreRoomBycreateUser(Long createUser);
 }
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreRoomUserService.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreRoomUserService.java
index e9c5c6d..2c64d1a 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreRoomUserService.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreRoomUserService.java
@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.system.domain.ScoreRoomUser;
+import io.lettuce.core.dynamic.annotation.Param;
 
 /**
  * 【请填写功能名称】Service接口
@@ -19,6 +20,16 @@ public interface IScoreRoomUserService
      */
     public ScoreRoomUser selectScoreRoomUserByRoomUserId(Long roomUserId);
 
+
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param UserId 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    public ScoreRoomUser selectScoreRoomUserByUserId(Long UserId);
+
+
     /**
      * 查询【请填写功能名称】列表
      * 
@@ -27,6 +38,13 @@ public interface IScoreRoomUserService
      */
     public List<ScoreRoomUser> selectScoreRoomUserList(ScoreRoomUser scoreRoomUser);
 
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param roomId 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<ScoreRoomUser> getUserScoresWithDetails(Long roomId);
     /**
      * 新增【请填写功能名称】
      * 
@@ -35,13 +53,8 @@ public interface IScoreRoomUserService
      */
     public int insertScoreRoomUser(ScoreRoomUser scoreRoomUser);
 
-    /**
-     * 修改【请填写功能名称】
-     * 
-     * @param scoreRoomUser 【请填写功能名称】
-     * @return 结果
-     */
-    public int updateScoreRoomUser(ScoreRoomUser scoreRoomUser);
+
+    public int updateScoreRoomUser(List<ScoreRoomUser> scoreRoomUsers);
 
     /**
      * 批量删除【请填写功能名称】
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreUserService.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreUserService.java
index aed4d16..a87fde4 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreUserService.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/IScoreUserService.java
@@ -17,7 +17,7 @@ public interface IScoreUserService
      * @param userId 【请填写功能名称】主键
      * @return 【请填写功能名称】
      */
-    public ScoreUser selectScoreUserByUserId(Long userId);
+    public ScoreUser selectScoreUserByUserId(String userId);
 
     /**
      * 查询【请填写功能名称】列表
@@ -33,8 +33,7 @@ public interface IScoreUserService
      * @param scoreUser 【请填写功能名称】
      * @return 结果
      */
-    public int insertScoreUser(ScoreUser scoreUser);
-
+    public ScoreUser insertScoreUser(ScoreUser scoreUser);
     /**
      * 修改【请填写功能名称】
      *
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreRoomDetailServiceImpl.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreRoomDetailServiceImpl.java
index e2ed06f..f0f5676 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreRoomDetailServiceImpl.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreRoomDetailServiceImpl.java
@@ -46,13 +46,13 @@ public class ScoreRoomDetailServiceImpl implements IScoreRoomDetailService
     /**
      * 新增【请填写功能名称】
      * 
-     * @param scoreRoomDetail 【请填写功能名称】
+     * @param scoreRoomDetails 【请填写功能名称】
      * @return 结果
      */
     @Override
-    public int insertScoreRoomDetail(ScoreRoomDetail scoreRoomDetail)
+    public int insertScoreRoomDetail(List<ScoreRoomDetail> scoreRoomDetails)
     {
-        return scoreRoomDetailMapper.insertScoreRoomDetail(scoreRoomDetail);
+        return scoreRoomDetailMapper.insertScoreRoomDetail(scoreRoomDetails);
     }
 
     /**
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreRoomServiceImpl.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreRoomServiceImpl.java
index d8ef4e1..e51b258 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreRoomServiceImpl.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreRoomServiceImpl.java
@@ -31,6 +31,18 @@ public class ScoreRoomServiceImpl implements IScoreRoomService
         return scoreRoomMapper.selectScoreRoomByRoomId(roomId);
     }
 
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param createUser 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<ScoreRoom> selectScoreRoomBycreateUser(Long createUser)
+    {
+        return scoreRoomMapper.selectScoreRoomBycreateUser(createUser);
+    }
+
     /**
      * 查询【请填写功能名称】列表
      * 
@@ -52,6 +64,8 @@ public class ScoreRoomServiceImpl implements IScoreRoomService
     @Override
     public int insertScoreRoom(ScoreRoom scoreRoom)
     {
+//        List<ScoreRoom> newRoom = scoreRoomMapper.selectScoreRoomList(scoreRoom);
+
         return scoreRoomMapper.insertScoreRoom(scoreRoom);
     }
 
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreRoomUserServiceImpl.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreRoomUserServiceImpl.java
index 1a1ff45..b91f1e0 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreRoomUserServiceImpl.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreRoomUserServiceImpl.java
@@ -1,6 +1,10 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+
+import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ScoreRoomUserMapper;
@@ -31,6 +35,20 @@ public class ScoreRoomUserServiceImpl implements IScoreRoomUserService
         return scoreRoomUserMapper.selectScoreRoomUserByRoomUserId(roomUserId);
     }
 
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param UserId 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public ScoreRoomUser selectScoreRoomUserByUserId(Long UserId)
+    {
+        return scoreRoomUserMapper.selectScoreRoomUserByUserId(UserId);
+    }
+
+
+
     /**
      * 查询【请填写功能名称】列表
      * 
@@ -43,6 +61,17 @@ public class ScoreRoomUserServiceImpl implements IScoreRoomUserService
         return scoreRoomUserMapper.selectScoreRoomUserList(scoreRoomUser);
     }
 
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param roomId 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<ScoreRoomUser> getUserScoresWithDetails(Long roomId) {
+        return scoreRoomUserMapper.selectUserScoresWithDetails(roomId);
+    }
+
     /**
      * 新增【请填写功能名称】
      * 
@@ -55,16 +84,53 @@ public class ScoreRoomUserServiceImpl implements IScoreRoomUserService
         return scoreRoomUserMapper.insertScoreRoomUser(scoreRoomUser);
     }
 
-    /**
-     * 修改【请填写功能名称】
-     * 
-     * @param scoreRoomUser 【请填写功能名称】
-     * @return 结果
-     */
+
     @Override
-    public int updateScoreRoomUser(ScoreRoomUser scoreRoomUser)
+    public int updateScoreRoomUser(List<ScoreRoomUser> scoreRoomUsers)
     {
-        return scoreRoomUserMapper.updateScoreRoomUser(scoreRoomUser);
+        List<ScoreRoomUser> updatedUsers = new ArrayList<>();
+
+        for (ScoreRoomUser playerScore: scoreRoomUsers){
+            // 处理单个用户的得分累加
+            ScoreRoomUser updatedUser = processUserScoreUpdate(playerScore);
+            updatedUsers.add(updatedUser);
+        }
+
+        return scoreRoomUserMapper.updateScoreRoomUser(updatedUsers);
+    }
+
+    private ScoreRoomUser processUserScoreUpdate(ScoreRoomUser newScore) {
+        // 1. 首先检查用户是否已在房间中
+        ScoreRoomUser existingUser = scoreRoomUserMapper.selectScoreRoomUserPrescore(newScore.getUserId(), newScore.getRoomId());
+
+        Long newTotalScore;
+        ScoreRoomUser userToUpdate;
+
+        if (existingUser == null) {
+            // 用户不在房间中，创建新记录
+            userToUpdate = new ScoreRoomUser();
+            userToUpdate.setRoomId(newScore.getRoomId());
+            userToUpdate.setUserId(newScore.getUserId());
+            userToUpdate.setPlayerType("user");
+            userToUpdate.setNickName(newScore.getNickName());
+            userToUpdate.setTotalScore(newScore.getTotalScore() != null ? newScore.getTotalScore() : 0L);
+
+            // 插入新记录
+            scoreRoomUserMapper.insertScoreRoomUser(userToUpdate);
+            return userToUpdate;
+        } else {
+            // 2. 存在记录：历史总分 + 本次得分
+            Long currentScore = existingUser.getTotalScore() != null ? existingUser.getTotalScore() : 0L;
+            Long additionalScore = newScore.getTotalScore() != null ? newScore.getTotalScore() : 0L;
+
+            newTotalScore = currentScore + additionalScore;
+
+            // 使用现有记录进行更新
+            userToUpdate = existingUser;
+            userToUpdate.setTotalScore(newTotalScore);
+
+            return userToUpdate;
+        }
     }
 
     /**
@@ -90,4 +156,7 @@ public class ScoreRoomUserServiceImpl implements IScoreRoomUserService
     {
         return scoreRoomUserMapper.deleteScoreRoomUserByRoomUserId(roomUserId);
     }
+
+
+
 }
diff --git a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreUserServiceImpl.java b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreUserServiceImpl.java
index 83357e6..694ed9a 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreUserServiceImpl.java
+++ b/RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScoreUserServiceImpl.java
@@ -27,7 +27,7 @@ public class ScoreUserServiceImpl implements IScoreUserService
      * @return 【请填写功能名称】
      */
     @Override
-    public ScoreUser selectScoreUserByUserId(Long userId)
+    public ScoreUser selectScoreUserByUserId(String userId)
     {
         return scoreUserMapper.selectScoreUserByUserId(userId);
     }
@@ -51,16 +51,23 @@ public class ScoreUserServiceImpl implements IScoreUserService
      * @return 结果
      */
     @Override
-    public int insertScoreUser(ScoreUser scoreUser)
+    public ScoreUser insertScoreUser(ScoreUser scoreUser)
     {
         // 判断当前openId是否已经有值了
         ScoreUser scoreUser1 = scoreUserMapper.selectScoreUserByOpenId(scoreUser.getOpenId());
         if(scoreUser1 != null) {
-            return 1;
+            throw new RuntimeException("当前openId是否已经有值");
         }
-
         scoreUser.setCreateTime(DateUtils.getNowDate());
-        return scoreUserMapper.insertScoreUser(scoreUser);
+        // 插入用户，MyBatis会自动将自增ID设置到user对象的userId属性中
+        int result =  scoreUserMapper.insertScoreUser(scoreUser);
+
+        if (result > 0) {
+            // 返回包含自增ID的用户对象
+            return scoreUser;
+        } else {
+            throw new RuntimeException("用户插入失败");
+        }
     }
 
     /**
diff --git a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreRoomDetailMapper.xml b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreRoomDetailMapper.xml
index 6b0d4e8..826a6af 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreRoomDetailMapper.xml
+++ b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreRoomDetailMapper.xml
@@ -35,26 +35,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where detail_id = #{detailId}
     </select>
 
-    <insert id="insertScoreRoomDetail" parameterType="ScoreRoomDetail" useGeneratedKeys="true" keyProperty="detailId">
-        insert into score_room_detail
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="roomId != null">room_id,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="score != null">score,</if>
-            <if test="createdTime != null">created_time,</if>
-            <if test="detailType != null">detail_type,</if>
-            <if test="getterId != null">getter_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="roomId != null">#{roomId},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="score != null">#{score},</if>
-            <if test="createdTime != null">#{createdTime},</if>
-            <if test="detailType != null">#{detailType},</if>
-            <if test="getterId != null">#{getterId},</if>
-         </trim>
+
+
+    <insert id="insertScoreRoomDetail" useGeneratedKeys="true" keyProperty="detailId">
+        INSERT INTO score_room_detail
+        (room_id, user_id, detail_score, game_time, created_time, detail_type)
+        VALUES
+        <foreach collection="scoreRoomDetails" item="item" separator=",">
+            (
+            #{item.roomId},
+            #{item.userId},
+            #{item.detailScore},
+            #{item.gameTime},
+            NOW(),
+            0
+            )
+        </foreach>
     </insert>
 
+
     <update id="updateScoreRoomDetail" parameterType="ScoreRoomDetail">
         update score_room_detail
         <trim prefix="SET" suffixOverrides=",">
diff --git a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreRoomMapper.xml b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreRoomMapper.xml
index c4ec238..a6125f7 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreRoomMapper.xml
+++ b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreRoomMapper.xml
@@ -9,11 +9,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createUser"    column="create_user"    />
         <result property="odds"    column="odds"    />
         <result property="roomStatus"    column="room_status"    />
-        <result property="boosId"    column="boos_id"    />
+        <result property="bossId"    column="boss_id"    />
+        <result property="roomName"    column="room_name"    />
     </resultMap>
 
     <sql id="selectScoreRoomVo">
-        select room_id, create_user, odds, room_status, boos_id from score_room
+        select room_id, create_user, odds, room_status, boss_id from score_room
     </sql>
 
     <select id="selectScoreRoomList" parameterType="ScoreRoom" resultMap="ScoreRoomResult">
@@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createUser != null "> and create_user = #{createUser}</if>
             <if test="odds != null "> and odds = #{odds}</if>
             <if test="roomStatus != null "> and room_status = #{roomStatus}</if>
-            <if test="boosId != null "> and boos_id = #{boosId}</if>
+            <if test="bossId != null "> and boss_id = #{bossId}</if>
         </where>
     </select>
     
@@ -31,19 +32,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where room_id = #{roomId}
     </select>
 
+    <select id="selectScoreRoomBycreateUser" parameterType="Long" resultMap="ScoreRoomResult">
+        <include refid="selectScoreRoomVo"/>
+        WHERE room_status IN (0, 1)
+        AND create_user = #{createUser}
+    </select>
+
     <insert id="insertScoreRoom" parameterType="ScoreRoom" useGeneratedKeys="true" keyProperty="roomId">
         insert into score_room
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="createUser != null">create_user,</if>
             <if test="odds != null">odds,</if>
             <if test="roomStatus != null">room_status,</if>
-            <if test="boosId != null">boos_id,</if>
+            <if test="bossId != null">boss_id,</if>
+            <if test="roomName != null">room_name,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="createUser != null">#{createUser},</if>
             <if test="odds != null">#{odds},</if>
             <if test="roomStatus != null">#{roomStatus},</if>
-            <if test="boosId != null">#{boosId},</if>
+            <if test="bossId != null">#{bossId},</if>
+            <if test="roomName != null">#{roomName},</if>
          </trim>
     </insert>
 
@@ -53,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createUser != null">create_user = #{createUser},</if>
             <if test="odds != null">odds = #{odds},</if>
             <if test="roomStatus != null">room_status = #{roomStatus},</if>
-            <if test="boosId != null">boos_id = #{boosId},</if>
+            <if test="bossId != null">boss_id = #{bossId},</if>
         </trim>
         where room_id = #{roomId}
     </update>
diff --git a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreRoomUserMapper.xml b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreRoomUserMapper.xml
index 9038547..a189475 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreRoomUserMapper.xml
+++ b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreRoomUserMapper.xml
@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="roomUserId"    column="room_user_id"    />
         <result property="roomId"    column="room_id"    />
         <result property="userId"    column="user_id"    />
-        <result property="score"    column="score"    />
+        <result property="totalScore"    column="score"    />
         <result property="playerType"    column="player_type"    />
         <result property="nickName"    column="nick_name"    />
         <result property="avatars"    column="avatars"    />
@@ -23,49 +23,65 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="roomId != null "> and room_id = #{roomId}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="score != null "> and score = #{score}</if>
+
             <if test="playerType != null  and playerType != ''"> and player_type = #{playerType}</if>
             <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
             <if test="avatars != null  and avatars != ''"> and avatars = #{avatars}</if>
         </where>
     </select>
-    
+
     <select id="selectScoreRoomUserByRoomUserId" parameterType="Long" resultMap="ScoreRoomUserResult">
         <include refid="selectScoreRoomUserVo"/>
         where room_user_id = #{roomUserId}
     </select>
 
+    <select id="selectScoreRoomUserPrescore" resultMap="ScoreRoomUserResult">
+        select room_id, user_id, score from score_room_user
+        where room_id = #{roomId} AND user_id = #{userId}
+    </select>
+
+
+    <select id="selectScoreRoomUserByUserId" parameterType="Long" resultMap="ScoreRoomUserResult">
+        <include refid="selectScoreRoomUserVo"/>
+        where user_id = #{UserId}
+    </select>
+
+
+
     <insert id="insertScoreRoomUser" parameterType="ScoreRoomUser" useGeneratedKeys="true" keyProperty="roomUserId">
         insert into score_room_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="roomId != null">room_id,</if>
             <if test="userId != null">user_id,</if>
-            <if test="score != null">score,</if>
+            <if test="totalScore != null">score,</if>
             <if test="playerType != null">player_type,</if>
             <if test="nickName != null">nick_name,</if>
             <if test="avatars != null">avatars,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="roomId != null">#{roomId},</if>
             <if test="userId != null">#{userId},</if>
-            <if test="score != null">#{score},</if>
+            <if test="totalScore != null">#{totalScore},</if>
             <if test="playerType != null">#{playerType},</if>
             <if test="nickName != null">#{nickName},</if>
             <if test="avatars != null">#{avatars},</if>
          </trim>
     </insert>
 
-    <update id="updateScoreRoomUser" parameterType="ScoreRoomUser">
-        update score_room_user
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="roomId != null">room_id = #{roomId},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="score != null">score = #{score},</if>
-            <if test="playerType != null">player_type = #{playerType},</if>
-            <if test="nickName != null">nick_name = #{nickName},</if>
-            <if test="avatars != null">avatars = #{avatars},</if>
-        </trim>
-        where room_user_id = #{roomUserId}
+    <update id="updateScoreRoomUser">
+        UPDATE score_room_user
+        SET
+        score = CASE
+        <foreach collection="scoreRoomUsers" item="item">
+            WHEN room_id = #{item.roomId} AND user_id = #{item.userId} THEN #{item.totalScore}
+        </foreach>
+        ELSE score
+        END
+        <!-- 如果需要更新其他字段，可以继续添加类似的CASE WHEN结构 -->
+        WHERE (room_id, user_id) IN
+        <foreach collection="scoreRoomUsers" item="item" separator="," open="(" close=")">
+            (#{item.roomId}, #{item.userId})
+        </foreach>
     </update>
 
     <delete id="deleteScoreRoomUserByRoomUserId" parameterType="Long">
@@ -78,4 +94,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{roomUserId}
         </foreach>
     </delete>
+
+    <resultMap id="UserScoreDetailResultMap" type="ScoreRoomUser">
+        <!-- 主用户信息映射 -->
+        <id property="userId" column="user_id"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="avatars" column="avatars"/>
+        <result property="totalScore" column="score"/>
+        <result property="roomId"    column="room_id"    />
+        <!-- 详细对局记录映射 -->
+        <collection property="details" ofType="ScoreRoomDetail">
+            <result property="gameTime" column="game_time"/>
+            <result property="detailScore" column="detail_score"/>
+            <result property="createdTime" column="created_time"/>
+            <result property="roomId"    column="room_id"    />
+        </collection>
+    </resultMap>
+
+    <select id="selectUserScoresWithDetails" parameterType="Long" resultMap="UserScoreDetailResultMap">
+        SELECT
+        sru.user_id,
+        sru.room_id,
+        sru.nick_name,
+        sru.avatars,
+        sru.score,
+        srd.game_time,
+        srd.detail_score,
+        srd.created_time
+        FROM score_room_user sru
+        LEFT JOIN score_room_detail srd ON sru.room_id = srd.room_id AND sru.user_id = srd.user_id
+        WHERE sru.room_id = #{roomId}
+        ORDER BY srd.game_time
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreUserMapper.xml b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreUserMapper.xml
index 1a82a26..b52ca22 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreUserMapper.xml
+++ b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/system/ScoreUserMapper.xml
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectScoreUserByUserId" parameterType="Long" resultMap="ScoreUserResult">
+    <select id="selectScoreUserByUserId" resultMap="ScoreUserResult">
         <include refid="selectScoreUserVo"/>
         where user_id = #{userId}
     </select>
diff --git a/scoring/api/room.js b/scoring/api/room.js
index 521e6c2..87c8266 100644
--- a/scoring/api/room.js
+++ b/scoring/api/room.js
@@ -1,8 +1,55 @@
-import {GET} from '@/utils/request'
+// api/room.js - 房间相关API
+import { GET, POST, PUT, DELETE } from '@/utils/request'
 
+/**
+ * 房间相关API
+ */
+export default {
+  /**
+   * 根据房间ID查询房间
+   * @param {number} roomId 房间ID
+   */
+  getRoomById(roomId) {
+    return GET(`/system/room/id/${roomId}`)
+  },
 
-// 查询【请填写功能名称】详细
-export const getuser = (roomid) => {
-	return GET('/system/roomuser/list',roomid)
-}
+  /**
+   * 根据创建者查询房间
+   * @param {number} createUser 创建者ID
+   */
+  getRoomsByCreateUser(createUser) {
+    return GET(`/system/room/createUser/${createUser}`)
+  },
 
+  /**
+   * 查询房间列表
+   * @param {Object} params 查询参数
+   */
+  getRoomList(params) {
+    return GET('/system/room/list', params)
+  },
+
+  /**
+   * 新增房间
+   * @param {Object} roomData 房间数据
+   */
+  addRoom(roomData) {
+    return POST('/system/room', roomData)
+  },
+
+  /**
+   * 修改房间
+   * @param {Object} roomData 房间数据
+   */
+  updateRoom(roomData) {
+    return PUT('/system/room', roomData)
+  },
+
+  /**
+   * 批量删除房间
+   * @param {Array} roomIds 房间ID数组
+   */
+  deleteRooms(roomIds) {
+    return DELETE(`/system/room/${roomIds}`)
+  }
+}
\ No newline at end of file
diff --git a/scoring/api/roomDetail.js b/scoring/api/roomDetail.js
new file mode 100644
index 0000000..29282e5
--- /dev/null
+++ b/scoring/api/roomDetail.js
@@ -0,0 +1,47 @@
+// api/roomDetail.js - 房间详情相关API
+import { GET, POST, PUT, DELETE } from '@/utils/request'
+
+/**
+ * 房间详情相关API
+ */
+export default {
+  /**
+   * 根据详情ID查询房间详情
+   * @param {number} detailId 详情ID
+   */
+  getRoomDetailById(detailId) {
+    return GET(`/system/detail/${detailId}`)
+  },
+
+  /**
+   * 查询房间详情列表
+   * @param {Object} params 查询参数
+   */
+  getRoomDetailList(params) {
+    return GET('/system/detail/list', params)
+  },
+
+  /**
+   * 批量新增房间详情
+   * @param {Array} roomDetails 房间详情数据数组
+   */
+  addRoomDetails(roomDetails) {
+    return POST('/system/detail', roomDetails)
+  },
+
+  /**
+   * 修改房间详情
+   * @param {Object} roomDetail 房间详情数据
+   */
+  updateRoomDetail(roomDetail) {
+    return PUT('/system/detail', roomDetail)
+  },
+
+  /**
+   * 批量删除房间详情
+   * @param {Array} detailIds 详情ID数组
+   */
+  deleteRoomDetails(detailIds) {
+    return DELETE(`/system/detail/${detailIds}`)
+  }
+}
\ No newline at end of file
diff --git a/scoring/api/roomUser.js b/scoring/api/roomUser.js
new file mode 100644
index 0000000..3609423
--- /dev/null
+++ b/scoring/api/roomUser.js
@@ -0,0 +1,179 @@
+// api/roomUser.js - 房间用户相关API
+import { GET, POST, PUT, DELETE } from '@/utils/request'
+
+/**
+ * 房间用户相关API
+ */
+export default {
+	/**
+	 * 获取房间内所有用户及其详细对局记录（已修复）
+	 * @param {number} roomId 房间ID
+	 */
+	async getUserScoresWithDetails(roomId) {
+		try {
+			console.log('获取房间用户详情，房间ID:', roomId);
+			
+			// 使用正确的API路径
+			const response = await GET(`/system/score/room/user/user-details/${roomId}`);
+			
+			console.log('房间用户详情API响应:', response);
+			
+			// 处理不同的响应格式
+			if (response.code === 200 || response.code === 0) {
+				return response.data;
+			} else if (response.success) {
+				return response.data;
+			} else {
+				// 如果接口返回错误，尝试使用列表接口
+				console.warn('主接口失败，尝试使用列表接口');
+				return await this.getRoomUserList({ roomId });
+			}
+		} catch (error) {
+			console.error('获取房间用户详情失败:', error);
+			
+			// 降级方案1：使用列表接口
+			try {
+				console.log('尝试使用列表接口作为降级方案');
+				const listResult = await this.getRoomUserList({ roomId });
+				if (listResult) {
+					return listResult;
+				}
+			} catch (listError) {
+				console.error('列表接口也失败:', listError);
+			}
+			
+			// 降级方案2：返回空数据并提示
+			throw error;
+		}
+	},
+
+	/**
+	 * 根据RoomUserId查询
+	 * @param {number} roomUserId 房间用户ID
+	 */
+	async getRoomUserById(roomUserId) {
+		try {
+			const response = await GET(`/system/score/room/user/RoomUserId/${roomUserId}`);
+			return response.data || response;
+		} catch (error) {
+			console.error('获取房间用户信息失败:', error);
+			throw error;
+		}
+	},
+
+	/**
+	 * 根据UserId查询
+	 * @param {number} userId 用户ID
+	 */
+	async getRoomUserByUserId(userId) {
+		try {
+			const response = await GET(`/system/score/room/user/userid/${userId}`);
+			return response.data || response;
+		} catch (error) {
+			console.error('根据用户ID获取房间用户失败:', error);
+			throw error;
+		}
+	},
+
+	/**
+	 * 查询房间用户列表
+	 * @param {Object} params 查询参数
+	 */
+	async getRoomUserList(params) {
+		try {
+			console.log('获取房间用户列表，参数:', params);
+			const response = await GET('/system/score/room/user/list', params);
+			console.log('房间用户列表响应:', response);
+			return response.data || response;
+		} catch (error) {
+			console.error('获取房间用户列表失败:', error);
+			throw error;
+		}
+	},
+
+	/**
+	 * 新增房间用户
+	 * @param {Object} roomUserData 房间用户数据
+	 */
+	async addRoomUser(roomUserData) {
+		try {
+			console.log('新增房间用户:', roomUserData);
+			const response = await POST('/system/score/room/user', roomUserData);
+			console.log('新增房间用户响应:', response);
+			return response.data || response;
+		} catch (error) {
+			console.error('新增房间用户失败:', error);
+			throw error;
+		}
+	},
+
+
+
+async updateRoomUsersSafe(roomUsers) {
+	try {
+		console.log('安全更新房间用户得分:', roomUsers);
+		
+		// 过滤和转换数据
+		const safeUsers = roomUsers.map(user => {
+			let userId = user.userId;
+			
+			// 确保userId在int范围内
+			if (userId > 2147483647 || userId < -2147483648) {
+				console.warn('用户ID超出范围，进行转换:', userId);
+				// 使用哈希值
+				const strId = userId.toString();
+				let hash = 0;
+				for (let i = 0; i < strId.length; i++) {
+					hash = ((hash << 5) - hash) + strId.charCodeAt(i);
+					hash = hash & hash;
+				}
+				userId = Math.abs(hash) % 1000000;
+			}
+			
+			return {
+				...user,
+				userId: userId
+			};
+		});
+		
+		const response = await PUT('/system/score/room/user', safeUsers);
+		console.log('安全更新响应:', response);
+		return response.data || response;
+	} catch (error) {
+		console.error('安全更新房间用户得分:', error);
+		throw error;
+	}
+},
+	/**
+	 * 批量更新用户得分
+	 * @param {Array} roomUsers 房间用户数据数组
+	 */
+	async updateRoomUsers(roomUsers) {
+		
+		try {
+			
+			
+			console.log('更新房间用户得分:', roomUsers);
+			const response = await PUT('/system/score/room/user', roomUsers);
+			console.log('更新房间用户得分响应:', response);
+			return response.data || response;
+		} catch (error) {
+			console.error('更新房间用户得分:', error);
+			throw error;
+		}
+	},
+
+	/**
+	 * 批量删除房间用户
+	 * @param {Array} roomUserIds 房间用户ID数组
+	 */
+	async deleteRoomUsers(roomUserIds) {
+		try {
+			const response = await DELETE(`/system/score/room/user/${roomUserIds}`);
+			return response.data || response;
+		} catch (error) {
+			console.error('删除房间用户失败:', error);
+			throw error;
+		}
+	}
+}
\ No newline at end of file
diff --git a/scoring/api/user.js b/scoring/api/user.js
index 0cff81a..ad47cab 100644
--- a/scoring/api/user.js
+++ b/scoring/api/user.js
@@ -1,4 +1,4 @@
-import { GET, POST } from '@/utils/request.js'
+import { GET, POST,PUT,DELETE } from '@/utils/request.js'
 
 export const register = (userInfo) => {
     return POST('/system/score/user', userInfo);
@@ -6,4 +6,60 @@ export const register = (userInfo) => {
 
 export const login = (userInfo) => {
     return POST('/system/score/user/login', userInfo);
+}
+
+
+
+
+/**
+ * 用户相关API
+ */
+export default {
+  /**
+   * 根据用户ID查询用户
+   * @param {string} userId 用户ID
+   */
+  getUserById(userId) {
+    return GET(`/system/score/user/${userId}`)
+  },
+
+  /**
+   * 查询用户列表
+   * @param {Object} params 查询参数
+   */
+  getUserList(params) {
+    return GET('/system/score/user/list', params)
+  },
+
+  /**
+   * 新增用户
+   * @param {Object} userData 用户数据
+   */
+  addUser(userData) {
+    return POST('/system/score/user', userData)
+  },
+
+  /**
+   * 修改用户
+   * @param {Object} userData 用户数据
+   */
+  updateUser(userData) {
+    return PUT('/system/score/user', userData)
+  },
+
+  /**
+   * 批量删除用户
+   * @param {Array} userIds 用户ID数组
+   */
+  deleteUsers(userIds) {
+    return DELETE(`/system/score/user/${userIds}`)
+  },
+
+  /**
+   * 用户登录
+   * @param {Object} loginData 登录数据
+   */
+  login(loginData) {
+    return POST('/system/score/user/login', loginData)
+  }
 }
\ No newline at end of file
diff --git a/scoring/pages.json b/scoring/pages.json
index 9459a30..f912091 100644
--- a/scoring/pages.json
+++ b/scoring/pages.json
@@ -32,7 +32,7 @@
 			    },
 			
 		    {
-		      "path": "pages/settle/index",  // 结算页面（新增注册）
+		      "path": "pages/settle/index",  
 		      "style": { "navigationBarTitleText": "房间结算" }
 		    },
 		   {
diff --git a/scoring/pages/game-detail/index.vue b/scoring/pages/game-detail/index.vue
index ce7931d..2e68f99 100644
--- a/scoring/pages/game-detail/index.vue
+++ b/scoring/pages/game-detail/index.vue
@@ -11,38 +11,80 @@
       </view>
     </view>
 
-    <!-- 玩家信息表头 -->
-    <view class="player-header">
-      <view class="header-row">
-        <view class="header-cell header-label">玩家 ({{ players.length }}位)</view>
-        <view class="header-cell" v-for="player in players" :key="player.id">
-          <view class="player-header-info">
-            <image class="player-avatar" :src="player.avatar" mode="aspectFit"></image>
-            <text class="player-name">{{ player.name }}</text>
+    <!-- 玩家列表容器 - 添加滚动条功能 -->
+    <view class="player-list-container">
+      <!-- 水平滚动容器 -->
+      <scroll-view 
+        class="player-scroll-view" 
+        scroll-x="true" 
+        :scroll-left="scrollLeft"
+        @scroll="onScroll"
+        :show-scrollbar="false"
+        scroll-with-animation
+      >
+        <view class="player-list-content">
+          <!-- 玩家信息表头 -->
+          <view class="player-header">
+            <view class="header-row">
+              <view class="header-cell header-label">玩家 ({{ players.length }}位)</view>
+              <view class="player-columns">
+                <view class="player-column" v-for="player in players" :key="player.id">
+                  <view class="player-header-info">
+                    <!-- 统一头像容器样式 -->
+                    <view class="avatar-container">
+                      <image class="player-avatar" :src="player.avatar" mode="aspectFill"></image>
+                    </view>
+                    <text class="player-name">{{ player.name }}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+
+          <!-- 对局详情表格 -->
+          <view class="detail-table">
+            <!-- 总分行 -->
+            <view class="table-row">
+              <view class="row-label">总分</view>
+              <view class="row-cells">
+                <view class="score-cell" v-for="player in players" :key="player.id">
+                  {{ formatScore(player.totalScore) }}
+                </view>
+              </view>
+            </view>
+
+            <!-- 每局得分行 -->
+            <view class="table-row" v-for="(round, roundIndex) in gameRounds" :key="roundIndex">
+              <view class="row-label">第{{ roundIndex + 1 }}局</view>
+              <view class="row-cells">
+                <view class="score-cell" v-for="player in players" :key="player.id">
+                  {{ formatScore(getPlayerRoundScore(roundIndex, player.id)) }}
+                </view>
+              </view>
+            </view>
           </view>
         </view>
-      </view>
-    </view>
-
-    <!-- 对局详情表格 -->
-    <view class="detail-table">
-      <!-- 总分行 -->
-      <view class="table-row">
-        <view class="row-label">总分</view>
-        <view class="row-cells">
-          <view class="score-cell" v-for="player in players" :key="player.id">
-            {{ formatScore(player.totalScore) }}
-          </view>
-        </view>
-      </view>
-
-      <!-- 每局得分行 -->
-      <view class="table-row" v-for="(round, roundIndex) in gameRounds" :key="roundIndex">
-        <view class="row-label">第{{ roundIndex + 1 }}局</view>
-        <view class="row-cells">
-          <view class="score-cell" v-for="player in players" :key="player.id">
-            {{ formatScore(getPlayerRoundScore(roundIndex, player.id)) }}
-          </view>
+      </scroll-view>
+      
+      <!-- 自定义可拖动滚动条 -->
+      <view class="custom-scrollbar" v-if="showScrollIndicator">
+        <view 
+          class="scroll-track"
+          @touchstart="onTrackTouchStart"
+          @touchmove.prevent="onTrackTouchMove"
+          @touchend="onTrackTouchEnd"
+          :id="trackId"
+        >
+          <view 
+            class="scroll-thumb" 
+            :style="{ 
+              left: thumbPosition + '%', 
+              width: thumbWidth + '%' 
+            }"
+            @touchstart="onThumbTouchStart"
+            @touchmove.prevent="onThumbTouchMove"
+            @touchend="onThumbTouchEnd"
+          ></view>
         </view>
       </view>
     </view>
@@ -55,13 +97,45 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, computed, nextTick, watch } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
 
 // 玩家数据
 const players = ref([])
 // 对局记录
 const gameRounds = ref([])
 
+// 滚动条相关数据
+const scrollLeft = ref(0)
+const scrollWidth = ref(0)
+const scrollViewWidth = ref(0)
+const trackId = ref('scroll-track-' + Date.now())
+
+// 滚动条拖动状态
+const isDragging = ref(false)
+const dragStartX = ref(0)
+const dragStartScrollLeft = ref(0)
+const trackRect = ref({ left: 0, width: 0 })
+
+// 计算属性：是否显示滚动条指示器
+const showScrollIndicator = computed(() => {
+  return scrollWidth.value > scrollViewWidth.value
+})
+
+// 计算属性：滚动条滑块宽度
+const thumbWidth = computed(() => {
+  if (scrollWidth.value === 0) return 100
+  const widthRatio = (scrollViewWidth.value / scrollWidth.value) * 100
+  return Math.max(20, Math.min(100, widthRatio)) // 最小宽度20%，最大100%
+})
+
+// 计算属性：滚动条滑块位置
+const thumbPosition = computed(() => {
+  if (scrollWidth.value === 0 || scrollWidth.value <= scrollViewWidth.value) return 0
+  const maxScroll = scrollWidth.value - scrollViewWidth.value
+  return (scrollLeft.value / maxScroll) * (100 - thumbWidth.value)
+})
+
 // 格式化分数显示
 const formatScore = (score) => {
   if (score === 0) return '0'
@@ -128,9 +202,154 @@ onMounted(() => {
     ]
     calculateTotalScores()
   }
+  
+  // 监听玩家数量变化
+  watch(() => players.value.length, () => {
+    setTimeout(() => {
+      updateScrollDimensions()
+    }, 300)
+  })
+  
+  // 更新滚动区域尺寸
+  setTimeout(() => {
+    updateScrollDimensions()
+  }, 1000)
 })
 
+onShow(() => {
+  // 更新滚动区域
+  setTimeout(() => {
+    updateScrollDimensions()
+    getTrackRect()
+  }, 300)
+})
 
+// 滚动事件处理
+const onScroll = (e) => {
+  scrollLeft.value = e.detail.scrollLeft
+}
+
+// 更新滚动区域尺寸
+const updateScrollDimensions = () => {
+  console.log('开始更新滚动区域尺寸...')
+  
+  nextTick(() => {
+    setTimeout(() => {
+      const query = uni.createSelectorQuery()
+      query.select('.player-scroll-view').boundingClientRect()
+      query.select('.player-list-content').boundingClientRect()
+      query.exec((res) => {
+        if (res[0] && res[1]) {
+          scrollViewWidth.value = res[0].width
+          scrollWidth.value = res[1].width
+          
+          console.log('滚动区域计算完成:', {
+            scrollViewWidth: scrollViewWidth.value,
+            scrollWidth: scrollWidth.value,
+            showScrollIndicator: scrollWidth.value > scrollViewWidth.value,
+            playersCount: players.value.length
+          })
+          
+          // 强制更新显示状态
+          if (scrollWidth.value > scrollViewWidth.value) {
+            console.log('需要显示滚动条')
+          }
+        } else {
+          console.error('获取滚动区域尺寸失败')
+        }
+      })
+    }, 100)
+  })
+}
+
+// 获取轨道位置信息
+const getTrackRect = () => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      const query = uni.createSelectorQuery()
+      query.select('.custom-scrollbar .scroll-track').boundingClientRect()
+      query.exec((res) => {
+        if (res[0]) {
+          trackRect.value = {
+            left: res[0].left,
+            width: res[0].width
+          }
+          resolve(trackRect.value)
+        } else {
+          resolve(null)
+        }
+      })
+    }, 100)
+  })
+}
+
+// 滚动条滑块触摸开始
+const onThumbTouchStart = async (e) => {
+  isDragging.value = true
+  dragStartX.value = e.touches[0].clientX
+  dragStartScrollLeft.value = scrollLeft.value
+  
+  await getTrackRect()
+  
+  e.stopPropagation()
+}
+
+// 滚动条滑块触摸移动
+const onThumbTouchMove = (e) => {
+  if (!isDragging.value) return
+  
+  const deltaX = e.touches[0].clientX - dragStartX.value
+  const maxScroll = Math.max(0, scrollWidth.value - scrollViewWidth.value)
+  
+  if (maxScroll > 0 && trackRect.value.width > 0) {
+    const scrollPercent = deltaX / trackRect.value.width
+    const newScrollLeft = dragStartScrollLeft.value + (scrollPercent * maxScroll)
+    scrollLeft.value = Math.max(0, Math.min(maxScroll, newScrollLeft))
+  }
+  
+  e.stopPropagation()
+}
+
+// 滚动条滑块触摸结束
+const onThumbTouchEnd = (e) => {
+  isDragging.value = false
+  e.stopPropagation()
+}
+
+// 滚动条轨道触摸开始
+const onTrackTouchStart = async (e) => {
+  const rect = await getTrackRect()
+  if (!rect) return
+  
+  const clickX = e.touches[0].clientX - rect.left
+  const thumbWidthPx = (thumbWidth.value / 100) * rect.width
+  const thumbCenter = (thumbPosition.value / 100) * rect.width + thumbWidthPx / 2
+  
+  const maxScroll = Math.max(0, scrollWidth.value - scrollViewWidth.value)
+  
+  if (maxScroll > 0) {
+    if (clickX < thumbCenter) {
+      scrollLeft.value = Math.max(0, scrollLeft.value - scrollViewWidth.value * 0.8)
+    } else {
+      scrollLeft.value = Math.min(maxScroll, scrollLeft.value + scrollViewWidth.value * 0.8)
+    }
+  }
+}
+
+// 滚动条轨道触摸移动
+const onTrackTouchMove = (e) => {
+  e.stopPropagation()
+}
+
+// 滚动条轨道触摸结束
+const onTrackTouchEnd = (e) => {
+  e.stopPropagation()
+}
+
+// 返回上一页
+const goBack = () => {
+  uni.navigateBack()
+}
 
 // 分享对局详情
 const shareDetail = () => {
@@ -145,6 +364,7 @@ const shareDetail = () => {
 .game-detail-page {
   background-color: #fff;
   min-height: 100vh;
+  padding-bottom: 200rpx; /* 给底部按钮留出空间 */
 }
 
 .nav-bar {
@@ -169,27 +389,59 @@ const shareDetail = () => {
   }
 }
 
+/* 玩家列表容器 */
+.player-list-container {
+  padding: 0 30rpx 30rpx;
+  position: relative;
+}
+
+/* 滚动视图样式 */
+.player-scroll-view {
+  width: 100%;
+  white-space: nowrap;
+  
+  // 隐藏原生滚动条
+  ::-webkit-scrollbar {
+    display: none;
+  }
+}
+
+.player-list-content {
+  display: inline-block;
+  min-width: 100%;
+  white-space: nowrap;
+}
+
 .player-header {
-  padding: 20rpx 30rpx;
   background-color: #f5f5f5;
   border-bottom: 1rpx solid #eee;
 
   .header-row {
     display: flex;
-    align-items: center;
-
-    .header-cell {
-      flex: 1;
+    padding: 20rpx 0;
+    
+    .header-label {
+      width: 200rpx;
+      flex: none;
+      font-size: 28rpx;
+      color: #000;
+      font-weight: 500;
       display: flex;
-      justify-content: center;
-      
-      &.header-label {
-        width: 200rpx;
-        flex: none;
-        font-size: 28rpx;
-        color: #000;
-        font-weight: 500;
-      }
+      align-items: center;
+      padding-left: 20rpx;
+    }
+
+    .player-columns {
+      display: flex;
+    }
+    
+    .player-column {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      width: 140rpx;
+      flex-shrink: 0;
+      padding: 0 10rpx;
     }
 
     .player-header-info {
@@ -197,24 +449,41 @@ const shareDetail = () => {
       flex-direction: column;
       align-items: center;
 
-      .player-avatar {
-        width: 60rpx;
-        height: 60rpx;
-        border-radius: 50%;
+      /* 统一头像容器样式 */
+      .avatar-container {
+        position: relative;
+        width: 110rpx;
+        height: 110rpx;
         margin-bottom: 10rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        
+        .player-avatar {
+          width: 100rpx;
+          height: 100rpx;
+          border-radius: 50%;
+          border: 5rpx solid #fff;
+          box-shadow: 0 6rpx 20rpx rgba(65, 71, 155, 0.3);
+          background: linear-gradient(135deg, #41479b 0%, #8b91e2 100%);
+          transition: all 0.3s ease;
+        }
       }
 
       .player-name {
         font-size: 24rpx;
         color: #000;
+        text-align: center;
+        word-break: break-all;
+        white-space: normal;
+        max-width: 120rpx;
+        font-weight: 500;
       }
     }
   }
 }
 
 .detail-table {
-  padding: 0 30rpx;
-
   .table-row {
     display: flex;
     padding: 20rpx 0;
@@ -226,30 +495,70 @@ const shareDetail = () => {
 
     .row-label {
       width: 200rpx;
+      flex: none;
       font-size: 28rpx;
       color: #000;
       display: flex;
       align-items: center;
       font-weight: 500;
+      padding-left: 20rpx;
     }
 
     .row-cells {
       display: flex;
-      flex: 1;
       
       .score-cell {
-        flex: 1;
+        width: 140rpx;
+        flex-shrink: 0;
         text-align: center;
         font-size: 28rpx;
         color: #333;
         display: flex;
         align-items: center;
         justify-content: center;
+        padding: 0 10rpx;
       }
     }
   }
 }
 
+/* 自定义可拖动滚动条样式 - 完全复制单人房间的样式 */
+.custom-scrollbar {
+  margin-top: 20rpx;
+  padding: 0 20rpx;
+  
+  .scroll-track {
+    height: 12rpx;
+    background-color: #f0f0f0;
+    border-radius: 6rpx;
+    position: relative;
+    
+    // 添加点击区域扩展
+    &::before {
+      content: '';
+      position: absolute;
+      top: -10rpx;
+      bottom: -10rpx;
+      left: 0;
+      right: 0;
+    }
+  }
+  
+  .scroll-thumb {
+    position: absolute;
+    height: 100%;
+    background-color: #41479b;
+    border-radius: 6rpx;
+    transition: all 0.1s ease;
+    
+    // 添加悬停效果
+    &:active {
+      background-color: #33367a;
+      transform: scale(1.1);
+    }
+  }
+}
+
 .action-buttons {
   position: fixed;
   bottom: 0;
diff --git a/scoring/pages/scoring/index.vue b/scoring/pages/scoring/index.vue
index 75dca81..f5172ae 100644
--- a/scoring/pages/scoring/index.vue
+++ b/scoring/pages/scoring/index.vue
@@ -1,81 +1,101 @@
 <template>
   <view class="scoring-page">
-    <!-- 顶部导航 -->
-    <view class="nav-bar">
-      <view class="nav-back" @click="goBack">
-        <uni-icons type="arrowleft" size="24" color="#fff"></uni-icons>
-      </view>
-      <view class="nav-title">
-        {{ isEditMode ? '修改' : '第' + currentRound + '局' }}
-        <text v-if="isEditMode">第{{ currentRound }}局</text>
-      </view>
-      <view class="nav-actions">
-        <uni-icons type="more" size="24" color="#fff"></uni-icons>
-      </view>
+    <!-- 加载状态 -->
+    <view v-if="loading" class="loading-container">
+      <uni-load-more status="loading" :contentText="loadingText"></uni-load-more>
+    </view>
+    
+    <!-- 错误提示 -->
+    <view v-if="errorMessage" class="error-message">
+      <uni-icons type="closeempty" size="24" color="#ff3b30"></uni-icons>
+      <text>{{ errorMessage }}</text>
+      <button class="retry-btn" @click="retryLoadData">重试</button>
     </view>
 
-    <!-- 玩家计分表格 -->
-    <view class="player-table">
-      <view class="table-header">
-        <text>玩家</text>
-        <text>胜负</text>
-        <text>得分</text>
-      </view>
-      
-      <!-- 动态渲染每个玩家的计分行 -->
-      <view class="table-row" v-for="(player, index) in players" :key="player.id">
-        <view class="player-info">
-          <image class="player-avatar" :src="player.avatar" mode="aspectFit"></image>
-          <text class="player-name">{{ player.name }}</text>
-          <view v-if="player.isSelf" class="self-tag">自己</view>
+    <!-- 主内容区 -->
+    <view v-if="!loading && !errorMessage">
+      <!-- 顶部导航 -->
+      <view class="nav-bar">
+        <view class="nav-back" @click="goBack">
+          <uni-icons type="arrowleft" size="24" color="#fff"></uni-icons>
         </view>
-        <view class="win-lose">
-          <button class="win-btn" :class="{ active: player.isWin }" @click="setWinStatus(index, true)">胜</button>
-          <button class="lose-btn" :class="{ active: !player.isWin }" @click="setWinStatus(index, false)">负</button>
+        <view class="nav-title">
+          {{ isEditMode ? '修改' : '第' + currentRound + '局' }}
+          <text v-if="isEditMode">第{{ currentRound }}局</text>
         </view>
-        <view class="score-input">
-          <input 
-            type="text" 
-            v-model="player.currentScore" 
-            placeholder="0" 
-            class="score-text" 
-            @focus="setCurrentPlayer(index)"
-            @input="checkTotalScore"
-          />
-          <button class="sum-btn" @click="calculateTotalScore(index)">∑ 合分</button>
+        <view class="nav-actions">
+          <uni-icons type="more" size="24" color="#fff"></uni-icons>
         </view>
       </view>
-    </view>
 
-    <!-- 总分检查提示 -->
-    <view v-if="showScoreWarning" class="score-warning">
-      对局分数相加不为0,请检查！
-    </view>
+      <!-- 玩家计分表格 -->
+      <view class="player-table">
+        <view class="table-header">
+          <text>玩家</text>
+          <text>胜负</text>
+          <text>得分</text>
+        </view>
+        
+        <!-- 动态渲染每个玩家的计分行 -->
+        <view class="table-row" v-for="(player, index) in players" :key="player.id">
+          <view class="player-info">
+            <!-- 修改头像容器，添加统一的大头像样式 -->
+            <view class="avatar-container">
+              <image class="player-avatar" :src="player.avatar" mode="aspectFill"></image>
+              <!-- 如果是玩家自己，添加标识 -->
+              <view v-if="player.isSelf" class="self-indicator"></view>
+            </view>
+            <text class="player-name">{{ player.name }}</text>
+            <view v-if="player.isSelf" class="self-tag">自己</view>
+          </view>
+          <view class="win-lose">
+            <button class="win-btn" :class="{ active: player.isWin }" @click="setWinStatus(index, true)">胜</button>
+            <button class="lose-btn" :class="{ active: !player.isWin }" @click="setWinStatus(index, false)">负</button>
+          </view>
+          <view class="score-input">
+            <input 
+              type="text" 
+              v-model="player.currentScore" 
+              placeholder="0" 
+              class="score-text" 
+              @focus="setCurrentPlayer(index)"
+              @input="checkTotalScore"
+            />
+            <button class="sum-btn" @click="calculateTotalScore(index)">∑ 合分</button>
+          </view>
+        </view>
+      </view>
 
-    <!-- 数字键盘 -->
-    <view class="keypad">
-      <view class="keypad-row">
-        <button class="keypad-btn" @click="inputNumber(1)">1</button>
-        <button class="keypad-btn" @click="inputNumber(2)">2</button>
-        <button class="keypad-btn" @click="inputNumber(3)">3</button>
-        <button class="keypad-btn" @click="inputOperator('+')">+</button>
-        <button class="keypad-btn" @click="deleteLast">⌫</button>
+      <!-- 总分检查提示 -->
+      <view v-if="showScoreWarning" class="score-warning">
+        对局分数相加不为0,请检查！
       </view>
-      <view class="keypad-row">
-        <button class="keypad-btn" @click="inputNumber(4)">4</button>
-        <button class="keypad-btn" @click="inputNumber(5)">5</button>
-        <button class="keypad-btn" @click="inputNumber(6)">6</button>
-        <button class="keypad-btn" @click="inputOperator('-')">-</button>
-        <button class="keypad-btn submit-btn" :class="{ disabled: !canSubmit }" @click="submitScore" :disabled="!canSubmit">
-          {{ isEditMode ? '更新' : '提交' }}
-        </button>
-      </view>
-      <view class="keypad-row">
-        <button class="keypad-btn" @click="inputNumber(7)">7</button>
-        <button class="keypad-btn" @click="inputNumber(8)">8</button>
-        <button class="keypad-btn" @click="inputNumber(9)">9</button>
-        <button class="keypad-btn" @click="inputNumber(0)">0</button>
-        <button class="keypad-btn clear-btn" @click="clearScore">清空</button>
+
+      <!-- 数字键盘 -->
+      <view class="keypad">
+        <view class="keypad-row">
+          <button class="keypad-btn" @click="inputNumber(1)">1</button>
+          <button class="keypad-btn" @click="inputNumber(2)">2</button>
+          <button class="keypad-btn" @click="inputNumber(3)">3</button>
+          <button class="keypad-btn" @click="inputOperator('+')">+</button>
+          <button class="keypad-btn" @click="deleteLast">⌫</button>
+        </view>
+        <view class="keypad-row">
+          <button class="keypad-btn" @click="inputNumber(4)">4</button>
+          <button class="keypad-btn" @click="inputNumber(5)">5</button>
+          <button class="keypad-btn" @click="inputNumber(6)">6</button>
+          <button class="keypad-btn" @click="inputOperator('-')">-</button>
+          <button class="keypad-btn submit-btn" :class="{ disabled: !canSubmit || submitting }" @click="submitScore" :disabled="!canSubmit || submitting">
+            {{ submitting ? '提交中...' : (isEditMode ? '更新' : '提交') }}
+          </button>
+        </view>
+        <view class="keypad-row">
+          <button class="keypad-btn" @click="inputNumber(7)">7</button>
+          <button class="keypad-btn" @click="inputNumber(8)">8</button>
+          <button class="keypad-btn" @click="inputNumber(9)">9</button>
+          <button class="keypad-btn" @click="inputNumber(0)">0</button>
+          <button class="keypad-btn clear-btn" @click="clearScore">清空</button>
+        </view>
       </view>
     </view>
   </view>
@@ -84,6 +104,9 @@
 <script setup>
 import { ref, onMounted } from 'vue'
 
+// 配置后端API地址
+const API_BASE_URL = 'http://localhost:8080'
+
 // 玩家数据
 const players = ref([])
 // 当前操作的玩家索引
@@ -98,55 +121,316 @@ const canSubmit = ref(false)
 const isEditMode = ref(false)
 // 编辑的对局索引
 const editRoundIndex = ref(-1)
+// 房间ID
+const roomId = ref('')
+// 加载状态
+const loading = ref(false)
+// 提交状态
+const submitting = ref(false)
+// 错误信息
+const errorMessage = ref('')
+// 加载文本
+const loadingText = ref({ contentdown: '下拉加载', contentrefresh: '加载中', contentnomore: '没有更多数据' })
+// 当前用户ID
+const currentUserId = ref('')
+// 对局详情数据（用于编辑）
+const roundDetails = ref([])
 
 // 使用 onMounted 替代 onLoad
 onMounted(() => {
+  loadPageData()
+})
+
+// 检查用户是否已登录
+const checkUserLogin = () => {
+  const userInfo = uni.getStorageSync('userInfo')
+  if (!userInfo || !userInfo.userId) {
+    console.warn('用户未登录，使用用户信息')
+    
+    // 创建用户信息
+    const tempUserInfo = {
+      userId: Date.now(),
+      nickName: '用户',
+      avatar: 'https://ts1.tc.mm.bing.net/th/id/OIP-C.QQG4bvcAR3CJ0WeQULA9UQAAAA?w=275&h=211&c=8&rs=1&qlt=90&o=6&cb=ucfimgc1&dpr=1.5&pid=3.1&rm=2',
+      openId: 'temp_openid_' + Date.now()
+    }
+    
+    uni.setStorageSync('userInfo', tempUserInfo)
+    currentUserId.value = tempUserInfo.userId
+    return tempUserInfo
+  }
+  
+  currentUserId.value = userInfo.userId
+  return userInfo
+}
+
+// 获取请求头，包含认证信息
+const getRequestHeaders = () => {
+  const headers = {
+    'Content-Type': 'application/json',
+  }
+  
+  // 添加用户信息到请求头
+  const userInfo = uni.getStorageSync('userInfo')
+  if (userInfo) {
+    // 对于RuoYi框架，通常需要userId或token
+    if (userInfo.userId) {
+      headers['X-User-Id'] = userInfo.userId
+    }
+    if (userInfo.openId) {
+      headers['X-Open-Id'] = userInfo.openId
+    }
+    // 如果有token，也添加
+    const token = uni.getStorageSync('token')
+    if (token) {
+      headers['Authorization'] = `Bearer ${token}`
+    }
+  }
+  
+  return headers
+}
+
+// 封装的请求函数，处理认证和错误
+const uniRequest = async (options) => {
+  return new Promise((resolve, reject) => {
+    const headers = getRequestHeaders()
+    
+    uni.request({
+      ...options,
+      header: {
+        ...headers,
+        ...options.header
+      },
+      success: (res) => {
+        console.log('API响应:', options.url, res)
+        
+        // 处理认证失败
+        if (res.statusCode === 401 || res.statusCode === 403) {
+          console.error('认证失败，状态码:', res.statusCode)
+          
+          // 尝试使用默认用户信息重新请求
+          if (options.url.includes('/system/score/room/user')) {
+            console.log('尝试使用简化方式调用接口')
+            
+            // 对于更新房间用户接口，尝试使用简化方式
+            const simpleHeaders = {
+              'Content-Type': 'application/json'
+            }
+            
+            uni.request({
+              ...options,
+              header: simpleHeaders,
+              success: (simpleRes) => {
+                console.log('简化请求响应:', simpleRes)
+                resolve(simpleRes)
+              },
+              fail: (simpleErr) => {
+                console.error('简化请求失败:', simpleErr)
+                
+                // 如果是认证问题，提示用户但允许继续
+                if (simpleRes && simpleRes.statusCode === 401 || simpleRes.statusCode === 403) {
+                  console.warn('接口需要认证，但用户未登录，跳过此步骤')
+                  // 返回一个模拟的成功响应，允许继续其他操作
+                  resolve({
+                    statusCode: 200,
+                    data: {
+                      code: 0,
+                      msg: '跳过认证步骤',
+                      data: null
+                    }
+                  })
+                } else {
+                  reject(simpleErr)
+                }
+              }
+            })
+            return
+          }
+          
+          reject(new Error('认证失败，无法访问系统资源'))
+          return
+        }
+        
+        resolve(res)
+      },
+      fail: (err) => {
+        console.error('API请求失败:', options.url, err)
+        reject(err)
+      }
+    })
+  })
+}
+
+// 加载页面数据
+const loadPageData = async () => {
   // 获取页面参数
   const pages = getCurrentPages()
   const currentPage = pages[pages.length - 1]
   const options = currentPage.options || {}
   
+  console.log('页面参数:', options)
+  
+  // 获取房间ID
+  roomId.value = options.roomId || ''
+  
+  if (!roomId.value) {
+    errorMessage.value = '缺少房间ID'
+    return
+  }
+  
+  // 检查并获取用户信息
+  checkUserLogin()
+  
   // 判断是否为编辑模式
   isEditMode.value = options.mode === 'edit'
   if (isEditMode.value && options.roundIndex) {
     editRoundIndex.value = parseInt(options.roundIndex)
   }
   
+  // 获取当前对局数
+  if (options.round) {
+    currentRound.value = parseInt(options.round)
+  }
+  
+  // 尝试从参数中获取玩家数据
   if (options.players) {
     try {
       const playerData = JSON.parse(decodeURIComponent(options.players))
-      // 初始化每个玩家的胜负状态和得分
+      console.log('从参数获取玩家数据:', playerData)
+      // 使用参数中的玩家数据
       players.value = playerData.map(player => ({
         ...player,
-        // 编辑模式下使用传入的胜负状态和得分，新增模式下使用默认值
         isWin: player.isWin !== undefined ? player.isWin : true,
         currentScore: player.currentScore || '0',
         finalScore: player.finalScore || 0
       }))
     } catch (e) {
       console.error('解析玩家数据失败:', e)
-      setDefaultPlayers()
+      // 如果解析失败，从后端加载
+      await loadPlayersFromBackend()
     }
   } else {
-    setDefaultPlayers()
+    // 直接从后端加载
+    await loadPlayersFromBackend()
   }
   
-  // 获取当前对局数
-  if (options.round) {
-    currentRound.value = parseInt(options.round)
+  // 如果是编辑模式，加载已有对局数据
+  if (isEditMode.value && editRoundIndex.value >= 0) {
+    await loadRoundData()
   }
   
   // 初始化时检查总分
   checkTotalScore()
-})
+  loading.value = false
+}
 
-// 设置默认玩家数据
+// 从后端加载玩家数据
+const loadPlayersFromBackend = async () => {
+  try {
+    loading.value = true
+    errorMessage.value = ''
+    
+    // 调用后端API获取房间用户信息
+    const res = await uniRequest({
+      url: `${API_BASE_URL}/system/score/room/user/user-details/${roomId.value}`,
+      method: 'GET'
+    })
+    
+    console.log('玩家数据响应:', res)
+    
+    if (res && res.data && res.data.code === 0) {
+      const userData = res.data.data || []
+      console.log('原始玩家数据:', userData)
+      
+      // 转换数据结构
+      players.value = userData.map(user => {
+        // 注意：后端返回的userId可能是数字，currentUserId.value可能是字符串
+        const isSelf = user.userId && currentUserId.value && 
+                      user.userId.toString() === currentUserId.value.toString()
+        
+        return {
+          userId: user.userId,
+          roomUserId: user.roomUserId,
+          id: user.userId || user.roomUserId || Date.now(), // 确保有id
+          name: user.nickName || `玩家${user.userId}`,
+          avatar: user.avatars || getDefaultAvatar(user.userId),
+          totalScore: user.totalScore || 0,
+          isSelf: isSelf,
+          isWin: true, // 默认胜
+          currentScore: '0',
+          finalScore: 0
+        }
+      })
+      
+      console.log('转换后的玩家数据:', players.value)
+    } else {
+      throw new Error(res?.data?.msg || '获取玩家数据失败')
+    }
+  } catch (error) {
+    console.error('获取玩家数据失败:', error)
+    // 如果API调用失败，使用默认数据
+    setDefaultPlayers()
+  }
+}
+
+// 加载对局数据（编辑模式）
+const loadRoundData = async () => {
+  try {
+    const res = await uniRequest({
+      url: `${API_BASE_URL}/system/detail/list`,
+      method: 'GET',
+      data: {
+        roomId: roomId.value,
+        gameTime: currentRound.value
+      }
+    })
+    
+    console.log('对局数据响应:', res)
+    
+    if (res && res.data && res.data.code === 0) {
+      roundDetails.value = res.data.rows || res.data.data || []
+      console.log('对局详情数据:', roundDetails.value)
+      
+      // 更新玩家数据
+      roundDetails.value.forEach(detail => {
+        const playerIndex = players.value.findIndex(p => 
+          p.userId == detail.userId || p.id == detail.userId
+        )
+        if (playerIndex !== -1) {
+          players.value[playerIndex].isWin = detail.detailType === 0
+          // 注意：使用detailScore而不是score
+          players.value[playerIndex].currentScore = Math.abs(detail.detailScore || 0).toString()
+        }
+      })
+    }
+  } catch (error) {
+    console.error('加载对局数据失败:', error)
+    uni.showToast({
+      title: '加载对局数据失败',
+      icon: 'none'
+    })
+  }
+}
+
+// 获取默认头像
+const getDefaultAvatar = (id) => {
+  const avatars = [
+    'https://ts1.tc.mm.bing.net/th/id/OIP-C.QQG4bvcAR3CJ0WeQULA9UQAAAA?w=275&h=211&c=8&rs=1&qlt=90&o=6&cb=ucfimgc1&dpr=1.5&pid=3.1&rm=2',
+    'https://tse2-mm.cn.bing.net/th/id/OIP-C.Pbhgd_vCFFNQWXi7y-HynAAAAA?w=209&h=209&c=7&r=0&o=7&cb=ucfimgc2&dpr=1.5&pid=1.7&rm=3',
+    'https://tse2-mm.cn.bing.net/th/id/OIP-C.VnGvVkR8K6-8h8Q7Xp8WwAAAAA?w=203&h=203&c=7&r=0&o=7&cb=ucfimgc3&dpr=1.5&pid=1.7&rm=3',
+    'https://tse1-mm.cn.bing.net/th/id/OIP-C.ddX21JNMY3djpNXh8QU9PAAAAA?w=202&h=202&c=7&r=0&o=7&cb=ucfimgc4&dpr=1.5&pid=1.7&rm=3'
+  ]
+  return avatars[id % avatars.length]
+}
+
+// 设置默认玩家数据（备用）
 const setDefaultPlayers = () => {
   players.value = [
     {
       id: 1,
+      userId: 1,
       name: '玩家80061',
-      avatar: 'https://ts1.tc.mm.bing.net/th/id/OIP-C.QQG4bvcAR3CJ0WeQULA9UQAAAA?w=275&h=211&c=8&rs=1&qlt=90&o=6&cb=ucfimgc1&dpr=1.5&pid=3.1&rm=2',
+      avatar: getDefaultAvatar(1),
       totalScore: 0,
       isSelf: true,
       isWin: true,
@@ -155,8 +439,9 @@ const setDefaultPlayers = () => {
     },
     {
       id: 2,
+      userId: 2,
       name: '玩家2',
-      avatar: 'https://tse2-mm.cn.bing.net/th/id/OIP-C.Pbhgd_vCFFNQWXi7y-HynAAAAA?w=209&h=209&c=7&r=0&o=7&cb=ucfimgc2&dpr=1.5&pid=1.7&rm=3',
+      avatar: getDefaultAvatar(2),
       totalScore: 0,
       isSelf: false,
       isWin: true,
@@ -166,33 +451,33 @@ const setDefaultPlayers = () => {
   ]
 }
 
+// 重试加载数据
+const retryLoadData = () => {
+  errorMessage.value = ''
+  loadPageData()
+}
+
 // 安全计算表达式（只支持加减法）
 const safeCalculate = (expression) => {
   if (!expression || expression === '0') return 0
   
   try {
-    // 移除所有空格
     const cleanExpr = expression.replace(/\s+/g, '')
     
-    // 验证表达式只包含数字和加减号
     if (!/^[\d+\-]+$/.test(cleanExpr)) {
       console.warn('表达式包含非法字符:', expression)
       return 0
     }
     
-    // 分割数字和运算符
     const numbers = cleanExpr.split(/[+\-]/).map(num => parseInt(num) || 0)
     const operators = cleanExpr.split(/\d+/).filter(op => op !== '')
     
-    // 如果没有运算符，直接返回数字
     if (operators.length === 0) {
       return numbers[0] || 0
     }
     
-    // 从第一个数字开始计算
     let result = numbers[0]
     
-    // 遍历运算符进行计算
     for (let i = 0; i < operators.length; i++) {
       const operator = operators[i]
       const nextNumber = numbers[i + 1] || 0
@@ -215,14 +500,12 @@ const safeCalculate = (expression) => {
 const checkTotalScore = () => {
   let total = 0
   
-  // 计算所有玩家的得分总和
   players.value.forEach(player => {
     const score = safeCalculate(player.currentScore)
     const finalScore = player.isWin ? score : -score
     total += finalScore
   })
   
-  // 检查总和是否为0
   showScoreWarning.value = total !== 0
   canSubmit.value = total === 0
 }
@@ -251,7 +534,6 @@ const inputNumber = (num) => {
 
 const inputOperator = (op) => {
   const player = players.value[currentPlayerIndex.value]
-  // 确保不会连续输入运算符
   const lastChar = player.currentScore.slice(-1)
   if (lastChar !== '+' && lastChar !== '-') {
     player.currentScore += op
@@ -276,22 +558,20 @@ const clearScore = () => {
 
 // 计算合分 - 将输入的分数归零
 const calculateTotalScore = (index) => {
-  // 将当前玩家的输入分数归零
   players.value[index].currentScore = '0'
   
-  // 显示提示信息
   uni.showToast({
     title: '分数已归零',
     icon: 'success',
     duration: 1000
   })
   
-  // 重新检查总分
   checkTotalScore()
 }
 
-// 提交分数并跳转至结算页
-const submitScore = () => {
+
+// 提交分数到后端
+const submitScore = async () => {
   if (!canSubmit.value) {
     uni.showToast({
       title: '对局分数相加不为0,请检查！',
@@ -302,51 +582,203 @@ const submitScore = () => {
   
   // 计算每个玩家的最终得分
   const roundScores = players.value.map(player => {
-    // 使用安全的方式计算表达式
     const scoreChange = safeCalculate(player.currentScore)
-    
-    // 根据胜负决定分数正负
     const finalScore = player.isWin ? scoreChange : -scoreChange
     
     return {
-      playerId: player.id,
-      score: finalScore
+      userId: player.userId,
+      roomId: roomId.value,
+      score: finalScore,
+      isWin: player.isWin,
+      nickName: player.name || player.nickName,
+      totalScore: finalScore // 本次得分，用于更新ScoreRoomUser
     }
   })
   
-  // 获取现有的对局记录
-  const existingRounds = uni.getStorageSync('gameRounds') || []
-  
-  if (isEditMode.value && editRoundIndex.value >= 0) {
-    // 编辑模式：更新指定索引的对局记录
-    existingRounds[editRoundIndex.value] = roundScores
+  try {
+    submitting.value = true
     
-    uni.showToast({
-      title: '对局分数已更新',
-      icon: 'success'
-    })
-  } else {
-    // 新增模式：添加新的对局记录
-    existingRounds.push(roundScores)
-    
-    uni.showToast({
-      title: '对局分数已保存',
-      icon: 'success'
-    })
-  }
-  
-  // 保存到本地存储
-  uni.setStorageSync('gameRounds', existingRounds)
-  
-  // 添加短暂延迟，确保数据保存完成
-  setTimeout(() => {
-    // 返回房间页面
-    uni.navigateBack({
-      success: () => {
-        console.log('返回房间页面，数据已更新')
+    // 1. 构建对局详情数据 (ScoreRoomDetail)
+    const detailList = roundScores.map(score => {
+      return {
+        roomId: parseInt(roomId.value) || 0,
+        userId: score.userId || 0,
+        detailScore: Math.abs(score.score), // 取绝对值
+        detailType: score.isWin ? 0 : 1, // 0胜 1负
+        gameTime: currentRound.value // 局次
       }
     })
-  }, 500)
+    
+    console.log('对局详情数据:', detailList)
+    
+    let success = false
+    
+    // 2. 先保存对局详情（这是最重要的，必须成功）
+    let detailResult = null
+    if (isEditMode.value && roundDetails.value.length > 0) {
+      // 编辑模式：更新已有的对局详情
+      const updatePromises = roundDetails.value.map(async (detail) => {
+        const scoreData = roundScores.find(s => s.userId == detail.userId)
+        if (scoreData) {
+          const updateData = {
+            detailId: detail.detailId,
+            detailScore: Math.abs(scoreData.score),
+            detailType: scoreData.isWin ? 0 : 1
+          }
+          
+          console.log('更新对局详情:', updateData)
+          
+          try {
+            const response = await uniRequest({
+              url: `${API_BASE_URL}/system/detail`,
+              method: 'PUT',
+              data: updateData
+            })
+            
+            return response
+          } catch (error) {
+            console.error('更新对局详情失败:', error)
+            return null
+          }
+        }
+        return null
+      })
+      
+      detailResult = await Promise.all(updatePromises.filter(p => p !== null))
+    } else {
+      // 新增模式：创建新的对局详情
+      try {
+        detailResult = await uniRequest({
+          url: `${API_BASE_URL}/system/detail`,
+          method: 'POST',
+          data: detailList
+        })
+        console.log('创建对局详情成功:', detailResult)
+      } catch (error) {
+        console.error('创建对局详情失败:', error)
+        // 尝试使用更简单的请求格式
+        detailResult = await uniRequest({
+          url: `${API_BASE_URL}/system/detail`,
+          method: 'POST',
+          data: JSON.stringify(detailList),
+          header: {
+            'Content-Type': 'application/json'
+          }
+        })
+      }
+    }
+    
+    // 3. 尝试更新房间用户总分（如果失败也没关系，总分可以从对局详情重新计算）
+    try {
+      const userList = roundScores.map(score => {
+        return {
+          roomId: parseInt(roomId.value) || 0,
+          userId: score.userId || 0,
+          totalScore: score.totalScore, // 本次得分
+          playerType: 'user',
+          nickName: score.nickName
+        }
+      })
+      
+      console.log('房间用户更新数据:', userList)
+      
+      // 尝试更新用户总分
+      const userResult = await uniRequest({
+        url: `${API_BASE_URL}/system/score/room/user`,
+        method: 'PUT',
+        data: userList
+      })
+      
+      console.log('房间用户更新结果:', userResult)
+    } catch (userError) {
+      console.warn('更新房间用户总分（可能是认证问题）:', userError)
+      // 继续执行，不影响对局详情的保存
+    }
+    
+    // 4. 更新本地存储，确保返回后能看到更新
+    try {
+      // 获取当前的对局记录
+      const existingRounds = uni.getStorageSync('gameRounds') || []
+      
+      // 构建当前局的数据
+      const currentRoundData = players.value.map(player => {
+        const scoreChange = safeCalculate(player.currentScore)
+        const finalScore = player.isWin ? scoreChange : -scoreChange
+        
+        return {
+          playerId: player.id,
+          userId: player.userId,
+          name: player.name,
+          score: finalScore,
+          isWin: player.isWin,
+          round: currentRound.value
+        }
+      })
+      
+      if (isEditMode.value && editRoundIndex.value >= 0) {
+        // 编辑模式：更新指定局
+        existingRounds[editRoundIndex.value] = currentRoundData
+      } else {
+        // 新增模式：添加新局
+        existingRounds.push(currentRoundData)
+      }
+      
+      // 保存到本地存储
+      uni.setStorageSync('gameRounds', existingRounds)
+      console.log('本地对局记录已更新:', existingRounds)
+      
+      // 更新玩家总分到本地存储
+      const existingPlayers = uni.getStorageSync('players') || []
+      players.value.forEach(player => {
+        const existingPlayerIndex = existingPlayers.findIndex(p => p.id === player.id)
+        if (existingPlayerIndex !== -1) {
+          // 累加总分
+          const currentScore = safeCalculate(player.currentScore)
+          const scoreChange = player.isWin ? currentScore : -currentScore
+          existingPlayers[existingPlayerIndex].totalScore = 
+            (existingPlayers[existingPlayerIndex].totalScore || 0) + scoreChange
+        }
+      })
+      uni.setStorageSync('players', existingPlayers)
+      console.log('本地玩家总分已更新:', existingPlayers)
+    } catch (storageError) {
+      console.error('更新本地存储失败:', storageError)
+    }
+    
+    uni.showToast({
+      title: isEditMode.value ? '对局分数已更新' : '对局分数已保存',
+      icon: 'success',
+      duration: 2000
+    })
+    
+    success = true
+    
+    // 返回房间页面，传递刷新标志
+    if (success) {
+      setTimeout(() => {
+        uni.navigateBack({
+          delta: 1,
+          success: () => {
+            console.log('返回单人房间页面')
+            // 触发页面刷新事件
+            uni.$emit('refreshRoomData', { 
+              roomId: roomId.value,
+              forceRefresh: true 
+            })
+          }
+        })
+      }, 1500)
+    }
+  } catch (error) {
+    console.error('提交分数:', error)
+    uni.showToast({
+      title: '提交失败：' + (error.message || '网络错误'),
+      icon: 'none',
+      duration: 2000
+    })
+  } finally {
+    submitting.value = false
+  }
 }
 
 // 返回上一页
@@ -359,6 +791,44 @@ const goBack = () => {
 .scoring-page {
   background-color: #f5f5f5;
   min-height: 100vh;
+  padding-bottom: 300rpx; /* 为键盘区域预留空间 */
+}
+
+// 加载状态样式
+.loading-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100vh;
+}
+
+// 错误提示样式
+.error-message {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 100vh;
+  padding: 40rpx;
+  text-align: center;
+  
+  .uni-icons {
+    margin-bottom: 20rpx;
+  }
+  
+  text {
+    color: #ff3b30;
+    font-size: 28rpx;
+    margin-bottom: 30rpx;
+  }
+  
+  .retry-btn {
+    background-color: #41479b;
+    color: #fff;
+    padding: 20rpx 40rpx;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+  }
 }
 
 .nav-bar {
@@ -400,8 +870,8 @@ const goBack = () => {
 
 .table-header {
   display: flex;
-  justify-content: space-around;
-  padding: 20rpx;
+  justify-content: space-between;
+  padding: 20rpx 30rpx;
   background-color: #f8f8f8;
   border-bottom: 1rpx solid #eee;
 
@@ -410,12 +880,18 @@ const goBack = () => {
     text-align: center;
     font-size: 28rpx;
     font-weight: 500;
+    
+    &:first-child {
+      text-align: left;
+      flex: 2;
+    }
   }
 }
 
 .table-row {
   display: flex;
-  padding: 20rpx;
+  align-items: center;
+  padding: 25rpx 30rpx;
   border-bottom: 1rpx solid #eee;
 
   &:last-child {
@@ -425,19 +901,54 @@ const goBack = () => {
   .player-info {
     display: flex;
     align-items: center;
-    flex: 1;
+    flex: 2;
+    min-width: 200rpx;
 
-    .player-avatar {
-      width: 60rpx;
-      height: 60rpx;
-      border-radius: 50%;
-      margin-right: 10rpx;
+    .avatar-container {
+      position: relative;
+      width: 110rpx;
+      height: 110rpx;
+      margin-right: 20rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      
+      .player-avatar {
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 50%;
+        border: 5rpx solid #fff;
+        box-shadow: 0 6rpx 20rpx rgba(65, 71, 155, 0.3);
+        background: linear-gradient(135deg, #41479b 0%, #8b91e2 100%);
+        transition: all 0.3s ease;
+        
+        &:not([src*="OIP-C"]) {
+          border: 5rpx solid #f0f0f0;
+        }
+      }
+      
+      .self-indicator {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        width: 24rpx;
+        height: 24rpx;
+        background-color: #4CAF50;
+        border: 3rpx solid #fff;
+        border-radius: 50%;
+        z-index: 2;
+      }
     }
 
     .player-name {
-      font-size: 28rpx;
+      font-size: 26rpx;
       color: #000;
       margin-right: 10rpx;
+      max-width: 120rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      font-weight: 500;
     }
 
     .self-tag {
@@ -446,20 +957,29 @@ const goBack = () => {
       font-size: 20rpx;
       padding: 2rpx 8rpx;
       border-radius: 10rpx;
+      margin-left: 5rpx;
     }
   }
 
   .win-lose {
-    display: flex;
     flex: 1;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 10rpx; /* 添加按钮间距 */
 
     .win-btn, .lose-btn {
-      flex: 1;
-      height: 60rpx;
-      line-height: 60rpx;
+      width: 70rpx; /* 固定宽度 */
+      height: 50rpx; /* 固定高度 */
+      line-height: 50rpx;
       border-radius: 8rpx;
-      font-size: 28rpx;
-      margin: 0 5rpx;
+      font-size: 26rpx;
+      text-align: center;
+      padding: 0;
+      margin: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
 
     .win-btn {
@@ -490,30 +1010,42 @@ const goBack = () => {
   .score-input {
     flex: 1;
     display: flex;
+    flex-direction: column;
     align-items: center;
+    min-width: 120rpx;
 
     .score-text {
-      width: 100rpx;
+      width: 120rpx;
       height: 60rpx;
       border: 1rpx solid #eee;
       border-radius: 8rpx;
       text-align: center;
       font-size: 32rpx;
+      margin-bottom: 10rpx;
+      background-color: #f9f9f9;
     }
 
     .sum-btn {
-      margin-left: 10rpx;
-      height: 60rpx;
-      line-height: 60rpx;
-      padding: 0 20rpx;
-      background-color: #41479b;
-      color: #fff;
+      width: 120rpx;
+      height: 50rpx;
+      line-height: 50rpx;
+      background-color: #0055ff;
+      color: #ffffff;
       border-radius: 8rpx;
       font-size: 24rpx;
+      text-align: center;
+      padding: 0;
+      margin: 0;
     }
   }
 }
 
+/* 优化虚拟玩家头像的默认样式 */
+.player-avatar[src*="OIP-C"] {
+  border: 5rpx solid #e6e6ff !important;
+  box-shadow: 0 6rpx 20rpx rgba(139, 145, 226, 0.3) !important;
+}
+
 .score-warning {
   text-align: center;
   color: #ff3b30;
@@ -531,11 +1063,13 @@ const goBack = () => {
   right: 0;
   background-color: #fff;
   padding: 20rpx;
+  border-top: 1rpx solid #ddd;
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
 
   .keypad-row {
     display: flex;
     justify-content: space-between;
-    margin-bottom: 20rpx;
+    margin-bottom: 15rpx;
 
     &:last-child {
       margin-bottom: 0;
@@ -544,27 +1078,58 @@ const goBack = () => {
 
   .keypad-btn {
     width: 120rpx;
-    height: 120rpx;
-    border-radius: 12rpx;
+    height: 100rpx;
+    border-radius: 10rpx;
     background-color: #f8f8f8;
     font-size: 36rpx;
     font-weight: 500;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: none;
+    transition: all 0.2s ease;
+    
+    &:active {
+      background-color: #e0e0e0;
+      transform: scale(0.98);
+    }
     
     &.submit-btn {
       background-color: #41479b;
       color: #fff;
+      font-size: 32rpx;
+      width: 140rpx; /* 稍微加宽提交按钮 */
       
       &.disabled {
         background-color: #ccc;
         color: #999;
       }
+      
+      /* 确保文字填满容器 */
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      text-align: center;
+      padding: 0;
     }
     
     &.clear-btn {
       background-color: #ff3b30;
       color: #fff;
       font-size: 28rpx;
+      width: 140rpx; /* 稍微加宽清空按钮 */
     }
   }
 }
+
+/* 删除按钮特殊样式 */
+.keypad-btn:nth-child(5):not(.submit-btn):not(.clear-btn) {
+  font-size: 32rpx;
+  background-color: #f8f8f8;
+}
+
+/* 确保数字键盘中特殊按钮的样式 */
+.keypad-btn:nth-child(4):not(.submit-btn):not(.clear-btn) {
+  font-size: 32rpx;
+}
 </style>
\ No newline at end of file
diff --git a/scoring/pages/settle/index.vue b/scoring/pages/settle/index.vue
index c372495..61a1402 100644
--- a/scoring/pages/settle/index.vue
+++ b/scoring/pages/settle/index.vue
@@ -23,8 +23,14 @@
       <!-- 动态渲染每个玩家的结算结果 -->
       <view class="table-row" v-for="player in players" :key="player.id">
         <view class="player-info">
-          <image class="player-avatar" :src="player.avatar" mode="aspectFit"></image>
+          <!-- 修改头像容器，添加统一的大头像样式 -->
+          <view class="avatar-container">
+            <image class="player-avatar" :src="player.avatar" mode="aspectFill"></image>
+            <!-- 如果是玩家自己，添加标识 -->
+            <view v-if="player.isSelf" class="self-indicator"></view>
+          </view>
           <text class="player-name">{{ player.name }}</text>
+          <view v-if="player.isSelf" class="self-tag">自己</view>
         </view>
         <view class="win-lose">
           <view class="win-tag" v-if="player.totalScore > 0">胜利!</view>
@@ -68,6 +74,9 @@ onMounted(() => {
   // 获取倍率
   rate.value = parseFloat(options.rate) || 1
   
+  // 获取当前用户信息
+  const currentUserInfo = uni.getStorageSync('userInfo')
+  
   // 从本地存储获取玩家数据和对局记录
   const savedPlayers = uni.getStorageSync('players')
   const savedRounds = uni.getStorageSync('gameRounds')
@@ -75,6 +84,12 @@ onMounted(() => {
   if (savedPlayers && savedRounds) {
     // 计算每个玩家的总分和倍率分
     players.value = savedPlayers.map(player => {
+      // 检查是否是玩家自己
+      const isSelf = currentUserInfo && 
+                    currentUserInfo.userId && 
+                    player.userId && 
+                    player.userId.toString() === currentUserInfo.userId.toString()
+      
       // 计算总分
       let totalScore = 0
       savedRounds.forEach(round => {
@@ -90,7 +105,8 @@ onMounted(() => {
       return {
         ...player,
         totalScore,
-        rateScore
+        rateScore,
+        isSelf: isSelf || false // 添加isSelf字段
       }
     })
   } else {
@@ -101,7 +117,8 @@ onMounted(() => {
         name: '玩家80061',
         avatar: 'https://ts1.tc.mm.bing.net/th/id/OIP-C.QQG4bvcAR3CJ0WeQULA9UQAAAA?w=275&h=211&c=8&rs=1&qlt=90&o=6&cb=ucfimgc1&dpr=1.5&pid=3.1&rm=2',
         totalScore: 0,
-        rateScore: 0
+        rateScore: 0,
+        isSelf: true
       }
     ]
   }
@@ -181,13 +198,21 @@ const shareResult = () => {
     text-align: center;
     font-size: 28rpx;
     font-weight: 500;
+    
+    &:first-child {
+      text-align: left;
+      flex: 1.5; /* 调整玩家信息列宽度 */
+      padding-left: 30rpx;
+    }
   }
 }
 
 .table-row {
   display: flex;
-  padding: 20rpx;
+  align-items: center;
+  padding: 25rpx 30rpx;
   border-bottom: 1rpx solid #ddd;
+  background-color: #fff;
 
   &:last-child {
     border-bottom: none;
@@ -196,18 +221,65 @@ const shareResult = () => {
   .player-info {
     display: flex;
     align-items: center;
-    flex: 1;
+    flex: 1.5; /* 与表头对齐 */
+    min-width: 200rpx;
 
-    .player-avatar {
-      width: 60rpx;
-      height: 60rpx;
-      border-radius: 50%;
-      margin-right: 10rpx;
+    .avatar-container {
+      position: relative;
+      width: 110rpx; /* 容器比头像稍大 */
+      height: 110rpx;
+      margin-right: 20rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      
+      .player-avatar {
+        width: 100rpx; /* 增大头像尺寸 */
+        height: 100rpx;
+        border-radius: 50%;
+        border: 5rpx solid #fff; /* 添加白色边框 */
+        box-shadow: 0 6rpx 20rpx rgba(65, 71, 155, 0.3); /* 添加阴影效果 */
+        background: linear-gradient(135deg, #41479b 0%, #8b91e2 100%); /* 添加渐变背景 */
+        transition: all 0.3s ease;
+        
+        /* 为虚拟玩家头像添加特殊样式 */
+        &:not([src*="OIP-C"]) {
+          /* 处理默认头像的特殊样式 */
+          border: 5rpx solid #f0f0f0;
+        }
+      }
+      
+      /* 玩家自己头像的特殊标识 */
+      .self-indicator {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        width: 24rpx;
+        height: 24rpx;
+        background-color: #4CAF50;
+        border: 3rpx solid #fff;
+        border-radius: 50%;
+        z-index: 2;
+      }
     }
 
-    .player-name {
-      font-size: 28rpx;
-      color: #000;
+.player-name {
+  font-size: 26rpx;
+  color: #000;
+  margin-right: 10rpx;
+  font-weight: 500;
+  /* 允许换行 */
+  word-break: break-all;
+  white-space: normal;
+}
+
+    .self-tag {
+      background-color: #007aff;
+      color: #fff;
+      font-size: 20rpx;
+      padding: 2rpx 8rpx;
+      border-radius: 10rpx;
+      margin-left: 5rpx;
     }
   }
 
@@ -221,24 +293,27 @@ const shareResult = () => {
       background-color: #07c160;
       color: #fff;
       font-size: 24rpx;
-      padding: 5rpx 15rpx;
+      padding: 6rpx 20rpx;
       border-radius: 8rpx;
+      text-align: center;
     }
     
     .lose-tag {
       background-color: #fa5151;
       color: #fff;
       font-size: 24rpx;
-      padding: 5rpx 15rpx;
+      padding: 6rpx 20rpx;
       border-radius: 8rpx;
+      text-align: center;
     }
     
     .draw-tag {
       background-color: #10aeff;
       color: #fff;
       font-size: 24rpx;
-      padding: 5rpx 15rpx;
+      padding: 6rpx 20rpx;
       border-radius: 8rpx;
+      text-align: center;
     }
   }
 
@@ -246,20 +321,28 @@ const shareResult = () => {
     flex: 1;
     text-align: center;
     font-size: 28rpx;
-    color: #666;
+    color: #333;
     display: flex;
     align-items: center;
     justify-content: center;
+    font-weight: 500;
   }
 }
 
+/* 优化虚拟玩家头像的默认样式 */
+.player-avatar[src*="OIP-C"] {
+  /* 虚拟玩家的默认头像样式 */
+  border: 5rpx solid #e6e6ff !important;
+  box-shadow: 0 6rpx 20rpx rgba(139, 145, 226, 0.3) !important;
+}
+
 .detail-link {
   text-align: center;
   margin: 20rpx 0;
   padding: 20rpx;
   
   text {
-    font-size: 26rpx;
+    font-size: 28rpx;
     color: #41479b;
     text-decoration: underline;
   }
@@ -279,5 +362,12 @@ const shareResult = () => {
   font-size: 32rpx;
   font-weight: 500;
   border-radius: 40rpx;
+  box-shadow: 0 4rpx 12rpx rgba(255, 193, 7, 0.3);
+  transition: all 0.2s ease;
+  
+  &:active {
+    background-color: #e6ac00;
+    transform: translateY(2rpx);
+  }
 }
 </style>
\ No newline at end of file
diff --git a/scoring/pages/single-room/index.vue b/scoring/pages/single-room/index.vue
index b41d9ce..b68f098 100644
--- a/scoring/pages/single-room/index.vue
+++ b/scoring/pages/single-room/index.vue
@@ -40,25 +40,25 @@
       </view>
     </view>
 
-    <!-- 玩家列表 - 添加滚动条功能 -->
+    <!-- 玩家列表 - 使用自定义横向滚动 -->
     <view class="player-list-container">
-      <!-- 水平滚动容器 -->
-      <scroll-view 
-        class="player-scroll-view" 
-        scroll-x="true" 
-        :scroll-left="scrollLeft"
-        @scroll="onScroll"
-        :show-scrollbar="false"
-        scroll-with-animation
+      <view class="scroll-wrapper" 
+        @touchstart="onTouchStart" 
+        @touchmove="onTouchMove" 
+        @touchend="onTouchEnd"
+        @touchcancel="onTouchEnd"
       >
-        <view class="player-list">
+        <view class="player-list" :style="{ transform: `translateX(${-scrollLeft}px)` }">
           <!-- 玩家信息行 -->
           <view class="player-row">
             <view class="player-label">玩家 ({{ players.length }}位)</view>
             <view class="player-columns">
               <view class="player-column" v-for="(player, index) in players" :key="player.id">
                 <view class="player-info" @click="editUserInfo(player)">
-                  <image class="player-avatar" :src="player.avatar" mode="aspectFit"></image>
+                  <view class="avatar-container">
+                    <image class="player-avatar" :src="player.avatar" mode="aspectFill"></image>
+                    <view v-if="player.isSelf" class="self-indicator"></view>
+                  </view>
                   <text class="player-name">{{ player.name }}</text>
                   <view v-if="player.isSelf" class="self-tag">自己</view>
                 </view>
@@ -90,25 +90,19 @@
             </view>
           </view>
         </view>
-      </scroll-view>
+      </view>
       
-      <!-- 自定义可拖动滚动条 -->
-      <view class="custom-scrollbar" v-if="showScrollIndicator">
-        <view 
-          class="scroll-track"
-          @touchstart="onTrackTouchStart"
-          @touchmove.prevent="onTrackTouchMove"
-          @touchend="onTrackTouchEnd"
-          :id="trackId"
-        >
+      <!-- 自定义滚动条 -->
+      <view class="custom-scrollbar" v-if="showScrollbar">
+        <view class="scrollbar-track">
           <view 
-            class="scroll-thumb" 
+            class="scrollbar-thumb" 
             :style="{ 
-              left: thumbPosition + '%', 
-              width: thumbWidth + '%' 
+              width: thumbWidth + 'px', 
+              left: thumbPosition + 'px'
             }"
             @touchstart="onThumbTouchStart"
-            @touchmove.prevent="onThumbTouchMove"
+            @touchmove="onThumbTouchMove"
             @touchend="onThumbTouchEnd"
           ></view>
         </view>
@@ -121,7 +115,7 @@
       <button class="settle-btn" @click="openSettlePopup">结算房间</button>
     </view>
 
-   <!-- 添加玩家弹窗 -->
+    <!-- 添加玩家弹窗 -->
     <view v-if="showAddPlayerPopup" class="popup-mask" @click="closeAddPlayerPopup">
       <view class="popup-content" @click.stop>
         <view class="popup-header">
@@ -214,24 +208,23 @@
 </template>
 
 <script setup>
-import { ref, onMounted, onUnmounted, computed, watch, nextTick } from 'vue'
+import { ref, onMounted, onUnmounted, watch, nextTick, getCurrentInstance } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
-import { getuser } from '@/api/room'
+import userApi from '@/api/user'
+import roomApi from '@/api/room'
+import roomUserApi from '@/api/roomUser'
+import roomDetailApi from '@/api/roomDetail'
+
+// 获取当前组件实例
+const instance = getCurrentInstance()
+
 // 房间数据
 const roomId = ref('15198520')
 const voiceEnabled = ref(false)
 const boardEnabled = ref(false)
 
 // 玩家数据
-const players = ref([
-  {
-    id: 1,
-    name: '玩家80061',
-    avatar: 'https://ts1.tc.mm.bing.net/th/id/OIP-C.QQG4bvcAR3CJ0WeQULA9UQAAAA?w=275&h=211&c=8&rs=1&qlt=90&o=6&cb=ucfimgc1&dpr=1.5&pid=3.1&rm=2',
-    totalScore: 0,
-    isSelf: true
-  }
-])
+const players = ref([])
 
 // 游戏对局记录
 const gameRounds = ref([])
@@ -244,43 +237,28 @@ const showTransferPopup = ref(false)
 const rateValue = ref('')
 const virtualPlayerName = ref('')
 
-// 滚动条相关数据
-const scrollLeft = ref(0)
-const scrollWidth = ref(0)
-const scrollViewWidth = ref(0)
-const trackId = ref('scroll-track-' + Date.now())
+// 滚动相关状态
+const scrollLeft = ref(0) // 当前滚动位置
+const scrollWrapperWidth = ref(0) // 滚动容器宽度
+const playerListWidth = ref(0) // 玩家列表总宽度
+const thumbWidth = ref(0) // 滚动条滑块宽度
+const thumbPosition = ref(0) // 滚动条滑块位置
+const showScrollbar = ref(false) // 是否显示滚动条
 
-// 滚动条拖动状态
-const isDragging = ref(false)
-const dragStartX = ref(0)
-const dragStartScrollLeft = ref(0)
-const trackRect = ref({ left: 0, width: 0 })
+// 触摸相关状态
+let isDragging = false // 是否正在拖动滚动条
+let isScrolling = false // 是否正在滚动内容
+let startX = 0 // 触摸开始X坐标
+let startScrollLeft = 0 // 触摸开始时的滚动位置
+let startThumbPosition = 0 // 触摸开始时的滑块位置
 
-// 存储最后知道的用户信息，用于比较
-let lastUserInfo = null
+// 刷新标志
+const shouldRefresh = ref(false)
+// 刷新间隔ID
+const refreshTimer = ref(null)
 
-// 用于保存interval ID的ref
-const storageIntervalIds = ref(null)
-const userInfoIntervalIds = ref(null)
-
-// 计算属性：是否显示滚动条指示器
-const showScrollIndicator = computed(() => {
-  return scrollWidth.value > scrollViewWidth.value
-})
-
-// 计算属性：滚动条滑块宽度
-const thumbWidth = computed(() => {
-  if (scrollWidth.value === 0) return 100
-  const widthRatio = (scrollViewWidth.value / scrollWidth.value) * 100
-  return Math.max(20, Math.min(100, widthRatio)) // 最小宽度20%，最大100%
-})
-
-// 计算属性：滚动条滑块位置
-const thumbPosition = computed(() => {
-  if (scrollWidth.value === 0 || scrollWidth.value <= scrollViewWidth.value) return 0
-  const maxScroll = scrollWidth.value - scrollViewWidth.value
-  return (scrollLeft.value / maxScroll) * (100 - thumbWidth.value)
-})
+// 定时器ID，用于清理
+const scrollInfoTimer = ref(null)
 
 // 格式化分数显示
 const formatScore = (score) => {
@@ -295,144 +273,371 @@ const getPlayerRoundScore = (roundIndex, playerId) => {
   return playerScore ? playerScore.score : 0
 }
 
+// 获取滚动容器和内容尺寸
+const getScrollInfo = () => {
+  nextTick(() => {
+    // 清理之前的定时器
+    if (scrollInfoTimer.value) {
+      clearTimeout(scrollInfoTimer.value)
+    }
+    
+    scrollInfoTimer.value = setTimeout(() => {
+      // 使用 getCurrentInstance 获取当前组件实例
+      const query = uni.createSelectorQuery().in(instance)
+      query.select('.scroll-wrapper').boundingClientRect()
+      query.select('.player-list').boundingClientRect()
+      query.exec((res) => {
+        if (res[0] && res[1]) {
+          scrollWrapperWidth.value = res[0].width
+          playerListWidth.value = res[1].width
+          
+          console.log('滚动容器宽度:', scrollWrapperWidth.value)
+          console.log('玩家列表宽度:', playerListWidth.value)
+          
+          // 计算是否需要显示滚动条
+          if (playerListWidth.value > scrollWrapperWidth.value) {
+            showScrollbar.value = true
+            
+            // 计算滑块宽度（最小40px）
+            const ratio = scrollWrapperWidth.value / playerListWidth.value
+            thumbWidth.value = Math.max(scrollWrapperWidth.value * ratio, 40)
+          } else {
+            showScrollbar.value = false
+            thumbWidth.value = scrollWrapperWidth.value
+          }
+          
+          console.log('是否需要滚动条:', showScrollbar.value)
+          console.log('滑块宽度:', thumbWidth.value)
+          
+          // 更新滑块位置
+          updateThumbPosition()
+        }
+      })
+    }, 100)
+  })
+}
+
+// 更新滑块位置
+const updateThumbPosition = () => {
+  if (playerListWidth.value <= scrollWrapperWidth.value || scrollWrapperWidth.value === 0) {
+    thumbPosition.value = 0
+    return
+  }
+  
+  const maxScroll = playerListWidth.value - scrollWrapperWidth.value
+  const maxThumbMove = scrollWrapperWidth.value - thumbWidth.value
+  
+  if (maxScroll <= 0) {
+    thumbPosition.value = 0
+  } else {
+    thumbPosition.value = (scrollLeft.value / maxScroll) * maxThumbMove
+  }
+}
+
+// 内容触摸开始
+const onTouchStart = (e) => {
+  if (!showScrollbar.value) return
+  
+  isScrolling = true
+  startX = e.touches[0].clientX
+  startScrollLeft = scrollLeft.value
+  e.stopPropagation()
+}
+
+// 内容触摸移动
+const onTouchMove = (e) => {
+  if (!isScrolling || !showScrollbar.value) return
+  
+  const deltaX = startX - e.touches[0].clientX
+  let newScrollLeft = startScrollLeft + deltaX
+  
+  // 限制滚动范围
+  const maxScroll = Math.max(0, playerListWidth.value - scrollWrapperWidth.value)
+  newScrollLeft = Math.max(0, Math.min(newScrollLeft, maxScroll))
+  
+  scrollLeft.value = newScrollLeft
+  updateThumbPosition()
+  
+  e.stopPropagation()
+}
+
+// 内容触摸结束
+const onTouchEnd = () => {
+  isScrolling = false
+}
+
+// 滑块触摸开始
+const onThumbTouchStart = (e) => {
+  if (!showScrollbar.value) return
+  
+  isDragging = true
+  startX = e.touches[0].clientX
+  startThumbPosition = thumbPosition.value
+  e.stopPropagation()
+}
+
+// 滑块触摸移动
+const onThumbTouchMove = (e) => {
+  if (!isDragging || !showScrollbar.value) return
+  
+  const deltaX = e.touches[0].clientX - startX
+  const maxThumbMove = scrollWrapperWidth.value - thumbWidth.value
+  
+  let newPosition = startThumbPosition + deltaX
+  newPosition = Math.max(0, Math.min(newPosition, maxThumbMove))
+  
+  thumbPosition.value = newPosition
+  
+  // 根据滑块位置计算滚动位置
+  if (maxThumbMove > 0) {
+    const maxScroll = playerListWidth.value - scrollWrapperWidth.value
+    const newScrollLeft = (newPosition / maxThumbMove) * maxScroll
+    scrollLeft.value = newScrollLeft
+  }
+  
+  e.stopPropagation()
+}
+
+// 滑块触摸结束
+const onThumbTouchEnd = () => {
+  isDragging = false
+}
+
+// 加载虚拟玩家
+const loadVirtualPlayers = () => {
+  const savedVirtualPlayers = uni.getStorageSync('virtualPlayers') || []
+  const currentPlayers = players.value
+  
+  savedVirtualPlayers.forEach(vp => {
+    const exists = currentPlayers.some(p => 
+      p.isVirtual && (p.id === vp.id || p.name === vp.name)
+    )
+    
+    if (!exists) {
+      const uniqueId = vp.id || `virtual_${Date.now()}_${Math.random().toString(36).substr(2, 6)}`
+      players.value.push({
+        ...vp,
+        id: uniqueId,
+        totalScore: 0
+      })
+    }
+  })
+}
+
+// 清理无效的虚拟玩家
+const cleanupInvalidVirtualPlayers = () => {
+  const validPlayers = players.value.filter(player => {
+    if (player.isVirtual) {
+      const hasRecords = gameRounds.value.some(round => 
+        round.some(item => 
+          item.playerId === player.id || item.playerName === player.name
+        )
+      )
+      
+      if (hasRecords) {
+        return true
+      }
+      
+      if (player.createdTime && (Date.now() - player.createdTime) < 24 * 60 * 60 * 1000) {
+        return true
+      }
+      
+      return false
+    }
+    return true
+  })
+  
+  if (validPlayers.length !== players.value.length) {
+    players.value = validPlayers
+    uni.setStorageSync('players', players.value)
+  }
+}
+
+// 刷新房间数据
+const refreshRoomData = async () => {
+  try {
+    uni.showLoading({
+      title: '刷新数据中...',
+      mask: true
+    })
+    
+    await loadRoomUsers()
+    await loadGameRounds()
+    updateTotalScores()
+    
+    // 重新计算滚动条
+    setTimeout(() => {
+      getScrollInfo()
+    }, 200)
+    
+  } catch (error) {
+    console.error('刷新数据失败:', error)
+  } finally {
+    uni.hideLoading()
+    shouldRefresh.value = false
+  }
+}
+
+// 监听刷新事件
+const setupRefreshListener = () => {
+  uni.$on('refreshRoomData', (data) => {
+    if (data.roomId === roomId.value || data.forceRefresh) {
+      shouldRefresh.value = true
+      refreshRoomData()
+      
+      if (refreshTimer.value) {
+        clearTimeout(refreshTimer.value)
+      }
+      
+      refreshTimer.value = setTimeout(() => {
+        refreshRoomData()
+      }, 5000)
+    }
+  })
+  
+  uni.$on('appActivated', () => {
+    refreshRoomData()
+  })
+}
+
+// 在onMounted中添加事件监听
+onMounted(() => {
+  console.log('组件已挂载')
+  
+  // 从URL参数获取房间ID
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  if (currentPage.options && currentPage.options.roomId) {
+    roomId.value = currentPage.options.roomId.toString()
+  }
+  
+  // 保存房间ID
+  uni.setStorageSync('currentRoomId', roomId.value)
+  
+  // 1. 先加载虚拟玩家
+  loadVirtualPlayers()
+  
+  // 2. 加载房间用户数据
+  loadRoomUsers().then(() => {
+    // 3. 加载对局记录
+    setTimeout(() => {
+      loadGameRounds()
+    }, 300)
+  })
+  
+  // 4. 加载用户信息
+  setTimeout(() => {
+    loadUserInfo()
+  }, 200)
+  
+  // 5. 设置监听器
+  setupRefreshListener()
+  
+  // 6. 初始化滚动条信息
+  setTimeout(() => {
+    getScrollInfo()
+  }, 500)
+})
+
+onShow(() => {
+  // 检查房间ID变化
+  const savedRoomId = uni.getStorageSync('currentRoomId')
+  if (savedRoomId && savedRoomId !== roomId.value) {
+    roomId.value = savedRoomId.toString()
+    loadRoomUsers()
+    setTimeout(() => {
+      loadGameRounds()
+    }, 500)
+  }
+  
+  // 同步玩家信息
+  syncPlayerInfo()
+  loadUserInfo()
+  
+  // 清理无效虚拟玩家
+  cleanupInvalidVirtualPlayers()
+  
+  // 重新计算滚动条
+  setTimeout(() => {
+    getScrollInfo()
+  }, 300)
+})
+
+// 在onUnmounted中清理
+onUnmounted(() => {
+  uni.$off('refreshRoomData')
+  uni.$off('appActivated')
+  
+  // 清理所有定时器
+  if (refreshTimer.value) {
+    clearTimeout(refreshTimer.value)
+  }
+  
+  if (scrollInfoTimer.value) {
+    clearTimeout(scrollInfoTimer.value)
+  }
+})
+
 // 更新玩家总分
 const updateTotalScores = () => {
   players.value.forEach(player => {
-    let total = 0
-    gameRounds.value.forEach(round => {
-      const roundScore = round.find(item => item.playerId === player.id)
-      if (roundScore) {
-        total += roundScore.score
+    player.totalScore = 0
+  })
+  
+  gameRounds.value.forEach((round, roundIndex) => {
+    round.forEach(item => {
+      let matchedPlayer = null
+      
+      if (item.userId) {
+        matchedPlayer = players.value.find(p => 
+          p.userId && p.userId.toString() === item.userId.toString()
+        )
       }
-    })
-    player.totalScore = total
-  })
-}
-
-// 滚动事件处理
-const onScroll = (e) => {
-  scrollLeft.value = e.detail.scrollLeft
-}
-
-// 监听玩家数量变化，更新滚动区域
-watch(players, () => {
-  // 在下一个tick更新滚动区域尺寸
-  setTimeout(() => {
-    updateScrollDimensions()
-  }, 100)
-}, { deep: true })
-
-// 更新滚动区域尺寸
-const updateScrollDimensions = () => {
-  const query = uni.createSelectorQuery()
-  query.select('.player-scroll-view').boundingClientRect()
-  query.select('.player-list').boundingClientRect()
-  query.exec((res) => {
-    if (res[0] && res[1]) {
-      scrollViewWidth.value = res[0].width
-      scrollWidth.value = res[1].width
-    }
-  })
-}
-
-// 获取轨道位置信息
-const getTrackRect = () => {
-  return new Promise((resolve) => {
-    const query = uni.createSelectorQuery()
-    query.select('.custom-scrollbar .scroll-track').boundingClientRect()
-    query.exec((res) => {
-      if (res[0]) {
-        trackRect.value = {
-          left: res[0].left,
-          width: res[0].width
+      
+      if (!matchedPlayer && item.playerId) {
+        matchedPlayer = players.value.find(p => 
+          (p.id && p.id.toString() === item.playerId.toString()) ||
+          (p.userId && p.userId.toString() === item.playerId.toString())
+        )
+      }
+      
+      if (!matchedPlayer && item.playerName) {
+        matchedPlayer = players.value.find(p => 
+          p.name === item.playerName
+        )
+      }
+      
+      if (!matchedPlayer && item.playerName) {
+        const virtualPlayer = players.value.find(p => 
+          p.isVirtual && (p.name === item.playerName || item.playerName.includes(p.name))
+        )
+        
+        if (virtualPlayer) {
+          matchedPlayer = virtualPlayer
         }
-        resolve(trackRect.value)
-      } else {
-        resolve(null)
+      }
+      
+      if (matchedPlayer) {
+        matchedPlayer.totalScore = (matchedPlayer.totalScore || 0) + (item.score || 0)
       }
     })
   })
 }
 
-// 滚动条滑块触摸开始
-const onThumbTouchStart = async (e) => {
-  isDragging.value = true
-  dragStartX.value = e.touches[0].clientX
-  dragStartScrollLeft.value = scrollLeft.value
-  
-  // 获取轨道位置信息
-  await getTrackRect()
-  
-  e.stopPropagation()
-}
-
-// 滚动条滑块触摸移动
-const onThumbTouchMove = (e) => {
-  if (!isDragging.value) return
-  
-  const deltaX = e.touches[0].clientX - dragStartX.value
-  const maxScroll = Math.max(0, scrollWidth.value - scrollViewWidth.value)
-  
-  if (maxScroll > 0 && trackRect.value.width > 0) {
-    const scrollPercent = deltaX / trackRect.value.width
-    const newScrollLeft = dragStartScrollLeft.value + (scrollPercent * maxScroll)
-    scrollLeft.value = Math.max(0, Math.min(maxScroll, newScrollLeft))
-  }
-  
-  e.stopPropagation()
-}
-
-// 滚动条滑块触摸结束
-const onThumbTouchEnd = (e) => {
-  isDragging.value = false
-  e.stopPropagation()
-}
-
-// 滚动条轨道触摸开始
-const onTrackTouchStart = async (e) => {
-  // 获取轨道位置信息
-  const rect = await getTrackRect()
-  if (!rect) return
-  
-  const clickX = e.touches[0].clientX - rect.left
-  const thumbWidthPx = (thumbWidth.value / 100) * rect.width
-  const thumbCenter = (thumbPosition.value / 100) * rect.width + thumbWidthPx / 2
-  
-  // 如果点击位置在滑块中心左侧，滚动到左侧
-  // 如果点击位置在滑块中心右侧，滚动到右侧
-  const maxScroll = Math.max(0, scrollWidth.value - scrollViewWidth.value)
-  
-  if (maxScroll > 0) {
-    if (clickX < thumbCenter) {
-      // 向左滚动一页
-      scrollLeft.value = Math.max(0, scrollLeft.value - scrollViewWidth.value * 0.8)
-    } else {
-      // 向右滚动一页
-      scrollLeft.value = Math.min(maxScroll, scrollLeft.value + scrollViewWidth.value * 0.8)
-    }
-  }
-}
-
-// 滚动条轨道触摸移动
-const onTrackTouchMove = (e) => {
-  // 轨道拖动可以用于快速跳转，但这里我们主要用滑块拖动
-  e.stopPropagation()
-}
-
-// 滚动条轨道触摸结束
-const onTrackTouchEnd = (e) => {
-  e.stopPropagation()
-}
+// 监听玩家数量变化，重新计算滚动条
+watch(players, () => {
+  setTimeout(() => {
+    getScrollInfo()
+  }, 300)
+}, { deep: true })
 
 // 编辑用户信息
 const editUserInfo = (player) => {
   if (player.isSelf) {
-    // 跳转到用户信息编辑页面
     uni.navigateTo({
       url: '/pages/edit-user-info/index'
     })
   } else {
-    // 如果是其他玩家，可以添加其他操作，比如查看玩家信息等
     uni.showToast({
       title: '只能编辑自己的信息',
       icon: 'none'
@@ -440,131 +645,140 @@ const editUserInfo = (player) => {
   }
 }
 
-// 加载用户信息 - 改进版
+// 加载用户信息
 const loadUserInfo = () => {
   const savedUserInfo = uni.getStorageSync('userInfo')
   if (savedUserInfo) {
-    // 强制更新自己的玩家信息
     const selfPlayerIndex = players.value.findIndex(player => player.isSelf)
-    if (selfPlayerIndex !== -1) {
-      players.value[selfPlayerIndex].name = savedUserInfo.nickname
-      players.value[selfPlayerIndex].avatar = savedUserInfo.avatar
-      // 强制触发视图更新
-      players.value = [...players.value]
+    
+    if (selfPlayerIndex === -1) {
+      const selfPlayer = {
+        id: savedUserInfo.userId,
+        userId: savedUserInfo.userId,
+        name: savedUserInfo.nickname || savedUserInfo.nickName || '自己',
+        avatar: savedUserInfo.avatar || savedUserInfo.avatars || 'https://ts1.tc.mm.bing.net/th/id/OIP-C.QQG4bvcAR3CJ0WeQULA9UQAAAA?w=275&h=211&c=8&rs=1&qlt=90&o=6&cb=ucfimgc1&dpr=1.5&pid=3.1&rm=2',
+        totalScore: 0,
+        isSelf: true,
+        isVirtual: false,
+        order: 0
+      }
+      
+      players.value.unshift(selfPlayer)
+    } else {
+      players.value[selfPlayerIndex].name = savedUserInfo.nickname || savedUserInfo.nickName || '自己'
+      players.value[selfPlayerIndex].avatar = savedUserInfo.avatar || savedUserInfo.avatars || 'https://ts1.tc.mm.bing.net/th/id/OIP-C.QQG4bvcAR3CJ0WeQULA9UQAAAA?w=275&h=211&c=8&rs=1&qlt=90&o=6&cb=ucfimgc1&dpr=1.5&pid=3.1&rm=2'
+      players.value[selfPlayerIndex].userId = savedUserInfo.userId
+      players.value[selfPlayerIndex].order = 0
     }
-  }
-}
-
-// 加载对局记录
-const loadGameRounds = () => {
-  const savedRounds = uni.getStorageSync('gameRounds')
-  if (savedRounds) {
-    gameRounds.value = savedRounds
-    updateTotalScores()
+    
+    players.value = [...players.value]
+    updatePlayerOrders()
   }
 }
 
 // 同步玩家信息
 const syncPlayerInfo = () => {
-  // 从本地存储获取最新的玩家信息
   const savedPlayers = uni.getStorageSync('players')
   if (savedPlayers && savedPlayers.length > 0) {
-    // 更新玩家基本信息，但保留当前的总分状态
+    const otherPlayers = savedPlayers.filter(p => !p.isSelf)
+    
     players.value.forEach((player, index) => {
-      const savedPlayer = savedPlayers.find(p => p.id === player.id)
-      if (savedPlayer) {
-        // 只更新头像和名称，不更新总分
-        player.avatar = savedPlayer.avatar
-        player.name = savedPlayer.name
+      if (!player.isSelf) {
+        const savedPlayer = otherPlayers.find(p => {
+          return (p.userId && player.userId && p.userId === player.userId) ||
+                 (p.id === player.id) ||
+                 (p.name === player.name && p.avatar === player.avatar)
+        })
+        
+        if (savedPlayer) {
+          player.avatar = savedPlayer.avatar
+          player.name = savedPlayer.name
+        }
       }
     })
   }
 }
 
-// 用户信息变化监听
-const setupUserInfoListener = () => {
-  lastUserInfo = uni.getStorageSync('userInfo')
-  
-  const intervalId = setInterval(() => {
-    const currentUserInfo = uni.getStorageSync('userInfo')
-    if (JSON.stringify(currentUserInfo) !== JSON.stringify(lastUserInfo)) {
-      console.log('检测到用户信息变化，自动更新')
-      lastUserInfo = currentUserInfo
-      loadUserInfo()
-      syncPlayerInfo()
+// 加载房间用户数据
+const loadRoomUsers = async () => {
+  try {
+    const savedUserInfo = uni.getStorageSync('userInfo')
+    players.value = []
+    
+    // 首先添加玩家自己（如果存在）
+    if (savedUserInfo && savedUserInfo.userId) {
+      const selfPlayer = {
+        id: savedUserInfo.userId,
+        userId: savedUserInfo.userId,
+        name: savedUserInfo.nickname || savedUserInfo.nickName || '自己',
+        avatar: savedUserInfo.avatar || savedUserInfo.avatars || 'https://ts1.tc.mm.bing.net/th/id/OIP-C.QQG4bvcAR3CJ0WeQULA9UQAAAA?w=275&h=211&c=8&rs=1&qlt=90&o=6&cb=ucfimgc1&dpr=1.5&pid=3.1&rm=2',
+        totalScore: 0,
+        isSelf: true,
+        isVirtual: false,
+        order: 0
+      }
+      players.value.push(selfPlayer)
     }
-  }, 500)
-  
-  return intervalId
+    
+    // 从本地存储加载虚拟玩家
+    const savedPlayers = uni.getStorageSync('players') || []
+    const virtualPlayers = savedPlayers.filter(p => p.isVirtual && !p.isSelf)
+    
+    let orderIndex = 1
+    virtualPlayers.forEach(vp => {
+      const exists = players.value.some(p => p.isVirtual && p.name === vp.name)
+      
+      if (!exists) {
+        players.value.push({
+          ...vp,
+          id: vp.id || `virtual_${Date.now()}_${orderIndex}`,
+          totalScore: 0,
+          order: orderIndex
+        })
+        orderIndex++
+      }
+    })
+    
+    // 保存到本地存储（排除玩家自己）
+    const playersToSave = players.value.filter(p => !p.isSelf)
+    uni.setStorageSync('players', playersToSave)
+    
+  } catch (error) {
+    console.error('加载房间用户失败:', error)
+  }
 }
 
-// 添加一个全局事件监听器来监听存储变化
-const setupStorageListener = () => {
-  // 监听存储变化，当 gameRounds 更新时重新加载数据
-  const intervalId = setInterval(() => {
-    const currentRounds = uni.getStorageSync('gameRounds') || []
-    if (JSON.stringify(currentRounds) !== JSON.stringify(gameRounds.value)) {
-      gameRounds.value = currentRounds
-      updateTotalScores()
+const loadGameRounds = async () => {
+  try {
+    const savedRounds = uni.getStorageSync('gameRounds')
+    if (savedRounds && Array.isArray(savedRounds)) {
+      gameRounds.value = savedRounds
+    } else {
+      gameRounds.value = []
     }
-  }, 1000)
-  
-  return intervalId
+    
+    updateTotalScores()
+    uni.setStorageSync('gameRounds', gameRounds.value)
+    
+  } catch (error) {
+    console.error('加载对局记录失败:', error)
+    gameRounds.value = []
+    updateTotalScores()
+  }
 }
 
-// 组件挂载后初始化
-onMounted(() => {
-  console.log('组件已挂载')
-  loadGameRounds()
-  loadUserInfo()
-  
-  // 设置监听器并保存ID以便清理
-  const storageIntervalId = setupStorageListener()
-  const userInfoIntervalId = setupUserInfoListener()
-  
-  // 监听用户信息更新事件
-  uni.$on('userInfoUpdated', () => {
-    console.log('收到用户信息更新事件')
-    loadUserInfo()
-    syncPlayerInfo()
+// 更新玩家排序
+const updatePlayerOrders = () => {
+  let orderIndex = 0
+  players.value.forEach((player, index) => {
+    if (player.isSelf) {
+      player.order = 0
+    } else {
+      player.order = orderIndex + 1
+      orderIndex++
+    }
   })
-  
-  // 保存interval ID以便清理
-  storageIntervalIds.value = storageIntervalId
-  userInfoIntervalIds.value = userInfoIntervalId
-  
-  // 初始化滚动区域尺寸
-  setTimeout(() => {
-    updateScrollDimensions()
-    getTrackRect() // 初始化轨道位置信息
-  }, 500)
-})
-
-// 页面显示时刷新
-onShow(() => {
-  console.log('页面显示，刷新数据')
-  loadGameRounds()
-  syncPlayerInfo()
-  loadUserInfo()
-  
-  // 更新滚动区域尺寸
-  setTimeout(() => {
-    updateScrollDimensions()
-    getTrackRect() // 更新轨道位置信息
-  }, 100)
-})
-
-// 在组件卸载时移除事件监听和定时器
-onUnmounted(() => {
-  uni.$off('userInfoUpdated')
-  
-  if (storageIntervalIds.value) {
-    clearInterval(storageIntervalIds.value)
-  }
-  if (userInfoIntervalIds.value) {
-    clearInterval(userInfoIntervalIds.value)
-  }
-})
+}
 
 // 返回上一页
 const goBack = () => {
@@ -608,7 +822,7 @@ const closeAddVirtualPlayerPopup = () => {
 }
 
 // 确认添加虚拟玩家
-const confirmAddVirtualPlayer = () => {
+const confirmAddVirtualPlayer = async () => {
   if (!virtualPlayerName.value.trim()) {
     uni.showToast({
       title: '请输入玩家名称',
@@ -617,27 +831,88 @@ const confirmAddVirtualPlayer = () => {
     return
   }
 
-  const newPlayer = {
-    id: Date.now(),
-    name: virtualPlayerName.value.trim(),
-    avatar: 'https://ts3.tc.mm.bing.net/th/id/OIP-C.0FQSOvu3OYJFe-h_sZKA6wHaNK?cb=ucfimg2ucfimg=1&rs=1&pid=ImgDetMain&o=7&rm=3',
-    totalScore: 0,
-    isSelf: false
-  }
-  
-  players.value.push(newPlayer)
-  
-  // 保存玩家数据到本地存储
-  uni.setStorageSync('players', players.value)
-  
-  // 关闭所有弹窗
-  closeAddVirtualPlayerPopup()
-  closeAddPlayerPopup()
-  
-  uni.showToast({
-    title: '已添加虚拟玩家',
-    icon: 'success'
+  uni.showLoading({
+    title: '添加中...'
   })
+
+  try {
+    // 检查是否已存在相同名称的玩家
+    const existingPlayer = players.value.find(p => p.name === virtualPlayerName.value.trim())
+    
+    if (existingPlayer) {
+      uni.showToast({
+        title: '该玩家名称已存在',
+        icon: 'none'
+      })
+      uni.hideLoading()
+      return
+    }
+
+    // 计算新的order值（放在玩家自己之后）
+    const maxOrder = players.value.reduce((max, p) => {
+      return p.isSelf ? max : Math.max(max, p.order || 0)
+    }, 0)
+    
+    const newOrder = maxOrder + 1
+    
+    // 生成唯一的虚拟用户ID
+    const virtualUserId = 1000000 + Math.floor(Math.random() * 1000000)
+    const virtualId = `virtual_${Date.now()}_${Math.floor(Math.random() * 1000)}`
+    
+    // 创建新玩家对象
+    const newPlayer = {
+      id: virtualId,
+      userId: virtualUserId,
+      name: virtualPlayerName.value.trim(),
+      avatar: 'https://ts3.tc.mm.bing.net/th/id/OIP-C.0FQSOvu3OYJFe-h_sZKA6wHaNK?cb=ucfimg2ucfimg=1&rs=1&pid=ImgDetMain&o=7&rm=3',
+      totalScore: 0,
+      isSelf: false,
+      isVirtual: true,
+      playerType: 'user',
+      order: newOrder,
+      createdTime: Date.now()
+    }
+    
+    console.log('创建新虚拟玩家:', newPlayer)
+    
+    // 添加到玩家列表（玩家自己之后）
+    const selfIndex = players.value.findIndex(p => p.isSelf)
+    if (selfIndex >= 0) {
+      players.value.splice(selfIndex + 1, 0, newPlayer)
+    } else {
+      players.value.push(newPlayer)
+    }
+    
+    // 重新计算order，保持连续
+    updatePlayerOrders()
+    
+    // 保存到本地存储（排除玩家自己）
+    const playersToSave = players.value.filter(p => !p.isSelf)
+    uni.setStorageSync('players', playersToSave)
+    
+    uni.showToast({
+      title: '已添加虚拟玩家',
+      icon: 'success'
+    })
+    
+    // 关闭弹窗
+    closeAddVirtualPlayerPopup()
+    closeAddPlayerPopup()
+    
+    // 重新计算滚动条
+    setTimeout(() => {
+      getScrollInfo()
+    }, 100)
+    
+  } catch (error) {
+    console.error('添加玩家失败:', error)
+    uni.showToast({
+      title: '添加失败',
+      icon: 'error'
+    })
+  } finally {
+    uni.hideLoading()
+  }
 }
 
 // 打开结算弹窗
@@ -666,18 +941,23 @@ const toggleBoard = (e) => {
   boardEnabled.value = e.detail.value
   
   if (boardEnabled.value) {
-    // 台板开启时添加一个新玩家
     addBoardPlayer()
   } else {
-    // 台板关闭时移除台板玩家
     removeBoardPlayer()
   }
 }
 
 // 添加台板玩家
 const addBoardPlayer = () => {
+  // 确保ID唯一
+  let playerId = Date.now()
+  const usedIds = new Set(players.value.map(p => p.id))
+  while (usedIds.has(playerId)) {
+    playerId = Date.now() + Math.floor(Math.random() * 1000)
+  }
+  
   const newPlayer = {
-    id: Date.now(),
+    id: playerId,
     name: '台板',
     avatar: 'https://tse3-mm.cn.bing.net/th/id/OIP-C.32slU2a6Cq1Sxvd1GV_LvgHaDe?w=292&h=164&c=7&r=0&o=7&cb=ucfimgc2&dpr=1.5&pid=1.7&rm=3',
     totalScore: 0,
@@ -685,11 +965,25 @@ const addBoardPlayer = () => {
   }
   
   players.value.push(newPlayer)
+  
+  // 保存到本地存储
+  uni.setStorageSync('players', players.value)
+  
+  // 重新计算滚动条
+  setTimeout(() => {
+    getScrollInfo()
+  }, 100)
 }
 
 // 移除台板玩家
 const removeBoardPlayer = () => {
   players.value = players.value.filter(player => player.name !== '台板')
+  uni.setStorageSync('players', players.value)
+  
+  // 重新计算滚动条
+  setTimeout(() => {
+    getScrollInfo()
+  }, 100)
 }
 
 // 确认结算
@@ -705,12 +999,15 @@ const confirmSettlement = () => {
   // 保存玩家数据到本地存储，供结算页面使用
   uni.setStorageSync('players', players.value)
   
+  // 保存游戏记录到本地存储
+  uni.setStorageSync('gameRounds', gameRounds.value)
+  
   // 关闭弹窗
   closeSettlePopup()
   
   // 跳转到结算页面，传递倍率参数
   uni.navigateTo({
-    url: `/pages/settle/index?rate=${rateValue.value}`
+    url: `/pages/settle/index?rate=${rateValue.value}&roomId=${roomId.value}`
   })
 }
 
@@ -721,14 +1018,17 @@ const toggleVoice = (e) => {
 
 // 开局计分
 const startScoring = () => {
+  // 保存当前玩家数据到本地存储
+  uni.setStorageSync('players', players.value)
+  
   // 将玩家数据传递到计分页面
   uni.navigateTo({
-    url: `/pages/scoring/index?players=${encodeURIComponent(JSON.stringify(players.value))}&round=${gameRounds.value.length + 1}`
+    url: `/pages/scoring/index?players=${encodeURIComponent(JSON.stringify(players.value))}&round=${gameRounds.value.length + 1}&roomId=${roomId.value}`
   })
 }
 
 // 编辑对局分数
-const editRoundScore = (roundIndex, playerId) => {
+const editRoundScore = async (roundIndex, playerId) => {
   // 获取该局的所有玩家得分数据
   const roundScores = gameRounds.value[roundIndex]
   
@@ -752,9 +1052,12 @@ const editRoundScore = (roundIndex, playerId) => {
     }
   })
   
+  // 保存当前玩家数据到本地存储
+  uni.setStorageSync('players', players.value)
+  
   // 跳转到计分页面，传递玩家数据、对局索引和编辑模式标识
   uni.navigateTo({
-    url: `/pages/scoring/index?players=${encodeURIComponent(JSON.stringify(playersWithScores))}&round=${roundIndex + 1}&mode=edit&roundIndex=${roundIndex}`
+    url: `/pages/scoring/index?players=${encodeURIComponent(JSON.stringify(playersWithScores))}&round=${roundIndex + 1}&mode=edit&roundIndex=${roundIndex}&roomId=${roomId.value}`
   })
 }
 
@@ -848,27 +1151,27 @@ const shareRoom = () => {
   }
 }
 
-/* 玩家列表容器 - 新增样式 */
+/* 玩家列表容器 */
 .player-list-container {
-  padding: 0 30rpx 30rpx;
+  padding: 0 30rpx 60rpx; /* 为滚动条留出底部空间 */
   position: relative;
 }
 
-/* 滚动视图样式 */
-.player-scroll-view {
+/* 滚动容器 */
+.scroll-wrapper {
   width: 100%;
-  white-space: nowrap;
-  
-  // 隐藏原生滚动条
-  ::-webkit-scrollbar {
-    display: none;
-  }
+  overflow: hidden;
+  position: relative;
+  touch-action: pan-x; /* 允许水平滑动 */
 }
 
-/* 玩家列表 - 修改后的样式 */
+/* 玩家列表 */
 .player-list {
-  display: inline-block;
-  min-width: 100%;
+  display: flex;
+  flex-direction: column;
+  transition: transform 0.2s ease;
+  will-change: transform;
+  min-width: fit-content;
 }
 
 .player-row {
@@ -882,25 +1185,30 @@ const shareRoom = () => {
 
   .player-label {
     width: 120rpx;
+    flex-shrink: 0;
     font-size: 28rpx;
     color: #000;
     display: flex;
     align-items: center;
-    flex-shrink: 0;
+    justify-content: center;
   }
 
   .player-columns {
     display: flex;
-    flex: 1;
-    justify-content: flex-start;
+    min-width: fit-content;
   }
 
   .player-column {
     display: flex;
     flex-direction: column;
     align-items: center;
-    width: 120rpx;
+    width: 140rpx;
     flex-shrink: 0;
+    margin-right: 10rpx;
+    
+    &:last-child {
+      margin-right: 0;
+    }
   }
 
   .player-info {
@@ -908,27 +1216,52 @@ const shareRoom = () => {
     flex-direction: column;
     align-items: center;
     
-    // 添加点击效果
     &:active {
       opacity: 0.7;
     }
 
-    .player-avatar {
-      width: 80rpx;
-      height: 80rpx;
-      border-radius: 50%;
+    .avatar-container {
+      position: relative;
+      width: 110rpx;
+      height: 110rpx;
       margin-bottom: 10rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      
+      .player-avatar {
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 50%;
+        border: 5rpx solid #fff;
+        box-shadow: 0 6rpx 20rpx rgba(65, 71, 155, 0.3);
+        background: linear-gradient(135deg, #41479b 0%, #8b91e2 100%);
+        transition: all 0.3s ease;
+      }
+      
+      .self-indicator {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        width: 24rpx;
+        height: 24rpx;
+        background-color: #4CAF50;
+        border: 3rpx solid #fff;
+        border-radius: 50%;
+        z-index: 2;
+      }
     }
 
     .player-name {
-      font-size: 24rpx;
+      font-size: 26rpx;
       color: #000;
       margin-bottom: 5rpx;
       text-align: center;
-      max-width: 100rpx;
+      max-width: 120rpx;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
+      font-weight: 500;
     }
 
     .self-tag {
@@ -937,6 +1270,7 @@ const shareRoom = () => {
       font-size: 20rpx;
       padding: 2rpx 8rpx;
       border-radius: 10rpx;
+      margin-top: 2rpx;
     }
   }
 
@@ -960,39 +1294,38 @@ const shareRoom = () => {
   }
 }
 
-/* 自定义可拖动滚动条样式 */
+/* 自定义滚动条 */
 .custom-scrollbar {
-  margin-top: 20rpx;
-  padding: 0 20rpx;
+  position: absolute;
+  bottom: 20rpx;
+  left: 30rpx;
+  right: 30rpx;
+  height: 12rpx;
+  z-index: 100;
   
-  .scroll-track {
-    height: 12rpx;
-    background-color: #f0f0f0;
-    border-radius: 6rpx;
+  .scrollbar-track {
     position: relative;
-    
-    // 添加点击区域扩展
-    &::before {
-      content: '';
-      position: absolute;
-      top: -10rpx;
-      bottom: -10rpx;
-      left: 0;
-      right: 0;
-    }
-  }
-  
-  .scroll-thumb {
-    position: absolute;
+    width: 100%;
     height: 100%;
-    background-color: #41479b;
+    background: rgba(240, 240, 240, 0.9);
     border-radius: 6rpx;
-    transition: all 0.1s ease;
+    overflow: visible;
     
-    // 添加悬停效果
-    &:active {
-      background-color: #33367a;
-      transform: scale(1.1);
+    .scrollbar-thumb {
+      position: absolute;
+      top: 0;
+      height: 100%;
+      min-width: 40px;
+      background: linear-gradient(90deg, #41479b, #6a6fcc);
+      border-radius: 6rpx;
+      border: 2rpx solid rgba(255, 255, 255, 0.8);
+      box-shadow: 0 2rpx 6rpx rgba(65, 71, 155, 0.3);
+      transition: background 0.3s ease;
+      touch-action: none;
+      
+      &:active {
+        background: #33367a;
+      }
     }
   }
 }
@@ -1002,7 +1335,7 @@ const shareRoom = () => {
   display: flex;
   padding: 40rpx;
   gap: 40rpx;
-  margin-top: 500rpx;
+  margin-top: 450rpx;
   
   button {
     flex: 1;
@@ -1196,11 +1529,11 @@ const shareRoom = () => {
     padding: 30rpx;
 
     .settle-tip {
-     font-size: 32rpx;
-     font-weight: 600;
-     color: #000;
-     margin-bottom: 30rpx;
-     margin-left: 120rpx;
+      font-size: 32rpx;
+      font-weight: 600;
+      color: #000;
+      margin-bottom: 30rpx;
+      text-align: center;
     }
 
     .rate-input-section {
@@ -1280,5 +1613,4 @@ const shareRoom = () => {
     }
   }
 }
-
 </style>
\ No newline at end of file
diff --git a/scoring/utils/request.js b/scoring/utils/request.js
index b1f5e5b..f42e34d 100644
--- a/scoring/utils/request.js
+++ b/scoring/utils/request.js
@@ -1,3 +1,4 @@
+// api/request.js
 import { BASE_URL } from './CommonValues.js';
 import { loginSystem } from '@/api/login.js';
 
@@ -50,13 +51,50 @@ export async function SIMPLE(url, data, method) {
 			dataType: 'json',
 			data: data,
 			success: res => {
-				if(res.data.code == '200' || res.data.statusCode == '200') {
+				console.log(`API响应 ${url}:`, res);
+				
+				// 更灵活的状态码判断
+				let isSuccess = false;
+				
+				// 检查HTTP状态码
+				if (res.statusCode === 200) {
+					// 检查响应数据
+					if (res.data) {
+						// 如果data是数组，直接认为是成功的
+						if (Array.isArray(res.data)) {
+							isSuccess = true;
+						}
+						// 如果有code字段且为200
+						else if (res.data.code === 200 || res.data.code === '200') {
+							isSuccess = true;
+						}
+						// 如果有statusCode字段且为200
+						else if (res.data.statusCode === 200 || res.data.statusCode === '200') {
+							isSuccess = true;
+						}
+						// 如果没有code字段但有data字段
+						else if (res.data.data !== undefined) {
+							isSuccess = true;
+						}
+						// 如果data是对象但不是错误结构
+						else if (typeof res.data === 'object' && !res.data.errMsg) {
+							isSuccess = true;
+						}
+					} else {
+						// 没有data字段但状态码是200
+						isSuccess = true;
+					}
+				}
+				
+				if (isSuccess) {
 					resolve(res.data)
 				} else {
+					console.error('请求返回错误状态:', res.data);
 					reject(res)
 				}
 			},
 			fail: err => {
+				console.error('请求失败:', err);
 				reject(err)
 			}
 		})
@@ -75,13 +113,50 @@ export function SIMPLE_TOKEN(url, data, token, method) {
 			dataType: 'json',
 			data: data,
 			success: res => {
-				if(res.data.code == '200' || res.data.statusCode == '200') {
+				console.log(`API响应 ${url}:`, res);
+				
+				// 更灵活的状态码判断
+				let isSuccess = false;
+				
+				// 检查HTTP状态码
+				if (res.statusCode === 200) {
+					// 检查响应数据
+					if (res.data) {
+						// 如果data是数组，直接认为是成功的
+						if (Array.isArray(res.data)) {
+							isSuccess = true;
+						}
+						// 如果有code字段且为200
+						else if (res.data.code === 200 || res.data.code === '200') {
+							isSuccess = true;
+						}
+						// 如果有statusCode字段且为200
+						else if (res.data.statusCode === 200 || res.data.statusCode === '200') {
+							isSuccess = true;
+						}
+						// 如果没有code字段但有data字段
+						else if (res.data.data !== undefined) {
+							isSuccess = true;
+						}
+						// 如果data是对象但不是错误结构
+						else if (typeof res.data === 'object' && !res.data.errMsg) {
+							isSuccess = true;
+						}
+					} else {
+						// 没有data字段但状态码是200
+						isSuccess = true;
+					}
+				}
+				
+				if (isSuccess) {
 					resolve(res.data)
 				} else {
+					console.error('请求返回错误状态:', res.data);
 					reject(res)
 				}
 			},
 			fail: err => {
+				console.error('请求失败:', err);
 				reject(err)
 			}
 		})