diff --git a/src/router/index.js b/src/router/index.js
index 1c38f56fd1b22ffabd3a68942c99a2ca114fa524..feef8a2f4aeccdf3a6eb66d62ca33425dee1d4f2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -22,35 +22,50 @@ const routes = [
   },
 
   {
-    path: '/',
+    path: '/Layout',
     name: 'Layout',
     component: LayoutView,
     children:[
       {
-        path: '',
+        path: '/Layout/home',
         name: 'home',
         component: HomeView
       },
       {
-        path: 'admin',
+        path: '/Layout/admin',
         name: 'admin',
         component: () => import('../views/AdminView.vue')
       },
       {
-        path: 'book',
+        path: '/Layout/book',
         name: 'book',
         component: () => import('../views/BookView.vue')
       },
       {
-        path: 'type',
+        path: '/Layout/type',
         name: 'type',
         component: () => import('../views/TypeView.vue')
       },
       {
-        path: 'audit',
+        path: '/Layout/audit',
         name: 'audit',
         component: () => import('../views/AuditView.vue')
       },
+      {
+        path: '/Layout/hotel',
+        name: 'hotel',
+        component: () => import('../views/HotelView.vue')
+      },
+      {
+        path: '/Layout/reserve',
+        name: 'reserve',
+        component: () => import('../views/ReserveView.vue')
+      },
+      {
+        path: '/Layout/log',
+        name: 'log',
+        component: () => import('../views/LogView.vue')
+      },
 
     ]
   },
diff --git a/src/views/AuditView.vue b/src/views/AuditView.vue
index cbbdc4ffa4804557046c9a626dff0331ce14a6ee..513ce3ca514c1641d99a56dc296d6b252c557562 100644
--- a/src/views/AuditView.vue
+++ b/src/views/AuditView.vue
@@ -2,8 +2,8 @@
   <div>
 
     <div style="margin-bottom:15px">
-    <el-input v-model="params.name" style="width: 200px" placeholder="请输入姓名"></el-input>
-    <el-input v-model="params.phone" style="width: 200px; margin-left:5px" placeholder="请输入电话"></el-input>
+    <el-input v-model="params.selectName" style="width: 200px" placeholder="请输入提交人姓名"></el-input>
+    <el-input v-model="params.time" style="width: 200px; margin-left:5px" placeholder="请输入提交时间"></el-input>
     <el-button type="warning" style="margin-left: 10px;" @click="findBySearch()">查询</el-button>
     <el-button type="danger" style="margin-left: 10px;" @click="reset()">清空</el-button>
     <el-button type="primary" style="margin-left: 10px;" @click="add()" v-if="user.role === 'student'">新增</el-button>
@@ -122,7 +122,6 @@ export default {
         pageNum: 1,
         pageSize: 5,
         name: '',
-        phone:'',
       },
       total: 0,
       dialogFormVisible: false,
diff --git a/src/views/HotelView.vue b/src/views/HotelView.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a2f15fe71c2902b6e4b1696625d6e84766658472
--- /dev/null
+++ b/src/views/HotelView.vue
@@ -0,0 +1,274 @@
+<template>
+  <div>
+
+    <div style="margin-bottom:15px">
+      <el-input v-model="params.name" style="width: 200px" placeholder="请输入酒店名称"></el-input>
+      <el-input v-model="params.phone" style="width: 200px; margin-left:5px" placeholder="请输入预定电话"></el-input>
+      <el-button type="warning" style="margin-left: 10px;" @click="findBySearch()">查询</el-button>
+      <el-button type="danger" style="margin-left: 10px;" @click="reset()">清空</el-button>
+      <el-button type="primary" style="margin-left: 10px;" @click="add()" v-if="user.role === 'admin'">新增</el-button>
+    </div>
+
+    <div>
+      <el-table :data="tableData" style="width: 100%">
+
+        <el-table-column prop="img" label="酒店实拍" v-slot="scope">
+
+          <el-image
+              style="width: 70px; height: 70px; border-radius:10%"
+              :src="'http://localhost:8080/api/files/' + scope.row.img"
+              :preview-src-list="['http://localhost:8080/api/files'+ scope.row.img]">
+          </el-image>
+
+        </el-table-column>
+
+        <el-table-column prop="name" label="酒店名称" width="180"></el-table-column>
+
+        <el-table-column prop="price" label="价格"></el-table-column>
+
+        <el-table-column prop="num" label="剩余间数"></el-table-column>
+
+        <el-table-column prop="phone" label="预定电话"></el-table-column>
+
+        <el-table-column label="操作">
+
+          <template v-slot="scope">
+
+            <el-button type="primary" @click="edit(scope.row)" v-if="user.role === 'admin'">编辑</el-button>
+
+            <el-button type="success" @click="reserve(scope.row)">预定</el-button>
+
+
+            <el-popconfirm title="确定删除吗？" @confirm="del(scope.row.id)">
+              <el-button slot="reference" type="danger" style="margin-left: 5px" v-if="user.role === 'admin'">删除</el-button>
+            </el-popconfirm>
+
+
+
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div style="margin-top: 10px">
+      <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="params.pageNum"
+          :page-sizes="[5, 10, 15, 20]"
+          :page-size="params.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>
+    </div>
+
+    <div>
+      <el-dialog title="请填写信息" :visible.sync="dialogFormVisible" width="30%">
+        <el-form :model="form">
+          <el-form-item label="酒店名称" label-width="15%">
+            <el-input v-model="form.name"  autocomplete="off" style="width: 90%"></el-input>
+          </el-form-item>
+
+          <el-form-item label="价格" label-width="15%">
+            <el-input v-model="form.price"  autocomplete="off" style="width: 90%"></el-input>
+          </el-form-item>
+
+          <el-form-item label="预定电话" label-width="15%">
+            <el-input v-model="form.phone"  autocomplete="off" style="width: 90%"></el-input>
+          </el-form-item>
+
+          <el-form-item label="剩余间数" label-width="15%">
+          <el-input v-model="form.num"  autocomplete="off" style="width: 90%"></el-input>
+          </el-form-item>
+
+
+          <el-form-item label="酒店实拍:" label-width="20%">
+
+            <el-upload action="http://localhost:8080/api/files/upload" :on-success="successUpload">
+              <el-button size="small" type="primary">点击上传</el-button>
+              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+            </el-upload>
+
+          </el-form-item>
+
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogFormVisible = false">取 消</el-button>
+          <el-button @click="submit()" type="primary">确 定</el-button>
+        </div>
+      </el-dialog>
+    </div>
+
+  </div>
+
+
+</template>
+
+<script>
+import request from "@/utils/request";
+
+
+export default {
+
+  data() {
+    return {
+      user:localStorage.getItem("user")?JSON.parse(localStorage.getItem("user")):{},
+      tableData: [],
+      form: {},
+      params: {
+        pageNum: 1,
+        pageSize: 5,
+        name: '',
+        phone:'',
+      },
+      total: 0,
+      dialogFormVisible: false
+    }
+  },
+
+  //页面加载的时候在此函数做一些事情
+  created() {
+    this.findBySearch()
+  },
+
+  //方法
+  methods:{
+
+
+    findBySearch() {
+      request.get("/hotel/search",{
+        params: this.params //携带params里的参数
+      }).then(res => {
+        if (res.code === '0'){
+          this.tableData = res.data.list;
+          this.total = res.data.total;
+        }else{
+
+        }
+      })
+    },
+
+    add(){
+      this.form = {};//新增之前先把值清空
+      this.dialogFormVisible = true;
+    },
+
+    reset(){
+      this.params = {
+        name: '',
+        phone: '',
+        pageNum: 1,
+        pageSize: 5,
+
+      }
+      this.findBySearch()
+    },
+
+    handleSizeChange(pageSize){
+      this.params.pageSize = pageSize;
+      this.findBySearch()
+    },
+
+    handleCurrentChange(pageNum){
+      this.params.pageNum = pageNum;
+      this.findBySearch()
+    },
+
+    submit() {
+      request.post("/hotel/save",this.form).then(res =>{
+        if(res.code === '0'){
+          this.$message({
+            message: '操作成功',
+            type: 'success'
+          });
+          this.dialogFormVisible = false
+        }else{
+          this.$message({
+            message: res.msg,
+            type: 'error'
+          });
+        }
+      })
+    },
+
+    edit(obj){
+      this.form = obj;
+      this.dialogFormVisible = true;
+    },
+
+    del(id){
+      request.delete("/hotel/deleteById/"+id).then(res => {
+        if (res.code === '0'){
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          });
+          this.findBySearch();
+        }else{
+
+        }
+      })
+
+    },
+
+    successUpload(res){
+      this.form.img = res.data;
+    },
+
+    down(flag){
+      location.href = 'http://localhost:8080/api/files/' + flag
+
+    },
+
+    reserve(obj){
+      let param = {hotelId: obj.id, userId:this.user.id}
+      request.post("/reserve/save",param).then(res =>{
+        if(res.code === '0'){
+          this.$message.success("预订成功！")
+          this.findBySearch();
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    }
+
+
+
+
+  }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</script>
\ No newline at end of file
diff --git a/src/views/LayoutView.vue b/src/views/LayoutView.vue
index cb567a6fe19af45e1d9ba366f04da61b9a96f4e6..e96861ee274b7f71537cc093d099678450e12116 100644
--- a/src/views/LayoutView.vue
+++ b/src/views/LayoutView.vue
@@ -23,7 +23,7 @@
       <el-aside style="overflow: hidden; min-height: 100vh; background-color: #545c64; width:250px">
         <el-menu :default-active="$route.path" router background-color="#545c64" text-color="#fff"
                  active-text-color="#ffd04b">
-          <el-menu-item index="/">
+          <el-menu-item index="/Layout/home">
             <i class="el-icon-menu"></i>
             <span slot="title">系统首页</span>
           </el-menu-item>
@@ -33,10 +33,11 @@
               <i class="el-icon-location"></i>
               <span>用户管理</span>
             </template>
+
             <el-menu-item-group>
-              <el-menu-item index="/admin">管理员信息</el-menu-item>
-              <el-menu-item index="/">用户信息</el-menu-item>
+              <el-menu-item index="/Layout/admin">管理员信息</el-menu-item>
             </el-menu-item-group>
+
           </el-submenu>
 
           <el-submenu index="3">
@@ -45,9 +46,12 @@
               <span>信息管理</span>
             </template>
             <el-menu-item-group>
-              <el-menu-item index="/book">图书信息</el-menu-item>
-              <el-menu-item index="/type">图书分类</el-menu-item>
-              <el-menu-item index="/audit">提交审核</el-menu-item>
+              <el-menu-item index="/Layout/book">图书信息</el-menu-item>
+              <el-menu-item index="/Layout/type">图书分类</el-menu-item>
+              <el-menu-item index="/Layout/audit">提交审核</el-menu-item>
+              <el-menu-item index="/Layout/hotel">酒店预定</el-menu-item>
+              <el-menu-item index="/Layout/reserve">预定管理</el-menu-item>
+              <el-menu-item index="/Layout/log" v-if="user.role === 'admin'">操作日志</el-menu-item>
             </el-menu-item-group>
           </el-submenu>
         </el-menu>
diff --git a/src/views/LogView.vue b/src/views/LogView.vue
new file mode 100644
index 0000000000000000000000000000000000000000..9f9fccb96dee05f852f66dbed8f4dad24781d4f0
--- /dev/null
+++ b/src/views/LogView.vue
@@ -0,0 +1,229 @@
+<template>
+  <div>
+
+    <div style="margin-bottom:15px">
+    <el-input v-model="params.name" style="width: 200px" placeholder="请输入操作名称"></el-input>
+    <el-input v-model="params.selectName" style="width: 200px; margin-left:5px" placeholder="请输入用户姓名"></el-input>
+    <el-button type="warning" style="margin-left: 10px;" @click="findBySearch()">查询</el-button>
+    <el-button type="danger" style="margin-left: 10px;" @click="reset()">清空</el-button>
+    </div>
+
+    <div>
+      <el-table :data="tableData" style="width: 100%">
+        <el-table-column prop="name" label="操作名称" width="180"></el-table-column>
+        <el-table-column prop="time" label="操作时间"></el-table-column>
+        <el-table-column prop="username" label="用户姓名"></el-table-column>
+        <el-table-column prop="ip" label="用户ip"></el-table-column>
+        <el-table-column label="操作">
+
+          <template v-slot="scope">
+
+
+
+
+               <el-popconfirm title="确定删除吗？" @confirm="del(scope.row.id)">
+                <el-button slot="reference" type="danger" style="margin-left: 5px" >删除</el-button>
+               </el-popconfirm>
+
+
+
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div style="margin-top: 10px">
+      <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="params.pageNum"
+          :page-sizes="[5, 10, 15, 20]"
+          :page-size="params.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>
+    </div>
+
+    <div>
+      <el-dialog title="请填写信息" :visible.sync="dialogFormVisible" width="30%">
+        <el-form :model="form">
+          <el-form-item label="姓名" label-width="15%">
+            <el-input v-model="form.name"  autocomplete="off" style="width: 90%"></el-input>
+          </el-form-item>
+          <el-form-item label="性别" label-width="15%">
+            <el-radio v-model="form.sex" label="男">男</el-radio>
+            <el-radio v-model="form.sex" label="女">女</el-radio>
+          </el-form-item>
+          <el-form-item label="年龄" label-width="15%">
+            <el-input v-model="form.age"  autocomplete="off" style="width: 90%"></el-input>
+          </el-form-item>
+          <el-form-item label="电话" label-width="15%">
+            <el-input v-model="form.phone"  autocomplete="off" style="width: 90%"></el-input>
+          </el-form-item>
+
+          <el-form-item label="角色" label-width="15%">
+            <el-select v-model="form.role" placeholder="请选择"  style="width: 90%">
+              <el-option label="教师" value="teacher"></el-option>
+              <el-option label="学生" value="student"></el-option>
+            </el-select>
+          </el-form-item>
+
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogFormVisible = false">取 消</el-button>
+          <el-button @click="submit()" type="primary">确 定</el-button>
+        </div>
+      </el-dialog>
+    </div>
+
+  </div>
+
+
+</template>
+
+<script>
+import request from "@/utils/request";
+
+
+export default {
+
+  data() {
+    return {
+      tableData: [],
+      form: {},
+      params: {
+        pageNum: 1,
+        pageSize: 5,
+        name: '',
+        selectName:'',
+      },
+      total: 0,
+      dialogFormVisible: false
+    }
+  },
+
+  //页面加载的时候在此函数做一些事情
+  created() {
+    this.findBySearch()
+  },
+
+  //方法
+  methods:{
+
+
+    findBySearch() {
+      request.get("/log/search",{
+         params: this.params //携带params里的参数
+      }).then(res => {
+        if (res.code === '0'){
+            this.tableData = res.data.list;
+            this.total = res.data.total;
+        }else{
+
+        }
+      })
+    },
+
+    add(){
+      this.form = {};//新增之前先把值清空
+      this.dialogFormVisible = true;
+    },
+
+    reset(){
+      this.params = {
+        name: '',
+        phone: '',
+        pageNum: 1,
+        pageSize: 5,
+
+      }
+      this.findBySearch()
+    },
+
+    handleSizeChange(pageSize){
+    this.params.pageSize = pageSize;
+    this.findBySearch()
+    },
+
+    handleCurrentChange(pageNum){
+    this.params.pageNum = pageNum;
+    this.findBySearch()
+    },
+
+    submit() {
+      request.post("/log/save",this.form).then(res =>{
+        if(res.code === '0'){
+          this.$message({
+            message: '操作成功',
+            type: 'success'
+          });
+          this.dialogFormVisible = false
+        }else{
+          this.$message({
+            message: res.msg,
+            type: 'error'
+          });
+        }
+      })
+    },
+
+    edit(obj){
+      this.form = obj;
+      this.dialogFormVisible = true;
+    },
+
+    del(id){
+      request.delete("/log/deleteById/"+id).then(res => {
+        if (res.code === '0'){
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          });
+          this.findBySearch();
+        }else{
+
+        }
+      })
+
+    }
+
+
+
+
+  }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</script>
\ No newline at end of file
diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index 2696e4b96239e9b33b729a0ab0435d998f0c84ac..1215a7637df1e68fd2c04183f50ced17f02bd999 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -61,7 +61,7 @@ export default {
             type: 'success'
           });
           localStorage.setItem("user",JSON.stringify(res.data))//将用户信息存在网页的localstorage里
-          this.$router.push("/");
+          this.$router.push("/Layout");
         }else{
           this.$message({
             message: res.msg,
diff --git a/src/views/ReserveView.vue b/src/views/ReserveView.vue
new file mode 100644
index 0000000000000000000000000000000000000000..37658d135239edd4fb04b82684a4e721aeeaa78d
--- /dev/null
+++ b/src/views/ReserveView.vue
@@ -0,0 +1,228 @@
+<template>
+  <div>
+
+    <div style="margin-bottom:15px">
+    <el-input v-model="params.name" style="width: 200px" placeholder="请输入酒店名称"></el-input>
+    <el-input v-model="params.time" style="width: 200px; margin-left:5px" placeholder="请输入提交时间"></el-input>
+    <el-button type="warning" style="margin-left: 10px;" @click="findBySearch()">查询</el-button>
+    <el-button type="danger" style="margin-left: 10px;" @click="reset()">清空</el-button>
+    </div>
+
+    <div>
+      <el-table :data="tableData" style="width: 100%">
+        <el-table-column prop="hotelName" label="酒店名称" width="180"></el-table-column>
+        <el-table-column prop="userName" label="预定人姓名"></el-table-column>
+        <el-table-column prop="time" label="预定时间"></el-table-column>
+        <el-table-column label="操作">
+
+          <template v-slot="scope">
+
+            <el-button type="primary" @click="edit(scope.row)">编辑</el-button>
+
+
+               <el-popconfirm title="确定删除吗？" @confirm="del(scope.row.id)">
+                <el-button slot="reference" type="danger" style="margin-left: 5px" >删除</el-button>
+               </el-popconfirm>
+
+
+
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div style="margin-top: 10px">
+      <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="params.pageNum"
+          :page-sizes="[5, 10, 15, 20]"
+          :page-size="params.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>
+    </div>
+
+    <div>
+      <el-dialog title="请填写信息" :visible.sync="dialogFormVisible" width="30%">
+        <el-form :model="form">
+          <el-form-item label="姓名" label-width="15%">
+            <el-input v-model="form.name"  autocomplete="off" style="width: 90%"></el-input>
+          </el-form-item>
+          <el-form-item label="性别" label-width="15%">
+            <el-radio v-model="form.sex" label="男">男</el-radio>
+            <el-radio v-model="form.sex" label="女">女</el-radio>
+          </el-form-item>
+          <el-form-item label="年龄" label-width="15%">
+            <el-input v-model="form.age"  autocomplete="off" style="width: 90%"></el-input>
+          </el-form-item>
+          <el-form-item label="电话" label-width="15%">
+            <el-input v-model="form.phone"  autocomplete="off" style="width: 90%"></el-input>
+          </el-form-item>
+
+          <el-form-item label="角色" label-width="15%">
+            <el-select v-model="form.role" placeholder="请选择"  style="width: 90%">
+              <el-option label="教师" value="teacher"></el-option>
+              <el-option label="学生" value="student"></el-option>
+            </el-select>
+          </el-form-item>
+
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogFormVisible = false">取 消</el-button>
+          <el-button @click="submit()" type="primary">确 定</el-button>
+        </div>
+      </el-dialog>
+    </div>
+
+  </div>
+
+
+</template>
+
+<script>
+import request from "@/utils/request";
+
+
+export default {
+
+  data() {
+    return {
+      tableData: [],
+      form: {},
+      params: {
+        pageNum: 1,
+        pageSize: 5,
+        name: '',
+        phone:'',
+      },
+      total: 0,
+      dialogFormVisible: false
+    }
+  },
+
+  //页面加载的时候在此函数做一些事情
+  created() {
+    this.findBySearch()
+  },
+
+  //方法
+  methods:{
+
+
+    findBySearch() {
+      request.get("/reserve/search",{
+         params: this.params //携带params里的参数
+      }).then(res => {
+        if (res.code === '0'){
+            this.tableData = res.data.list;
+            this.total = res.data.total;
+        }else{
+
+        }
+      })
+    },
+
+    add(){
+      this.form = {};//新增之前先把值清空
+      this.dialogFormVisible = true;
+    },
+
+    reset(){
+      this.params = {
+        name: '',
+        phone: '',
+        pageNum: 1,
+        pageSize: 5,
+
+      }
+      this.findBySearch()
+    },
+
+    handleSizeChange(pageSize){
+    this.params.pageSize = pageSize;
+    this.findBySearch()
+    },
+
+    handleCurrentChange(pageNum){
+    this.params.pageNum = pageNum;
+    this.findBySearch()
+    },
+
+    submit() {
+      request.post("/reserve/save",this.form).then(res =>{
+        if(res.code === '0'){
+          this.$message({
+            message: '操作成功',
+            type: 'success'
+          });
+          this.dialogFormVisible = false
+        }else{
+          this.$message({
+            message: res.msg,
+            type: 'error'
+          });
+        }
+      })
+    },
+
+    edit(obj){
+      this.form = obj;
+      this.dialogFormVisible = true;
+    },
+
+    del(id){
+      request.delete("/reserve/deleteById/"+id).then(res => {
+        if (res.code === '0'){
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          });
+          this.findBySearch();
+        }else{
+
+        }
+      })
+
+    }
+
+
+
+
+  }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</script>
\ No newline at end of file