diff --git a/src/components/admin/common/myHeader.vue b/src/components/admin/common/myHeader.vue
index bc6b30c..b3dddae 100644
--- a/src/components/admin/common/myHeader.vue
+++ b/src/components/admin/common/myHeader.vue
@@ -24,6 +24,8 @@
         </svg>
         <span>&nbsp;首页</span>
       </div>
+
+      <!--头像-->
       <div class="header-user-con">
         <el-dropdown placement="bottom">
           <el-avatar class="user-avatar" :size="40"
@@ -34,6 +36,7 @@
           </el-dropdown-menu>
         </el-dropdown>
       </div>
+
     </div>
   </div>
 </template>
diff --git a/src/components/admin/common/sidebar.vue b/src/components/admin/common/sidebar.vue
index a1c442d..b72543d 100644
--- a/src/components/admin/common/sidebar.vue
+++ b/src/components/admin/common/sidebar.vue
@@ -29,6 +29,7 @@
               </template>
             </el-submenu>
           </template>
+
           <template v-else>
             <el-menu-item :index="item.index" :key="item.index">
               <i :class="item.icon"></i>
@@ -61,6 +62,11 @@
           index: "/userList",
           title: "用户管理",
           isBoss: true
+        }, {
+          icon: "el-icon-refrigerator",
+          index: "/drugReaction",
+          title: "药品管理",
+          isBoss: false
         }, {
           icon: "el-icon-postcard",
           index: "/postList",
diff --git a/src/components/admin/drugReaction.vue b/src/components/admin/drugReaction.vue
new file mode 100644
index 0000000..09c157c
--- /dev/null
+++ b/src/components/admin/drugReaction.vue
@@ -0,0 +1,260 @@
+<template>
+  <div>
+    <div>
+      <div class="handle-box">
+        <el-input v-model="queryParams.drug1" placeholder="药品A名称" class="handle-input mrb10"></el-input>
+        <el-input v-model="queryParams.drug2" placeholder="药品B名称" class="handle-input mrb10"></el-input>
+        <el-input v-model="queryParams.reaction" placeholder="相互作用效果" class="handle-input mrb10"></el-input>
+        <el-button type="primary" icon="el-icon-search" @click="searchUser()">搜索</el-button>
+        <el-button type="danger" @click="clearSearch()">清除参数</el-button>
+      </div>
+
+      <el-table :data="users" border class="table" header-cell-class-name="table-header">
+        <el-table-column prop="id" label="ID" width="55" align="center"></el-table-column>
+        <el-table-column prop="username" label="药品A名称" align="center"></el-table-column>
+        <el-table-column prop="phoneNumber" label="药品B名称" align="center"></el-table-column>
+        <el-table-column prop="email" label="相互作用效果" align="center"></el-table-column>
+        <el-table-column prop="introduction" label="简介" align="center"></el-table-column>
+        <el-table-column prop="createTime" label="注册时间" align="center"></el-table-column>
+      </el-table>
+      <div class="pagination">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage1"
+          :page-sizes="[10, 15, 20, 25]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total=this.pagination.total>
+        </el-pagination>
+      </div>
+    </div>
+
+    <!-- 编辑弹出框 -->
+    <el-dialog title="修改用户类型"
+               :visible.sync="editVisible"
+               width="30%"
+               :before-close="handleClose"
+               :append-to-body="true"
+               destroy-on-close
+               center>
+      <div class="myCenter">
+        <el-radio-group v-model="changeUser.userType">
+          <el-radio-button :label="0">Boss</el-radio-button>
+          <el-radio-button :label="1">管理员</el-radio-button>
+          <el-radio-button :label="2">普通用户</el-radio-button>
+        </el-radio-group>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+          <el-button @click="handleClose()">取 消</el-button>
+          <el-button type="primary" @click="saveEdit()">确 定</el-button>
+        </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+      pagination: {
+        current: 1,
+        size: 10,
+        total: 0,
+        searchKey: "",
+        userStatus: null,
+        userType: null
+      },
+      users: [],
+      changeUser: {
+        id: null,
+        userType: null
+      },
+      editVisible: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        drug1: null,
+        drug2: null,
+        reaction: null
+      },
+    }
+  },
+
+  computed: {},
+
+  watch: {},
+
+  created() {
+    this.getUsers();
+  },
+
+  mounted() {
+  },
+
+  methods: {
+    clearSearch() {
+      this.pagination = {
+        current: 1,
+        size: 10,
+        total: 0,
+        searchKey: "",
+        userStatus: null,
+        userType: null
+      }
+      this.getUsers();
+    },
+    getUsers() {
+      this.$http.post(this.$constant.baseURL + "/admin/user/list", this.pagination, true)
+        .then((res) => {
+          if (!this.$common.isEmpty(res.data)) {
+            this.users = res.data.records;
+            this.pagination.total = res.data.total;
+          }
+        })
+        .catch((error) => {
+          this.$message({
+            message: error.message,
+            type: "error"
+          });
+        });
+    },
+    changeUserStatus(user) {
+      this.$http.get(this.$constant.baseURL + "/admin/user/changeUserStatus", {
+        userId: user.id,
+        flag: user.userStatus
+      }, true)
+        .then((res) => {
+          this.$message({
+            message: "修改成功！",
+            type: "success"
+          });
+        })
+        .catch((error) => {
+          this.$message({
+            message: error.message,
+            type: "error"
+          });
+        });
+    },
+    changeUserAdmire(user) {
+      if (!this.$common.isEmpty(user.admire)) {
+        this.$confirm('确认保存？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'success',
+          center: true
+        }).then(() => {
+          this.$http.get(this.$constant.baseURL + "/admin/user/changeUserAdmire", {
+            userId: user.id,
+            admire: user.admire
+          }, true)
+            .then((res) => {
+              this.$message({
+                message: "修改成功！",
+                type: "success"
+              });
+            })
+            .catch((error) => {
+              this.$message({
+                message: error.message,
+                type: "error"
+              });
+            });
+        }).catch(() => {
+          this.$message({
+            type: 'success',
+            message: '已取消保存!'
+          });
+        });
+      }
+    },
+    editUser(user) {
+      this.changeUser.id = user.id;
+      this.changeUser.userType = user.userType;
+      this.editVisible = true;
+    },
+    handlePageChange(val) {
+      this.pagination.current = val;
+      this.getUsers();
+    },
+    searchUser() {
+      this.pagination.total = 0;
+      this.pagination.current = 1;
+      this.getUsers();
+    },
+    handleClose() {
+      this.changeUser = {
+        id: null,
+        userType: null
+      };
+      this.editVisible = false;
+    },
+    saveEdit() {
+      this.$http.get(this.$constant.baseURL + "/admin/user/changeUserType", {
+        userId: this.changeUser.id,
+        userType: this.changeUser.userType
+      }, true)
+        .then((res) => {
+          this.handleClose();
+          this.getUsers();
+          this.$message({
+            message: "修改成功！",
+            type: "success"
+          });
+        })
+        .catch((error) => {
+          this.$message({
+            message: error.message,
+            type: "error"
+          });
+        });
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+.handle-box {
+  margin-bottom: 20px;
+}
+
+.handle-select {
+  width: 120px;
+}
+
+.handle-input {
+  width: 160px;
+  display: inline-block;
+}
+
+.table {
+  width: 100%;
+  font-size: 14px;
+}
+
+.mrb10 {
+  margin-right: 10px;
+  margin-bottom: 10px;
+}
+
+.table-td-thumb {
+  display: block;
+  margin: auto;
+  width: 40px;
+  height: 40px;
+}
+
+.pagination {
+  margin: 20px 0;
+  text-align: right;
+}
+
+.el-switch {
+  margin: 5px;
+}
+</style>
diff --git a/src/components/index.vue b/src/components/index.vue
index 7d3de4c..b9a6cc3 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -82,9 +82,9 @@
               <div class="announcement background-opacity">
                 <i class="fa fa-volume-up" aria-hidden="true"></i>
                 <div>
-                                    <div v-for="(notice, index) in $store.state.webInfo.notices" :key="index">
-                                      {{ notice }}
-                                    </div>
+                  <div v-for="(notice, index) in $store.state.webInfo.notices" :key="index">
+                    {{ notice }}
+                  </div>
                 </div>
               </div>
 
@@ -111,7 +111,7 @@
                     @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"
                     :current-page="currentPage1"
-                    :page-sizes="[10, 15, 20, 15]"
+                    :page-sizes="[10, 15, 20, 25]"
                     :page-size="10"
                     layout="total, sizes, prev, pager, next, jumper"
                     :total=this.pagination.total>
diff --git a/src/components/myAside.vue b/src/components/myAside.vue
index 2082c9a..4110135 100644
--- a/src/components/myAside.vue
+++ b/src/components/myAside.vue
@@ -131,7 +131,7 @@
               <el-avatar
                 style="margin-bottom: 10px"
                 :size="36"
-                :src="!$common.isEmpty($store.state.currentUser)?$store.state.currentUser.avatar:$store.state.webInfo.avatar">
+                    :src="item.avatar ">
               </el-avatar>
               <div style="margin-left: 10px;height: 36px;line-height: 36px;overflow: hidden;max-width: 80px">
                 {{ item.username }}
diff --git a/src/router/index.js b/src/router/index.js
index 5537bb3..cefc25c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -123,7 +123,13 @@ const routes = [
       path: '/resourcePathList',
       name: 'resourcePathList',
       component: () => import('../components/admin/resourcePathList')
-    }]
+    },
+      , {
+        path: '/drugReaction',
+        name: 'drugReaction',
+        component: () => import('../components/admin/drugReaction')
+      }
+      ]
   },
   {
     path: '/verify',