Merge branch 'refs/heads/tx'

# Conflicts:
#	src/views/system/order/index.vue
#	src/views/system/room/index.vue

src/views/system/room/room_detail.vue

@@ -0,0 +1,22 @@
+<template>
+    <div class="room-detail">
+      <!-- 你的模板内容 -->
+    </div>
+  </template>
+  
+  <script>
+  export default {
+    name: 'RoomDetail',
+    data() {
+      return {
+        // 你的数据
+      }
+    }
+  }
+  </script>
+  
+  <style scoped>
+  .room-detail {
+    /* 你的样式 */
+  }
+  </style>