diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 1abc839..437f2c3 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -1,225 +1,537 @@
 <template>
-  <div class="login">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">{{title}}</h3>
-      <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        >
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
-          v-model="loginForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+  <div class="page-container">
+    <!-- 登录主容器 -->
+    <div class="login-wrapper">
+      <!-- 系统logo+名称 -->
+      <div class="system-info">
+        <div class="logo-box">
+          <i class="el-icon-location logo-icon"></i>
         </div>
-      </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="handleLogin"
+        <h1 class="system-title">多人联网演示系统</h1>
+      </div>
+
+      <!-- 登录卡片 -->
+      <div class="login-card">
+        <!-- 登录/注册切换标签 -->
+      <div class="tab-container">
+        <button 
+          @click="switchTab('login')"
+          :class="{ 'tab-active': activeTab === 'login' }"
+          class="tab-item"
         >
-          <span v-if="!loading">登 录</span>
-          <span v-else>登 录 中...</span>
-        </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
+          <i class="el-icon-user mr-1"></i> 登录
+        </button>
+        <button 
+          @click="switchTab('register')"
+          :class="{ 'tab-active': activeTab === 'register' }"
+          class="tab-item"
+        >
+          <i class="el-icon-edit mr-1"></i> 注册
+        </button>
+      </div>
+
+        <!-- 表单容器 -->
+        <div class="form-container">
+          <!-- 登录表单 -->
+          <div v-if="activeTab === 'login'">
+            <!-- 账号输入 -->
+            <div class="form-item">
+              <label class="form-label">账号</label>
+              <div class="input-wrapper">
+                <i class="el-icon-user input-icon"></i>
+                <input 
+                  type="text" 
+                  v-model="form.username"
+                  placeholder="请输入账号" 
+                  class="form-input"
+                >
+              </div>
+            </div>
+
+            <!-- 密码输入 -->
+            <div class="form-item">
+              <div class="pwd-label-wrapper">
+                <label class="form-label">密码</label>
+                <a href="#" class="forgot-pwd">忘记密码？</a>
+              </div>
+              <div class="input-wrapper">
+                <i class="el-icon-lock input-icon"></i>
+                <input 
+                  :type="showPwd ? 'text' : 'password'" 
+                  v-model="form.password"
+                  placeholder="请输入密码" 
+                  class="form-input"
+                >
+                <i 
+                  @click="togglePwd"
+                  :class="showPwd ? 'el-icon-view' : 'el-icon-hide'"
+                  class="toggle-pwd-icon"
+                ></i>
+              </div>
+            </div>
+
+            <!-- 记住密码 + 自动登录 -->
+            <div class="checkbox-group">
+              <label class="checkbox-item">
+                <input type="checkbox" checked class="checkbox">
+                <span>记住密码</span>
+              </label>
+              <label class="checkbox-item">
+                <input type="checkbox" class="checkbox">
+                <span>自动登录</span>
+              </label>
+            </div>
+
+            <!-- 登录按钮 -->
+            <button 
+              @click="handleLogin"
+              :class="{ 'login-btn-disabled': isLogging }"
+              class="login-btn"
+            >
+              {{ isLogging ? '登录中...' : '登录系统' }}
+            </button>
+          </div>
+
+          <!-- 注册表单 -->
+          <div v-else-if="activeTab === 'register'">
+            <!-- 账号输入 -->
+            <div class="form-item">
+              <label class="form-label">账号</label>
+              <div class="input-wrapper">
+                <i class="el-icon-user input-icon"></i>
+                <input 
+                  type="text" 
+                  v-model="form.username"
+                  placeholder="请输入账号" 
+                  class="form-input"
+                >
+              </div>
+            </div>
+
+            <!-- 密码输入 -->
+            <div class="form-item">
+              <label class="form-label">密码</label>
+              <div class="input-wrapper">
+                <i class="el-icon-lock input-icon"></i>
+                <input 
+                  :type="showPwd ? 'text' : 'password'" 
+                  v-model="form.password"
+                  placeholder="请输入密码" 
+                  class="form-input"
+                >
+                <i 
+                  @click="togglePwd"
+                  :class="showPwd ? 'el-icon-view' : 'el-icon-hide'"
+                  class="toggle-pwd-icon"
+                ></i>
+              </div>
+            </div>
+
+            <!-- 确认密码输入 -->
+            <div class="form-item">
+              <label class="form-label">确认密码</label>
+              <div class="input-wrapper">
+                <i class="el-icon-lock input-icon"></i>
+                <input 
+                  :type="showConfirmPwd ? 'text' : 'password'" 
+                  v-model="form.confirmPassword"
+                  placeholder="请确认密码" 
+                  class="form-input"
+                >
+                <i 
+                  @click="toggleConfirmPwd"
+                  :class="showConfirmPwd ? 'el-icon-view' : 'el-icon-hide'"
+                  class="toggle-pwd-icon"
+                ></i>
+              </div>
+            </div>
+
+            <!-- 权限等级 -->
+            <div class="form-item">
+              <label class="form-label">权限等级</label>
+              <select 
+                v-model="form.role"
+                class="form-select"
+              >
+                <option value="user">普通用户</option>
+                <option value="host">主持人</option>
+                <option value="admin">管理员</option>
+              </select>
+            </div>
+
+            <!-- 注册按钮 -->
+            <button 
+              @click="handleRegister"
+              :class="{ 'login-btn-disabled': isRegistering }"
+              class="login-btn"
+            >
+              {{ isRegistering ? '注册中...' : '注册账号' }}
+            </button>
+          </div>
         </div>
-      </el-form-item>
-    </el-form>
-    <!--  底部  -->
-    <div class="el-login-footer">
-      <span>{{ footerContent }}</span>
+      </div>
+
+      <!-- 底部版权/提示 -->
+      <div class="copyright">
+        <p>© 2026 多人联网演示系统 | 支持Windows/国产化系统互通</p>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login"
-import Cookies from "js-cookie"
-import { encrypt, decrypt } from '@/utils/jsencrypt'
-import defaultSettings from '@/settings'
+import axios from 'axios';
 
 export default {
-  name: "Login",
+  name: 'Login',
   data() {
     return {
-      title: process.env.VUE_APP_TITLE,
-      footerContent: defaultSettings.footerContent,
-      codeUrl: "",
-      loginForm: {
-        username: "admin",
-        password: "admin123",
-        rememberMe: false,
-        code: "",
-        uuid: ""
-      },
-      loginRules: {
-        username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
-        ],
-        password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
-        ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
-      },
-      loading: false,
-      // 验证码开关
-      captchaEnabled: true,
-      // 注册开关
-      register: false,
-      redirect: undefined
-    }
-  },
-  watch: {
-    $route: {
-      handler: function(route) {
-        this.redirect = route.query && route.query.redirect
-      },
-      immediate: true
+      activeTab: 'login',
+      showPwd: false,
+      showConfirmPwd: false,
+      isLogging: false,
+      isRegistering: false,
+      // 表单数据
+      form: {
+        username: '',
+        password: '',
+        confirmPassword: '',
+        role: 'user' // 默认普通用户
+      }
     }
   },
-  created() {
-    this.getCode()
-    this.getCookie()
-  },
   methods: {
-    getCode() {
-      getCodeImg().then(res => {
-        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
-        if (this.captchaEnabled) {
-          this.codeUrl = "data:image/gif;base64," + res.img
-          this.loginForm.uuid = res.uuid
-        }
-      })
+    switchTab(tab) {
+      this.activeTab = tab;
     },
-    getCookie() {
-      const username = Cookies.get("username")
-      const password = Cookies.get("password")
-      const rememberMe = Cookies.get('rememberMe')
-      this.loginForm = {
-        username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
-      }
+    togglePwd() {
+      this.showPwd = !this.showPwd;
+    },
+    toggleConfirmPwd() {
+      this.showConfirmPwd = !this.showConfirmPwd;
     },
     handleLogin() {
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loading = true
-          if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 })
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 })
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 })
-          } else {
-            Cookies.remove("username")
-            Cookies.remove("password")
-            Cookies.remove('rememberMe')
-          }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
-            // this.$router.push({ path: this.redirect || "/" }).catch(()=>{})
-            // 跳转选择房间
-            this.$router.push({ path: this.redirect || "/selectRoom" }).catch(()=>{})
-          }).catch(() => {
-            this.loading = false
-            if (this.captchaEnabled) {
-              this.getCode()
-            }
-          })
-        }
-      })
+      if (this.isLogging) return;
+      this.isLogging = true;
+      // 直接跳转到selectRoom界面，忽略密码验证
+      setTimeout(() => {
+        this.$router.push('/selectRoom');
+        this.isLogging = false;
+      }, 500);
+    },
+    async handleRegister() {
+      if (this.isRegistering) return;
+      
+      // 表单验证
+      if (!this.form.username || !this.form.password || !this.form.confirmPassword) {
+        alert('请填写所有必填字段');
+        return;
+      }
+      
+      if (this.form.password !== this.form.confirmPassword) {
+        alert('两次输入的密码不一致');
+        return;
+      }
+      
+      this.isRegistering = true;
+      
+      try {
+        const response = await axios.post('http://localhost:3002/api/users/register', {
+          username: this.form.username,
+          password: this.form.password,
+          role: this.form.role
+        });
+        
+        this.isRegistering = false;
+        alert('注册成功，请登录');
+        this.switchTab('login');
+        // 清空表单
+        this.form = {
+          username: '',
+          password: '',
+          confirmPassword: '',
+          role: 'user'
+        };
+      } catch (error) {
+        this.isRegistering = false;
+        alert(error.response?.data?.message || '注册失败，请重试');
+      }
     }
   }
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-.login {
+<style scoped>
+/* 全局页面样式 */
+.page-container {
+  background-color: #F9FAFB; /* 原 neutral 色值 */
+  min-height: 100vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 16px;
+  color: #333842; /* 原 dark 色值 */
+  font-family: Inter, system-ui, sans-serif;
+}
+
+/* 登录主容器 */
+.login-wrapper {
+  width: 100%;
+  max-width: 320px;
+}
+
+/* 系统信息（logo+名称） */
+.system-info {
+  text-align: center;
+  margin-bottom: 24px;
   display: flex;
+  align-items: center;
   justify-content: center;
+  gap: 12px;
+}
+
+.logo-box {
+  display: inline-block;
+  width: 48px;
+  height: 48px;
+  background-color: #165DFF; /* 原 primary 色值 */
+  border-radius: 50%;
+  display: flex;
   align-items: center;
-  height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
-  background-size: cover;
+  justify-content: center;
+  margin-bottom: 0;
+}
+
+.logo-icon {
+  color: white;
+  font-size: 24px;
+}
+
+.system-title {
+  font-size: 20px;
+  font-weight: 600;
+  color: #333842;
+  margin: 0;
+}
+
+.system-desc {
+  font-size: 12px;
+  color: #9CA3AF; /* 原 gray-500 色值 */
+  margin-top: 4px;
+}
+
+/* 登录卡片 */
+.login-card {
+  background-color: white;
+  border-radius: 8px;
+  box-shadow: 0 4px 12px rgba(22, 93, 255, 0.08);
+  overflow: hidden;
 }
-.title {
-  margin: 0px auto 30px auto;
+
+/* 标签容器 */
+.tab-container {
+  display: flex;
+  border-bottom: 1px solid #E5E7EB; /* 原 gray-200 色值 */
+}
+
+.tab-item {
+  flex: 1;
+  padding: 12px 0;
+  font-size: 14px;
   text-align: center;
-  color: #707070;
+  background: transparent;
+  border: none;
+  cursor: pointer;
+  color: #333842;
+  transition: color 0.2s;
+}
+
+.tab-item:hover {
+  color: #165DFF; /* 原 primary 色值 */
+}
+
+.tab-active {
+  border-bottom: 2px solid #165DFF;
+  color: #165DFF;
+  font-weight: 500;
+}
+
+/* 表单容器 */
+.form-container {
+  padding: 24px;
+}
+
+.form-item {
+  margin-bottom: 16px;
+}
+
+.form-item:last-of-type {
+  margin-bottom: 20px;
+}
+
+.form-label {
+  display: block;
+  font-size: 12px;
+  font-weight: 500;
+  margin-bottom: 4px;
+  color: #71717A; /* 原 gray-600 色值 */
 }
 
-.login-form {
+/* 房间选择下拉框 */
+.form-select {
+  width: 100%;
+  padding: 8px 12px;
+  border: 1px solid #E5E7EB;
   border-radius: 6px;
-  background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
-  z-index: 1;
-  .el-input {
-    height: 38px;
-    input {
-      height: 38px;
-    }
-  }
-  .input-icon {
-    height: 39px;
-    width: 14px;
-    margin-left: 2px;
-  }
+  font-size: 14px;
+  outline: none;
+  transition: border-color 0.2s;
 }
-.login-tip {
-  font-size: 13px;
-  text-align: center;
-  color: #bfbfbf;
-}
-.login-code {
-  width: 33%;
-  height: 38px;
-  float: right;
-  img {
-    cursor: pointer;
-    vertical-align: middle;
-  }
+
+.form-select:focus {
+  border-color: #165DFF;
+}
+
+/* 输入框容器 */
+.input-wrapper {
+  position: relative;
+}
+
+.form-input {
+  width: 100%;
+  padding: 8px 12px 8px 36px;
+  border: 1px solid #E5E7EB;
+  border-radius: 6px;
+  font-size: 14px;
+  outline: none;
+  transition: border-color 0.2s;
+}
+
+.form-input:focus {
+  border-color: #165DFF;
+}
+
+.input-icon {
+  position: absolute;
+  left: 12px;
+  top: 50%;
+  transform: translateY(-50%);
+  color: #9CA3AF; /* 原 gray-400 色值 */
+}
+
+/* 密码标签行 */
+.pwd-label-wrapper {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 4px;
+}
+
+.forgot-pwd {
+  font-size: 12px;
+  color: #165DFF;
+  text-decoration: none;
+}
+
+.forgot-pwd:hover {
+  text-decoration: underline;
+}
+
+/* 密码显隐图标 */
+.toggle-pwd-icon {
+  position: absolute;
+  right: 12px;
+  top: 50%;
+  transform: translateY(-50%);
+  color: #9CA3AF;
+  cursor: pointer;
+}
+
+/* 复选框组 */
+.checkbox-group {
+  display: flex;
+  align-items: center;
+  font-size: 12px;
+  margin-bottom: 24px;
+}
+
+.checkbox-item {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  margin-right: 16px;
+}
+
+.checkbox {
+  margin-right: 4px;
+  color: #165DFF;
 }
-.el-login-footer {
-  height: 40px;
-  line-height: 40px;
-  position: fixed;
-  bottom: 0;
+
+/* 登录按钮 */
+.login-btn {
   width: 100%;
+  background-color: #165DFF;
+  color: white;
+  padding: 8px 0;
+  border: none;
+  border-radius: 6px;
+  font-size: 14px;
+  font-weight: 500;
+  cursor: pointer;
+  transition: background-color 0.2s;
+}
+
+.login-btn:hover {
+  background-color: rgba(22, 93, 255, 0.9);
+}
+
+.login-btn-disabled {
+  opacity: 0.8;
+  cursor: not-allowed;
+}
+
+/* 其他登录方式 */
+.other-login {
   text-align: center;
-  color: #fff;
-  font-family: Arial;
+  margin-top: 24px;
+}
+
+.other-login-desc {
   font-size: 12px;
-  letter-spacing: 1px;
+  color: #9CA3AF;
+  margin-bottom: 12px;
+}
+
+.other-login-btns {
+  display: flex;
+  justify-content: center;
+  gap: 16px;
+}
+
+.other-login-btn {
+  width: 32px;
+  height: 32px;
+  border-radius: 50%;
+  background-color: #E8F3FF; /* 原 secondary 色值 */
+  border: none;
+  color: #165DFF;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  transition: all 0.2s;
+}
+
+.other-login-btn:hover {
+  background-color: #165DFF;
+  color: white;
 }
-.login-code-img {
-  height: 38px;
+
+/* 版权信息 */
+.copyright {
+  text-align: center;
+  margin-top: 16px;
+  font-size: 12px;
+  color: #9CA3AF;
 }
 </style>
diff --git a/ruoyi-ui/src/views/selectRoom/index.vue b/ruoyi-ui/src/views/selectRoom/index.vue
index 2ee640a..e1575f9 100644
--- a/ruoyi-ui/src/views/selectRoom/index.vue
+++ b/ruoyi-ui/src/views/selectRoom/index.vue
@@ -1,28 +1,992 @@
 <template>
-  <div>
-    <el-button @click="go()">跳转</el-button>
-    <el-button @click="goHome()">返回首页</el-button>
+  <div class="page-container">
+    <!-- 背景装饰 -->
+    <div class="background-decoration"></div>
+    
+    <!-- 主内容区域 -->
+    <div class="main-content">
+      <!-- 房间选择面板 -->
+      <div class="room-panel">
+        <!-- 面板标题 -->
+        <div class="panel-header">
+          <h2>房间选择</h2>
+          <p>选择或创建您要加入的协作房间</p>
+        </div>
+
+        <!-- 房间列表 -->
+        <div class="room-list">
+          <!-- 房间项 -->
+          <div 
+            v-for="room in getParentRooms" 
+            :key="room.id"
+            class="room-group"
+          >
+            <!-- 父房间 -->
+            <div 
+              class="room-item parent-room"
+              :class="{ 'active': selectedRoom === room.id }"
+              @click="toggleRoomExpansion(room)"
+              @contextmenu.prevent="showContextMenu($event, room)"
+            >
+              <div class="room-info">
+                <div class="room-icon">
+                  <i class="fa fa-building"></i>
+                </div>
+                <div class="room-details">
+                  <h3>{{ room.name }}</h3>
+                  <p class="room-stats">{{ getChildRooms(room.id).length }} 个子房间</p>
+                </div>
+              </div>
+              <div class="room-actions">
+                <div class="expand-icon">
+                  <i class="fa" :class="expandedRooms.includes(room.id) ? 'fa-chevron-down' : 'fa-chevron-right'"></i>
+                </div>
+                <div class="select-indicator">
+                  <i v-if="selectedRoom === room.id" class="fa fa-check"></i>
+                </div>
+                <div v-if="expandedRooms.includes(room.id)" class="add-child-btn" @click.stop="showAddChildRoomDialog(room)">
+                  <i class="el-icon-plus"></i>
+                </div>
+              </div>
+            </div>
+
+            <!-- 子房间列表 -->
+            <div v-if="expandedRooms.includes(room.id)" class="child-rooms">
+              <div 
+                v-for="childRoom in getChildRooms(room.id)" 
+                :key="childRoom.id"
+                class="room-item child-room"
+                :class="{ 'active': selectedRoom === childRoom.id }"
+                @click="selectRoom(childRoom)"
+                @contextmenu.prevent="showContextMenu($event, childRoom)"
+              >
+                <div class="room-info">
+                  <div class="room-icon">
+                    <i class="fa fa-room"></i>
+                  </div>
+                  <div class="room-details">
+                    <h3>{{ childRoom.name }}</h3>
+                  </div>
+                </div>
+                <div class="room-actions">
+                  <div class="select-indicator">
+                    <i v-if="selectedRoom === childRoom.id" class="fa fa-check"></i>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 空状态 -->
+          <div v-if="getParentRooms.length === 0" class="empty-state">
+            <i class="fa fa-sitemap"></i>
+            <h3>暂无房间</h3>
+            <p>点击下方按钮创建您的第一个房间</p>
+          </div>
+        </div>
+
+        <!-- 操作按钮 -->
+        <div class="action-buttons">
+          <button @click="showAddRoomDialog" class="btn-secondary">
+            <i class="fa fa-plus"></i> 新增大房间
+          </button>
+          <button 
+            @click="enterRoom" 
+            class="btn-primary" 
+            :disabled="!selectedRoom"
+            :class="{ 'disabled': !selectedRoom }"
+          >
+            <i class="fa fa-sign-in"></i> 进入房间
+          </button>
+        </div>
+      </div>
+
+      <!-- 底部信息 -->
+      <div class="footer-info">
+        <p>© 2026 多人联网演示系统 | 支持Windows/国产化系统互通</p>
+      </div>
+    </div>
+
+    <!-- 右键菜单 -->
+    <div 
+      v-if="contextMenu.visible" 
+      :style="{ left: contextMenu.x + 'px', top: contextMenu.y + 'px' }"
+      class="context-menu"
+    >
+      <div @click="editRoom" class="menu-item">
+        <i class="fa fa-edit"></i>
+        <span>修改房间</span>
+      </div>
+      <div @click="deleteRoom" class="menu-item menu-item-danger">
+        <i class="fa fa-trash"></i>
+        <span>删除房间</span>
+      </div>
+    </div>
+
+    <!-- 房间编辑弹窗 -->
+    <div v-if="dialog.visible" class="dialog-overlay">
+      <div class="dialog">
+        <div class="dialog-header">
+          <h3>{{ dialog.mode === 'add' ? '新增房间' : '修改房间' }}</h3>
+          <button @click="closeDialog" class="dialog-close">
+            <i class="fa fa-times"></i>
+          </button>
+        </div>
+        <div class="dialog-body">
+          <div class="form-group">
+            <label>房间名称</label>
+            <input 
+              v-model="dialog.form.name" 
+              type="text" 
+              placeholder="请输入房间名称"
+              class="form-input"
+            >
+          </div>
+        </div>
+        <div class="dialog-footer">
+          <button @click="closeDialog" class="btn-secondary">取消</button>
+          <button @click="saveRoom" class="btn-primary">确定</button>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
-//登录后跳转的页面
 export default {
-
+  name: 'RoomSelect',
   data() {
     return {
- 
+      selectedRoom: null,
+      expandedRooms: [], // 记录展开的大房间ID
+      contextMenu: {
+        visible: false,
+        x: 0,
+        y: 0,
+        room: null
+      },
+      dialog: {
+        visible: false,
+        mode: 'add',
+        form: {
+          id: null,
+          name: '',
+          parentId: null
+        }
+      },
+      rooms: [
+        {
+          id: 1,
+          name: '大房间-001',
+          parentId: null
+        },
+        {
+          id: 2,
+          name: '子房间-001-1',
+          parentId: 1
+        },
+        {
+          id: 3,
+          name: '子房间-001-2',
+          parentId: 1
+        },
+        {
+          id: 4,
+          name: '大房间-002',
+          parentId: null
+        },
+        {
+          id: 5,
+          name: '子房间-002-1',
+          parentId: 4
+        },
+        {
+          id: 6,
+          name: '大房间-003',
+          parentId: null
+        },
+        {
+          id: 7,
+          name: '大房间-004',
+          parentId: null
+        }
+      ]
+    }
+  },
+  mounted() {
+    document.addEventListener('click', this.hideContextMenu)
+  },
+  beforeDestroy() {
+    document.removeEventListener('click', this.hideContextMenu)
+  },
+  computed: {
+    getParentRooms() {
+      return this.rooms.filter(room => room.parentId === null)
     }
   },
- 
   methods: {
-    go(){
-        this.$router.push({ path: this.redirect || "/childRoom" }).catch(()=>{})
+    getChildRooms(parentId) {
+      return this.rooms.filter(room => room.parentId === parentId)
+    },
+    toggleRoomExpansion(room) {
+      const index = this.expandedRooms.indexOf(room.id)
+      if (index > -1) {
+        this.expandedRooms.splice(index, 1)
+      } else {
+        this.expandedRooms = [room.id]
+      }
     },
-    // 返回首页
-    goHome(){
-      this.$router.push({ path: this.redirect || "/" }).catch(()=>{})
+    selectRoom(room) {
+      this.selectedRoom = room.id
+    },
+    enterRoom() {
+      if (this.selectedRoom) {
+        const room = this.rooms.find(r => r.id === this.selectedRoom)
+        this.$router.push('/childRoom');
+      }
+    },
+    showContextMenu(event, room) {
+      this.contextMenu.visible = true
+      this.contextMenu.x = event.clientX
+      this.contextMenu.y = event.clientY
+      this.contextMenu.room = room
+    },
+    hideContextMenu() {
+      this.contextMenu.visible = false
+    },
+    showAddRoomDialog() {
+      this.dialog.mode = 'add'
+      this.dialog.form = {
+        id: null,
+        name: '',
+        parentId: null
+      }
+      this.dialog.visible = true
+    },
+    showAddChildRoomDialog(parentRoom) {
+      this.dialog.mode = 'add'
+      this.dialog.form = {
+        id: null,
+        name: '',
+        parentId: parentRoom.id
+      }
+      this.dialog.visible = true
+    },
+    editRoom() {
+      this.dialog.mode = 'edit'
+      this.dialog.form = {
+        id: this.contextMenu.room.id,
+        name: this.contextMenu.room.name,
+        parentId: this.contextMenu.room.parentId
+      }
+      this.dialog.visible = true
+      this.hideContextMenu()
+    },
+    deleteRoom() {
+      if (confirm('确定要删除这个房间吗？删除后所有子房间也会被删除。')) {
+        const roomId = this.contextMenu.room.id
+        // 删除房间及其所有子房间
+        this.rooms = this.rooms.filter(r => r.id !== roomId && r.parentId !== roomId)
+        if (this.selectedRoom === roomId) {
+          this.selectedRoom = null
+        }
+        // 如果删除的是大房间，从展开列表中移除
+        const index = this.expandedRooms.indexOf(roomId)
+        if (index > -1) {
+          this.expandedRooms.splice(index, 1)
+        }
+      }
+      this.hideContextMenu()
+    },
+    saveRoom() {
+      if (!this.dialog.form.name.trim()) {
+        alert('请输入房间名称')
+        return
+      }
+      
+      if (this.dialog.mode === 'add') {
+        const newRoom = {
+          id: Date.now(),
+          name: this.dialog.form.name,
+          parentId: this.dialog.form.parentId
+        }
+        this.rooms.push(newRoom)
+      } else {
+        const roomIndex = this.rooms.findIndex(r => r.id === this.dialog.form.id)
+        if (roomIndex !== -1) {
+          this.rooms[roomIndex].name = this.dialog.form.name
+        }
+      }
+      this.closeDialog()
+    },
+    closeDialog() {
+      this.dialog.visible = false
     }
   }
 }
 </script>
+
+<style scoped>
+/* 全局样式 */
+* {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+}
+
+/* 页面容器 */
+.page-container {
+  background: linear-gradient(135deg, #ffffff 0%, #f0f8ff 100%);
+  min-height: 100vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 20px;
+  color: #1a202c;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+  position: relative;
+  overflow: hidden;
+}
+
+/* 背景装饰 */
+.background-decoration {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-image: 
+    radial-gradient(circle at 20% 20%, rgba(22, 93, 255, 0.05) 0%, transparent 50%),
+    radial-gradient(circle at 80% 80%, rgba(22, 93, 255, 0.05) 0%, transparent 50%);
+  pointer-events: none;
+  z-index: 0;
+}
+
+/* 主内容区域 */
+.main-content {
+  width: 100%;
+  max-width: 400px;
+  z-index: 1;
+  animation: fadeIn 0.5s ease-out;
+}
+
+/* 系统标题 */
+.system-header {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-bottom: 30px;
+  padding: 0 20px;
+}
+
+.system-logo {
+  width: 48px;
+  height: 48px;
+  background: #165DFF;
+  border-radius: 12px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0 4px 12px rgba(22, 93, 255, 0.15);
+}
+
+.system-logo i {
+  color: white;
+  font-size: 24px;
+}
+
+.system-title h1 {
+  font-size: 28px;
+  font-weight: 700;
+  color: #1a202c;
+  margin: 0;
+  line-height: 1.2;
+}
+
+.system-title p {
+  font-size: 14px;
+  color: #64748b;
+  margin: 4px 0 0 0;
+  line-height: 1.5;
+}
+
+/* 房间选择面板 */
+.room-panel {
+  background-color: white;
+  border-radius: 16px;
+  box-shadow: 0 4px 24px rgba(0, 0, 0, 0.08);
+  overflow: hidden;
+  transition: all 0.3s ease;
+}
+
+/* 面板标题 */
+.panel-header {
+  padding: 20px 24px 16px;
+  background: linear-gradient(135deg, #ffffff 0%, #f8fafc 100%);
+  border-bottom: 1px solid #e2e8f0;
+  text-align: center;
+}
+
+.panel-header h2 {
+  font-size: 20px;
+  font-weight: 600;
+  color: #1a202c;
+  margin: 0 0 6px 0;
+  line-height: 1.2;
+}
+
+.panel-header p {
+  font-size: 13px;
+  color: #64748b;
+  margin: 0;
+  line-height: 1.5;
+}
+
+/* 房间列表 */
+.room-list {
+  padding: 0;
+  max-height: 500px;
+  overflow-y: auto;
+}
+
+/* 滚动条样式 */
+.room-list::-webkit-scrollbar {
+  width: 8px;
+}
+
+.room-list::-webkit-scrollbar-track {
+  background-color: #f8fafc;
+  border-radius: 4px;
+}
+
+.room-list::-webkit-scrollbar-thumb {
+  background-color: #cbd5e1;
+  border-radius: 4px;
+  transition: all 0.2s ease;
+}
+
+.room-list::-webkit-scrollbar-thumb:hover {
+  background-color: #94a3b8;
+}
+
+/* 房间项通用样式 */
+.room-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 12px 24px;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  position: relative;
+  border-bottom: 1px solid #f1f5f9;
+}
+
+/* 移除鼠标悬停效果 */
+.room-item:hover {
+  background-color: white;
+  box-shadow: none;
+  transform: none;
+}
+
+/* 大房间样式 */
+.parent-room {
+  background-color: white;
+  border-left: 4px solid transparent;
+}
+
+.parent-room.active {
+  background-color: #f0f8ff;
+  border-left-color: #165DFF;
+}
+
+/* 子房间样式 */
+.child-room {
+  background-color: white;
+  padding-left: 64px;
+  border-left: 4px solid transparent;
+  font-size: 14px;
+}
+
+.child-room.active {
+  background-color: #f0f8ff;
+  border-left-color: #165DFF;
+}
+
+/* 房间信息 */
+.room-info {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  flex: 1;
+  min-width: 0;
+}
+
+.room-icon {
+  width: 36px;
+  height: 36px;
+  border-radius: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+
+.parent-room .room-icon {
+  background: linear-gradient(135deg, #e0f2fe 0%, #bae6fd 100%);
+  color: #0369a1;
+  font-size: 16px;
+}
+
+.child-room .room-icon {
+  background: linear-gradient(135deg, #f0f9ff 0%, #e0f2fe 100%);
+  color: #0ea5e9;
+  font-size: 14px;
+}
+
+.room-details {
+  flex: 1;
+  min-width: 0;
+}
+
+.room-details h3 {
+  font-size: 16px;
+  font-weight: 600;
+  color: #1a202c;
+  margin: 0 0 4px 0;
+  line-height: 1.4;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.child-room .room-details h3 {
+  font-size: 15px;
+  font-weight: 500;
+}
+
+.room-stats {
+  font-size: 12px;
+  color: #64748b;
+  margin: 0;
+  line-height: 1.4;
+}
+
+/* 房间操作 */
+.room-actions {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+.expand-icon {
+  color: #94a3b8;
+  font-size: 12px;
+  transition: all 0.2s ease;
+}
+
+.parent-room.active .expand-icon {
+  color: #165DFF;
+}
+
+.select-indicator {
+  width: 20px;
+  height: 20px;
+  border-radius: 4px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #165DFF;
+  font-size: 14px;
+}
+
+.add-child-btn {
+  width: 28px;
+  height: 28px;
+  color: #333;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  font-size: 24px;
+}
+
+.add-child-btn:hover {
+  color: #000;
+  transform: scale(1.1);
+}
+
+/* 子房间列表 */
+.child-rooms {
+  background-color: white;
+}
+
+/* 新增子房间按钮 */
+.add-child-room {
+  padding: 12px 32px 12px 64px;
+  background-color: white;
+  border-bottom: 1px solid #f1f5f9;
+}
+
+/* 空状态 */
+.empty-state {
+  text-align: center;
+  padding: 60px 32px;
+  color: #64748b;
+}
+
+.empty-state i {
+  font-size: 48px;
+  margin-bottom: 16px;
+  color: #cbd5e1;
+  opacity: 0.7;
+}
+
+.empty-state h3 {
+  font-size: 18px;
+  font-weight: 600;
+  margin: 0 0 8px 0;
+  color: #334155;
+}
+
+.empty-state p {
+  font-size: 14px;
+  margin: 0;
+  line-height: 1.5;
+}
+
+/* 新增房间按钮 */
+.add-room-section {
+  padding: 20px 32px;
+  background-color: #f8fafc;
+  border-top: 1px solid #e2e8f0;
+}
+
+.btn-add {
+  width: 100%;
+  padding: 14px 16px;
+  background-color: white;
+  border: 2px dashed #cbd5e1;
+  border-radius: 10px;
+  color: #64748b;
+  font-size: 14px;
+  font-weight: 500;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+}
+
+.btn-add:hover {
+  background-color: #f0f8ff;
+  border-color: #165DFF;
+  color: #165DFF;
+  transform: translateY(-1px);
+  box-shadow: 0 4px 12px rgba(22, 93, 255, 0.1);
+}
+
+/* 操作按钮 */
+.action-buttons {
+  display: flex;
+  gap: 12px;
+  padding: 16px 26px;
+  background-color: #f8fafc;
+  border-top: 1px solid #e2e8f0;
+}
+
+/* 按钮通用样式 */
+button {
+  flex: 1;
+  padding: 10px 16px;
+  border: none;
+  border-radius: 8px;
+  font-size: 14px;
+  font-weight: 500;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  text-decoration: none;
+  outline: none;
+  position: relative;
+  overflow: hidden;
+}
+
+/* 主按钮样式 */
+.btn-primary {
+  background: #165DFF;
+  color: white;
+  box-shadow: 0 4px 12px rgba(22, 93, 255, 0.15);
+}
+
+.btn-primary:hover:not(.disabled) {
+  background: #0d4ed8;
+  box-shadow: 0 6px 16px rgba(22, 93, 255, 0.2);
+  transform: translateY(-1px);
+}
+
+.btn-primary.disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+  transform: none;
+  box-shadow: none;
+}
+
+/* 次要按钮样式 */
+.btn-secondary {
+  background-color: white;
+  color: #334155;
+  border: 1px solid #e2e8f0;
+}
+
+.btn-secondary:hover {
+  background-color: #f8fafc;
+  border-color: #cbd5e1;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+  transform: translateY(-1px);
+}
+
+/* 底部信息 */
+.footer-info {
+  text-align: center;
+  margin-top: 24px;
+  font-size: 13px;
+  color: #64748b;
+  line-height: 1.5;
+}
+
+/* 右键菜单 */
+.context-menu {
+  position: fixed;
+  background: white;
+  border-radius: 12px;
+  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.12);
+  padding: 8px 0;
+  min-width: 200px;
+  z-index: 1000;
+  border: 1px solid #e2e8f0;
+  animation: fadeIn 0.2s ease-out;
+}
+
+.menu-item {
+  padding: 12px 20px;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  font-size: 14px;
+  color: #334155;
+  transition: all 0.2s ease;
+}
+
+.menu-item:hover {
+  background-color: #f8fafc;
+}
+
+.menu-item-danger {
+  color: #ef4444;
+}
+
+.menu-item-danger:hover {
+  background-color: #fef2f2;
+}
+
+.menu-item i {
+  width: 16px;
+  text-align: center;
+  font-size: 14px;
+}
+
+.menu-item-danger i {
+  color: #ef4444;
+}
+
+/* 弹窗样式 */
+.dialog-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 2000;
+  animation: fadeIn 0.2s ease-out;
+}
+
+.dialog {
+  background-color: white;
+  border-radius: 16px;
+  width: 90%;
+  max-width: 420px;
+  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.12);
+  overflow: hidden;
+  animation: slideIn 0.3s ease-out;
+}
+
+@keyframes slideIn {
+  from {
+    opacity: 0;
+    transform: translateY(-20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.dialog-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20px 24px;
+  border-bottom: 1px solid #e2e8f0;
+  background: linear-gradient(135deg, #ffffff 0%, #f8fafc 100%);
+}
+
+.dialog-header h3 {
+  font-size: 18px;
+  font-weight: 600;
+  color: #1a202c;
+  margin: 0;
+  line-height: 1.2;
+}
+
+.dialog-close {
+  background: none;
+  border: none;
+  cursor: pointer;
+  color: #64748b;
+  font-size: 20px;
+  padding: 4px;
+  transition: all 0.2s ease;
+  border-radius: 6px;
+  width: 32px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.dialog-close:hover {
+  background-color: #f1f5f9;
+  color: #334155;
+}
+
+.dialog-body {
+  padding: 24px;
+}
+
+/* 表单样式 */
+.form-group {
+  margin-bottom: 20px;
+}
+
+.form-group:last-child {
+  margin-bottom: 0;
+}
+
+.form-group label {
+  display: block;
+  font-size: 14px;
+  font-weight: 500;
+  color: #374151;
+  margin-bottom: 8px;
+  line-height: 1.4;
+}
+
+.form-input {
+  width: 100%;
+  padding: 12px 16px;
+  border: 1px solid #e2e8f0;
+  border-radius: 8px;
+  font-size: 15px;
+  color: #1a202c;
+  outline: none;
+  transition: all 0.2s ease;
+  background-color: white;
+}
+
+.form-input:focus {
+  border-color: #165DFF;
+  box-shadow: 0 0 0 3px rgba(22, 93, 255, 0.1);
+}
+
+.form-input::placeholder {
+  color: #94a3b8;
+}
+
+.dialog-footer {
+  display: flex;
+  gap: 12px;
+  padding: 20px 24px;
+  border-top: 1px solid #e2e8f0;
+  background-color: #f8fafc;
+}
+
+/* 动画效果 */
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+/* 响应式设计 */
+@media (max-width: 640px) {
+  .page-container {
+    padding: 12px;
+  }
+  
+  .system-header {
+    margin-bottom: 20px;
+    padding: 0 16px;
+  }
+  
+  .system-title h1 {
+    font-size: 24px;
+  }
+  
+  .room-panel {
+    border-radius: 12px;
+  }
+  
+  .panel-header {
+    padding: 20px 24px 16px;
+  }
+  
+  .panel-header h2 {
+    font-size: 20px;
+  }
+  
+  .room-item {
+    padding: 14px 24px;
+  }
+  
+  .child-room {
+    padding-left: 48px;
+  }
+  
+  .add-child-room {
+    padding: 10px 24px 10px 48px;
+  }
+  
+  .action-buttons {
+    padding: 20px 24px;
+  }
+  
+  .dialog {
+    border-radius: 12px;
+  }
+}
+</style>