diff --git a/.env.development b/.env.development
index de583d0940..d2124efd92 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,5 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = '/dev-api'
+# VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = 'HTTP://LOCALHOST:8333'
diff --git a/.gitignore b/.gitignore
index 9ad28d23dd..0a730a8258 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ tests/**/coverage/
 *.ntvs*
 *.njsproj
 *.sln
+.history/*
diff --git a/package.json b/package.json
index 24138249e2..c3b69b7fa6 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
   "dependencies": {
     "axios": "0.18.1",
     "core-js": "3.6.5",
+    "echarts": "^4.1.0",
     "element-ui": "2.13.2",
     "js-cookie": "2.2.0",
     "normalize.css": "7.0.0",
diff --git a/src/api/activity/couponInfo.js b/src/api/activity/couponInfo.js
new file mode 100644
index 0000000000..4dc601af26
--- /dev/null
+++ b/src/api/activity/couponInfo.js
@@ -0,0 +1,56 @@
+import request from '@/utils/request'
+
+const api_name = '/admin/activity/couponInfo'
+
+export default {
+
+  getPageList(page, limit) {
+    return request({
+      url: `${api_name}/${page}/${limit}`,
+      method: 'get'
+    })
+  },
+  getById(id) {
+    return request({
+      url: `${api_name}/get/${id}`,
+      method: 'get'
+    })
+  },
+
+  save(role) {
+    return request({
+      url: `${api_name}/save`,
+      method: 'post',
+      data: role
+    })
+  },
+
+  updateById(role) {
+    return request({
+      url: `${api_name}/update`,
+      method: 'put',
+      data: role
+    })
+  },
+  removeById(id) {
+    return request({
+      url: `${api_name}/remove/${id}`,
+      method: 'delete'
+    })
+  },
+  removeRows(idList) {
+    return request({
+      url: `${api_name}/batchRemove`,
+      method: 'delete',
+      data: idList
+    })
+  },
+
+  getPageCouponUseList(page, limit, searchObj) {
+    return request({
+      url: `${api_name}/couponUse/${page}/${limit}`,
+      method: 'get',
+      params: searchObj
+    })
+  }
+}
diff --git a/src/api/order/orderinfo.js b/src/api/order/orderinfo.js
new file mode 100644
index 0000000000..765ff46fd1
--- /dev/null
+++ b/src/api/order/orderinfo.js
@@ -0,0 +1,14 @@
+import request from '@/utils/request'
+
+const api_name = '/admin/order/orderInfo'
+
+export default {
+
+  getPageList(page, limit, searchObj) {
+    return request({
+      url: `${api_name}/${page}/${limit}`,
+      method: 'get',
+      params: searchObj
+    })
+  }
+}
diff --git a/src/api/user.js b/src/api/user.js
index 8ff4389dba..218db72d5d 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function login(data) {
   return request({
-    url: '/vue-admin-template/user/login',
+    url: '/admin/vod/user/login',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function login(data) {
 
 export function getInfo(token) {
   return request({
-    url: '/vue-admin-template/user/info',
+    url: '/admin/vod/user/info',
     method: 'get',
     params: { token }
   })
diff --git a/src/api/vod/chapter.js b/src/api/vod/chapter.js
new file mode 100644
index 0000000000..6771d277db
--- /dev/null
+++ b/src/api/vod/chapter.js
@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+const api_name = '/admin/vod/chapter'
+
+export default {
+
+  getNestedTreeList(courseId) {
+    return request({
+      url: `${api_name}/getNestedTreeList/${courseId}`,
+      method: 'get'
+    })
+  },
+
+  removeById(id) {
+    return request({
+      url: `${api_name}/remove/${id}`,
+      method: 'delete'
+    })
+  },
+
+  save(chapter) {
+    return request({
+      url: `${api_name}/save`,
+      method: 'post',
+      data: chapter
+    })
+  },
+
+  getById(id) {
+    return request({
+      url: `${api_name}/get/${id}`,
+      method: 'get'
+    })
+  },
+
+  updateById(chapter) {
+    return request({
+      url: `${api_name}/update`,
+      method: 'post',
+      data: chapter
+    })
+  }
+}
diff --git a/src/api/vod/course.js b/src/api/vod/course.js
new file mode 100644
index 0000000000..ede052b350
--- /dev/null
+++ b/src/api/vod/course.js
@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+const api_name = '/admin/vod/course'
+
+export default {
+  //课程列表
+  getPageList(page, limit, searchObj) {
+    return request({
+      url: `${api_name}/${page}/${limit}`,
+      method: 'get',
+      params: searchObj
+    })
+  },
+
+  //添加课程基本信息
+  saveCourseInfo(courseInfo) {
+    return request({
+      url: `${api_name}/save`,
+      method: 'post',
+      data: courseInfo
+    })
+  },
+
+    //id获取课程信息
+  getCourseInfoById(id) {
+    return request({
+      url: `${api_name}/get/${id}`,
+      method: 'get'
+    })
+  },
+  //修改课程信息
+  updateCourseInfoById(courseInfo) {
+    return request({
+      url: `${api_name}/update`,
+      method: 'post',
+      data: courseInfo
+    })
+  },
+
+  //获取发布课程信息
+  getCoursePublishById(id) {
+    return request({
+      url: `${api_name}/getCoursePublishVo/${id}`,
+      method: 'get'
+    })
+  },
+  //发布课程
+  publishCourseById(id) {
+    return request({
+      url: `${api_name}/publishCourseById/${id}`,
+      method: 'put'
+    })
+  },
+
+  //删除课程
+  removeById(id) {
+    return request({
+      url: `${api_name}/remove/${id}`,
+      method: 'delete'
+    })
+  },
+
+}
diff --git a/src/api/vod/subject.js b/src/api/vod/subject.js
new file mode 100644
index 0000000000..4a3f348bce
--- /dev/null
+++ b/src/api/vod/subject.js
@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+
+const api_name = '/admin/vod/subject'
+
+export default {
+  // 课程分类列表接口
+  getChildList(id) {
+    return request({
+      url: `${api_name}/getChildSubject/${id}`,
+      method: 'get'
+    })
+  }
+}
diff --git a/src/api/vod/teacher.js b/src/api/vod/teacher.js
new file mode 100644
index 0000000000..a4f5d4c693
--- /dev/null
+++ b/src/api/vod/teacher.js
@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+const api_name = '/admin/vod/teacher'
+
+export default {
+	  //讲师列表
+    pageList(page, limit, searchObj) {
+        return request({
+            url: `${api_name}/findQueryPage/${page}/${limit}`,
+            method: `post`,
+            data: searchObj
+        })
+    },
+    //讲师删除
+    removeById(id) {
+      return request({
+        url: `${api_name}/remove/${id}`,
+        method: `delete`
+      })
+    },
+    //讲师添加
+    saveTeacher(teacher) {
+      return request({
+        url: `${api_name}/saveTeacher`,
+        method: `post`,
+        data:teacher
+      })
+    },
+    //根据id得到数据
+    getById(id) {
+      return request({
+        url: `${api_name}/getTeacher/${id}`,
+        method: `get`
+      })
+    },
+    //更新数据
+    updateTeacher(teacher) {
+      return request({
+        url: `${api_name}/updateTeacher`,
+        method: `post`,
+        data: teacher
+      })
+    },
+    //批量删除
+    batchRemove(idList) {
+      return request({
+        url: `${api_name}/removeBatch`,
+        method: `delete`,
+        data: idList
+      })
+    },
+
+    //查询所有讲师
+    list(){
+      return request({
+        url: `${api_name}/findAll`,
+        method: `get`
+      })
+    }
+}
diff --git a/src/api/vod/video.js b/src/api/vod/video.js
new file mode 100644
index 0000000000..094df3e011
--- /dev/null
+++ b/src/api/vod/video.js
@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+const api_name = '/admin/vod/video'
+
+export default {
+
+  save(video) {
+    return request({
+      url: `${api_name}/save`,
+      method: 'post',
+      data: video
+    })
+  },
+
+  getById(id) {
+    return request({
+      url: `${api_name}/get/${id}`,
+      method: 'get'
+    })
+  },
+
+  updateById(video) {
+    return request({
+      url: `${api_name}/update`,
+      method: 'put',
+      data: video
+    })
+  },
+
+  removeById(id) {
+    return request({
+      url: `${api_name}/remove/${id}`,
+      method: 'delete'
+    })
+  }
+}
diff --git a/src/api/vod/videoVisitor.js b/src/api/vod/videoVisitor.js
new file mode 100644
index 0000000000..180835975c
--- /dev/null
+++ b/src/api/vod/videoVisitor.js
@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+
+const api_name = '/admin/vod/videoVisitor'
+
+export default {
+
+  findCount(courseId, startDate, endDate) {
+    return request({
+      url: `${api_name}/findCount/${courseId}/${startDate}/${endDate}`,
+      method: 'get'
+    })
+  }
+}
diff --git a/src/api/vod/vod.js b/src/api/vod/vod.js
new file mode 100644
index 0000000000..b429b85e20
--- /dev/null
+++ b/src/api/vod/vod.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+export default {
+  //删除视频
+  removeByVodId(id) {
+    return request({
+      url: `/admin/vod/remove/${id}`,
+      method: 'delete'
+    })
+  }
+}
diff --git a/src/api/wechat/menu.js b/src/api/wechat/menu.js
new file mode 100644
index 0000000000..7ec2eee251
--- /dev/null
+++ b/src/api/wechat/menu.js
@@ -0,0 +1,64 @@
+import request from '@/utils/request'
+
+const api_name = '/admin/wechat/menu'
+
+export default {
+
+  findMenuInfo() {
+    return request({
+      url: `${api_name}/findMenuInfo`,
+      method: `get`
+    })
+  },
+
+  findOneMenuInfo() {
+    return request({
+      url: `${api_name}/findOneMenuInfo`,
+      method: `get`
+    })
+  },
+
+  save(menu) {
+    return request({
+      url: `${api_name}/save`,
+      method: `post`,
+      data: menu
+    })
+  },
+
+  getById(id) {
+    return request({
+      url: `${api_name}/get/${id}`,
+      method: `get`
+    })
+  },
+
+  updateById(menu) {
+    return request({
+      url: `${api_name}/update`,
+      method: `put`,
+      data: menu
+    })
+  },
+
+  syncMenu() {
+    return request({
+      url: `${api_name}/syncMenu`,
+      method: `get`
+    })
+  },
+
+  removeById(id) {
+    return request({
+      url: `${api_name}/remove/${id}`,
+      method: 'delete'
+    })
+  },
+
+  removeMenu() {
+    return request({
+      url: `${api_name}/removeMenu`,
+      method: `delete`
+    })
+  }
+}
diff --git a/src/router/index.js b/src/router/index.js
index 13459e90e2..c8dca90c7c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -55,6 +55,84 @@ export const constantRoutes = [
     }]
   },
 
+  {
+    path: '/vod',
+    component: Layout,
+    redirect: '/vod/teacher/list',
+    name: 'vod',
+    meta: { title: '讲师管理', icon: 'el-icon-s-help' },
+    children: [
+      {
+        path: 'teacher/list',
+        name: 'TeacherList',
+        component: () => import('@/views/vod/teacher/list'),
+        meta: { title: '讲师列表', icon: 'table' }
+      },
+      {
+        path: 'teacher/create',
+        name: 'TeacherCreate',
+        component: () => import('@/views/vod/teacher/form'),
+        meta: { title: '添加讲师', icon: 'tree' }
+      },
+      {
+        path: 'teacher/edit/:id',
+        name: 'TeacherEdit',
+        component: () => import('@/views/vod/teacher/form'),
+        meta: { title: '编辑讲师' },
+        hidden: true
+      }
+    ]
+  },
+
+  // 课程管理
+  {
+    path: '/vodcourse',
+    component: Layout,
+    redirect: '/vodcourse/course/list',
+    name: 'Vodcourse',
+    meta: {
+      title: '点播管理',
+      icon: 'el-icon-bank-card'
+    },
+    alwaysShow: true,
+    children: [
+      {
+        path: 'course/list',
+        name: 'CourseList',
+        component: () => import('@/views/vod/course/list'),
+        meta: { title: '课程列表', icon: 'table'}
+      },
+      {
+        path: 'course/info',
+        name: 'CourseInfo',
+        component: () => import('@/views/vod/course/form'),
+        meta: { title: '发布课程' },
+        hidden: true
+      },
+      {
+        path: 'course/info/:id',
+        name: 'CourseInfoEdit',
+        component: () => import('@/views/vod/course/form'),
+        meta: { title: '编辑课程' },
+        hidden: true
+      },
+      {
+        path: 'course/chapter/:id',
+        name: 'CourseChapterEdit',
+        component: () => import('@/views/vod/course/form'),
+        meta: { title: '编辑大纲' },
+        hidden: true
+      },
+      {
+        path: 'course/chart/:id',
+        name: 'CourseChart',
+        component: () => import('@/views/vod/course/chart'),
+        meta: { title: '课程统计' },
+        hidden: true
+      }
+    ]
+  },
+
   {
     path: '/example',
     component: Layout,
@@ -77,6 +155,98 @@ export const constantRoutes = [
     ]
   },
 
+  {
+    path: '/order',
+    component: Layout,
+    redirect: '/order/orderInfo/list',
+    name: 'Order',
+    meta: { title: '订单管理', icon: 'el-icon-truck' },
+    alwaysShow: true,
+    children: [
+      {
+        path: 'orderInfo/list',
+        name: 'OrderInfo',
+        component: () => import('@/views/order/list'),
+        meta: { title: '订单列表' }
+      }
+    ]
+  },
+
+  {
+    path: '/activity',
+    component: Layout,
+    redirect: '/couponInfo/list',
+    name: 'Activity',
+    meta: { title: '营销活动管理', icon: 'el-icon-football' },
+    alwaysShow: true,
+    children: [
+      {
+        path: 'couponInfo/list',
+        name: 'CouponInfo',
+        component: () => import('@/views/activity/couponInfo/list'),
+        meta: { title: '优惠券列表' }
+      },
+      {
+        path: 'couponInfo/add',
+        name: 'CouponInfoAdd',
+        component: () => import('@/views/activity/couponInfo/form'),
+        meta: { title: '添加' },
+        hidden: true
+      },
+      {
+        path: 'couponInfo/edit/:id',
+        name: 'CouponInfoEdit',
+        component: () => import('@/views/activity/couponInfo/form'),
+        meta: { title: '编辑', noCache: true },
+        hidden: true
+      },
+      {
+        path: 'couponInfo/show/:id',
+        name: 'CouponInfoShow',
+        component: () => import('@/views/activity/couponInfo/show'),
+        meta: { title: '详情', noCache: true },
+        hidden: true
+      }
+    ]
+  },
+
+  {
+    path: '/wechat',
+    component: Layout,
+    redirect: '/wechat/menu/list',
+    name: 'Wechat',
+    meta: {
+      title: '公众号菜单管理',
+      icon: 'el-icon-refrigerator'
+    },
+    alwaysShow: true,
+    children: [
+      {
+        path: 'menu/list',
+        name: 'Menu',
+        component: () => import('@/views/wechat/menu/list'),
+        meta: { title: '菜单列表' }
+      }
+    ]
+  },
+
+  {
+    path: '/subject',
+    component: Layout,
+    redirect: '/subject/list',
+    name: '课程分类管理',
+    alwaysShow: true,
+    meta: { title: '课程分类管理', icon: 'example' },
+    children: [
+      {
+        path: 'list',
+        name: '课程分类列表',
+        component: () => import('@/views/vod/subject/list'),
+        meta: { title: '课程分类列表', icon: 'table' }
+      }
+    ]
+  },
+
   {
     path: '/form',
     component: Layout,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 2f6423fa9c..550dc84488 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -67,14 +67,14 @@ const actions = {
   // user logout
   logout({ commit, state }) {
     return new Promise((resolve, reject) => {
-      logout(state.token).then(() => {
+      //logout(state.token).then(() => {
         removeToken() // must remove  token  first
         resetRouter()
         commit('RESET_STATE')
         resolve()
-      }).catch(error => {
-        reject(error)
-      })
+      //}).catch(error => {
+        //reject(error)
+      //})
     })
   },
 
diff --git a/src/views/activity/couponInfo/form.vue b/src/views/activity/couponInfo/form.vue
new file mode 100644
index 0000000000..6accc6bbef
--- /dev/null
+++ b/src/views/activity/couponInfo/form.vue
@@ -0,0 +1,162 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="120px">
+
+      <el-form-item label="优惠券名称">
+        <el-input v-model="couponInfo.couponName"/>
+      </el-form-item>
+      <el-form-item label="优惠券类型">
+        <el-radio-group v-model="couponInfo.couponType">
+          <el-radio label="1">注册卷</el-radio>
+          <el-radio label="2">推荐购买卷</el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      <el-form-item label="发行数量">
+        <el-input v-model="couponInfo.publishCount"/>
+      </el-form-item>
+      <el-form-item label="领取时间">
+        <el-date-picker
+          v-model="couponInfo.startTime"
+          type="date"
+          placeholder="选择开始日期"
+          value-format="yyyy-MM-dd" />
+        至
+        <el-date-picker
+          v-model="couponInfo.endTime"
+          type="date"
+          placeholder="选择开始日期"
+          value-format="yyyy-MM-dd" />
+      </el-form-item>
+      <el-form-item label="过期时间">
+        <el-date-picker
+          v-model="couponInfo.expireTime"
+          type="datetime"
+          placeholder="选择开始日期"
+          value-format="yyyy-MM-dd HH:mm:ss" />
+      </el-form-item>
+      <el-form-item label="直播详情">
+        <el-input v-model="couponInfo.ruleDesc" type="textarea" rows="5"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="saveOrUpdate">保存</el-button>
+        <el-button @click="back">返回</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+
+import api from '@/api/activity/couponInfo'
+
+const defaultForm = {
+  id: '',
+  couponType: '1',
+  couponName: '',
+  amount: '0',
+  conditionAmount: '0',
+  startTime: '',
+  endTime: '',
+  rangeType: '1',
+  ruleDesc: '',
+  publishCount: '',
+  perLimit: '1',
+  useCount: '0',
+  receiveCount: '',
+  expireTime: '',
+  publishStatus: ''
+}
+
+export default {
+  data() {
+    return {
+      couponInfo: defaultForm,
+      saveBtnDisabled: false,
+
+      keyword: '',
+      skuInfoList: []
+    }
+  },
+
+  // 监听器
+  watch: {
+    $route(to, from) {
+      console.log('路由变化......')
+      console.log(to)
+      console.log(from)
+      this.init()
+    }
+  },
+
+  // 生命周期方法（在路由切换，组件不变的情况下不会被调用）
+  created() {
+    console.log('form created ......')
+    this.init()
+  },
+
+  methods: {
+
+    // 表单初始化
+    init() {
+      // debugger
+      if (this.$route.params && this.$route.params.id) {
+        const id = this.$route.params.id
+        this.fetchDataById(id)
+      } else {
+        // 对象拓展运算符：拷贝对象，而不是赋值对象的引用
+        this.couponInfo = { ...defaultForm }
+      }
+    },
+
+    saveOrUpdate() {
+      this.saveBtnDisabled = true // 防止表单重复提交
+      if (!this.couponInfo.id) {
+        this.saveData()
+      } else {
+        this.updateData()
+      }
+    },
+
+    // 新增
+    saveData() {
+      api.save(this.couponInfo).then(response => {
+        // debugger
+        if (response.code) {
+          this.$message({
+            type: 'success',
+            message: response.message
+          })
+          this.$router.push({ path: '/activity/couponInfo/list' })
+        }
+      })
+    },
+
+    // 根据id更新记录
+    updateData() {
+      api.updateById(this.couponInfo).then(response => {
+        debugger
+        if (response.code) {
+          this.$message({
+            type: 'success',
+            message: response.message
+          })
+          this.$router.push({ path: '/activity/couponInfo/list' })
+        }
+      })
+    },
+
+    back() {
+      this.$router.push({ path: '/activity/couponInfo/list' })
+    },
+
+    // 根据id查询记录
+    fetchDataById(id) {
+      api.getById(id).then(response => {
+        // debugger
+        this.couponInfo = response.data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/activity/couponInfo/list.vue b/src/views/activity/couponInfo/list.vue
new file mode 100644
index 0000000000..082b658a65
--- /dev/null
+++ b/src/views/activity/couponInfo/list.vue
@@ -0,0 +1,164 @@
+<template>
+  <div class="app-container">
+
+    <!-- 工具条 -->
+    <el-card class="operate-container" shadow="never">
+      <i class="el-icon-tickets" style="margin-top: 5px"></i>
+      <span style="margin-top: 5px">数据列表</span>
+      <el-button class="btn-add" size="mini" @click="add()">添加</el-button>
+    </el-card>
+
+    <!-- banner列表 -->
+    <el-table
+      v-loading="listLoading"
+      :data="list"
+      element-loading-text="数据正在加载......"
+      border
+      fit
+      highlight-current-row>
+
+      <el-table-column
+        label="序号"
+        width="70"
+        align="center">
+        <template slot-scope="scope">
+          {{ (page - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="couponName" label="购物券名称" />
+      <el-table-column prop="couponType" label="购物券类型">
+        <template slot-scope="scope">
+          {{ scope.row.couponType == 'REGISTER' ? '注册卷' : '推荐赠送卷' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="规则">
+        <template slot-scope="scope">
+          {{ '现金卷：' + scope.row.amount + '元' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="使用范围 ">
+          所有商品
+      </el-table-column>
+      <el-table-column prop="publishCount" label="发行数量" />
+      <el-table-column prop="expireTime" label="过期时间" />
+      <el-table-column prop="createTime" label="创建时间" />
+      <el-table-column label="操作" width="150" align="center">
+        <template slot-scope="scope">
+          <router-link :to="'/activity/couponInfo/edit/'+scope.row.id">
+            <el-button size="mini" type="text" >修改</el-button>
+          </router-link>
+          <el-button size="mini" type="text" @click="removeDataById(scope.row.id)">删除</el-button>
+          <router-link :to="'/activity/couponInfo/show/'+scope.row.id">
+            <el-button size="mini" type="text" >详情</el-button>
+          </router-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页组件 -->
+    <el-pagination
+      :current-page="page"
+      :total="total"
+      :page-size="limit"
+      :page-sizes="[5, 10, 20, 30, 40, 50, 100]"
+      style="padding: 30px 0; text-align: center;"
+      layout="sizes, prev, pager, next, jumper, ->, total, slot"
+      @current-change="fetchData"
+      @size-change="changeSize"
+    />
+  </div>
+</template>
+
+<script>
+import api from '@/api/activity/couponInfo'
+
+export default {
+  data() {
+    return {
+      listLoading: true, // 数据是否正在加载
+      list: null, // banner列表
+      total: 0, // 数据库中的总记录数
+      page: 1, // 默认页码
+      limit: 10, // 每页记录数
+      searchObj: {}, // 查询表单对象
+      multipleSelection: [] // 批量选择中选择的记录列表
+    }
+  },
+
+  // 生命周期函数：内存准备完毕，页面尚未渲染
+  created() {
+    console.log('list created......')
+    this.fetchData()
+  },
+
+  // 生命周期函数：内存准备完毕，页面渲染成功
+  mounted() {
+    console.log('list mounted......')
+  },
+
+  methods: {
+
+    // 当页码发生改变的时候
+    changeSize(size) {
+      console.log(size)
+      this.limit = size
+      this.fetchData(1)
+    },
+
+    add(){
+      this.$router.push({ path: '/activity/couponInfo/add' })
+    },
+
+    // 加载banner列表数据
+    fetchData(page = 1) {
+      console.log('翻页。。。' + page)
+      // 异步获取远程数据（ajax）
+      this.page = page
+
+      api.getPageList(this.page, this.limit, this.searchObj).then(
+        response => {
+          this.list = response.data.records
+          this.total = response.data.total
+
+          // 数据加载并绑定成功
+          this.listLoading = false
+        }
+      )
+    },
+
+    // 重置查询表单
+    resetData() {
+      console.log('重置查询表单')
+      this.searchObj = {}
+      this.fetchData()
+    },
+
+    // 根据id删除数据
+    removeDataById(id) {
+      // debugger
+      this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => { // promise
+        // 点击确定，远程调用ajax
+        return api.removeById(id)
+      }).then((response) => {
+        this.fetchData(this.page)
+        if (response.code) {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+        }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/activity/couponInfo/show.vue b/src/views/activity/couponInfo/show.vue
new file mode 100644
index 0000000000..b4ee78fab0
--- /dev/null
+++ b/src/views/activity/couponInfo/show.vue
@@ -0,0 +1,173 @@
+<template>
+  <div class="app-container">
+
+    <h4>优惠券信息</h4>
+    <table class="table table-striped table-condenseda table-bordered" width="100%">
+      <tbody>
+      <tr>
+        <th width="15%">优惠券名称</th>
+        <td width="35%"><b style="font-size: 14px">{{ couponInfo.couponName }}</b></td>
+        <th width="15%">优惠券类型</th>
+        <td width="35%">
+          {{ couponInfo.couponType == 'REGISTER' ? '注册卷' : '推荐赠送卷' }}
+        </td>
+      </tr>
+      <tr>
+        <th>发行数量</th>
+        <td>{{ couponInfo.publishCount }}</td>
+        <th>每人限领次数</th>
+        <td>{{ couponInfo.perLimit }}</td>
+      </tr>
+      <tr>
+        <th>领取数量</th>
+        <td>{{ couponInfo.receiveCount }}</td>
+        <th>使用数量</th>
+        <td>{{ couponInfo.useCount }}</td>
+      </tr>
+      <tr>
+        <th>领取时间</th>
+        <td>{{ couponInfo.startTime }}至{{ couponInfo.endTime }}</td>
+        <th>过期时间</th>
+        <td>{{ couponInfo.expireTime }}</td>
+      </tr>
+      <tr>
+        <th>规则描述</th>
+        <td colspan="3">{{ couponInfo.ruleDesc }}</td>
+      </tr>
+      </tbody>
+    </table>
+
+    <h4>
+      优惠券发放列表&nbsp;&nbsp;&nbsp;
+    </h4>
+    <el-table
+      v-loading="listLoading"
+      :data="list"
+      stripe
+      border
+      style="width: 100%;margin-top: 10px;">
+
+      <el-table-column
+        label="序号"
+        width="70"
+        align="center">
+        <template slot-scope="scope">
+          {{ (page - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="param.nickName" label="用户昵称" />
+      <el-table-column prop="param.phone" label="手机号" />
+      <el-table-column label="使用状态">
+        <template slot-scope="scope">
+          {{ scope.row.couponStatus == 'NOT_USED' ? '未使用' : '已使用' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="getTime" label="获取时间" />
+      <el-table-column prop="usingTime" label="使用时间" />
+      <el-table-column prop="usedTime" label="支付时间" />
+      <el-table-column prop="expireTime" label="过期时间" />
+    </el-table>
+    <!-- 分页组件 -->
+    <el-pagination
+      :current-page="page"
+      :total="total"
+      :page-size="limit"
+      :page-sizes="[5, 10, 20, 30, 40, 50, 100]"
+      style="padding: 30px 0; text-align: center;"
+      layout="sizes, prev, pager, next, jumper, ->, total, slot"
+      @current-change="fetchData"
+      @size-change="changeSize"
+    />
+
+    <div style="margin-top: 15px;">
+      <el-form label-width="0px">
+        <el-form-item>
+          <el-button @click="back">返回</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import api from '@/api/activity/couponInfo'
+export default {
+  data() {
+    return {
+      listLoading: false, // 数据是否正在加载
+
+      couponId: null,
+      couponInfo: {},
+
+      list: null, // banner列表
+      total: 0, // 数据库中的总记录数
+      page: 1, // 默认页码
+      limit: 10, // 每页记录数
+      searchObj: {} // 查询表单对象
+    }
+  },
+
+  // 监听器
+  watch: {
+    $route(to, from) {
+      console.log('路由变化......')
+      console.log(to)
+      console.log(from)
+      this.init()
+    }
+  },
+
+  // 生命周期方法（在路由切换，组件不变的情况下不会被调用）
+  created() {
+    console.log('form created ......')
+    this.couponId = this.$route.params.id
+    // 获取优惠券信息
+    this.fetchDataById()
+    this.fetchData()
+  },
+
+  methods: {
+
+    // 根据id查询记录
+    fetchDataById() {
+      api.getById(this.couponId).then(response => {
+        //
+        this.couponInfo = response.data
+      })
+    },
+
+    // 当页码发生改变的时候
+    changeSize(size) {
+      console.log(size)
+      this.limit = size
+      this.fetchData(1)
+    },
+
+    // 加载banner列表数据
+    fetchData(page = 1) {
+      console.log('翻页。。。' + page)
+      // 异步获取远程数据（ajax）
+      this.page = page
+      this.searchObj.couponId = this.couponId
+      api.getPageCouponUseList(this.page, this.limit, this.searchObj).then(
+        response => {
+          this.list = response.data.records
+          this.total = response.data.total
+
+          // 数据加载并绑定成功
+          this.listLoading = false
+        }
+      )
+    },
+
+    back() {
+      this.$router.push({ path: '/activity/couponInfo/list' })
+    }
+  }
+}
+</script>
+<style>
+  .app-container h4 {
+    color: #606266;
+  }
+</style>
diff --git a/src/views/order/list.vue b/src/views/order/list.vue
new file mode 100644
index 0000000000..6a966086f8
--- /dev/null
+++ b/src/views/order/list.vue
@@ -0,0 +1,143 @@
+<template>
+  <div class="app-container">
+    <el-card class="operate-container" shadow="never">
+      <el-form :inline="true" class="demo-form-inline">
+        <el-form-item>
+          <el-input v-model="searchObj.outTradeNo" placeholder="订单号"/>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="searchObj.phone" placeholder="手机"/>
+        </el-form-item>
+        <el-form-item>
+          <el-date-picker
+            v-model="searchObj.createTimeBegin"
+            type="date"
+            placeholder="选择下单开始日期"
+            value-format="yyyy-MM-dd" />
+        </el-form-item>
+        <el-form-item>
+          <el-date-picker
+            v-model="searchObj.createTimeEnd"
+            type="date"
+            placeholder="选择截止日期"
+            value-format="yyyy-MM-dd" />
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="searchObj.orderStatus" placeholder="订单状态" class="v-select patient-select">
+            <el-option
+              v-for="item in statusList"
+              :key="item.status"
+              :label="item.name"
+              :value="item.status">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="fetchData()">查询</el-button>
+        <el-button type="default" @click="resetData()">清空</el-button>
+      </el-form>
+    </el-card>
+    <!-- 列表 -->
+    <el-table
+      v-loading="listLoading"
+      :data="list"
+      border
+      fit
+      highlight-current-row>
+      <el-table-column
+        label="序号"
+        width="60"
+        align="center">
+        <template slot-scope="scope">
+          {{ (page - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="outTradeNo" label="订单号" width="160"/>
+      <el-table-column prop="courseName" label="课程名称" width="160">
+        <template slot-scope="scope">
+          {{ scope.row.param.courseName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="finalAmount" label="订单金额" width="90"/>
+      <el-table-column prop="nickName" label="下单用户" />
+      <el-table-column prop="phone" label="用户手机" />
+      <el-table-column prop="payTime" label="支付时间" width="156"/>
+      <el-table-column prop="orderStatus" label="订单状态">
+        <template slot-scope="scope">
+          {{ scope.row.orderStatus == 0 ? '未支付' : '已支付' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="下单时间" width="156"/>
+    </el-table>
+    <!-- 分页组件 -->
+    <el-pagination
+      :current-page="page"
+      :total="total"
+      :page-size="limit"
+      :page-sizes="[5, 10, 20, 30, 40, 50, 100]"
+      style="padding: 30px 0; text-align: center;"
+      layout="sizes, prev, pager, next, jumper, ->, total, slot"
+      @current-change="fetchData"
+      @size-change="changeSize"
+    />
+  </div>
+</template>
+<script>
+import orderInfoApi from '@/api/order/orderinfo'    //大小写修改
+
+export default {
+  data() {
+    return {
+      listLoading: true, // 数据是否正在加载
+      list: null, // banner列表
+      total: 0, // 数据库中的总记录数
+      page: 1, // 默认页码
+      limit: 10, // 每页记录数
+      searchObj: {}, // 查询表单对象
+      statusList: [
+        {
+          'status': 0,
+          'name': '未支付'
+        },
+        {
+          'status': 1,
+          'name': '已支付'
+        }
+      ]
+    }
+  },
+  // 生命周期函数：内存准备完毕，页面尚未渲染
+  created() {
+    this.fetchData()
+  },
+  // 生命周期函数：内存准备完毕，页面渲染成功
+  mounted() {
+    console.log('list mounted......')
+  },
+  methods: {
+    // 当页码发生改变的时候
+    changeSize(size) {
+      this.limit = size
+      this.fetchData(1)
+    },
+    // 加载banner列表数据
+    fetchData(page = 1) {
+      // 异步获取远程数据（ajax）
+      this.page = page
+      orderInfoApi.getPageList(this.page, this.limit, this.searchObj).then(
+        response => {
+          this.list = response.data.records
+          this.total = response.data.total
+          // 数据加载并绑定成功
+          this.listLoading = false
+        }
+      )
+    },
+    // 重置查询表单
+    resetData() {
+      console.log('重置查询表单')
+      this.searchObj = {}
+      this.fetchData()
+    }
+  }
+}
+</script>
diff --git a/src/views/vod/course/chart.vue b/src/views/vod/course/chart.vue
new file mode 100644
index 0000000000..5487e0229a
--- /dev/null
+++ b/src/views/vod/course/chart.vue
@@ -0,0 +1,99 @@
+<template>
+  <div class="app-container">
+    <!--表单-->
+    <el-form :inline="true" class="demo-form-inline">
+      <el-form-item>
+        <el-date-picker
+          v-model="startDate"
+          type="date"
+          placeholder="选择开始日期"
+          value-format="yyyy-MM-dd" />
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="endDate"
+          type="date"
+          placeholder="选择截止日期"
+          value-format="yyyy-MM-dd" />
+      </el-form-item>
+      <el-button
+        :disabled="btnDisabled"
+        type="primary"
+        icon="el-icon-search"
+        @click="showChart()">查询</el-button>
+    </el-form>
+    <div id="chart" class="chart" style="height:500px;" />
+  </div>
+</template>
+<script>
+import echarts from 'echarts'
+import api from '@/api/vod/videoVisitor'
+
+export default {
+  data() {
+    return {
+      courseId: '',
+      startDate: '',
+      endDate: '',
+      btnDisabled: false
+    }
+  },
+  created() {
+    this.courseId = this.$route.params.id
+    // 初始化最近十天数据
+    let currentDate = new Date();
+    this.startDate = this.dateFormat(new Date(currentDate.getTime()-7*24*3600*1000))
+    this.endDate = this.dateFormat(currentDate)
+    this.showChart()
+  },
+  methods: {
+    showChart() {
+      api.findCount(this.courseId, this.startDate, this.endDate).then(response => {
+        this.setChartData(response.data)
+      })
+    },
+    setChartData(data) {
+      // 基于准备好的dom，初始化echarts实例
+      var myChart = echarts.init(document.getElementById('chart'))
+      // 指定图表的配置项和数据
+      var option = {
+        title: {
+          text: '观看课程人数统计'
+        },
+        xAxis: {
+          data: data.xData
+        },
+        yAxis: {
+          minInterval: 1
+        },
+        series: [{
+          type: 'line',
+          data: data.yData
+        }]
+      }
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option)
+    },
+    dateFormat(date) {
+      let fmt = 'YYYY-mm-dd'
+      let ret;
+      const opt = {
+        "Y+": date.getFullYear().toString(),        // 年
+        "m+": (date.getMonth() + 1).toString(),     // 月
+        "d+": date.getDate().toString(),            // 日
+        "H+": date.getHours().toString(),           // 时
+        "M+": date.getMinutes().toString(),         // 分
+        "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      };
+      for (let k in opt) {
+        ret = new RegExp("(" + k + ")").exec(fmt);
+        if (ret) {
+          fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+        };
+      };
+      return fmt;
+    }
+  }
+}
+</script>
diff --git a/src/views/vod/course/components/Chapter/Form.vue b/src/views/vod/course/components/Chapter/Form.vue
new file mode 100644
index 0000000000..6e01129e16
--- /dev/null
+++ b/src/views/vod/course/components/Chapter/Form.vue
@@ -0,0 +1,83 @@
+<template>
+  <!-- 添加和修改章节表单 -->
+  <el-dialog :visible="dialogVisible" title="添加章节" @close="close()">
+    <el-form :model="chapter" label-width="120px">
+      <el-form-item label="章节标题">
+        <el-input v-model="chapter.title"/>
+      </el-form-item>
+      <el-form-item label="章节排序">
+        <el-input-number v-model="chapter.sort" :min="0"/>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="close()">取 消</el-button>
+      <el-button type="primary" @click="saveOrUpdate()">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import chapterApi from '@/api/vod/chapter'
+export default {
+
+  data() {
+    return {
+      dialogVisible: false,
+      chapter: {
+        sort: 0
+      }
+    }
+  },
+  methods: {
+    open(chapterId) {
+      this.dialogVisible = true
+      if (chapterId) {
+        chapterApi.getById(chapterId).then(response => {
+          this.chapter = response.data
+        })
+      }
+    },
+
+    close() {
+      this.dialogVisible = false
+      // 重置表单
+      this.resetForm()
+    },
+
+    resetForm() {
+      this.chapter = {
+        sort: 0
+      }
+    },
+
+    saveOrUpdate() {
+      if (!this.chapter.id) {
+        this.save()
+      } else {
+        this.update()
+      }
+    },
+
+    save() {
+      this.chapter.courseId = this.$parent.$parent.courseId
+      chapterApi.save(this.chapter).then(response => {
+        this.$message.success(response.message)
+        // 关闭组件
+        this.close()
+        // 刷新列表
+        this.$parent.fetchNodeList()
+      })
+    },
+
+    update() {
+      chapterApi.updateById(this.chapter).then(response => {
+        this.$message.success(response.message)
+        // 关闭组件
+        this.close()
+        // 刷新列表
+        this.$parent.fetchNodeList()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/vod/course/components/Chapter/index.vue b/src/views/vod/course/components/Chapter/index.vue
new file mode 100644
index 0000000000..af56089b6d
--- /dev/null
+++ b/src/views/vod/course/components/Chapter/index.vue
@@ -0,0 +1,177 @@
+<template>
+  <div class="app-container">
+
+    <!-- 添加章节按钮 -->
+    <div>
+      <el-button type="primary" @click="addChapter()">添加章节</el-button>
+    </div>
+
+    <!-- 章节列表 -->
+    <ul class="chapterList">
+      <li
+        v-for="chapter in chapterList"
+        :key="chapter.id">
+        <p>
+          {{ chapter.title }}
+          <span class="acts">
+            <el-button type="text" @click="addVideo(chapter.id)">添加课时</el-button>
+            <el-button type="text" @click="editChapter(chapter.id)">编辑</el-button>
+            <el-button type="text" @click="removeChapterById(chapter.id)">删除</el-button>
+          </span>
+        </p>
+        <!-- 视频 -->
+        <ul class="chapterList videoList">
+          <li
+            v-for="video in chapter.children"
+            :key="video.id">
+            <p>
+              {{ video.title }}
+              <el-tag v-if="!video.videoSourceId" size="mini" type="danger">
+                {{ '尚未上传视频' }}
+              </el-tag>
+              <span class="acts">
+                <el-tag v-if="video.isFree" size="mini" type="success">{{ '免费观看' }}</el-tag>
+                <el-button type="text" @click="editVideo(chapter.id, video.id)">编辑</el-button>
+                <el-button type="text" @click="removeVideoById(video.id)">删除</el-button>
+              </span>
+            </p>
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <!-- 章节表单对话框 -->
+    <chapter-form ref="chapterForm" />
+    <!-- 课时表单对话框 -->
+    <video-form ref="videoForm" />
+    <div style="text-align:center">
+      <el-button type="primary" @click="prev()">上一步</el-button>
+      <el-button type="primary" @click="next()">下一步</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import chapterApi from '@/api/vod/chapter'
+import videoApi from '@/api/vod/video'
+
+// 引入组件
+import ChapterForm from '@/views/vod/course/components/Chapter/Form'
+import VideoForm from '@/views/vod/course/components/Video/Form'
+
+export default {
+  // 注册组件
+  components: { ChapterForm, VideoForm },
+  data() {
+    return {
+      chapterList: [] // 章节嵌套列表
+    }
+  },
+  created() {
+    this.fetchNodeList()
+  },
+  methods: {
+    // 获取章节小节数据
+    fetchNodeList() {
+      chapterApi.getNestedTreeList(this.$parent.courseId).then(response => {
+        this.chapterList = response.data
+      })
+    },
+    //删除章节
+    removeChapterById(chapterId) {
+      this.$confirm('此操作将永久删除该章节，是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        return chapterApi.removeById(chapterId)
+      }).then(response => {
+        this.fetchNodeList()
+        this.$message.success(response.message)
+      }).catch((response) => {
+        if (response === 'cancel') {
+          this.$message.info('取消删除')
+        }
+      })
+    },
+    // 添加章节
+    addChapter() {
+      this.$refs.chapterForm.open()
+    },
+    // 编辑章节
+    editChapter(chapterId) {
+      this.$refs.chapterForm.open(chapterId)
+    },
+    // 添加课时
+    addVideo(chapterId) {
+      this.$refs.videoForm.open(chapterId)
+    },
+    // 编辑课时
+    editVideo(chapterId, videoId) {
+      this.$refs.videoForm.open(chapterId, videoId)
+    },
+    // 删除课时
+    removeVideoById(videoId) {
+      this.$confirm('此操作将永久删除该课时, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        return videoApi.removeById(videoId)
+      }).then(response => {
+        this.fetchNodeList()
+        this.$message.success(response.message)
+      }).catch((response) => {
+        if (response === 'cancel') {
+          this.$message.info('取消删除')
+        }
+      })
+    },
+    // 上一步
+    prev() {
+      this.$parent.active = 0
+    },
+    // 下一步
+    next() {
+      this.$parent.active = 2
+    }
+  }
+}
+</script>
+<style scoped>
+.chapterList{
+    position: relative;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+.chapterList li{
+  position: relative;
+}
+.chapterList p{
+  float: left;
+  font-size: 20px;
+  margin: 10px 0;
+  padding: 10px;
+  height: 70px;
+  line-height: 50px;
+  width: 100%;
+  border: 1px solid #DDD;
+}
+.chapterList .acts {
+    float: right;
+    font-size: 14px;
+}
+
+.videoList{
+  padding-left: 50px;
+}
+.videoList p{
+  float: left;
+  font-size: 14px;
+  margin: 10px 0;
+  padding: 10px;
+  height: 50px;
+  line-height: 30px;
+  width: 100%;
+  border: 1px dashed #DDD;
+}
+</style>
diff --git a/src/views/vod/course/components/Info.vue b/src/views/vod/course/components/Info.vue
new file mode 100644
index 0000000000..e0f34fa0cd
--- /dev/null
+++ b/src/views/vod/course/components/Info.vue
@@ -0,0 +1,234 @@
+<template>
+  <div class="app-container">
+    <!-- 课程信息表单 -->
+    <el-form label-width="120px">
+      <el-form-item label="课程标题">
+        <el-input v-model="courseInfo.title" placeholder=" 示例：机器学习项目课：从基础到搭建项目视频课程。专业名称注意大小写"/>
+      </el-form-item>
+      <!-- 课程讲师 -->
+      <el-form-item label="课程讲师">
+        <el-select
+          v-model="courseInfo.teacherId"
+          placeholder="请选择">
+          <el-option
+            v-for="teacher in teacherList"
+            :key="teacher.id"
+            :label="teacher.name"
+            :value="teacher.id"/>
+        </el-select>
+      </el-form-item>
+      <!-- 所属分类：级联下拉列表 -->
+      <el-form-item label="课程类别">
+        <!-- 一级分类 -->
+        <el-select
+          v-model="courseInfo.subjectParentId"
+          placeholder="请选择"
+          @change="subjectChanged">
+          <el-option
+            v-for="subject in subjectList"
+            :key="subject.id"
+            :label="subject.title"
+            :value="subject.id"/>
+        </el-select>
+        <!-- 二级分类 -->
+        <el-select v-model="courseInfo.subjectId" placeholder="请选择">
+          <el-option
+            v-for="subject in subjectLevelTwoList"
+            :key="subject.id"
+            :label="subject.title"
+            :value="subject.id"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="总课时">
+        <el-input-number :min="0" v-model="courseInfo.lessonNum" controls-position="right" placeholder="请填写课程的总课时数"/>
+      </el-form-item>
+      <!-- 课程简介-->
+      <el-form-item label="课程简介">
+        <el-input v-model="courseInfo.description" type="textarea" rows="5"/>
+      </el-form-item>
+      <!-- 课程封面 -->
+      <el-form-item label="课程封面">
+        <el-upload
+          :show-file-list="false"
+          :on-success="handleCoverSuccess"
+          :before-upload="beforeCoverUpload"
+          :on-error="handleCoverError"
+          :action="BASE_API+'/admin/vod/file/upload'"
+          class="cover-uploader">
+          <img v-if="courseInfo.cover" :src="courseInfo.cover">
+          <i v-else class="el-icon-plus avatar-uploader-icon"/>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="课程价格">
+        <el-input-number :min="0" v-model="courseInfo.price" controls-position="right" placeholder="免费课程请设置为0元"/> 元
+      </el-form-item>
+    </el-form>
+
+    <div style="text-align:center">
+      <el-button :disabled="saveBtnDisabled" type="primary" @click="saveAndNext()">保存并下一步</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import courseApi from '@/api/vod/course'
+import teacherApi from '@/api/vod/teacher'
+import subjectApi from '@/api/vod/subject'
+
+export default {
+  data() {
+    return {
+      BASE_API: 'http://localhost:8301',
+      saveBtnDisabled: false, // 按钮是否禁用
+      courseInfo: {// 表单数据
+        price: 0,
+        lessonNum: 0,
+        // 以下解决表单数据不全时insert语句非空校验
+        teacherId: '',
+        subjectId: '',
+        subjectParentId: '',
+        cover: '',
+        description: ''
+      },
+      teacherList: [], // 讲师列表
+      subjectList: [], // 一级分类列表
+      subjectLevelTwoList: []// 二级分类列表
+    }
+  },
+  created() {
+    if (this.$parent.courseId) { // 回显
+      this.fetchCourseInfoById(this.$parent.courseId)
+    } else { // 新增
+      // 初始化分类列表
+      this.initSubjectList()
+    }
+    // 获取讲师列表
+    this.initTeacherList()
+  },
+  methods: {
+    // 获取讲师列表
+    initTeacherList() {
+      teacherApi.list().then(response => {
+        this.teacherList = response.data
+      })
+    },
+
+    // 初始化分类列表
+    initSubjectList() {
+      subjectApi.getChildList(0).then(response => {
+        this.subjectList = response.data
+      })
+    },
+
+    // 选择一级分类，切换二级分类
+    subjectChanged(value) {
+      subjectApi.getChildList(value).then(response => {
+        this.courseInfo.subjectId = ''
+        this.subjectLevelTwoList = response.data
+      })
+    },
+
+    // 上传成功回调
+    handleCoverSuccess(res, file) {
+      this.courseInfo.cover = res.data
+    },
+
+    // 上传校验
+    beforeCoverUpload(file) {
+      const isJPG = file.type === 'image/jpeg'
+      const isLt2M = file.size / 1024 / 1024 < 2
+
+      if (!isJPG) {
+        this.$message.error('上传头像图片只能是 JPG 格式!')
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isJPG && isLt2M
+    },
+
+    // 错误处理
+    handleCoverError() {
+      console.log('error')
+      this.$message.error('上传失败2')
+    },
+
+    // 获取课程信息
+    fetchCourseInfoById(id) {
+      courseApi.getCourseInfoById(id).then(response => {
+        this.courseInfo = response.data
+        // 初始化分类列表
+        subjectApi.getChildList(0).then(response => {
+          this.subjectList = response.data
+          // 填充二级菜单：遍历一级菜单列表，
+          this.subjectList.forEach(subject => {
+            // 找到和courseInfo.subjectParentId一致的父类别记录
+            if (subject.id === this.courseInfo.subjectParentId) {
+              // 拿到当前类别下的子类别列表，将子类别列表填入二级下拉菜单列表
+              subjectApi.getChildList(subject.id).then(response => {
+                this.subjectLevelTwoList = response.data
+              })
+            }
+          })
+        })
+      })
+    },
+
+    // 保存并下一步
+    saveAndNext() {
+      this.saveBtnDisabled = true
+      if (!this.$parent.courseId) {
+        this.saveData()
+      } else {
+        this.updateData()
+      }
+    },
+
+    // 修改
+    updateData() {
+      courseApi.updateCourseInfoById(this.courseInfo).then(response => {
+        this.$message.success(response.message)
+        this.$parent.courseId = response.data // 获取courseId
+        this.$parent.active = 1 // 下一步
+      })
+    },
+
+    // 保存
+    saveData() {
+      courseApi.saveCourseInfo(this.courseInfo).then(response => {
+        this.$message.success(response.message)
+        this.$parent.courseId = response.data // 获取courseId
+        // debugger
+        this.$parent.active = 1 // 下一步
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.tinymce-container {
+  position: relative;
+  line-height: normal;
+}
+.cover-uploader .avatar-uploader-icon {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+
+  font-size: 28px;
+  color: #8c939d;
+  width: 640px;
+  height: 357px;
+  line-height: 357px;
+  text-align: center;
+}
+.cover-uploader .avatar-uploader-icon:hover {
+  border-color: #409EFF;
+}
+.cover-uploader img {
+  width: 640px;
+  height: 357px;
+  display: block;
+}
+</style>
diff --git a/src/views/vod/course/components/Publish.vue b/src/views/vod/course/components/Publish.vue
new file mode 100644
index 0000000000..c2b0fefbd8
--- /dev/null
+++ b/src/views/vod/course/components/Publish.vue
@@ -0,0 +1,108 @@
+<template>
+  <div class="app-container">
+    <!--课程预览-->
+    <div class="ccInfo">
+      <img :src="coursePublish.cover">
+      <div class="main">
+        <h2>{{ coursePublish.title }}</h2>
+        <p class="gray"><span>共{{ coursePublish.lessonNum }}课时</span></p>
+        <p><span>所属分类：{{ coursePublish.subjectParentTitle }} — {{ coursePublish.subjectTitle }}</span></p>
+        <p>课程讲师：{{ coursePublish.teacherName }}</p>
+        <h3 class="red">￥{{ coursePublish.price }}</h3>
+      </div>
+    </div>
+    <div style="text-align:center">
+      <el-button type="primary" @click="prev()">上一步</el-button>
+      <el-button :disabled="publishBtnDisabled" type="primary" @click="publish()">发布课程</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import courseApi from '@/api/vod/course'
+
+export default {
+  data() {
+    return {
+      publishBtnDisabled: false, // 按钮是否禁用
+      coursePublish: {}
+    }
+  },
+  created() {
+    if (this.$parent.courseId) {
+      this.fetchCoursePublishById(this.$parent.courseId)
+    }
+  },
+  methods: {
+    // 获取课程发布信息
+    fetchCoursePublishById(id) {
+      courseApi.getCoursePublishById(id).then(response => {
+        this.coursePublish = response.data
+      })
+    },
+    // 上一步
+    prev() {
+      this.$parent.active = 1
+    },
+    // 下一步
+    publish() {
+      this.publishBtnDisabled = true
+      courseApi.publishCourseById(this.$parent.courseId).then(response => {
+        this.$parent.active = 3
+        this.$message.success(response.message)
+        this.$router.push({ path: '/vodcourse/course/list' })
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.ccInfo {
+    background: #f5f5f5;
+    padding: 20px;
+    overflow: hidden;
+    border: 1px dashed #DDD;
+    margin-bottom: 40px;
+    position: relative;
+}
+.ccInfo img {
+    background: #d6d6d6;
+    width: 500px;
+    height: 278px;
+    display: block;
+    float: left;
+    border: none;
+}
+.ccInfo .main {
+    margin-left: 520px;
+}
+.ccInfo .main h2 {
+    font-size: 28px;
+    margin-bottom: 30px;
+    line-height: 1;
+    font-weight: normal;
+}
+.ccInfo .main p {
+    margin-bottom: 10px;
+    word-wrap: break-word;
+    line-height: 24px;
+    max-height: 48px;
+    overflow: hidden;
+}
+.ccInfo .main p {
+    margin-bottom: 10px;
+    word-wrap: break-word;
+    line-height: 24px;
+    max-height: 48px;
+    overflow: hidden;
+}
+.ccInfo .main h3 {
+    left: 540px;
+    bottom: 20px;
+    line-height: 1;
+    font-size: 28px;
+    color: #d32f24;
+    font-weight: normal;
+    position: absolute;
+}
+</style>
diff --git a/src/views/vod/course/components/Video/Form.vue b/src/views/vod/course/components/Video/Form.vue
new file mode 100644
index 0000000000..73436dd1a4
--- /dev/null
+++ b/src/views/vod/course/components/Video/Form.vue
@@ -0,0 +1,152 @@
+<template>
+  <!-- 添加和修改课时表单 -->
+  <el-dialog :visible="dialogVisible" title="添加课时" @close="close()">
+    <el-form :model="video" label-width="120px">
+      <el-form-item label="课时标题">
+        <el-input v-model="video.title"/>
+      </el-form-item>
+      <el-form-item label="课时排序">
+        <el-input-number v-model="video.sort" :min="0" />
+      </el-form-item>
+      <el-form-item label="是否免费">
+        <el-radio-group v-model="video.isFree">
+          <el-radio :label="0">免费</el-radio>
+          <el-radio :label="1">默认</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 上传视频 -->
+      <el-form-item label="上传视频">
+        <el-upload
+          ref="upload"
+          :auto-upload="false"
+          :on-success="handleUploadSuccess"
+          :on-error="handleUploadError"
+          :on-exceed="handleUploadExceed"
+          :file-list="fileList"
+          :limit="1"
+          :before-remove="handleBeforeRemove"
+          :on-remove="handleOnRemove"
+          :action="BASE_API+'/admin/vod/upload'">
+          <el-button slot="trigger" size="small" type="primary">选择视频</el-button>
+          <el-button
+            :disabled="uploadBtnDisabled"
+            style="margin-left: 10px;"
+            size="small"
+            type="success"
+            @click="submitUpload()">上传</el-button>
+        </el-upload>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="close()">取 消</el-button>
+      <el-button type="primary" @click="saveOrUpdate()">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import videoApi from '@/api/vod/video'
+import vodApi from '@/api/vod/vod'
+export default {
+  data() {
+    return {
+      BASE_API: 'http://localhost:8301',
+      dialogVisible: false,
+      video: {
+        sort: 0,
+        free: false
+      },
+      fileList: [], // 上传文件列表
+      uploadBtnDisabled: false
+    }
+  },
+  methods: {
+    open(chapterId, videoId) {
+      this.dialogVisible = true
+      this.video.chapterId = chapterId
+      if (videoId) {
+        videoApi.getById(videoId).then(response => {
+          this.video = response.data
+          // 回显
+          if (this.video.videoOriginalName) {
+            this.fileList = [{ 'name': this.video.videoOriginalName }]
+          }
+        })
+      }
+    },
+    close() {
+      this.dialogVisible = false
+      // 重置表单
+      this.resetForm()
+    },
+    resetForm() {
+      this.video = {
+        sort: 0,
+        free: false
+      }
+      this.fileList = [] // 重置视频上传列表
+    },
+    saveOrUpdate() {
+      if (!this.video.id) {
+        this.save()
+      } else {
+        this.update()
+      }
+    },
+    save() {
+      this.video.courseId = this.$parent.$parent.courseId
+      videoApi.save(this.video).then(response => {
+        this.$message.success(response.message)
+        // 关闭组件
+        this.close()
+        // 刷新列表
+        this.$parent.fetchNodeList()
+      })
+    },
+    update() {
+      videoApi.updateById(this.video).then(response => {
+        this.$message.success(response.message)
+        // 关闭组件
+        this.close()
+        // 刷新列表
+        this.$parent.fetchNodeList()
+      })
+    },
+    // 上传多于一个视频
+    handleUploadExceed(files, fileList) {
+      this.$message.warning('想要重新上传视频，请先删除已上传的视频')
+    },
+    // 上传
+    submitUpload() {
+      this.uploadBtnDisabled = true
+      this.$refs.upload.submit() // 提交上传请求
+    },
+    // 视频上传成功的回调
+    handleUploadSuccess(response, file, fileList) {
+      this.uploadBtnDisabled = false
+      this.video.videoSourceId = response.data
+      this.video.videoOriginalName = file.name
+    },
+    // 失败回调
+    handleUploadError() {
+      this.uploadBtnDisabled = false
+      this.$message.error('上传失败2')
+    },
+    // 删除视频文件确认
+    handleBeforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`)
+    },
+    // 执行视频文件的删除
+    handleOnRemove(file, fileList) {
+      if (!this.video.videoSourceId) {
+        return
+      }
+      vodApi.removeByVodId(this.video.videoSourceId).then(response => {
+        this.video.videoSourceId = ''
+        this.video.videoOriginalName = ''
+        videoApi.updateById(this.video)
+        this.$message.success(response.message)
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/vod/course/form.vue b/src/views/vod/course/form.vue
new file mode 100644
index 0000000000..9636de1758
--- /dev/null
+++ b/src/views/vod/course/form.vue
@@ -0,0 +1,45 @@
+<template>
+  <div class="app-container">
+    <h2 style="text-align: center;">发布新课程</h2>
+    <el-steps :active="active" finish-status="success" simple style="margin-bottom: 40px">
+      <el-step title="填写课程基本信息" />
+      <el-step title="创建课程大纲" />
+      <el-step title="发布课程" />
+    </el-steps>
+    <!-- 填写课程基本信息 -->
+    <info v-if="active === 0" />
+    <!-- 创建课程大纲 -->
+    <chapter v-if="active === 1" />
+    <!-- 发布课程 -->
+    <Publish v-if="active === 2 || active === 3" />
+  </div>
+</template>
+
+<script>
+// 引入子组件
+import Info from '@/views/vod/course/components/Info'
+import Chapter from '@/views/vod/course/components/Chapter'
+import Publish from '@/views/vod/course/components/Publish'
+
+export default {
+  components: { Info, Chapter, Publish }, // 注册子组件
+  data() {
+    return {
+      active: 0,
+      courseId: null
+    }
+  },
+  created() {
+    // 获取路由id
+    if (this.$route.params.id) {
+      this.courseId = this.$route.params.id
+    }
+    if (this.$route.name === 'CourseInfoEdit') {
+      this.active = 0
+    }
+    if (this.$route.name === 'CourseChapterEdit') {
+      this.active = 1
+    }
+  }
+}
+</script>
diff --git a/src/views/vod/course/list.vue b/src/views/vod/course/list.vue
new file mode 100644
index 0000000000..765e3676d3
--- /dev/null
+++ b/src/views/vod/course/list.vue
@@ -0,0 +1,249 @@
+<template>
+  <div class="app-container">
+    <!--查询表单-->
+    <el-card class="operate-container" shadow="never">
+    <el-form :inline="true" class="demo-form-inline">
+
+      <!-- 所属分类：级联下拉列表 -->
+      <!-- 一级分类 -->
+      <el-form-item label="课程类别">
+        <el-select
+          v-model="searchObj.subjectParentId"
+          placeholder="请选择"
+          @change="subjectLevelOneChanged">
+          <el-option
+            v-for="subject in subjectList"
+            :key="subject.id"
+            :label="subject.title"
+            :value="subject.id"/>
+        </el-select>
+
+        <!-- 二级分类 -->
+        <el-select v-model="searchObj.subjectId" placeholder="请选择">
+          <el-option
+            v-for="subject in subjectLevelTwoList"
+            :key="subject.id"
+            :label="subject.title"
+            :value="subject.id"/>
+        </el-select>
+      </el-form-item>
+
+      <!-- 标题 -->
+      <el-form-item label="标题">
+        <el-input v-model="searchObj.title" placeholder="课程标题"/>
+      </el-form-item>
+      <!-- 讲师 -->
+      <el-form-item label="讲师">
+        <el-select
+          v-model="searchObj.teacherId"
+          placeholder="请选择讲师">
+          <el-option
+            v-for="teacher in teacherList"
+            :key="teacher.id"
+            :label="teacher.name"
+            :value="teacher.id"/>
+        </el-select>
+      </el-form-item>
+
+      <el-button type="primary" icon="el-icon-search" @click="fetchData()">查询</el-button>
+      <el-button type="default" @click="resetData()">清空</el-button>
+    </el-form>
+    </el-card>
+
+    <!-- 工具按钮 -->
+    <el-card class="operate-container" shadow="never">
+      <i class="el-icon-tickets" style="margin-top: 5px"></i>
+      <span style="margin-top: 5px">数据列表</span>
+      <el-button class="btn-add" @click="add()">添加</el-button>
+    </el-card>
+
+    <!-- 表格 -->
+    <el-table :data="list" border stripe>
+        <el-table-column label="#" width="50">
+        <template slot-scope="scope">
+          {{ (page - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="封面" width="200" align="center">
+        <template slot-scope="scope">
+          <img :src="scope.row.cover" alt="scope.row.title" width="100%">
+        </template>
+      </el-table-column>
+      <el-table-column label="课程信息">
+        <template slot-scope="scope">
+          <a href="">{{ scope.row.title }}</a>
+          <p>
+            分类：{{ scope.row.param.subjectParentTitle }} > {{ scope.row.param.subjectTitle }}
+          </p>
+          <p>
+            课时：{{ scope.row.lessonNum }} /
+            浏览：{{ scope.row.viewCount }} /
+            付费学员：{{ scope.row.buyCount }}
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column label="讲师" width="100" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.param.teacherName }}
+        </template>
+      </el-table-column>
+      <el-table-column label="价格(元)" width="100" align="center" >
+        <template slot-scope="scope">
+          <!-- {{ typeof '0' }}  {{ typeof 0 }} {{ '0' == 0 }} -->
+          <!-- {{ typeof scope.row.price }}
+          {{ typeof Number(scope.row.price) }}
+          {{ typeof Number(scope.row.price).toFixed(2) }} -->
+
+          <el-tag v-if="Number(scope.row.price) === 0" type="success">免费</el-tag>
+
+          <!-- 前端解决保留两位小数的问题 -->
+          <!-- <el-tag v-else>{{ Number(scope.row.price).toFixed(2) }}</el-tag> -->
+
+          <!-- 后端解决保留两位小数的问题，前端不用处理 -->
+          <el-tag v-else>{{ scope.row.price }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" label="课程状态" width="100" align="center" >
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.status === 0 ? 'warning' : 'success'">{{ scope.row.status === 0 ? '未发布' : '已发布' }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="发布时间" width="140" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.createTime ? scope.row.createTime.substr(0, 16) : '' }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" width="210" align="center">
+        <template slot-scope="scope">
+          <router-link :to="'/vodcourse/course/info/'+scope.row.id">
+            <el-button type="text" icon="el-icon-edit" >修改</el-button>
+          </router-link>
+          <router-link :to="'/vodcourse/course/chapter/'+scope.row.id">
+            <el-button type="text" icon="el-icon-edit" >编辑大纲</el-button>
+          </router-link>
+          <router-link :to="'/vodcourse/course/chart/'+scope.row.id">
+            <el-button type="text" icon="el-icon-edit">课程统计</el-button>
+          </router-link>
+          <el-button type="text" icon="el-icon-delete" @click="removeById(scope.row.id)" >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页组件 -->
+    <el-pagination
+      :current-page="page"
+      :total="total"
+      :page-size="limit"
+      :page-sizes="[5, 10, 20, 30, 40, 50, 100]"
+      style="padding: 30px 0; text-align: center;"
+      layout="total, sizes, prev, pager, next, jumper"
+      @size-change="changePageSize"
+      @current-change="changeCurrentPage"
+    />
+  </div>
+</template>
+
+<script>
+import courseApi from '@/api/vod/course'
+import teacherApi from '@/api/vod/teacher'
+import subjectApi from '@/api/vod/subject'
+
+export default {
+
+  data() {
+    return {
+      list: [], // 课程列表
+      total: 0, // 总记录数
+      page: 1, // 页码
+      limit: 10, // 每页记录数
+      searchObj: {
+        subjectId: ''// 解决查询表单无法选中二级类别
+      }, // 查询条件
+      teacherList: [], // 讲师列表
+      subjectList: [], // 一级分类列表
+      subjectLevelTwoList: [] // 二级分类列表,
+    }
+  },
+
+  created() {
+    this.fetchData()
+    // 初始化分类列表
+    this.initSubjectList()
+    // 获取讲师列表
+    this.initTeacherList()
+  },
+
+  methods: {
+    fetchData() {
+      courseApi.getPageList(this.page, this.limit, this.searchObj).then(response => {
+        this.list = response.data.records
+        console.log(this.list)
+        this.total = response.data.totalCount
+      })
+    },
+
+    initTeacherList() {
+      teacherApi.list().then(response => {
+        this.teacherList = response.data
+      })
+    },
+
+    initSubjectList() {
+      subjectApi.getChildList(0).then(response => {
+        this.subjectList = response.data
+      })
+    },
+
+    subjectLevelOneChanged(value) {
+      subjectApi.getChildList(value).then(response => {
+        this.subjectLevelTwoList = response.data
+        this.searchObj.subjectId = ''
+      })
+    },
+
+    add() {
+      this.$router.push({ path: '/vodcourse/course/info' })
+    },
+
+    // 每页记录数改变，size：回调参数，表示当前选中的“每页条数”
+    changePageSize(size) {
+      this.limit = size
+      this.fetchData()
+    },
+
+    // 改变页码，page：回调参数，表示当前选中的“页码”
+    changeCurrentPage(page) {
+      this.page = page
+      this.fetchData()
+    },
+
+    // 重置表单
+    resetData() {
+      this.searchObj = {}
+      this.subjectLevelTwoList = [] // 二级分类列表
+      this.fetchData()
+    },
+
+    
+    // 根据id删除数据
+    removeById(id) {
+      this.$confirm('此操作将永久删除该课程，以及该课程下的章节和视频，是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        return courseApi.removeById(id)
+      }).then(response => {
+        this.fetchData()
+        this.$message.success(response.message)
+      }).catch((response) => { // 失败
+        if (response === 'cancel') {
+          this.$message.info('取消删除')
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/vod/subject/list.vue b/src/views/vod/subject/list.vue
new file mode 100644
index 0000000000..c283dc7d76
--- /dev/null
+++ b/src/views/vod/subject/list.vue
@@ -0,0 +1,95 @@
+<template>
+  <div  class="app-container">
+  <el-table
+      :data="list"
+      style="width: 100%"
+      row-key="id"
+      border
+      lazy
+      :load="load"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      <el-table-column
+      prop="title"
+      label="名称"
+      width="150">
+      </el-table-column>
+      <el-table-column
+      prop="createTime"
+      label="创建时间">
+      </el-table-column>
+  </el-table>
+
+  <div class="el-toolbar">
+    <div class="el-toolbar-body" style="justify-content: flex-start;">
+      <el-button type="text" @click="exportData"><i class="fa fa-plus"/> 导出</el-button>
+      <el-button type="text" @click="importData"><i class="fa fa-plus"/> 导入</el-button>
+    </div>
+  </div>
+
+  <el-dialog title="导入" :visible.sync="dialogImportVisible" width="480px">
+    <el-form label-position="right" label-width="170px">
+        <el-form-item label="文件">
+            <el-upload
+                       :multiple="false"
+                       :on-success="onUploadSuccess"
+                       :action="'http://localhost:8301/admin/vod/subject/importData'"
+                       class="upload-demo">
+                <el-button size="small" type="primary">点击上传</el-button>
+                <div slot="tip" class="el-upload__tip">只能上传xls文件，且不超过500kb</div>
+            </el-upload>
+        </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogImportVisible = false">取消</el-button>
+    </div>
+</el-dialog>
+
+  </div>
+
+
+</template>
+
+<script>
+import subjectApi from '@/api/vod/subject'
+export default {
+  data() {
+      return {
+          dialogImportVisible: false,   // 控制是否弹框
+          list:[] //数据字典列表数组
+      }
+  },
+  created() {
+      this.getSubList(0)
+  },
+  methods: {
+      //数据字典列表
+      getSubList(id) {
+          subjectApi.getChildList(id)
+              .then(response => {
+                  this.list = response.data
+              })
+      },
+      // 导出数据
+      exportData() {
+        window.open("http://localhost:8301/admin/vod/subject/exportData")
+     },
+
+     // 导入数据
+     importData(){
+        this.dialogImportVisible = true
+     },
+
+     onUploadSuccess(response, file) {
+        this.$message.info('上传成功')   //提示
+        this.dialogImportVisible = false  // 关闭弹框
+        this.getSubList(0)               // 刷新页面
+     },
+
+      load(tree, treeNode, resolve) {
+          subjectApi.getChildList(tree.id).then(response => {
+              resolve(response.data)
+          })
+    }
+  }
+}
+</script>
diff --git a/src/views/vod/teacher/form.vue b/src/views/vod/teacher/form.vue
new file mode 100644
index 0000000000..713c8f0883
--- /dev/null
+++ b/src/views/vod/teacher/form.vue
@@ -0,0 +1,147 @@
+<template>
+  <div class="app-container">
+    <!-- 输入表单 -->
+    <el-form label-width="120px">
+      <el-form-item label="讲师名称">
+        <el-input v-model="teacher.name" />
+      </el-form-item>
+      <el-form-item label="入驻时间">
+        <el-date-picker v-model="teacher.joinDate" value-format="yyyy-MM-dd" />
+      </el-form-item>
+      <el-form-item label="讲师排序">
+        <el-input-number v-model="teacher.sort" :min="0"/>
+      </el-form-item>
+      <el-form-item label="讲师头衔">
+        <el-select v-model="teacher.level">
+          <!--
+            数据类型一定要和取出的json中的一致，否则没法回填
+            因此，这里value使用动态绑定的值，保证其数据类型是number
+            -->
+          <el-option :value="1" label="高级讲师"/>
+          <el-option :value="2" label="首席讲师"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="讲师简介">
+        <el-input v-model="teacher.intro"/>
+      </el-form-item>
+      <el-form-item label="讲师资历">
+        <el-input v-model="teacher.career" :rows="10" type="textarea"/>
+      </el-form-item>
+
+      <!-- 讲师头像 -->
+      <el-form-item label="讲师头像">
+        <el-upload
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+          :action="BASE_API+'/admin/vod/file/upload'"
+          class="avatar-uploader">
+          <img v-if="teacher.avatar" :src="teacher.avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"/>
+        </el-upload>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" @click="saveOrUpdate()">保存</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import teacherApi from '@/api/vod/teacher'
+export default {
+  data() {
+    return {
+      BASE_API: 'http://localhost:8301',
+      // 初始化讲师默认数据
+      teacher: {
+        sort: 0,
+        level: 1
+      },
+      saveBtnDisabled: false // 保存按钮是否禁用，防止表单重复提交
+    }
+  },
+  // 页面渲染成功
+  created() {
+    // 获取id,根据id查询得到数据
+    if (this.$route.params.id) {
+      this.fetchDataById(this.$route.params.id)
+    }
+  },
+  methods: {
+    // 上传成功回调
+    handleAvatarSuccess(res, file) {
+      console.log(res)
+      if (res.code==20000) {
+        console.log(res)
+        this.teacher.avatar = res.data
+        // 强制重新渲染
+        this.$forceUpdate()
+      } else {
+        this.$message.error('上传失败 （非0）')
+      }
+    },
+
+    // 错误处理
+    handleAvatarError() {
+      console.log('error')
+      debugger
+      this.$message.error('上传失败（http失败）')
+    },
+
+    // 上传校验
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg'
+      const isLt2M = file.size / 1024 / 1024 < 2
+      debugger
+      if (!isJPG) {
+        this.$message.error('上传头像图片只能是 JPG 格式!')
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isJPG && isLt2M
+    },
+
+    //根据id回显数据
+    fetchDataById(id){
+      teacherApi.getById(id).then(response => {
+		    this.teacher = response.data
+	    })
+    },
+    //添加
+    save(){
+      // debugger
+      teacherApi.saveTeacher(this.teacher).then(response => {
+        this.$message({
+          type: 'success',
+          message: '添加成功！'
+        })
+        this.$router.push({ path: '/vod/teacher/list' })
+      })
+    },
+    //修改
+    updateData(){
+      // teacher数据的获取
+      teacherApi.updateTeacher(this.teacher).then(response => {
+      this.$message({
+        type: 'success',
+        message: '修改成功!'
+      })
+      this.$router.push({ path: '/vod/teacher/list' })
+      })
+    },
+    saveOrUpdate() {
+    // 禁用保存按钮
+      this.saveBtnDisabled = true
+      if (!this.teacher.id) {
+        this.save()
+      } else {
+        this.updateData()
+      }
+    },
+  }
+}
+</script>
diff --git a/src/views/vod/teacher/list.vue b/src/views/vod/teacher/list.vue
new file mode 100644
index 0000000000..ef544a942d
--- /dev/null
+++ b/src/views/vod/teacher/list.vue
@@ -0,0 +1,192 @@
+<template>
+  <div class="app-container">
+    讲师列表
+    <!--查询表单-->
+    <el-card class="operate-container" shadow="never">
+      <el-form :inline="true" class="demo-form-inline">
+      <el-form-item label="名称">
+        <el-input v-model="searchObj.name" placeholder="讲师名" />
+      </el-form-item>
+
+      <el-form-item label="头衔">
+        <el-select v-model="searchObj.level" clearable placeholder="头衔">
+          <el-option value="1" label="高级讲师"/>
+          <el-option value="0" label="首席讲师"/>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="入驻时间">
+        <el-date-picker
+          v-model="searchObj.joinDateBegin"
+          placeholder="开始时间"
+          value-format="yyyy-MM-dd" />
+      </el-form-item>
+      <el-form-item label="-">
+        <el-date-picker
+          v-model="searchObj.joinDateEnd"
+          placeholder="结束时间"
+          value-format="yyyy-MM-dd" />
+      </el-form-item>
+
+        <el-button type="primary" icon="el-icon-search" @click="fetchData()">查询</el-button>
+        <el-button type="default" @click="resetData()">清空</el-button>
+    </el-form>
+    </el-card>
+<!-- 工具按钮 -->
+<el-card class="operate-container" shadow="never">
+  <i class="el-icon-tickets" style="margin-top: 5px"></i>
+  <span style="margin-top: 5px">数据列表</span>
+  <el-button class="btn-add" @click="add()" style="margin-left: 10px;">添加</el-button>
+  <el-button class="btn-add" @click="batchRemove()" >批量删除</el-button>
+</el-card>
+    <!-- 表格 -->
+    <el-table
+      :data="list"
+      border
+      stripe
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection"/>
+      <el-table-column
+        label="#"
+        width="50">
+        <template slot-scope="scope">
+          {{ (page - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="name" label="名称" width="80" />
+      <el-table-column label="头衔" width="90">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.level === 1" type="success" size="mini">高级讲师</el-tag>
+          <el-tag v-if="scope.row.level === 0" size="mini">首席讲师</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="intro" label="简介" />
+      <el-table-column prop="sort" label="排序" width="60" />
+      <el-table-column prop="joinDate" label="入驻时间" width="160" />
+      <el-table-column label="操作" width="200" align="center">
+        <template slot-scope="scope">
+          <el-button type="text" size="mini" @click="removeById(scope.row.id)">删除</el-button>
+          <router-link :to="'/vod/teacher/edit/'+scope.row.id">
+            <el-button type="text" size="mini">修改</el-button>
+          </router-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页组件 -->
+    <el-pagination
+      :current-page="page"
+      :total="total"
+      :page-size="limit"
+      :page-sizes="[5, 10, 20, 30, 40, 50, 100]"
+      style="padding: 30px 0; text-align: center;"
+      layout="total, sizes, prev, pager, next, jumper"
+      @size-change="changePageSize"
+      @current-change="changeCurrentPage"
+    />
+
+  </div>
+</template>
+<script>
+
+import teacherApi from '@/api/vod/teacher'
+export default {
+  // 定义数据模型
+  data() {
+    return {
+      list: [], // 讲师列表
+      total: 0, // 总记录数
+      page: 1, // 页码
+      limit: 4, // 每页记录数
+      searchObj: {}, // 查询条件
+      multipleSelection: []// 批量删除选中的记录列表
+    }
+  },
+  // 页面渲染成功后获取数据
+  created() {
+    this.fetchData()
+  },
+  // 定义方法
+  methods: {
+    // 批量删除方法
+    batchRemove(){
+      if (this.multipleSelection.length === 0) {
+        this.$message.warning('请选择要删除的记录！')
+        return
+      }
+
+      this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // 点击确定，远程调用ajax
+        // 遍历selection，将id取出放入id列表
+        var idList = []
+        this.multipleSelection.forEach(item => {
+          idList.push(item.id)
+        })
+         // 调用api
+        return teacherApi.batchRemove(idList)
+      }).then((response) => {
+        this.fetchData()
+        this.$message.success(response.message)
+      }).catch(error => {
+        if (error === 'cancel') {
+          this.$message.info('取消删除')
+        }
+      })
+    },
+    //复选框发生变化，调用方法，选中复选框行内容进行传递
+    handleSelectionChange(selection){
+      console.log(selection)
+      this.multipleSelection = selection
+    },
+
+    //跳转到表单添加页面
+    add(){
+      this.$router.push({path:'/vod/teacher/create'})
+    },
+
+    fetchData() {
+      // 调用api
+      teacherApi.pageList(this.page, this.limit, this.searchObj).then(response => {
+        this.list = response.data.records
+        this.total = response.data.total
+      })
+    },
+
+    // 每页记录数改变，size：回调参数，表示当前选中的“每页条数”
+    changePageSize(size) {
+      this.limit = size
+      this.fetchData()
+    },
+
+    // 改变页码，page：回调参数，表示当前选中的“页码”
+    changeCurrentPage(page) {
+      this.page = page
+      this.fetchData()
+    },
+
+    // 重置表单
+    resetData() {
+      this.searchObj = {}
+      this.fetchData()
+    },
+
+    // 根据id删除数据
+    removeById(id) {
+      this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        return teacherApi.removeById(id)
+      }).then((response) => {
+        this.fetchData()
+        this.$message.success(response.message)
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/wechat/menu/list.vue b/src/views/wechat/menu/list.vue
new file mode 100644
index 0000000000..072885086d
--- /dev/null
+++ b/src/views/wechat/menu/list.vue
@@ -0,0 +1,289 @@
+<template>
+  <div class="app-container">
+
+    <!-- 工具条 -->
+    <el-card class="operate-container" shadow="never">
+      <i class="el-icon-tickets" style="margin-top: 5px"></i>
+      <span style="margin-top: 5px">数据列表</span>
+      <el-button class="btn-add" size="mini" @click="remove" style="margin-left: 10px;">删除菜单</el-button>
+      <el-button class="btn-add" size="mini" @click="syncMenu">同步菜单</el-button>
+      <el-button class="btn-add" size="mini" @click="add">添 加</el-button>
+    </el-card>
+
+    <el-table
+      :data="list"
+      style="width: 100%;margin-bottom: 20px;"
+      row-key="id"
+      border
+      default-expand-all
+      :tree-props="{children: 'children'}">
+
+      <el-table-column label="名称" prop="name" width="350"></el-table-column>
+      <el-table-column label="类型" width="100">
+        <template slot-scope="scope">
+          {{ scope.row.type == 'view' ? '链接' : scope.row.type == 'click' ? '事件' : '' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="菜单URL" prop="url" ></el-table-column>
+      <el-table-column label="菜单KEY" prop="meunKey"  width="130"></el-table-column>
+      <el-table-column label="排序号" prop="sort"  width="70"></el-table-column>
+      <el-table-column label="操作" width="170" align="center">
+        <template slot-scope="scope">
+          <el-button v-if="scope.row.parentId > 0" type="text" size="mini" @click="edit(scope.row.id)">修改</el-button>
+          <el-button v-if="scope.row.parentId > 0" type="text" size="mini" @click="removeDataById(scope.row.id)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog title="添加/修改" :visible.sync="dialogVisible" width="40%" >
+      <el-form ref="flashPromotionForm" label-width="150px" size="small" style="padding-right: 40px;">
+
+        <el-form-item label="选择一级菜单">
+          <el-select
+            v-model="menu.parentId"
+            placeholder="请选择">
+            <el-option
+              v-for="item in list"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="menu.parentId == 1" label="菜单名称">
+          <el-select
+            v-model="menu.name"
+            placeholder="请选择"
+            @change="liveCourseChanged">
+            <el-option
+              v-for="item in liveCourseList"
+              :key="item.id"
+              :label="item.courseName"
+              :value="item"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="menu.parentId == 2" label="菜单名称">
+          <el-select
+            v-model="menu.name"
+            placeholder="请选择"
+            @change="subjectChanged">
+            <el-option
+              v-for="item in subjectList"
+              :key="item.id"
+              :label="item.title"
+              :value="item"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="menu.parentId == 3" label="菜单名称">
+          <el-input v-model="menu.name"/>
+        </el-form-item>
+        <el-form-item label="菜单类型">
+          <el-radio-group v-model="menu.type">
+            <el-radio label="view">链接</el-radio>
+            <el-radio label="click">事件</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="menu.type == 'view'" label="链接">
+          <el-input v-model="menu.url"/>
+        </el-form-item>
+        <el-form-item v-if="menu.type == 'click'" label="菜单KEY">
+          <el-input v-model="menu.meunKey"/>
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input v-model="menu.sort"/>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" size="small">取 消</el-button>
+        <el-button type="primary" @click="saveOrUpdate()" size="small">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import menuApi from '@/api/wechat/menu'
+//import liveCourseApi from '@/api/live/liveCourse'
+import subjectApi from '@/api/vod/subject'
+const defaultForm = {
+  id: null,
+  parentId: 1,
+  name: '',
+  nameId: null,
+  sort: 1,
+  type: 'view',
+  meunKey: '',
+  url: ''
+}
+export default {
+
+  // 定义数据
+  data() {
+    return {
+      list: [],
+
+      liveCourseList: [],
+      subjectList: [],
+
+      dialogVisible: false,
+      menu: defaultForm,
+      saveBtnDisabled: false
+    }
+  },
+
+  // 当页面加载时获取数据
+  created() {
+    this.fetchData()
+   // this.fetchLiveCourse()
+    this.fetchSubject()
+  },
+
+  methods: {
+    // 调用api层获取数据库中的数据
+    fetchData() {
+      console.log('加载列表')
+      menuApi.findMenuInfo().then(response => {
+        this.list = response.data
+        console.log(this.list)
+      })
+    },
+
+    // fetchLiveCourse() {
+    //   liveCourseApi.findLatelyList().then(response => {
+    //     this.liveCourseList = response.data
+    //     this.liveCourseList.push({'id': 0, 'courseName': '全部列表'})
+    //   })
+    // },
+
+    fetchSubject() {
+      console.log('加载列表')
+      subjectApi.getChildList(0).then(response => {
+        this.subjectList = response.data
+      })
+    },
+
+    syncMenu() {
+      this.$confirm('你确定上传菜单吗, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        return menuApi.syncMenu();
+      }).then((response) => {
+        this.fetchData()
+        this.$message.success(response.message)
+      }).catch(error => {
+        console.log('error', error)
+        // 当取消时会进入catch语句:error = 'cancel'
+        // 当后端服务抛出异常时：error = 'error'
+        if (error === 'cancel') {
+          this.$message.info('取消上传')
+        }
+      })
+    },
+
+    // 根据id删除数据
+    removeDataById(id) {
+      // debugger
+      this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => { // promise
+        // 点击确定，远程调用ajax
+        return menuApi.removeById(id)
+      }).then((response) => {
+        this.fetchData(this.page)
+        if (response.code) {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+        }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+
+    // -------------
+    add(){
+      this.dialogVisible = true
+      this.menu = Object.assign({}, defaultForm)
+    },
+
+    edit(id) {
+      this.dialogVisible = true
+      this.fetchDataById(id)
+    },
+
+    fetchDataById(id) {
+      menuApi.getById(id).then(response => {
+        this.menu = response.data
+      })
+    },
+
+    saveOrUpdate() {
+      this.saveBtnDisabled = true // 防止表单重复提交
+
+      if (!this.menu.id) {
+        this.saveData()
+      } else {
+        this.updateData()
+      }
+    },
+
+    // 新增
+    saveData() {
+      menuApi.save(this.menu).then(response => {
+        if (response.code) {
+          this.$message({
+            type: 'success',
+            message: response.message
+          })
+          this.dialogVisible = false;
+          this.fetchData(this.page)
+        }
+      })
+    },
+
+    // 根据id更新记录
+    updateData() {
+      menuApi.updateById(this.menu).then(response => {
+        if (response.code) {
+          this.$message({
+            type: 'success',
+            message: response.message
+          })
+          this.dialogVisible = false;
+          this.fetchData(this.page)
+        }
+      })
+    },
+
+    // 根据id查询记录
+    fetchDataById(id) {
+      menuApi.getById(id).then(response => {
+        this.menu = response.data
+      })
+    },
+
+    subjectChanged(item) {
+      console.info(item)
+      this.menu.name = item.title
+      this.menu.url = '/course/' + item.id
+    },
+
+    liveCourseChanged(item) {
+      console.info(item)
+      this.menu.name = item.courseName
+      if(item.id == 0) {
+        this.menu.url = '/live'
+      } else {
+        this.menu.url = '/liveInfo/' + item.id
+      }
+
+    }
+  }
+}
+</script>
diff --git a/vue.config.js b/vue.config.js
index 4856ed02a7..24fb6d5463 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -27,7 +27,7 @@ module.exports = {
   publicPath: '/',
   outputDir: 'dist',
   assetsDir: 'static',
-  lintOnSave: process.env.NODE_ENV === 'development',
+  lintOnSave: false, //process.env.NODE_ENV === 'development',
   productionSourceMap: false,
   devServer: {
     port: port,