diff --git a/.env.production b/.env.production
index 80c8103..f06e00f 100644
--- a/.env.production
+++ b/.env.production
@@ -2,5 +2,5 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'http://demonuxtapi.dishait.cn/'
 
diff --git a/package.json b/package.json
index 31a9b8f..1fe5427 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
   },
   "dependencies": {
     "axios": "0.18.1",
+    "canvas": "^2.11.2",
     "clipboard": "2.0.4",
     "codemirror": "5.45.0",
     "core-js": "3.6.5",
@@ -37,6 +38,7 @@
     "tui-editor": "1.3.3",
     "v-distpicker": "^1.3.3",
     "vue": "2.6.10",
+    "vue-clipboard2": "^0.3.3",
     "vue-count-to": "1.0.13",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",
diff --git a/src/api/column.js b/src/api/column.js
index b175bc4..11c7d4b 100644
--- a/src/api/column.js
+++ b/src/api/column.js
@@ -1,69 +1,50 @@
-import request from '@/utils/request'
+import {get, post} from '@/api/request-common'
 
 export function fetchList(query) {
-  return request({
-    url: '/vue-element-admin/column/list',
-    method: 'get',
-    params: query
-  })
+  return get('/admin/s/column', query)
 }
 
-export function createColumn(data) {
-  return request({
-    url: '/vue-element-admin/column/create',
-    method: 'post',
-    data
-  })
+export function create(data) {
+  return post('/admin/s/column/save', data)
 }
 
-export function updateColumn(data) {
-  return request({
-    url: '/vue-element-admin/column/update',
-    method: 'post',
-    data
-  })
+export function update(data) {
+  return post('/admin/s/column/update', data)
 }
 
-export function fetchDetail(query) {
-  return request({
-    url: '/vue-element-admin/column/detail',
-    method: 'get',
-    params: query
-  })
+export function updateStatus(data) {
+  return post('/admin/s/column/updatestatus', data)
 }
 
-export function updateStatus(data) {
-  return request({
-    url: '/vue-element-admin/column/status',
-    method: 'post',
-    data
-  })
+export function updateEnd(data) {
+  return post('/admin/s/column/updateend', data)
 }
 
-export function updateIsEnd(data) {
-  return request({
-    url: '/vue-element-admin/column/is-end',
-    method: 'post',
-    data
-  })
+export function remove(data) {
+  return post('/admin/s/column/delete', data)
 }
 
-export function fetchColumnCourse(query) {
-  return get('/vue-element-admin/column/course', query)
+export function getDetail(query) {
+  return get('/admin/s/column/read', query)
+}
+
+export function addColumnCourse(data){
+  return post('/admin/s/column_course/save', data)
 }
 
-function get(url, query) {
-  return request({
-    url: url,
-    method: 'get',
-    params: query
-  })
+
+export function updateIsEnd(data) {
+  // return request({
+  //   url: '/vue-element-admin/column/is-end',
+  //   method: 'post',
+  //   data
+  // })
+}
+
+export function fetchColumnCourse(query) {
+  return get('/admin/s/column_course', query)
 }
 
-function post(url, data) {
-  return request({
-    url: url,
-    method: 'post',
-    data
-  })
+export function removeColumnCourse(data) {
+  return post('/admin/s/column_course/delete', data)
 }
diff --git a/src/api/course.js b/src/api/course.js
new file mode 100644
index 0000000..0546e04
--- /dev/null
+++ b/src/api/course.js
@@ -0,0 +1,22 @@
+import request from '@/utils/request'
+import {get, post} from "@/api/request-common";
+
+export function fetchList(query) {
+  return get('/admin/s/course', query)
+}
+
+export function create(data) {
+  return post('/admin/s/course/save', data)
+}
+
+export function update(data) {
+  return post('/admin/s/course/update', data)
+}
+
+export function remove(data) {
+  return post('/admin/s/course/delete', data)
+}
+
+export function updateStatus(data){
+  return post("/admin/s/course/updatestatus", data)
+}
diff --git a/src/api/marketing.js b/src/api/marketing.js
index bda028d..daf8075 100644
--- a/src/api/marketing.js
+++ b/src/api/marketing.js
@@ -2,50 +2,50 @@ import {get, post} from './request-common'
 
 
 export function fetchGroup(data){
-  return get('/vue-element-admin/marketing/group/list', data)
+  return get('/admin/s/group', data)
 }
 
 export function groupTakeOff(data){
-  return get('/vue-element-admin/marketing/group/takeoff', data)
+  return get('/admin/s/group/updatestatus', data)
 }
 
 export function groupAdd(data) {
-  return post('/vue-element-admin/marketing/group/add', data)
+  return post('/admin/s/group/save', data)
 }
 
 export function groupEdit(data) {
-  return post('/vue-element-admin/marketing/group/edit', data)
+  return post('/admin/s/group/update', data)
 }
 
 export function fetchSplash(data){
-  return get('/vue-element-admin/marketing/splash/list', data)
+  return get('/admin/s/flashsale', data)
 }
 
 export function splashTakeOff(data) {
-  return get('/vue-element-admin/marketing/splash/takeoff', data)
+  return get('/admin/s/flashsale/updatestatus', data)
 }
 
 export function splashAdd(data) {
-  return post('/vue-element-admin/marketing/splash/add', data)
+  return post('/admin/s/flashsale/save', data)
 }
 
 export function splashEdit(data) {
-  return post('/vue-element-admin/marketing/splash/edit', data)
+  return post('/admin/s/flashsale/update', data)
 }
 
 export function fetchCoupon(data){
-  return get('/vue-element-admin/marketing/coupon/list', data)
+  return get('/admin/s/coupon', data)
 }
 
 export function couponTakeOff(data) {
-  return get('/vue-element-admin/marketing/coupon/takeoff', data)
+  return get('/admin/s/coupon/updatestatus', data)
 }
 
 export function couponAdd(data) {
-  return post('/vue-element-admin/marketing/coupon/add', data)
+  return post('/admin/s/coupon/save', data)
 }
 
 export function couponEdit(data) {
-  return post('/vue-element-admin/marketing/coupon/edit', data)
+  return post('/admin/s/coupon/update', data)
 }
 
diff --git a/src/api/media.js b/src/api/media.js
deleted file mode 100644
index a8fa30e..0000000
--- a/src/api/media.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import request from '@/utils/request'
-
-export function fetchList(query) {
-  return request({
-    url: '/vue-element-admin/media/list',
-    method: 'get',
-    params: query
-  })
-}
-
-export function createMedia(data) {
-  return request({
-    url: '/vue-element-admin/media/create',
-    method: 'post',
-    data
-  })
-}
-
-export function updateMedia(data) {
-  return request({
-    url: '/vue-element-admin/media/update',
-    method: 'post',
-    data
-  })
-}
diff --git a/src/api/pay.js b/src/api/pay.js
index 87a443a..74e219a 100644
--- a/src/api/pay.js
+++ b/src/api/pay.js
@@ -1,29 +1,43 @@
 import {get, post} from './request-common'
 
-export function getOrders(data) {
-  return get('/vue-element-admin/pay/order', data)
+export function fetchOrders(query){
+  return get('/admin/s/order', query)
 }
 
-export function orderDel(data) {
-  return get('/vue-element-admin/pay/del-order', data)
+export function removeOrder(data){
+  return post('/admin/s/order/delete', data)
 }
 
-export function fetchCashOut(data){
-  return get('/vue-element-admin/pay/assets', data)
+export function fetchAccounts(query){
+  return get('/admin/s/cash', query)
 }
 
-export function fetchAccounts(data){
-  return get('/vue-element-admin/pay/accounts', data)
+export function addAccount(data){
+  return post('/admin/s/cash/save', data)
 }
 
-export function cashOut(data) {
-  return post('/vue-element-admin/pay/cash-out', data)
+export function delAccount(data){
+  return post('/admin/s/cash/delete', data)
 }
 
-export function delAccount(data){
-  return get('/vue-element-admin/pay/delAccount', data)
+export function updateAccount(data){
+  return post('/admin/s/cash/update', data)
 }
 
-export function addAccount(data) {
-  return post('/vue-element-admin/pay/addAccount', data)
+export function fetchCashOut(data){
+  return get('/admin/s/cashconfirm', data)
 }
+export function cashOut(data) {
+  return post('/admin/s/cashconfirm/save', data)
+}
+
+
+
+// export function getOrders(data) {
+//   return get('/vue-element-admin/pay/order', data)
+// }
+//
+// export function orderDel(data) {
+//   return get('/vue-element-admin/pay/del-order', data)
+// }
+
diff --git a/src/api/platform.js b/src/api/platform.js
new file mode 100644
index 0000000..883f35a
--- /dev/null
+++ b/src/api/platform.js
@@ -0,0 +1,34 @@
+import {get, post} from './request-common'
+
+
+export function fetchRoles(data) {
+  return get('/platform/role', data)
+}
+
+export function createRole(data) {
+  return post('/platform/role/save', data)
+}
+
+export function updateRole(data) {
+  return post('/platform/role/update', data)
+}
+
+export function removeRole(data) {
+  return post('/platform/role/delete', data)
+}
+
+export function fetchRoleAuth(data){
+  return get('/platform/role/read', data)
+}
+
+export function fetchAllMenu(){
+  return get('/platform/access', {type: 'menu'})
+}
+
+export function fetchAllAccess(){
+  return get('/platform/access', {type: 'rule'})
+}
+
+export function setMenuAccess(data){
+  return post('/platform/role/setrules', data)
+}
diff --git a/src/api/school.js b/src/api/school.js
index 4b6991e..6c918df 100644
--- a/src/api/school.js
+++ b/src/api/school.js
@@ -1,9 +1,22 @@
 import {get, post} from "@/api/request-common";
+import {getSchoolId} from '@/utils/auth'
 
 export function fetchSchool(data) {
-  return get('/vue-element-admin/school/list', data)
+  return get('/admin/school', data)
 }
 
 export function addSchool(data) {
-  return post('/vue-element-admin/school/add', data)
+  return post('/admin/school/save', data)
+}
+
+export function fetchSchoolDetail(data) {
+  return get('/admin/s/school/read', {id: getSchoolId()})
+}
+
+export function updateSchool(data) {
+  return post('/admin/s/school/update', data)
+}
+
+export function statistics(data) {
+  return get('/admin/s/statistics\n', data)
 }
diff --git a/src/api/setting.js b/src/api/setting.js
index 6092ff2..b678e2c 100644
--- a/src/api/setting.js
+++ b/src/api/setting.js
@@ -1,21 +1,25 @@
 import {get, post} from "@/api/request-common";
 
 export function fetchStaff(data){
-  return get('/vue-element-admin/setting/staff/list', data)
+  return get('/admin/s/schoolstaff', data)
 }
 
 export function staffDel(data) {
-  return post('/vue-element-admin/setting/staff/del', data)
+  return post('/admin/s/schoolstaff/delete', data)
 }
 
 export function staffAdd(data) {
-  return post('/vue-element-admin/setting/staff/add', data)
+  return post('/admin/s/schoolstaff/save', data)
 }
 
 export function setRole(data) {
-  return post('/vue-element-admin/setting/staff/setRole', data)
+  return post('/admin/s/schoolstaff/setroles', data)
 }
 
 export function fetchRole(data){
-  return get('/vue-element-admin/setting/role/list', data)
+  return get('/admin/role', data)
+}
+
+export function fetchRoleAuth(data){
+  return get('/admin/role/read', data)
 }
diff --git a/src/api/user.js b/src/api/user.js
index b8b8741..5b68ff0 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -1,8 +1,17 @@
 import request from '@/utils/request'
+import {get, post} from '@/api/request-common'
 
 export function login(data) {
   return request({
-    url: '/vue-element-admin/user/login',
+    url: '/user/login',
+    method: 'post',
+    data
+  })
+}
+
+export function register(data) {
+  return request({
+    url: '/user/reg',
     method: 'post',
     data
   })
@@ -10,7 +19,7 @@ export function login(data) {
 
 export function getInfo(token) {
   return request({
-    url: '/vue-element-admin/user/info',
+    url: '/admin/user/info',
     method: 'get',
     params: { token }
   })
@@ -18,7 +27,48 @@ export function getInfo(token) {
 
 export function logout() {
   return request({
-    url: '/vue-element-admin/user/logout',
+    url: '/admin/user/logout',
     method: 'post'
   })
 }
+
+export function fetchUserList(query){
+  return get('/admin/s/school_user', query)
+}
+
+export function updateAccess(data) {
+  return post('/admin/s/school_user/updateaccess', data)
+}
+
+export function updateComment(data) {
+  return post('/admin/s/school_user/updatecomment', data)
+}
+
+export function fetchUserDetail(query) {
+  return get('/admin/s/school_user/read', query)
+}
+
+export function fetchCourseSubscription(query) {
+  query.type = 'course'
+  query.comment = 0
+  return get('/admin/s/order_item', query)
+}
+
+export function fetchColumnSubscription(query) {
+  query.type = 'column'
+  query.comment = 0
+  return get('/admin/s/order_item', query)
+}
+
+export function fetchOrderRecord(query) {
+  return get('/admin/s/order', query)
+}
+
+export function fetchHistory(query) {
+  return get('/admin/s/user_history', query)
+}
+
+export function fetchComment(query) {
+  query.comment = 1
+  return get('/admin/s/order_item', query)
+}
diff --git a/src/components/ChooseCourse/index.vue b/src/components/ChooseCourse/index.vue
index 946e498..9094090 100644
--- a/src/components/ChooseCourse/index.vue
+++ b/src/components/ChooseCourse/index.vue
@@ -45,6 +45,7 @@
               :data="list"
               stripe
               fit
+              v-loading="tableLoading"
               highlight-current-row
               style="width: 100%;height: 100%;overflow: auto"
               @selection-change="handleSelectionChange">
@@ -72,7 +73,7 @@
 
               <el-table-column label="类型" width="110px" align="center">
                 <template slot-scope="{row}">
-                  <span>{{ row.courseType | courseTypeFilter }}</span>
+                  <span>{{ row.type | courseTypeFilter }}</span>
                 </template>
               </el-table-column>
             </el-table>
@@ -100,9 +101,10 @@
 
 <script>
 import waves from '@/directive/waves' // waves directive
-import {fetchList as fetchMediaList} from '@/api/media'
-import {fetchList as fetchAudioList} from '@/api/audio'
-import {fetchList as fetchVideoList} from '@/api/video'
+// import {fetchList as fetchMediaList} from '@/api/media'
+// import {fetchList as fetchAudioList} from '@/api/audio'
+// import {fetchList as fetchVideoList} from '@/api/video'
+import {fetchList} from '@/api/course'
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 
 export default {
@@ -115,9 +117,9 @@ export default {
   filters: {
     courseTypeFilter(status) {
       const statusMap = {
-        0: '图文',
-        1: '音频',
-        2: '视频',
+        'media': '图文',
+        'audio': '音频',
+        'video': '视频',
       }
       return statusMap[status]
     }
@@ -133,7 +135,8 @@ export default {
         limit: 10,
       },
       multipleSelection: [],
-      callback: undefined
+      callback: undefined,
+      tableLoading: false
     }
   },
   methods: {
@@ -154,21 +157,24 @@ export default {
       this.handleMenuSelect(this.$refs.menu.activeIndex, null)
     },
     handleMenuSelect(key, keyPath){
-      let method = undefined
+      let method = fetchList
       if(key == 1) {
-        method = fetchMediaList
+        // method = fetchMediaList
+        this.listQuery.type = 'media'
       }else if(key == 2) {
-        method = fetchAudioList
+        // method = fetchAudioList
+        this.listQuery.type = 'audio'
       }else if(key == 3) {
-        method = fetchVideoList
+        // method = fetchVideoList
+        this.listQuery.type = 'video'
       }
-
-
+      this.list = []
+      this.total = 0
+      this.tableLoading = true
       method(this.listQuery).then(res => {
-        if(res && res.code === 20000) {
-          this.list = res.data.items
-          this.total = res.data.total
-        }
+        this.tableLoading = false
+        this.list = res.data.items
+        this.total = res.data.total
       })
     },
     pagination() {
diff --git a/src/components/Tinymce/components/EditorImage.vue b/src/components/Tinymce/components/EditorImage.vue
index 07d48e6..a8d950a 100644
--- a/src/components/Tinymce/components/EditorImage.vue
+++ b/src/components/Tinymce/components/EditorImage.vue
@@ -3,7 +3,7 @@
     <el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
       upload
     </el-button>
-    <el-dialog :visible.sync="dialogVisible">
+    <el-dialog :visible.sync="dialogVisible" append-to-body>
       <el-upload
         :multiple="true"
         :file-list="fileList"
@@ -11,10 +11,10 @@
         :on-remove="handleRemove"
         :on-success="handleSuccess"
         :before-upload="beforeUpload"
+        :action="uploadOptions.action"
+        :headers="uploadOptions.header"
         class="editor-slide-upload"
-        action="https://httpbin.org/post"
-        list-type="picture-card"
-      >
+        list-type="picture-card">
         <el-button size="small" type="primary">
           Click upload
         </el-button>
@@ -31,6 +31,7 @@
 
 <script>
 // import { getToken } from 'api/qiniu'
+import {uploadOptions} from '@/utils/upload'
 
 export default {
   name: 'EditorSlideUpload',
@@ -42,6 +43,7 @@ export default {
   },
   data() {
     return {
+      uploadOptions,
       dialogVisible: false,
       listObj: {},
       fileList: []
@@ -67,7 +69,7 @@ export default {
       const objKeyArr = Object.keys(this.listObj)
       for (let i = 0, len = objKeyArr.length; i < len; i++) {
         if (this.listObj[objKeyArr[i]].uid === uid) {
-          this.listObj[objKeyArr[i]].url = response.files.file
+          this.listObj[objKeyArr[i]].url = response.data
           this.listObj[objKeyArr[i]].hasSuccess = true
           return
         }
diff --git a/src/directive/permission/permission.js b/src/directive/permission/permission.js
index 49d1f88..742a68b 100644
--- a/src/directive/permission/permission.js
+++ b/src/directive/permission/permission.js
@@ -21,11 +21,24 @@ function checkPermission(el, binding) {
   }
 }
 
+function checkPermissionNew(el, binding) {
+  const { value } = binding
+  const accesses = store.getters && store.getters.accesses
+  if (value && value.length > 0) {
+    if(!accesses.includes(value)){
+      //如果不具备这个权限，则将el移除
+      el.parentNode && el.parentNode.removeChild(el)
+    }
+  } else {
+    throw new Error(`need permission! Like v-permission="'/admin/s/course/save,POST'"`)
+  }
+}
+
 export default {
   inserted(el, binding) {
-    checkPermission(el, binding)
+    checkPermissionNew(el, binding)
   },
   update(el, binding) {
-    checkPermission(el, binding)
+    checkPermissionNew(el, binding)
   }
 }
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index a0c98b7..6a98aea 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -4,7 +4,8 @@
       <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
       <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
     </div>
-    <div style="display: inline-flex;margin-left: 20px;height: 100%;align-items: center" v-if="!isShowMenu">我的网校列表</div>
+    <div style="display: inline-flex;margin-left: 20px;height: 100%;align-items: center" v-if="!isShowMenu">
+      {{this.$route.fullPath === '/' ? '我的网校列表' : '平台角色设置'}}</div>
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
@@ -12,21 +13,21 @@
 
         <error-log class="errLog-container right-menu-item hover-effect" />
 
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
+<!--        <screenfull v-if="isShowMenu" id="screenfull" class="right-menu-item hover-effect" />-->
 
-        <el-tooltip v-if="isShowMenu" content="Global Size" effect="dark" placement="bottom">
+<!--        <el-tooltip v-if="isShowMenu" content="Global Size" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip>-->
 
       </template>
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
-          <i v-if="isShowMenu" class="el-icon-caret-bottom" />
+          <img :src="avatar || 'https://img.zcool.cn/community/01e4ea57a6e2550000018c1bfdce56.jpg'" class="user-avatar">
+          <i class="el-icon-caret-bottom" />
         </div>
-        <el-dropdown-menu v-if="isShowMenu" slot="dropdown">
-          <router-link to="/profile/index">
+        <el-dropdown-menu slot="dropdown">
+<!--          <router-link to="/profile/index">
             <el-dropdown-item>Profile</el-dropdown-item>
           </router-link>
           <router-link to="/">
@@ -37,9 +38,17 @@
           </a>
           <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">
             <el-dropdown-item>Docs</el-dropdown-item>
-          </a>
+          </a>-->
+
+          <el-dropdown-item v-if="this.$route.fullPath !== '/'" divided @click.native="onSchoole">
+            <span style="display:block;">我的网校</span>
+          </el-dropdown-item>
+
+          <el-dropdown-item v-if="this.$route.fullPath !== '/platform/role' && this.$store.getters.isPlatform" divided @click.native="onPlatform">
+            <span style="display:block;">平台角色</span>
+          </el-dropdown-item>
           <el-dropdown-item divided @click.native="logout">
-            <span style="display:block;">Log Out</span>
+            <span style="display:block;">退出登录</span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
@@ -55,7 +64,7 @@ import ErrorLog from '@/components/ErrorLog'
 import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
-
+// console.log($router)
 export default {
   props:{
     isShowMenu: {
@@ -85,6 +94,12 @@ export default {
     async logout() {
       await this.$store.dispatch('user/logout')
       this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+    },
+    onPlatform(){
+      this.$router.push({path: '/platform/role'})
+    },
+    onSchoole(){
+      this.$router.push({path: '/'})
     }
   }
 }
diff --git a/src/main.js b/src/main.js
index b5fa135..0cb2a3d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -19,6 +19,8 @@ import './permission' // permission control
 import './utils/error-log' // error log
 
 import * as filters from './filters' // global filters
+import permission from '@/directive/permission'
+import VueClipboard from 'vue-clipboard2'
 
 /**
  * If you don't want to use mock-server
@@ -43,7 +45,11 @@ Object.keys(filters).forEach(key => {
   Vue.filter(key, filters[key])
 })
 
+//定义全局权限校验指令v-permission
+Vue.directive('permission', permission)
+
 Vue.config.productionTip = false
+Vue.use(VueClipboard)
 
 new Vue({
   el: '#app',
diff --git a/src/permission.js b/src/permission.js
index ff5eaad..b924b94 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,7 +3,7 @@ import store from './store'
 import { Message } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
-import { getToken } from '@/utils/auth' // get token from cookie
+import { getToken, removeSchoolId, getIsPlatform } from '@/utils/auth' // get token from cookie
 import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
@@ -20,31 +20,67 @@ router.beforeEach(async(to, from, next) => {
   // determine whether the user has logged in
   const hasToken = getToken()
 
-  if (hasToken) {
-    if (to.path === '/login') {
+  if (hasToken) {//已登录
+    if (to.path === '/login') {//如果访问的是登录页，跳转到首页
       // if is logged in, redirect to the home page
       next({ path: '/' })
       NProgress.done() // hack: https://github.com/PanJiaChen/vue-element-admin/pull/2939
+    } else if(to.path === '/') { //如果访问的是首页, 则获取用户信息
+      removeSchoolId() //回到首页后要清除schoolId
+      await store.dispatch('user/getInfo')
+      next()
+      NProgress.done()
+      return
+    } else if(getIsPlatform() && to.path === '/platform/role') { //如果访问的是平台页面
+      await store.dispatch('user/getInfo')
+      next()
+      NProgress.done()
+      return
     } else {
       // determine whether the user has obtained his permission roles through getInfo
       const hasRoles = store.getters.roles && store.getters.roles.length > 0
-      if (hasRoles) {
+      if (hasRoles) {//有角色说明已经获取到用户信息, 直接放行
         next()
-      } else {
+      } else { //还未获取到用户信息
         try {
-          // get user info
-          // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
-          const { roles } = await store.dispatch('user/getInfo')
+          //保留原始的逻辑
+          if(false) {
+            const {roles, menus} = await store.dispatch('user/getInfo')
+            if (roles.length === 0) {
+              Message.error('没有访问权限')
+              next({
+                ...from
+              })
+              NProgress.done()
+              return
+            }
+            const accessRoutes = await store.dispatch('permission/generateRoutes', roles)
+            router.addRoutes(accessRoutes)
+            next({ ...to, replace: true })
+          } else {
+            // get user info
+            // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
+            const { roles, menus } = await store.dispatch('user/getInfo')
+            if(menus.length === 0) {
+              Message.error('没有访问权限')
+              next({
+                ...from
+              })
+              NProgress.done()
+              return
+            }
 
-          // generate accessible routes map based on roles
-          const accessRoutes = await store.dispatch('permission/generateRoutes', roles)
+            // generate accessible routes map based on roles
+            // const accessRoutes = await store.dispatch('permission/generateRoutes', menus)
+            const accessRoutes = await store.dispatch('permission/generateRoutesByMenus', menus)
 
-          // dynamically add accessible routes
-          router.addRoutes(accessRoutes)
+            // dynamically add accessible routes
+            router.addRoutes(accessRoutes)
 
-          // hack method to ensure that addRoutes is complete
-          // set the replace: true, so the navigation will not leave a history record
-          next({ ...to, replace: true })
+            // hack method to ensure that addRoutes is complete
+            // set the replace: true, so the navigation will not leave a history record
+            next({...to, replace: true})
+          }
         } catch (error) {
           // remove token and go to login page to re-login
           await store.dispatch('user/resetToken')
@@ -54,13 +90,13 @@ router.beforeEach(async(to, from, next) => {
         }
       }
     }
-  } else {
+  } else {//未登录
     /* has no token*/
 
-    if (whiteList.indexOf(to.path) !== -1) {
+    if (whiteList.indexOf(to.path) !== -1) {//白名单直接放行
       // in the free login whitelist, go directly
       next()
-    } else {
+    } else { //跳转到登录页面，并带上登陆成功后需要redirect的地址
       // other pages that do not have permission to access are redirected to the login page.
       next(`/login?redirect=${to.path}`)
       NProgress.done()
diff --git a/src/router/index.js b/src/router/index.js
index 17b2c1b..62aa3ef 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,11 +6,6 @@ Vue.use(Router)
 /* Layout */
 import Layout from '@/layout'
 
-/* Router Modules */
-import componentsRouter from './modules/components'
-import chartsRouter from './modules/charts'
-import tableRouter from './modules/table'
-import nestedRouter from './modules/nested'
 
 /**
  * Note: sub-menu only appear when route children.length >= 1
@@ -39,27 +34,33 @@ import nestedRouter from './modules/nested'
  * all roles can be accessed
  */
 export const constantRoutes = [
+  {
+    path: '/login',
+    component: () => import('@/views/login/index'),
+    hidden: true
+  },
+  {
+    path: '/',
+    component: () => import('@/views/school/index'),
+    hidden: true
+  },
+  {
+    path: '/platform/role',
+    component: () => import('@/views/platform/index'),
+    hidden: true
+  },
   {
     path: '/redirect',
     component: Layout,
     hidden: true,
     children: [
       {
+        //动态路由,将匹配所有内容并将其放在 `$route.params.path` 下
         path: '/redirect/:path(.*)',
         component: () => import('@/views/redirect/index')
       }
     ]
   },
-  {
-    path: '/login',
-    component: () => import('@/views/login/index'),
-    hidden: true
-  },
-  {
-    path: '/',
-    component: () => import('@/views/school/index'),
-    hidden: true
-  },
   {
     path: '/auth-redirect',
     component: () => import('@/views/login/auth-redirect'),
@@ -88,51 +89,8 @@ export const constantRoutes = [
       }
     ]
   },
-  // {
-  //   path: '/documentation',
-  //   component: Layout,
-  //   children: [
-  //     {
-  //       path: 'index',
-  //       component: () => import('@/views/documentation/index'),
-  //       name: 'Documentation',
-  //       meta: { title: 'Documentation', icon: 'documentation', affix: true }
-  //     }
-  //   ]
-  // },
-  // {
-  //   path: '/guide',
-  //   component: Layout,
-  //   redirect: '/guide/index',
-  //   children: [
-  //     {
-  //       path: 'index',
-  //       component: () => import('@/views/guide/index'),
-  //       name: 'Guide',
-  //       meta: { title: 'Guide', icon: 'guide', noCache: true }
-  //     }
-  //   ]
-  // },
-  // {
-  //   path: '/profile',
-  //   component: Layout,
-  //   redirect: '/profile/index',
-  //   hidden: true,
-  //   children: [
-  //     {
-  //       path: 'index',
-  //       component: () => import('@/views/profile/index'),
-  //       name: 'Profile',
-  //       meta: { title: 'Profile', icon: 'user', noCache: true }
-  //     }
-  //   ]
-  // }
 ]
 
-/**
- * asyncRoutes
- * the routes that need to be dynamically loaded based on user roles
- */
 export const asyncRoutes = [
   {
     path: '/course',
@@ -283,264 +241,121 @@ export const asyncRoutes = [
     ]
   },
 
-  // {
-  //   path: '/permission',
-  //   component: Layout,
-  //   redirect: '/permission/page',
-  //   alwaysShow: true, // will always show the root menu
-  //   name: 'Permission',
-  //   meta: {
-  //     title: 'Permission',
-  //     icon: 'lock',
-  //     roles: ['admin', 'editor'] // you can set roles in root nav
-  //   },
-  //   children: [
-  //     {
-  //       path: 'page',
-  //       component: () => import('@/views/permission/page'),
-  //       name: 'PagePermission',
-  //       meta: {
-  //         title: 'Page Permission',
-  //         roles: ['admin'] // or you can only set roles in sub nav
-  //       }
-  //     },
-  //     {
-  //       path: 'directive',
-  //       component: () => import('@/views/permission/directive'),
-  //       name: 'DirectivePermission',
-  //       meta: {
-  //         title: 'Directive Permission'
-  //         // if do not set roles, means: this page does not require permission
-  //       }
-  //     },
-  //     {
-  //       path: 'role',
-  //       component: () => import('@/views/permission/role'),
-  //       name: 'RolePermission',
-  //       meta: {
-  //         title: 'Role Permission',
-  //         roles: ['admin']
-  //       }
-  //     }
-  //   ]
-  // },
+  // 404 page must be placed at the end !!!
+  { path: '*', redirect: '/404', hidden: true }
+]
 
-  // {
-  //   path: '/icon',
-  //   component: Layout,
-  //   children: [
-  //     {
-  //       path: 'index',
-  //       component: () => import('@/views/icons/index'),
-  //       name: 'Icons',
-  //       meta: { title: 'Icons', icon: 'icon', noCache: true }
-  //     }
-  //   ]
-  // },
-  //
-  // /** when your routing map is too long, you can split it into small modules **/
-  // componentsRouter,
-  // chartsRouter,
-  // nestedRouter,
-  // tableRouter,
+//是否使用手动补齐User子菜单的方式
+export const isUsePaddingMethod = false
 
-  /*{
-    path: '/example',
-    component: Layout,
-    redirect: '/example/list',
-    name: 'Example',
-    meta: {
-      title: 'Example',
-      icon: 'el-icon-s-help'
-    },
-    children: [
-      {
-        path: 'create',
-        component: () => import('@/views/example/create'),
-        name: 'CreateArticle',
-        meta: { title: 'Create Article', icon: 'edit' }
-      },
-      {
-        path: 'edit/:id(\\d+)',
-        component: () => import('@/views/example/edit'),
-        name: 'EditArticle',
-        meta: { title: 'Edit Article', noCache: true, activeMenu: '/example/list' },
-        hidden: true
-      },
-      {
-        path: 'list',
-        component: () => import('@/views/example/list'),
-        name: 'ArticleList',
-        meta: { title: 'Article List', icon: 'list' }
-      }
-    ]
+/**
+ * asyncRoutes
+ * the routes that need to be dynamically loaded based on user roles
+ */
+export const routesMenus = [
+  {
+    path: 'media',
+    component: () => import('@/views/course/media'),
+    name: 'Media',
+    meta: { title: '图文' }
   },
-
   {
-    path: '/tab',
-    component: Layout,
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/tab/index'),
-        name: 'Tab',
-        meta: { title: 'Tab', icon: 'tab' }
-      }
-    ]
+    path: 'audio',
+    component: () => import('@/views/course/audio'),
+    name: 'Audio',
+    meta: { title: '音频' }
   },
-
   {
-    path: '/error',
-    component: Layout,
-    redirect: 'noRedirect',
-    name: 'ErrorPages',
-    meta: {
-      title: 'Error Pages',
-      icon: '404'
-    },
-    children: [
-      {
-        path: '401',
-        component: () => import('@/views/error-page/401'),
-        name: 'Page401',
-        meta: { title: '401', noCache: true }
-      },
-      {
-        path: '404',
-        component: () => import('@/views/error-page/404'),
-        name: 'Page404',
-        meta: { title: '404', noCache: true }
-      }
-    ]
+    path: 'video',
+    component: () => import('@/views/course/video'),
+    name: 'Video',
+    meta: { title: '视频' }
   },
-
   {
-    path: '/error-log',
-    component: Layout,
-    children: [
-      {
-        path: 'log',
-        component: () => import('@/views/error-log/index'),
-        name: 'ErrorLog',
-        meta: { title: 'Error Log', icon: 'bug' }
-      }
-    ]
+    path: 'column',
+    component: () => import('@/views/course/column'),
+    name: 'Column',
+    meta: { title: '专栏' }
   },
-
   {
-    path: '/excel',
-    component: Layout,
-    redirect: '/excel/export-excel',
-    name: 'Excel',
-    meta: {
-      title: 'Excel',
-      icon: 'excel'
-    },
-    children: [
-      {
-        path: 'export-excel',
-        component: () => import('@/views/excel/export-excel'),
-        name: 'ExportExcel',
-        meta: { title: 'Export Excel' }
-      },
-      {
-        path: 'export-selected-excel',
-        component: () => import('@/views/excel/select-excel'),
-        name: 'SelectExcel',
-        meta: { title: 'Export Selected' }
-      },
-      {
-        path: 'export-merge-header',
-        component: () => import('@/views/excel/merge-header'),
-        name: 'MergeHeader',
-        meta: { title: 'Merge Header' }
-      },
-      {
-        path: 'upload-excel',
-        component: () => import('@/views/excel/upload-excel'),
-        name: 'UploadExcel',
-        meta: { title: 'Upload Excel' }
-      }
-    ]
+    path: 'column_detail',
+    component: () => import('@/views/course/column_detail'),
+    name: 'ColumnDetail',
+    hidden: true,
+    meta: { title: '专栏详情' }
   },
-
   {
-    path: '/zip',
-    component: Layout,
-    redirect: '/zip/download',
-    alwaysShow: true,
-    name: 'Zip',
-    meta: { title: 'Zip', icon: 'zip' },
-    children: [
-      {
-        path: 'download',
-        component: () => import('@/views/zip/index'),
-        name: 'ExportZip',
-        meta: { title: 'Export Zip' }
-      }
-    ]
+    path: 'order',
+    component: () => import('@/views/my-pay/order'),
+    name: 'Order',
+    meta: { title: '订单管理' }
   },
-
   {
-    path: '/pdf',
-    component: Layout,
-    redirect: '/pdf/index',
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/pdf/index'),
-        name: 'PDF',
-        meta: { title: 'PDF', icon: 'pdf' }
-      }
-    ]
+    path: 'asset',
+    component: () => import('@/views/my-pay/asset'),
+    name: 'Assets',
+    meta: { title: '资产管理' }
   },
   {
-    path: '/pdf/download',
-    component: () => import('@/views/pdf/download'),
-    hidden: true
+    path: 'payment',
+    component: () => import('@/views/my-pay/payment'),
+    name: 'Payment',
+    meta: { title: '支付设置' }
   },
-
   {
-    path: '/theme',
-    component: Layout,
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/theme/index'),
-        name: 'Theme',
-        meta: { title: 'Theme', icon: 'theme' }
-      }
-    ]
+    path: 'group',
+    component: () => import('@/views/marketing/group'),
+    name: 'Group',
+    meta: { title: '拼团' }
   },
-
   {
-    path: '/clipboard',
-    component: Layout,
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/clipboard/index'),
-        name: 'ClipboardDemo',
-        meta: { title: 'Clipboard', icon: 'clipboard' }
-      }
-    ]
+    path: 'splashsale',
+    component: () => import('@/views/marketing/splashsale'),
+    name: 'Flashsale',
+    meta: { title: '秒杀' }
   },
-
   {
-    path: 'external-link',
-    component: Layout,
-    children: [
-      {
-        path: 'https://github.com/PanJiaChen/vue-element-admin',
-        meta: { title: 'External Link', icon: 'link' }
-      }
-    ]
-  },*/
-
-  // 404 page must be placed at the end !!!
-  { path: '*', redirect: '/404', hidden: true }
+    path: 'coupon',
+    component: () => import('@/views/marketing/coupon'),
+    name: 'Coupon',
+    meta: { title: '优惠券' }
+  },
+  {
+    path: 'shop',
+    component: () => import('@/views/setting/shop'),
+    name: 'SettingIndex',
+    meta: { title: '店铺设置' }
+  },
+  {
+    path: 'staff',
+    component: () => import('@/views/setting/staff'),
+    name: 'Staffs',
+    meta: { title: '员工管理' }
+  },
+  {
+    path: 'role',
+    component: () => import('@/views/setting/role'),
+    name: 'Role',
+    meta: { title: '角色管理' }
+  }
 ]
 
+if(isUsePaddingMethod) {
+  routesMenus.push({
+    path: 'my_user',
+    component: () => import('@/views/user/user'),
+    name: 'MyUser',
+    meta: { title: '用户' }
+  })
+}else {
+  routesMenus.push({
+    path: 'user',
+    component: () => import('@/views/user/user'),
+    name: 'User',
+    meta: { title: '用户' }
+  })
+}
+
 const createRouter = () => new Router({
   // mode: 'history', // require service support
   scrollBehavior: () => ({ y: 0 }),
diff --git a/src/store/getters.js b/src/store/getters.js
index 8fcf5a5..63bf9d1 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -9,6 +9,9 @@ const getters = {
   name: state => state.user.name,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
+  menus: state => state.user.menus,
+  accesses: state => state.user.accesses,
+  isPlatform: state => state.user.isPlatform,
   permission_routes: state => state.permission.routes,
   errorLogs: state => state.errorLog.logs
 }
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index aeb5ee5..14fac23 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1,4 +1,8 @@
-import { asyncRoutes, constantRoutes } from '@/router'
+import { asyncRoutes, constantRoutes, routesMenus, isUsePaddingMethod } from '@/router'
+import Layout from "@/layout";
+
+let paddingUser = false
+let alwaysShow = true
 
 /**
  * Use meta.role to determine if the current user has permission
@@ -34,6 +38,129 @@ export function filterAsyncRoutes(routes, roles) {
   return res
 }
 
+export function filterAsyncRoutesByMenus(routes, menus) {
+  const res = []
+
+  for (let i =0; i<menus.length; i++) {
+    let menu = menus[i]
+    let route = undefined
+    const index = routes.findIndex(r => r.name === menu.name)
+    let tmp = {}
+
+    if(index === -1) {
+      //在routes中没有找到对应的路由, 这种情况与2种
+      //1.一级菜单
+      //2.服务器返回的子菜单在本地路由中没有对应数据
+      tmp = {
+        path: (menu.access_id === 0 ? '/' : '') + menu.name.toLowerCase(),
+        component: Layout,
+        name: menu.name,
+        hidden: menu.hidden,
+        meta: {
+          title: menu.title
+        }
+      }
+    }else {//子菜单
+      //这里有个特殊场景：name=User的一级菜单会走到这里(因为本地的routes本来是没有一级菜单的，但是User下面的子菜单的name正好也是User，所以会走到这里)
+      route = routes[index]
+      tmp = {
+        path: (menu.access_id === 0 ? '/' : '') + menu.name.toLowerCase(),
+        component: menu.access_id === 0 ? Layout : route.component,
+        name: menu.name || route.name,
+        meta: route.meta || {},
+        hidden: menu.hidden
+      }
+      tmp.meta.title = menu.title
+    }
+
+    if(menu.children && menu.children.length > 0) {//如果有子菜单则递归
+      tmp.children = filterAsyncRoutesByMenus(routesMenus, menu.children)
+      tmp.redirect = tmp.path + '/' + tmp.children[0].path
+
+      //这里'可视化'和'工具'菜单未实现，因此它们的子菜单的component会是Layout(有对应实现的子菜单component应该是对应具体的页面)，所以在这里做个检查过滤
+      if(tmp.children[0].component === Layout) {
+        continue
+      }
+    } else {
+      //User一级菜单没有children，这里需要单独给其添加一个用户页面的子路由
+      if(menu.access_id === 0) {
+        delete tmp.name
+        tmp.children = []
+        route = routes[index]
+        let child = {
+          path: route.path,
+          component: route.component,
+          name: route.name,
+          meta: route.meta || {},
+        }
+        tmp.meta.title = menu.title
+        tmp.children.push(child)
+        tmp.redirect = tmp.path + "/" + child.path
+      }
+    }
+
+    res.push(tmp)
+  }
+
+  return res
+}
+
+export function filterAsyncRoutesByMenusPadding(routes, menus) {
+  const res = []
+
+  if(!paddingUser) {
+    //因为服务器返回的menus中User一级菜单没有子菜单，为了让下面的处理逻辑更加简单些，因此手动补上子菜单(这里可以对应没有手动添加子菜单filterAsyncRoutesByMenus
+    // 的处理逻辑，更加复杂难以理解)
+    paddingUser = true
+    const item = menus.find(item => item.name === 'User')
+    item.children.push({id: 1000, access_id: 4, name: "MyUser", hidden: false, title: "用户123", children: []})
+  }
+
+  for (let i =0; i<menus.length; i++) {
+    let menu = menus[i]
+    let route = undefined
+    const index = routes.findIndex(r => r.name === menu.name)
+    let tmp = {}
+
+    if(index === -1) {//一级菜单
+      tmp = {
+        path: '/' + menu.name.toLowerCase(),
+        component: Layout,
+        name: menu.name,
+        hidden: menu.hidden,
+        meta: {
+          title: menu.title
+        },
+        alwaysShow: alwaysShow,//如果只有一个子菜单时，默认采用nested mode，如果想总是显示root menu，需要显示设置其为true
+      }
+    }else {//子菜单
+      route = routes[index]
+      tmp = {
+        path: route.path,
+        component: route.component,
+        name: menu.name || route.name,
+        meta: route.meta || {},
+        hidden: menu.hidden
+      }
+      tmp.meta.title = menu.title
+    }
+
+    if(menu.children && menu.children.length > 0) {//如果有子菜单则递归
+      tmp.children = filterAsyncRoutesByMenus(routesMenus, menu.children)
+      tmp.redirect = tmp.path + '/' + tmp.children[0].path
+
+      //这里'可视化'和'工具'菜单未实现，因此它们的子菜单的component会是Layout(有对应实现的子菜单component应该是对应具体的页面)，所以在这里做个检查过滤
+      if(tmp.children[0].component === Layout) {
+        continue
+      }
+    }
+
+    res.push(tmp)
+  }
+
+  return res
+}
+
 const state = {
   routes: [],
   addRoutes: []
@@ -55,6 +182,16 @@ const actions = {
       } else {
         accessedRoutes = filterAsyncRoutes(asyncRoutes, roles)
       }
+      commit('SET_ROUTES', accessedRoutes)
+      resolve(accessedRoutes)
+    })
+  },
+  generateRoutesByMenus({ commit }, menus) {
+    return new Promise(resolve => {
+      let accessedRoutes = isUsePaddingMethod ? filterAsyncRoutesByMenusPadding(routesMenus, menus) : filterAsyncRoutesByMenus(routesMenus, menus)
+      //最后添加404路由
+      accessedRoutes.push({ path: '*', redirect: '/404', hidden: true })
+
       commit('SET_ROUTES', accessedRoutes)
       resolve(accessedRoutes)
     })
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 7800941..4819d1f 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,5 +1,5 @@
-import { login, logout, getInfo } from '@/api/user'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import { login, register, logout, getInfo } from '@/api/user'
+import { getToken, setToken, removeToken, removeSchoolId, setIsPlatform, removeIsPlatform } from '@/utils/auth'
 import router, { resetRouter } from '@/router'
 
 const state = {
@@ -7,7 +7,10 @@ const state = {
   name: '',
   avatar: '',
   introduction: '',
-  roles: []
+  roles: [],
+  menus: [],
+  accesses: [],
+  isPlatform: false
 }
 
 const mutations = {
@@ -25,6 +28,15 @@ const mutations = {
   },
   SET_ROLES: (state, roles) => {
     state.roles = roles
+  },
+  SET_MENUS: (state, menus) => {
+    state.menus = menus
+  },
+  SET_ACCESSES: (state, accesses) => {
+    state.accesses = accesses
+  },
+  SET_IS_PLATFORM: (state, isPlatform) => {
+    state.isPlatform = isPlatform
   }
 }
 
@@ -43,6 +55,17 @@ const actions = {
       })
     })
   },
+  //注册
+  register({commit}, userInfo){
+    const { username, password, repassword } = userInfo
+    return new Promise((resolve, reject) => {
+      register({ username: username.trim(), password, repassword }).then(response => {
+        resolve()
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
 
   // get user info
   getInfo({ commit, state }) {
@@ -54,17 +77,21 @@ const actions = {
           reject('Verification failed, please Login again.')
         }
 
-        const { roles, name, avatar, introduction } = data
+        const { roles, menus, accesses, name, avatar, introduction, isplatform } = data
 
-        // roles must be a non-empty array
-        if (!roles || roles.length <= 0) {
-          reject('getInfo: roles must be a non-null array!')
-        }
+        // // roles must be a non-empty array
+        // if (!roles || roles.length <= 0) {
+        //   reject('getInfo: roles must be a non-null array!')
+        // }
 
         commit('SET_ROLES', roles)
+        commit('SET_MENUS', menus)
+        commit('SET_ACCESSES', accesses)
         commit('SET_NAME', name)
         commit('SET_AVATAR', avatar)
         commit('SET_INTRODUCTION', introduction)
+        commit('SET_IS_PLATFORM', isplatform)
+        setIsPlatform(isplatform)
         resolve(data)
       }).catch(error => {
         reject(error)
@@ -78,7 +105,12 @@ const actions = {
       logout(state.token).then(() => {
         commit('SET_TOKEN', '')
         commit('SET_ROLES', [])
+        commit('SET_MENUS', [])
+        commit('SET_ACCESSES', [])
+        commit('SET_IS_PLATFORM', false)
         removeToken()
+        removeSchoolId()
+        removeIsPlatform()
         resetRouter()
 
         // reset visited views and cached views
@@ -97,7 +129,12 @@ const actions = {
     return new Promise(resolve => {
       commit('SET_TOKEN', '')
       commit('SET_ROLES', [])
+      commit('SET_MENUS', [])
+      commit('SET_ACCESSES', [])
+      commit('SET_IS_PLATFORM', false)
       removeToken()
+      removeSchoolId()
+      removeIsPlatform()
       resolve()
     })
   },
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 08a43d6..3354d30 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,6 +1,8 @@
 import Cookies from 'js-cookie'
 
-const TokenKey = 'Admin-Token'
+const TokenKey = 'token'
+const SchoolIdKey = 'schoolId'
+const IsPlatform = 'IisPlatform'
 
 export function getToken() {
   return Cookies.get(TokenKey)
@@ -13,3 +15,27 @@ export function setToken(token) {
 export function removeToken() {
   return Cookies.remove(TokenKey)
 }
+
+export function getSchoolId() {
+  return Cookies.get(SchoolIdKey)
+}
+
+export function setSchoolId(schoolId) {
+  return Cookies.set(SchoolIdKey, schoolId)
+}
+
+export function removeSchoolId() {
+  return Cookies.remove(SchoolIdKey)
+}
+
+export function getIsPlatform() {
+  return Cookies.get(IsPlatform)
+}
+
+export function setIsPlatform(isPlatform) {
+  return Cookies.set(IsPlatform, isPlatform)
+}
+
+export function removeIsPlatform() {
+  return Cookies.remove(IsPlatform)
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 2fb95ac..7dd374a 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,7 +1,7 @@
 import axios from 'axios'
 import { MessageBox, Message } from 'element-ui'
 import store from '@/store'
-import { getToken } from '@/utils/auth'
+import { getToken, getSchoolId } from '@/utils/auth'
 
 // create an axios instance
 const service = axios.create({
@@ -19,13 +19,17 @@ service.interceptors.request.use(
       // let each request carry token
       // ['X-Token'] is a custom headers key
       // please modify it according to the actual situation
-      config.headers['X-Token'] = getToken()
+      config.headers['token'] = getToken()
+    }
+    const schoolId = getSchoolId()
+    if(schoolId) {
+      config.headers['schoolid'] = schoolId
     }
     return config
   },
   error => {
     // do something with request error
-    console.log(error) // for debug
+    console.log('request error', error) // for debug
     return Promise.reject(error)
   }
 )
@@ -48,7 +52,7 @@ service.interceptors.response.use(
     // if the custom code is not 20000, it is judged as an error.
     if (res.code !== 20000) {
       Message({
-        message: res.message || 'Error',
+        message: (res.msg + ': ' + res.data) || 'Error',
         type: 'error',
         duration: 5 * 1000
       })
@@ -66,15 +70,15 @@ service.interceptors.response.use(
           })
         })
       }
-      return Promise.reject(new Error(res.message || 'Error'))
+      return Promise.reject(new Error((res.msg + ': ' + res.data) || 'Error'))
     } else {
       return res
     }
   },
   error => {
-    console.log('err' + error) // for debug
+    console.log('response err') // for debug
     Message({
-      message: error.message,
+      message: error,
       type: 'error',
       duration: 5 * 1000
     })
diff --git a/src/utils/upload.js b/src/utils/upload.js
new file mode 100644
index 0000000..02e8ccf
--- /dev/null
+++ b/src/utils/upload.js
@@ -0,0 +1,9 @@
+import { getToken, getSchoolId } from '@/utils/auth'
+
+export let uploadOptions = {
+  action: process.env.VUE_APP_BASE_API + '/admin/s/upload',
+  header: {
+    token: getToken(),
+    schoolid: getSchoolId()
+  }
+}
diff --git a/src/views/charts/keyboard.vue b/src/views/backup/charts/keyboard.vue
similarity index 100%
rename from src/views/charts/keyboard.vue
rename to src/views/backup/charts/keyboard.vue
diff --git a/src/views/charts/line.vue b/src/views/backup/charts/line.vue
similarity index 100%
rename from src/views/charts/line.vue
rename to src/views/backup/charts/line.vue
diff --git a/src/views/charts/mix-chart.vue b/src/views/backup/charts/mix-chart.vue
similarity index 100%
rename from src/views/charts/mix-chart.vue
rename to src/views/backup/charts/mix-chart.vue
diff --git a/src/views/clipboard/index.vue b/src/views/backup/clipboard/index.vue
similarity index 100%
rename from src/views/clipboard/index.vue
rename to src/views/backup/clipboard/index.vue
diff --git a/src/views/components-demo/avatar-upload.vue b/src/views/backup/components-demo/avatar-upload.vue
similarity index 100%
rename from src/views/components-demo/avatar-upload.vue
rename to src/views/backup/components-demo/avatar-upload.vue
diff --git a/src/views/components-demo/back-to-top.vue b/src/views/backup/components-demo/back-to-top.vue
similarity index 100%
rename from src/views/components-demo/back-to-top.vue
rename to src/views/backup/components-demo/back-to-top.vue
diff --git a/src/views/components-demo/count-to.vue b/src/views/backup/components-demo/count-to.vue
similarity index 100%
rename from src/views/components-demo/count-to.vue
rename to src/views/backup/components-demo/count-to.vue
diff --git a/src/views/components-demo/dnd-list.vue b/src/views/backup/components-demo/dnd-list.vue
similarity index 100%
rename from src/views/components-demo/dnd-list.vue
rename to src/views/backup/components-demo/dnd-list.vue
diff --git a/src/views/components-demo/drag-dialog.vue b/src/views/backup/components-demo/drag-dialog.vue
similarity index 100%
rename from src/views/components-demo/drag-dialog.vue
rename to src/views/backup/components-demo/drag-dialog.vue
diff --git a/src/views/components-demo/drag-kanban.vue b/src/views/backup/components-demo/drag-kanban.vue
similarity index 100%
rename from src/views/components-demo/drag-kanban.vue
rename to src/views/backup/components-demo/drag-kanban.vue
diff --git a/src/views/components-demo/drag-select.vue b/src/views/backup/components-demo/drag-select.vue
similarity index 100%
rename from src/views/components-demo/drag-select.vue
rename to src/views/backup/components-demo/drag-select.vue
diff --git a/src/views/components-demo/dropzone.vue b/src/views/backup/components-demo/dropzone.vue
similarity index 100%
rename from src/views/components-demo/dropzone.vue
rename to src/views/backup/components-demo/dropzone.vue
diff --git a/src/views/components-demo/json-editor.vue b/src/views/backup/components-demo/json-editor.vue
similarity index 100%
rename from src/views/components-demo/json-editor.vue
rename to src/views/backup/components-demo/json-editor.vue
diff --git a/src/views/components-demo/markdown.vue b/src/views/backup/components-demo/markdown.vue
similarity index 100%
rename from src/views/components-demo/markdown.vue
rename to src/views/backup/components-demo/markdown.vue
diff --git a/src/views/components-demo/mixin.vue b/src/views/backup/components-demo/mixin.vue
similarity index 100%
rename from src/views/components-demo/mixin.vue
rename to src/views/backup/components-demo/mixin.vue
diff --git a/src/views/components-demo/split-pane.vue b/src/views/backup/components-demo/split-pane.vue
similarity index 100%
rename from src/views/components-demo/split-pane.vue
rename to src/views/backup/components-demo/split-pane.vue
diff --git a/src/views/components-demo/sticky.vue b/src/views/backup/components-demo/sticky.vue
similarity index 100%
rename from src/views/components-demo/sticky.vue
rename to src/views/backup/components-demo/sticky.vue
diff --git a/src/views/components-demo/tinymce.vue b/src/views/backup/components-demo/tinymce.vue
similarity index 100%
rename from src/views/components-demo/tinymce.vue
rename to src/views/backup/components-demo/tinymce.vue
diff --git a/src/views/documentation/index.vue b/src/views/backup/documentation/index.vue
similarity index 100%
rename from src/views/documentation/index.vue
rename to src/views/backup/documentation/index.vue
diff --git a/src/views/error-log/components/ErrorTestA.vue b/src/views/backup/error-log/components/ErrorTestA.vue
similarity index 100%
rename from src/views/error-log/components/ErrorTestA.vue
rename to src/views/backup/error-log/components/ErrorTestA.vue
diff --git a/src/views/error-log/components/ErrorTestB.vue b/src/views/backup/error-log/components/ErrorTestB.vue
similarity index 100%
rename from src/views/error-log/components/ErrorTestB.vue
rename to src/views/backup/error-log/components/ErrorTestB.vue
diff --git a/src/views/error-log/index.vue b/src/views/backup/error-log/index.vue
similarity index 100%
rename from src/views/error-log/index.vue
rename to src/views/backup/error-log/index.vue
diff --git a/src/views/example/components/ArticleDetail.vue b/src/views/backup/example/components/ArticleDetail.vue
similarity index 100%
rename from src/views/example/components/ArticleDetail.vue
rename to src/views/backup/example/components/ArticleDetail.vue
diff --git a/src/views/example/components/Dropdown/Comment.vue b/src/views/backup/example/components/Dropdown/Comment.vue
similarity index 100%
rename from src/views/example/components/Dropdown/Comment.vue
rename to src/views/backup/example/components/Dropdown/Comment.vue
diff --git a/src/views/example/components/Dropdown/Platform.vue b/src/views/backup/example/components/Dropdown/Platform.vue
similarity index 100%
rename from src/views/example/components/Dropdown/Platform.vue
rename to src/views/backup/example/components/Dropdown/Platform.vue
diff --git a/src/views/example/components/Dropdown/SourceUrl.vue b/src/views/backup/example/components/Dropdown/SourceUrl.vue
similarity index 100%
rename from src/views/example/components/Dropdown/SourceUrl.vue
rename to src/views/backup/example/components/Dropdown/SourceUrl.vue
diff --git a/src/views/example/components/Dropdown/index.js b/src/views/backup/example/components/Dropdown/index.js
similarity index 100%
rename from src/views/example/components/Dropdown/index.js
rename to src/views/backup/example/components/Dropdown/index.js
diff --git a/src/views/example/components/Warning.vue b/src/views/backup/example/components/Warning.vue
similarity index 100%
rename from src/views/example/components/Warning.vue
rename to src/views/backup/example/components/Warning.vue
diff --git a/src/views/example/create.vue b/src/views/backup/example/create.vue
similarity index 100%
rename from src/views/example/create.vue
rename to src/views/backup/example/create.vue
diff --git a/src/views/example/edit.vue b/src/views/backup/example/edit.vue
similarity index 100%
rename from src/views/example/edit.vue
rename to src/views/backup/example/edit.vue
diff --git a/src/views/example/list.vue b/src/views/backup/example/list.vue
similarity index 100%
rename from src/views/example/list.vue
rename to src/views/backup/example/list.vue
diff --git a/src/views/excel/components/AutoWidthOption.vue b/src/views/backup/excel/components/AutoWidthOption.vue
similarity index 100%
rename from src/views/excel/components/AutoWidthOption.vue
rename to src/views/backup/excel/components/AutoWidthOption.vue
diff --git a/src/views/excel/components/BookTypeOption.vue b/src/views/backup/excel/components/BookTypeOption.vue
similarity index 100%
rename from src/views/excel/components/BookTypeOption.vue
rename to src/views/backup/excel/components/BookTypeOption.vue
diff --git a/src/views/excel/components/FilenameOption.vue b/src/views/backup/excel/components/FilenameOption.vue
similarity index 100%
rename from src/views/excel/components/FilenameOption.vue
rename to src/views/backup/excel/components/FilenameOption.vue
diff --git a/src/views/excel/export-excel.vue b/src/views/backup/excel/export-excel.vue
similarity index 100%
rename from src/views/excel/export-excel.vue
rename to src/views/backup/excel/export-excel.vue
diff --git a/src/views/excel/merge-header.vue b/src/views/backup/excel/merge-header.vue
similarity index 100%
rename from src/views/excel/merge-header.vue
rename to src/views/backup/excel/merge-header.vue
diff --git a/src/views/excel/select-excel.vue b/src/views/backup/excel/select-excel.vue
similarity index 100%
rename from src/views/excel/select-excel.vue
rename to src/views/backup/excel/select-excel.vue
diff --git a/src/views/excel/upload-excel.vue b/src/views/backup/excel/upload-excel.vue
similarity index 100%
rename from src/views/excel/upload-excel.vue
rename to src/views/backup/excel/upload-excel.vue
diff --git a/src/views/guide/index.vue b/src/views/backup/guide/index.vue
similarity index 100%
rename from src/views/guide/index.vue
rename to src/views/backup/guide/index.vue
diff --git a/src/views/guide/steps.js b/src/views/backup/guide/steps.js
similarity index 100%
rename from src/views/guide/steps.js
rename to src/views/backup/guide/steps.js
diff --git a/src/views/icons/element-icons.js b/src/views/backup/icons/element-icons.js
similarity index 100%
rename from src/views/icons/element-icons.js
rename to src/views/backup/icons/element-icons.js
diff --git a/src/views/icons/index.vue b/src/views/backup/icons/index.vue
similarity index 100%
rename from src/views/icons/index.vue
rename to src/views/backup/icons/index.vue
diff --git a/src/views/icons/svg-icons.js b/src/views/backup/icons/svg-icons.js
similarity index 100%
rename from src/views/icons/svg-icons.js
rename to src/views/backup/icons/svg-icons.js
diff --git a/src/views/nested/menu1/index.vue b/src/views/backup/nested/menu1/index.vue
similarity index 100%
rename from src/views/nested/menu1/index.vue
rename to src/views/backup/nested/menu1/index.vue
diff --git a/src/views/nested/menu1/menu1-1/index.vue b/src/views/backup/nested/menu1/menu1-1/index.vue
similarity index 100%
rename from src/views/nested/menu1/menu1-1/index.vue
rename to src/views/backup/nested/menu1/menu1-1/index.vue
diff --git a/src/views/nested/menu1/menu1-2/index.vue b/src/views/backup/nested/menu1/menu1-2/index.vue
similarity index 100%
rename from src/views/nested/menu1/menu1-2/index.vue
rename to src/views/backup/nested/menu1/menu1-2/index.vue
diff --git a/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue b/src/views/backup/nested/menu1/menu1-2/menu1-2-1/index.vue
similarity index 100%
rename from src/views/nested/menu1/menu1-2/menu1-2-1/index.vue
rename to src/views/backup/nested/menu1/menu1-2/menu1-2-1/index.vue
diff --git a/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue b/src/views/backup/nested/menu1/menu1-2/menu1-2-2/index.vue
similarity index 100%
rename from src/views/nested/menu1/menu1-2/menu1-2-2/index.vue
rename to src/views/backup/nested/menu1/menu1-2/menu1-2-2/index.vue
diff --git a/src/views/nested/menu1/menu1-3/index.vue b/src/views/backup/nested/menu1/menu1-3/index.vue
similarity index 100%
rename from src/views/nested/menu1/menu1-3/index.vue
rename to src/views/backup/nested/menu1/menu1-3/index.vue
diff --git a/src/views/nested/menu2/index.vue b/src/views/backup/nested/menu2/index.vue
similarity index 100%
rename from src/views/nested/menu2/index.vue
rename to src/views/backup/nested/menu2/index.vue
diff --git a/src/views/pdf/content.js b/src/views/backup/pdf/content.js
similarity index 100%
rename from src/views/pdf/content.js
rename to src/views/backup/pdf/content.js
diff --git a/src/views/pdf/download.vue b/src/views/backup/pdf/download.vue
similarity index 100%
rename from src/views/pdf/download.vue
rename to src/views/backup/pdf/download.vue
diff --git a/src/views/pdf/index.vue b/src/views/backup/pdf/index.vue
similarity index 100%
rename from src/views/pdf/index.vue
rename to src/views/backup/pdf/index.vue
diff --git a/src/views/profile/components/Account.vue b/src/views/backup/profile/components/Account.vue
similarity index 100%
rename from src/views/profile/components/Account.vue
rename to src/views/backup/profile/components/Account.vue
diff --git a/src/views/profile/components/Activity.vue b/src/views/backup/profile/components/Activity.vue
similarity index 100%
rename from src/views/profile/components/Activity.vue
rename to src/views/backup/profile/components/Activity.vue
diff --git a/src/views/profile/components/Timeline.vue b/src/views/backup/profile/components/Timeline.vue
similarity index 100%
rename from src/views/profile/components/Timeline.vue
rename to src/views/backup/profile/components/Timeline.vue
diff --git a/src/views/profile/components/UserCard.vue b/src/views/backup/profile/components/UserCard.vue
similarity index 100%
rename from src/views/profile/components/UserCard.vue
rename to src/views/backup/profile/components/UserCard.vue
diff --git a/src/views/profile/index.vue b/src/views/backup/profile/index.vue
similarity index 100%
rename from src/views/profile/index.vue
rename to src/views/backup/profile/index.vue
diff --git a/src/views/qiniu/upload.vue b/src/views/backup/qiniu/upload.vue
similarity index 100%
rename from src/views/qiniu/upload.vue
rename to src/views/backup/qiniu/upload.vue
diff --git a/src/views/tab/components/TabPane.vue b/src/views/backup/tab/components/TabPane.vue
similarity index 100%
rename from src/views/tab/components/TabPane.vue
rename to src/views/backup/tab/components/TabPane.vue
diff --git a/src/views/tab/index.vue b/src/views/backup/tab/index.vue
similarity index 100%
rename from src/views/tab/index.vue
rename to src/views/backup/tab/index.vue
diff --git a/src/views/table/complex-table.vue b/src/views/backup/table/complex-table.vue
similarity index 100%
rename from src/views/table/complex-table.vue
rename to src/views/backup/table/complex-table.vue
diff --git a/src/views/table/drag-table.vue b/src/views/backup/table/drag-table.vue
similarity index 100%
rename from src/views/table/drag-table.vue
rename to src/views/backup/table/drag-table.vue
diff --git a/src/views/table/dynamic-table/components/FixedThead.vue b/src/views/backup/table/dynamic-table/components/FixedThead.vue
similarity index 100%
rename from src/views/table/dynamic-table/components/FixedThead.vue
rename to src/views/backup/table/dynamic-table/components/FixedThead.vue
diff --git a/src/views/table/dynamic-table/components/UnfixedThead.vue b/src/views/backup/table/dynamic-table/components/UnfixedThead.vue
similarity index 100%
rename from src/views/table/dynamic-table/components/UnfixedThead.vue
rename to src/views/backup/table/dynamic-table/components/UnfixedThead.vue
diff --git a/src/views/table/dynamic-table/index.vue b/src/views/backup/table/dynamic-table/index.vue
similarity index 100%
rename from src/views/table/dynamic-table/index.vue
rename to src/views/backup/table/dynamic-table/index.vue
diff --git a/src/views/table/inline-edit-table.vue b/src/views/backup/table/inline-edit-table.vue
similarity index 100%
rename from src/views/table/inline-edit-table.vue
rename to src/views/backup/table/inline-edit-table.vue
diff --git a/src/views/theme/index.vue b/src/views/backup/theme/index.vue
similarity index 100%
rename from src/views/theme/index.vue
rename to src/views/backup/theme/index.vue
diff --git a/src/views/zip/index.vue b/src/views/backup/zip/index.vue
similarity index 100%
rename from src/views/zip/index.vue
rename to src/views/backup/zip/index.vue
diff --git a/src/views/course/audio.vue b/src/views/course/audio.vue
index 3d91585..4a11333 100644
--- a/src/views/course/audio.vue
+++ b/src/views/course/audio.vue
@@ -11,14 +11,14 @@
           v-model="listQuery.status"
           placeholder="商品状态"
           clearable
+          @clear="getList"
           style="width: 110px;margin-right: 10px"
-          class="filter-item"
-        >
+          class="filter-item">
           <el-option v-for="(item, k) in statusOptions" :key="k" :label="item" :value="k"/>
         </el-select>
         <el-input
           v-model="listQuery.title"
-          placeholder="Title"
+          placeholder="请输入搜索内容"
           style="width: 200px;margin-right: 10px"
           class="filter-item"
         />
@@ -59,7 +59,7 @@
 
       <el-table-column label="订阅量" width="110px" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.subscription }}</span>
+          <span>{{ row.sub_count }}</span>
         </template>
       </el-table-column>
 
@@ -73,13 +73,13 @@
 
       <el-table-column label="创建时间" width="180px" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.created_time }}</span>
+          <span>{{ row.created_time | timeFilter }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="更新时间" width="180px" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.updated_time }}</span>
+          <span>{{ row.updated_time | timeFilter }}</span>
         </template>
       </el-table-column>
 
@@ -118,34 +118,42 @@
         <el-form-item label="封面">
           <!--图片上传组件-->
           <el-upload
-            action="https://jsonplaceholder.typicode.com/posts/"
+            :action="uploadOptions.action"
+            :headers="uploadOptions.header"
             list-type="picture-card"
+            :limit="1"
+            :on-exceed="onCoverExceed"
             :on-preview="handlePictureCardPreview"
             :on-remove="handleCoverRemove"
-            :on-success="handleUploadSuccess">
+            :on-success="handleUploadSuccess"
+            :file-list="coverFileList">
             <i class="el-icon-plus"></i>
           </el-upload>
           <!--图片预览Dialog-->
-          <el-dialog :visible.sync="preDialogVisible">
+          <el-dialog :visible.sync="preDialogVisible" :append-to-body="true">
             <img width="100%" :src="preDialogImageUrl" alt="">
           </el-dialog>
         </el-form-item>
 
-        <el-form-item label="课程介绍" required prop="introduce">
+        <el-form-item label="课程介绍" required prop="try">
           <template>
-            <tinymce ref="introduceTinymce" v-model="productForm.introduce" :height="300" :width="600"/>
+            <tinymce ref="introduceTinymce" v-model="productForm.try" :height="300" :width="600"/>
           </template>
         </el-form-item>
 
         <el-form-item label="课程内容" required prop="content">
           <template>
             <el-upload
-              action="https://jsonplaceholder.typicode.com/posts/"
+              :action="uploadOptions.action"
+              :headers="uploadOptions.header"
+              :before-remove="handleAudioBeforeRemove"
               :on-remove="handleAudioRemove"
+              :on-success="handleAudioUploadSuccess"
+              :on-exceed="onAudioExceed"
               :limit="1"
               style="width: 600px"
               accept=".mp3,.m4a"
-              :file-list="productForm.fileList">
+              :file-list="audioFileList">
               <el-button size="small" type="primary">上传音频</el-button>
               <div slot="tip" class="el-upload__tip">格式支持mp3、m4a文件，且不超过100M</div>
             </el-upload>
@@ -154,19 +162,26 @@
 
         <el-form-item label="商品状态" required prop="status">
           <el-radio-group v-model="productForm.status">
-            <el-radio label="1">上架</el-radio>
-            <el-radio label="0">下架</el-radio>
+            <el-radio :label="1">上架</el-radio>
+            <el-radio :label="0">下架</el-radio>
           </el-radio-group>
         </el-form-item>
 
         <el-form-item label="商品价格" required prop="price">
-          <el-input-number v-model="productForm.price" :min="0" label="商品价格"></el-input-number>
+          <el-input-number v-model="productForm.price" :precision="1" :step="0.1" label="商品价格"></el-input-number>
+        </el-form-item>
+
+        <el-form-item label="划线价格" required prop="t_price">
+          <el-input-number v-model="productForm.t_price" :precision="1" :step="0.1" label="划线价格"></el-input-number>
         </el-form-item>
       </el-form>
       <span style="display:block;text-align: center">
         <el-button @click="cancelForm('productForm')">取 消</el-button>
         <el-button type="primary"
-                   @click="dialogStatus === 'create' ? createAudio('productForm') : updateAudio('productForm')">提 交</el-button>
+                   @click="dialogStatus === 'create' ? createAudio('productForm') : updateAudio('productForm')"
+                   :loading="btnLoading">
+          {{dialogStatus === 'create' ? (btnLoading ? '提交中...' : '提 交') : (
+          btnLoading ? '更新中...' : '更 新')}}</el-button>
       </span>
     </el-dialog>
 
@@ -176,9 +191,10 @@
 <script>
 import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
-import {fetchList, createAudio, updateAudio} from '@/api/audio'
+import {fetchList, create, update, remove, updateStatus} from '@/api/course'
 import Tinymce from '@/components/Tinymce'
-import {getYmdHmsTimeStr} from '@/utils'
+import {parseTime} from '@/utils'
+import {uploadOptions} from '@/utils/upload'
 
 export default {
   name: 'Audio',
@@ -191,10 +207,15 @@ export default {
         '0': 'info'
       }
       return statusMap[status]
+    },
+    timeFilter(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
     }
   },
   data() {
     return {
+      uploadOptions,
       tableKey: 0,
       list: undefined,
       total: 0,
@@ -203,7 +224,7 @@ export default {
         limit: 10,
         status: undefined,
         title: undefined,
-        type: undefined,
+        type: 'audio',
         sort: '+id'
       },
       listLoading: true,
@@ -213,11 +234,13 @@ export default {
       //添加和修改商品表单数据
       productForm: {
         id: undefined,
-        cover: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif?imageView2/1/w/80/h/80',
+        cover: '',
         title: '',
-        introduce: '',
-        fileList: [],
+        try: '',
+        content: '',
         price: undefined,
+        t_price: undefined,
+        type: 'audio',
         //status初始值设置为undefined才能进行校验
         status: undefined
       },
@@ -227,7 +250,7 @@ export default {
           {required: true, message: '请输入商品名称', trigger: 'blur'},
           {min: 3, max: 5, message: '长度在 3 到 10 个字符', trigger: 'blur'}
         ],
-        introduce: [
+        try: [
           {required: true, message: '请输入课程介绍', trigger: 'blur'},
         ],
         content: [
@@ -238,11 +261,17 @@ export default {
         ],
         price: [
           {required: true, message: '请输入商品价格', trigger: 'change'},
+        ],
+        t_price: [
+          {required: true, message: '请输入划线价格', trigger: 'change'},
         ]
       },
       newCoverUrl: '',
       preDialogImageUrl: '',
       preDialogVisible: false,
+      coverFileList: [],
+      audioFileList: [],
+      btnLoading: false
     }
   },
   mounted() {
@@ -268,13 +297,12 @@ export default {
         this.$router.replace({path: '/'})
       }
     },
-    getList() {
+    async getList() {
       this.listLoading = true
-      fetchList(this.listQuery).then(response => {
-        this.list = response.data.items
-        this.total = response.data.total
-        this.listLoading = false
-      })
+      let res = await fetchList(this.listQuery)
+      this.list = res.data.items
+      this.total = res.data.total
+      this.listLoading = false
     },
     //Id排序start
     getSortClass: function (key) {
@@ -283,7 +311,6 @@ export default {
     },
     sortChange(data) {
       const {prop, order} = data
-      console.log('order', order)
       if (prop === 'id') {
         this.sortByID(order)
       }
@@ -305,16 +332,18 @@ export default {
       this.getList()
     },
     //改变商品状态
-    changeProductStatus(row, status) {
-      row.status = status
+    async changeProductStatus(row, status) {
+      await updateStatus({id: row.id, status})
       this.$message({
         message: '操作成功',
         type: "success"
       })
+      await this.getList()
     },
     //删除封面
     handleCoverRemove(file, fileList) {
-      console.log(file, fileList);
+      this.productForm.cover = ''
+      this.coverFileList = []
     },
     //预览封面
     handlePictureCardPreview(file) {
@@ -323,21 +352,56 @@ export default {
     },
     //封面上传成功
     handleUploadSuccess(response, file, fileList) {
-      console.log(response, file, fileList)
+      if(response.msg === 'ok' && response.code === 20000) {
+        this.productForm.cover = response.data
+        this.coverFileList = [{
+          name: response.data,
+          url: response.data
+        }]
+      } else {
+        this.$message.error('上传失败: ' + response.msg);
+      }
+    },
+    //文件超出个数限制时的钩子
+    onCoverExceed(files, fileList){
+      this.$message.info('只允许上传一张封面')
+    },
+    //音频上传成功
+    handleAudioUploadSuccess(response, file, fileList) {
+      console.log(response)
+      if(response.msg === 'ok' && response.code === 20000) {
+        this.productForm.content = response.data
+        this.audioFileList = [{
+          name: response.data,
+          url: response.data
+        }]
+      } else {
+        this.$message.error('上传失败: ' + response.msg);
+      }
+    },
+    handleAudioBeforeRemove(file, fileList){
+      return this.$confirm(`确定移除 ${ file.name }？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+      // return this.$confirm(`确定移除 ${ file.name }？`);
     },
     //音频删除
     handleAudioRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${ file.name }？`);
+      this.productForm.content = ''
+      this.audioFileList = []
+    },
+    onAudioExceed(){
+      this.$message.info('只允许上传一个音频')
     },
     //删除记录
-    handleDelete(row, index) {
-      this.$notify({
-        title: '提示',
-        message: '删除成功',
-        type: 'success',
-        duration: 2000
-      })
-      this.list.splice(index, 1)
+    async handleDelete(row, index) {
+      let ids = []
+      ids.push(row.id)
+      await remove({ids})
+      this.$notify.success('删除成功');
+      await this.getList()
     },
     //新增
     showDialog() {
@@ -348,6 +412,21 @@ export default {
     beforeRemove(file, fileList) {
       return this.$confirm(`确定移除 ${ file.name }？`);
     },
+    reset() {
+      this.productForm = {
+        id: undefined,
+        cover: '',
+        title: '',
+        try: '',
+        content: '',
+        price: undefined,
+        t_price: undefined,
+        type: 'audio',
+        status: undefined
+      }
+      this.coverFileList = []
+      this.audioFileList = []
+    },
     //打开新增文章对话框
     openedDialog() {
       //需要使用opened事件，不能是open事件，因为open事件时$refs还未创建
@@ -355,27 +434,29 @@ export default {
         //如果是创建则清空上次数据
         //清除表单内容
         this.$refs['productForm'].resetFields();
-        //清空富文本内容
-        this.$refs.introduceTinymce.setContent('')
+        this.reset()
+        this.$nextTick(() => {
+          //清空富文本内容
+          this.$refs.introduceTinymce.setContent('')
+          this.$refs['productForm'].clearValidate()
+        })
       }
     },
     //新增文章
     createAudio(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.productForm.id = parseInt(Math.random() * 100) + 1024
-          this.productForm.created_time = getYmdHmsTimeStr()
-          this.productForm.updated_time = getYmdHmsTimeStr()
-          this.productForm.subscription = 0
-          createAudio(this.productForm).then(() => {
-            this.list.unshift(this.productForm)
+          this.btnLoading = true
+          create(this.productForm).then(() => {
             this.dialogVisible = false;
+            this.btnLoading = false
             this.$notify({
               message: '',
               type: "success",
               title: '成功',
               duration: 2000
             })
+            this.getList()
           })
         }
       })
@@ -389,24 +470,30 @@ export default {
       this.dialogStatus = 'edit'
       this.productForm = Object.assign({}, row)
       this.dialogVisible = true;
+      this.coverFileList = [{
+        name: this.productForm.cover,
+        url: this.productForm.cover,
+      }]
+      this.audioFileList = [{
+        name: this.productForm.content,
+        url: this.productForm.content,
+      }]
     },
     //更新
     updateAudio(formName) {
-      this.$refs[formName].validate((valid) => {
+      this.$refs[formName].validate(async (valid) => {
         if (valid) {
-          let temp = Object.assign({}, this.productForm)
-          temp.updated_time = getYmdHmsTimeStr()
-          updateAudio(temp).then(() => {
-            let index = this.list.findIndex(item => item.id === temp.id)
-            this.list.splice(index, 1, temp)
-            this.dialogVisible = false
-            this.$notify({
-              type: "success",
-              title: '成功',
-              message: '更新成功',
-              duration: 2000
-            })
+          this.btnLoading = true
+          await update(this.productForm)
+          this.dialogVisible = false
+          this.btnLoading = false
+          this.$notify({
+            type: "success",
+            title: '成功',
+            message: '更新成功',
+            duration: 2000
           })
+          await this.getList()
         }
       })
     }
diff --git a/src/views/course/column.vue b/src/views/course/column.vue
index f1178a9..9658419 100644
--- a/src/views/course/column.vue
+++ b/src/views/course/column.vue
@@ -18,7 +18,7 @@
         </el-select>
         <el-input
           v-model="listQuery.title"
-          placeholder="Title"
+          placeholder="请输入搜索内容"
           style="width: 200px;margin-right: 10px"
           class="filter-item"
           clearable
@@ -60,15 +60,15 @@
 
       <el-table-column label="更新状态" width="110px" align="center">
         <template slot-scope="{row}">
-          <el-tag :type="row.updateStatus | statusFilter">
-            {{ updateStatusOptions[row.updateStatus] }}
+          <el-tag :type="row.isend | statusFilter">
+            {{ updateStatusOptions[row.isend] }}
           </el-tag>
         </template>
       </el-table-column>
 
       <el-table-column label="订阅量" width="110px" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.subscription }}</span>
+          <span>{{ row.sub_count }}</span>
         </template>
       </el-table-column>
 
@@ -82,13 +82,13 @@
 
       <el-table-column label="创建时间" width="180px" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.created_time }}</span>
+          <span>{{ row.created_time | timeFilter }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="更新时间" width="180px" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.updated_time }}</span>
+          <span>{{ row.updated_time | timeFilter }}</span>
         </template>
       </el-table-column>
 
@@ -122,7 +122,8 @@
       title="提示"
       :visible.sync="dialogVisible"
       fullscreen
-      @opened="openedDialog">
+      @opened="openedDialog"
+      @close="reset">
       <el-form :model="productForm" :rules="productRules" ref="productForm" label-width="100px" class="demo-ruleForm">
         <el-form-item ref="title" label="标题" required prop="title">
           <el-input v-model="productForm.title" style="width: 200px"></el-input>
@@ -130,11 +131,15 @@
         <el-form-item label="封面">
           <!--图片上传组件-->
           <el-upload
-            action="https://jsonplaceholder.typicode.com/posts/"
+            :action="uploadOptions.action"
+            :headers="uploadOptions.header"
             list-type="picture-card"
+            :limit="1"
+            :on-exceed="onCoverExceed"
             :on-preview="handlePictureCardPreview"
             :on-remove="handleCoverRemove"
-            :on-success="handleUploadSuccess">
+            :on-success="handleUploadSuccess"
+            :file-list="coverFileList">
             <i class="el-icon-plus"></i>
           </el-upload>
           <!--图片预览Dialog-->
@@ -143,14 +148,14 @@
           </el-dialog>
         </el-form-item>
 
-        <el-form-item label="课程介绍" required prop="introduce">
+        <el-form-item label="课程介绍" required prop="try">
           <template>
             <el-input
               type="textarea"
               style="width: 600px"
               :rows="3"
               placeholder="请输入课程介绍"
-              v-model="productForm.introduce">
+              v-model="productForm.try">
             </el-input>
           </template>
         </el-form-item>
@@ -163,26 +168,34 @@
 
         <el-form-item label="商品状态" required prop="status">
           <el-radio-group v-model="productForm.status">
-            <el-radio label="1">上架</el-radio>
-            <el-radio label="0">下架</el-radio>
+            <el-radio :label="1">上架</el-radio>
+            <el-radio :label="0">下架</el-radio>
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item label="更新状态" required prop="updateStatus">
-          <el-radio-group v-model="productForm.updateStatus">
-            <el-radio label="1">已完结</el-radio>
-            <el-radio label="0">连载中</el-radio>
+        <el-form-item label="更新状态" required prop="isend">
+          <el-radio-group v-model="productForm.isend">
+            <el-radio :label="1">已完结</el-radio>
+            <el-radio :label="0">连载中</el-radio>
           </el-radio-group>
         </el-form-item>
 
         <el-form-item label="商品价格" required prop="price">
-          <el-input-number v-model="productForm.price" :min="0" label="商品价格"></el-input-number>
+          <el-input-number v-model="productForm.price" :precision="1" :step="0.1" label="商品价格"></el-input-number>
+        </el-form-item>
+
+        <el-form-item label="划线价格" required prop="price">
+          <el-input-number v-model="productForm.t_price" :precision="1" :step="0.1" label="划线价格"></el-input-number>
         </el-form-item>
       </el-form>
       <span style="display:block;text-align: center">
         <el-button @click="cancelForm('productForm')">取 消</el-button>
         <el-button type="primary"
-                   @click="dialogStatus === 'create' ? createColumn('productForm') : updateColumn('productForm')">提 交</el-button>
+                   @click="dialogStatus === 'create' ? createColumn('productForm') : updateColumn('productForm')"
+                   :loading="btnLoading">
+          {{dialogStatus === 'create' ? (btnLoading ? '提交中...' : '提 交') : (
+          btnLoading ? '更新中...' : '更 新')}}
+        </el-button>
       </span>
     </el-dialog>
 
@@ -192,9 +205,10 @@
 <script>
 import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
-import {fetchList, createColumn, updateColumn} from '@/api/column'
+import {fetchList, create, update, updateStatus, remove} from '@/api/column'
 import Tinymce from '@/components/Tinymce'
-import {getYmdHmsTimeStr} from '@/utils'
+import {parseTime} from '@/utils'
+import {uploadOptions} from '@/utils/upload'
 
 export default {
   name: 'Column',
@@ -207,10 +221,15 @@ export default {
         '0': 'info'
       }
       return statusMap[status]
+    },
+    timeFilter(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
     }
   },
   data() {
     return {
+      uploadOptions,
       tableKey: 0,
       list: undefined,
       total: 0,
@@ -230,13 +249,14 @@ export default {
       //添加和修改商品表单数据
       productForm: {
         id: undefined,
-        cover: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif?imageView2/1/w/80/h/80',
+        cover: '',
         title: '',
-        introduce: '',
+        try: '',
         content: '',
         price: undefined,
+        t_price: undefined,
+        isend: undefined,
         //status初始值设置为undefined才能进行校验
-        updateStatus: undefined,
         status: undefined
       },
       //添加和修改商品校验规则
@@ -245,7 +265,7 @@ export default {
           {required: true, message: '请输入商品名称', trigger: 'blur'},
           {min: 3, max: 5, message: '长度在 3 到 10 个字符', trigger: 'blur'}
         ],
-        introduce: [
+        try: [
           {required: true, message: '请输入课程介绍', trigger: 'blur'},
         ],
         content: [
@@ -254,16 +274,21 @@ export default {
         status: [
           {required: true, message: '请选择商品状态', trigger: 'change'},
         ],
-        updateStatus: [
+        isend: [
           {required: true, message: '请选择更新状态', trigger: 'change'},
         ],
         price: [
           {required: true, message: '请输入商品价格', trigger: 'change'},
+        ],
+        t_price: [
+          {required: true, message: '请输入划线价格', trigger: 'change'},
         ]
       },
       newCoverUrl: '',
       preDialogImageUrl: '',
       preDialogVisible: false,
+      coverFileList: [],
+      btnLoading: false
     }
   },
   mounted() {
@@ -326,16 +351,18 @@ export default {
       this.getList()
     },
     //改变商品状态
-    changeProductStatus(row, status) {
-      row.status = status
+    async changeProductStatus(row, status) {
+      await updateStatus({id: row.id, status})
       this.$message({
         message: '操作成功',
         type: "success"
       })
+      await this.getList()
     },
     //删除封面
     handleCoverRemove(file, fileList) {
-      console.log(file, fileList);
+      this.productForm.cover = ''
+      this.coverFileList = []
     },
     //预览封面
     handlePictureCardPreview(file) {
@@ -344,17 +371,27 @@ export default {
     },
     //封面上传成功
     handleUploadSuccess(response, file, fileList) {
-      console.log(response, file, fileList)
+      if(response.msg === 'ok' && response.code === 20000) {
+        this.productForm.cover = response.data
+        this.coverFileList = [{
+          name: response.data,
+          url: response.data
+        }]
+      } else {
+        this.$message.error('上传失败: ' + response.msg);
+      }
+    },
+    //文件超出个数限制时的钩子
+    onCoverExceed(files, fileList){
+      this.$message.info('只允许上传一张封面')
     },
     //删除记录
-    handleDelete(row, index) {
-      this.$notify({
-        title: '提示',
-        message: '删除成功',
-        type: 'success',
-        duration: 2000
-      })
-      this.list.splice(index, 1)
+    async handleDelete(row, index) {
+      let ids = []
+      ids.push(row.id)
+      await remove({ids})
+      this.$notify.success('删除成功');
+      await this.getList()
     },
     //新增
     showDialog() {
@@ -372,20 +409,35 @@ export default {
         //如果是创建则清空上次数据
         //清除表单内容
         this.$refs['productForm'].resetFields();
-        //清空富文本内容
-        this.$refs.contentTinymce.setContent('')
+        this.reset()
+        this.$nextTick(() => {
+          //清空富文本内容
+          this.$refs.contentTinymce.setContent('')
+          this.$refs['productForm'].clearValidate()
+        })
+      }
+    },
+    reset() {
+      this.productForm = {
+        id: undefined,
+        cover: '',
+        title: '',
+        try: '',
+        content: '',
+        price: undefined,
+        t_price: undefined,
+        isend: undefined,
+        status: undefined
       }
+      this.coverFileList = []
     },
     //新增文章
     createColumn(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.productForm.id = parseInt(Math.random() * 100) + 1024
-          this.productForm.created_time = getYmdHmsTimeStr()
-          this.productForm.updated_time = getYmdHmsTimeStr()
-          this.productForm.subscription = 0
-          createColumn(this.productForm).then(() => {
-            this.list.unshift(this.productForm)
+          this.btnLoading = true
+          create(this.productForm).then(() => {
+            this.btnLoading = false
             this.dialogVisible = false;
             this.$notify({
               message: '',
@@ -393,6 +445,7 @@ export default {
               title: '成功',
               duration: 2000
             })
+            this.getList()
           })
         }
       })
@@ -405,17 +458,19 @@ export default {
     editColumn(row) {
       this.dialogStatus = 'edit'
       this.productForm = Object.assign({}, row)
+      this.coverFileList = [{
+        name: this.productForm.cover,
+        url: this.productForm.cover
+      }]
       this.dialogVisible = true;
     },
     //更新
     updateColumn(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          let temp = Object.assign({}, this.productForm)
-          temp.updated_time = getYmdHmsTimeStr()
-          updateColumn(temp).then(() => {
-            let index = this.list.findIndex(item => item.id === temp.id)
-            this.list.splice(index, 1, temp)
+          this.btnLoading = true
+          update(this.productForm).then(() => {
+            this.btnLoading = false
             this.dialogVisible = false
             this.$notify({
               type: "success",
@@ -423,6 +478,7 @@ export default {
               message: '更新成功',
               duration: 2000
             })
+            this.getList()
           })
         }
       })
diff --git a/src/views/course/column_detail.vue b/src/views/course/column_detail.vue
index 0bbbb23..de5c3b1 100644
--- a/src/views/course/column_detail.vue
+++ b/src/views/course/column_detail.vue
@@ -2,11 +2,11 @@
   <div class="app-container">
     <el-card class="box-card">
       <div style="display: flex">
-        <img :src="detail.cover">
+        <img :src="detail.cover" style="width: 200px;height: 100px">
         <div style="flex:1;margin-left: 16px">
           <div style="display: flex;justify-content: space-between">
             <h5 style="margin: 0px">{{ detail.title }}</h5>
-            <small style="color: #bbbbbb">{{ detail.updateStatus === 1 ? '已完结' : '连载中' }}</small>
+            <small style="color: #bbbbbb">{{ detail.isend === 1 ? '已完结' : '连载中' }}</small>
           </div>
           <p style="color: #bbbbbb;margin: 4px 0"><small>{{ detail.introduce }}</small></p>
           <p style="margin: 4px 0"><small style="color: red">$</small><small>{{ detail.price }}</small></p>
@@ -15,8 +15,8 @@
             <el-button size="mini" :type="detail.status === 1 ? 'info' : 'success'"
                        @click="updateStatus(detail.status)">{{ detail.status === 1 ? '下架' : "上架" }}
             </el-button>
-            <el-button size="mini" @click="updateIsEnd(detail.updateStatus)">
-              {{ detail.updateStatus === 1 ? '设置为连载中' : "设置为已完结" }}
+            <el-button size="mini" @click="updateIsEnd(detail.isend)">
+              {{ detail.isend === 1 ? '设置为连载中' : "设置为已完结" }}
             </el-button>
           </el-button-group>
         </div>
@@ -45,7 +45,7 @@
           clearable
           @clear="getColumnCourse"/>
 
-        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="searchColumnCourse">搜索</el-button>
+        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getColumnCourse">搜索</el-button>
       </div>
     </div>
 
@@ -85,13 +85,13 @@
 
       <el-table-column label="类型" width="110px" align="center">
         <template slot-scope="{row}">
-          <span>{{ courseType[row.courseType] }}</span>
+          <span>{{ courseType[row.type] }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="访问量" width="110px" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.visits}}</span>
+          <span>{{ row.sub_count}}</span>
         </template>
       </el-table-column>
 
@@ -135,7 +135,7 @@
 <script>
 import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
-import {fetchDetail, updateStatus, updateIsEnd, fetchColumnCourse} from '@/api/column'
+import {getDetail, updateStatus, updateEnd, addColumnCourse, fetchColumnCourse, removeColumnCourse} from '@/api/column'
 import Sortable from "sortablejs";
 import ChooseCourse from "@/components/ChooseCourse";
 
@@ -160,25 +160,29 @@ export default {
     return {
       detail: {
         id: undefined,
-        cover: '',
         title: '',
+        cover: '',
         introduce: '',
         content: '',
         price: undefined,
-        updateStatus: undefined,
-        status: undefined
+        t_price: undefined,
+        status: undefined,
+        isend: undefined,
       },
       columnCourseLoading: false,
       columnCourses: [],
       columnCoursesTotal: 0,
       listQuery: {
+        column_id: undefined,
         page: 1,
         limit: 10,
-        status: undefined,
-        title: '',
       },
       statusOptions: ['未上架', '已上架'],
-      courseType: ['图文', '音频', '视频'],
+      courseType: {
+        'media': '图文',
+        'audio': '音频',
+        'video': '视频'
+      },
       oldList: [],
       newList: []
     }
@@ -193,15 +197,17 @@ export default {
   },
   methods: {
     getDetail() {
-      fetchDetail({id}).then(res => {
+      getDetail({id}).then(res => {
         this.detail = res.data
       })
     },
     async getColumnCourse() {
-      this.listLoading = true
-      const {data} = await fetchColumnCourse(this.listQuery)
-      this.columnCourses = data.data
-      this.columnCoursesTotal = data.total
+      this.columnCourseLoading = true
+      this.listQuery.column_id = id
+      const res = await fetchColumnCourse(this.listQuery)
+      this.columnCourseLoading = false
+      this.columnCourses = res.data.items
+      this.columnCoursesTotal = res.data.total
       this.$nextTick(() => {
         this.setSort()
       })
@@ -228,41 +234,40 @@ export default {
         id,
         status: newStatus
       }).then(res => {
-        if (res.code === 20000) {
-          this.detail.status = newStatus
-        }
+        this.detail.status = newStatus
+        this.$message.success('更新成功');
       })
     },
     updateIsEnd(isEnd) {
       const newStatus = isEnd === 1 ? 0 : 1
-      updateIsEnd({
+      updateEnd({
         id,
-        status: newStatus
+        isend: newStatus
       }).then(res => {
-        console.log(res)
-        if (res.code === 20000) {
-          this.detail.updateStatus = newStatus
-        }
+        this.detail.isend = newStatus
+        this.$message.success('更新成功');
       })
     },
-    //搜索专辑课程
-    searchColumnCourse() {
-      this.getColumnCourse()
-    },
     //添加专辑课程
     addColunmCourse() {
-      this.$refs.chooseCourse.open(data => {
-        this.columnCourses = [...data, ...this.columnCourses]
+      this.$refs.chooseCourse.open(async data => {
+        console.log(data)
+        await addColumnCourse( {column_id: id, course_id: data[0].id})
+        await this.getColumnCourse()
       })
     },
-    deleteItem(row, index){
+    async deleteItem(row, index){
+      await removeColumnCourse({
+        column_id: id,
+        ids: [row.id]
+      })
+      await this.getColumnCourse()
       this.$notify({
         title: '提示',
         message: '删除成功',
         type: 'success',
         duration: 2000
       })
-      this.columnCourses.splice(index, 1)
     }
   }
 }
diff --git a/src/views/course/media.vue b/src/views/course/media.vue
index 93e1dd7..d32c027 100644
--- a/src/views/course/media.vue
+++ b/src/views/course/media.vue
@@ -5,23 +5,24 @@
   <div class="app-container">
     <!--搜索和新增-->
     <div class="filter-container" style="display: flex;justify-content: space-between">
-      <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="showDialog">新增图文</el-button>
+      <div>
+        <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="showDialog" v-permission="'/admin/s/course/save,POST'">新增图文</el-button>
+      </div>
       <div>
         <el-select
           v-model="listQuery.status"
           placeholder="商品状态"
           clearable
+          @clear="getList"
           style="width: 110px;margin-right: 10px"
-          class="filter-item"
-        >
+          class="filter-item">
           <el-option v-for="(item, k) in statusOptions" :key="k" :label="item" :value="k"/>
         </el-select>
         <el-input
           v-model="listQuery.title"
-          placeholder="Title"
+          placeholder="请输入搜索内容"
           style="width: 200px;margin-right: 10px"
-          class="filter-item"
-        />
+          class="filter-item"/>
         <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
     </div>
@@ -46,8 +47,7 @@
           <div style="display: flex">
             <img
               :src="row.cover"
-              style="width: 100px;height: 50px"
-            >
+              style="width: 100px;height: 50px">
             <div
               style="display: flex;flex-direction: column;justify-content: space-between;align-items:flex-start;margin-left: 10px">
               <span style="color:#0485fd;">{{ row.title }}</span>
@@ -59,7 +59,7 @@
 
       <el-table-column label="订阅量" width="110px" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.subscription }}</span>
+          <span>{{ row.sub_count }}</span>
         </template>
       </el-table-column>
 
@@ -73,13 +73,13 @@
 
       <el-table-column label="创建时间" width="180px" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.created_time }}</span>
+          <span>{{ row.created_time | timeFilter }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="更新时间" width="180px" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.updated_time }}</span>
+          <span>{{ row.updated_time | timeFilter}}</span>
         </template>
       </el-table-column>
 
@@ -118,11 +118,15 @@
         <el-form-item label="封面">
           <!--图片上传组件-->
           <el-upload
-            action="https://jsonplaceholder.typicode.com/posts/"
+            :action="uploadOptions.action"
             list-type="picture-card"
+            :on-exceed="onExceed"
             :on-preview="handlePictureCardPreview"
             :on-remove="handleRemove"
-            :on-success="handleUploadSuccess">
+            :on-success="handleUploadSuccess"
+            :headers="uploadOptions.header"
+            :limit="1"
+            :file-list="fileList">
             <i class="el-icon-plus"></i>
           </el-upload>
           <!--图片预览Dialog-->
@@ -145,19 +149,25 @@
 
         <el-form-item label="商品状态" required prop="status">
           <el-radio-group v-model="productForm.status">
-            <el-radio label="1">上架</el-radio>
-            <el-radio label="0">下架</el-radio>
+            <el-radio :label="1">上架</el-radio>
+            <el-radio :label="0">下架</el-radio>
           </el-radio-group>
         </el-form-item>
 
         <el-form-item label="商品价格" required prop="price">
-          <el-input-number v-model="productForm.price" :min="0" label="商品价格"></el-input-number>
+          <el-input-number v-model="productForm.price"  :precision="1" :step="0.1"  label="商品价格"></el-input-number>
+        </el-form-item>
+
+        <el-form-item label="划线价格" required prop="t_price">
+          <el-input-number v-model="productForm.t_price" :precision="1" :step="0.1" label="划线价格"></el-input-number>
         </el-form-item>
       </el-form>
       <span style="display:block;text-align: center">
         <el-button @click="cancelMediaForm('productForm')">取 消</el-button>
         <el-button type="primary"
-                   @click="dialogStatus === 'create' ? createMedia('productForm') : updateMedia('productForm')">提 交</el-button>
+                   @click="dialogStatus === 'create' ? createMedia('productForm') : updateMedia('productForm')"
+                   :loading="btnLoading">{{dialogStatus === 'create' ? (btnLoading ? '提交中...' : '提 交') : (
+                                                                    btnLoading ? '更新中...' : '更 新')}}</el-button>
       </span>
     </el-dialog>
 
@@ -167,9 +177,10 @@
 <script>
 import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
-import {fetchList, createMedia, updateMedia} from '@/api/media'
+import {fetchList, create, update, remove, updateStatus} from '@/api/course'
 import Tinymce from '@/components/Tinymce'
-import {getYmdHmsTimeStr} from '@/utils'
+import {parseTime} from '@/utils'
+import {uploadOptions} from '@/utils/upload'
 
 export default {
   name: 'Media',
@@ -182,10 +193,15 @@ export default {
         '0': 'info'
       }
       return statusMap[status]
+    },
+    timeFilter(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
     }
   },
   data() {
     return {
+      uploadOptions,
       tableKey: 0,
       list: undefined,
       total: 0,
@@ -194,7 +210,7 @@ export default {
         limit: 10,
         status: undefined,
         title: undefined,
-        type: undefined,
+        type: 'media',
         sort: '+id'
       },
       listLoading: true,
@@ -204,11 +220,13 @@ export default {
       //添加和修改商品表单数据
       productForm: {
         id: undefined,
-        cover: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif?imageView2/1/w/80/h/80',
+        cover: '',
         title: '',
         try: '',
         content: '',
         price: undefined,
+        t_price: 0,
+        type: 'media',
         //status初始值设置为undefined才能进行校验
         status: undefined
       },
@@ -229,11 +247,16 @@ export default {
         ],
         price: [
           {required: true, message: '请输入商品价格', trigger: 'change'},
+        ],
+        t_price: [
+          {required: true, message: '请输入划线价格', trigger: 'change'},
         ]
       },
       newCoverUrl: '',
       preDialogImageUrl: '',
       preDialogVisible: false,
+      fileList: [],
+      btnLoading: false
     }
   },
   mounted() {
@@ -297,27 +320,37 @@ export default {
     },
     //改变商品状态
     changeProductStatus(row, status) {
-      row.status = status
-      this.$message({
-        message: '操作成功',
-        type: "success"
-      })
+      const msg = '此操作将' + (status === 1 ? '上架' : '下架') + '课程, 是否继续?'
+      this.$confirm(msg, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        let res = await updateStatus({
+          id: row.id,
+          status
+        })
+        this.getList()
+        this.$message.success('更新成功')
+      });
     },
     //删除记录
-    handleDelete(row, index) {
-      this.$notify({
-        title: '提示',
-        message: '删除成功',
-        type: 'success',
-        duration: 2000
+    async handleDelete(row, index) {
+      let res = await remove({
+        ids: [row.id]
       })
-      this.list.splice(index, 1)
+      this.getList()
+      this.$notify.success('删除成功');
     },
     //新增media
     showDialog() {
       this.dialogStatus = 'create'
       this.dialogVisible = true
     },
+    //文件超出个数限制时的钩子
+    onExceed(files, fileList){
+      this.$message.info('只允许上传一张封面')
+    },
     //删除图片
     handleRemove(file, fileList) {
       console.log(file, fileList);
@@ -329,38 +362,54 @@ export default {
     },
     //图片上传成功
     handleUploadSuccess(response, file, fileList) {
-      console.log(response, file, fileList)
+      if(response.msg === 'ok' && response.code === 20000) {
+        this.productForm.cover = response.data
+      } else {
+        // this.fileList = fileList
+        this.$message.error('上传失败: ' + response.msg);
+      }
+    },
+    reset() {
+      this.productForm = {
+        id: undefined,
+        cover: '',
+        title: '',
+        try: '',
+        content: '',
+        price: undefined,
+        t_price: undefined,
+        type: 'media',
+        status: undefined
+      }
+      this.fileList = []
     },
     //打开新增文章对话框
     openedDialog() {
       //需要使用opened事件，不能是open事件，因为open事件时$refs还未创建
       if (this.dialogStatus === 'create') {
         //如果是创建media则清空上次数据
+        //清除图片数据
+        this.reset()
         //清除表单内容
         this.$refs['productForm'].resetFields();
-        //清空富文本内容
-        this.$refs.tryTinymce.setContent('')
-        this.$refs.contentTinymce.setContent('')
+        this.$nextTick(() => {
+          //清空富文本内容
+          this.$refs.tryTinymce.setContent('')
+          this.$refs.contentTinymce.setContent('')
+          this.$refs['productForm'].clearValidate()
+        })
       }
     },
     //新增文章
     createMedia(formName) {
-      this.$refs[formName].validate((valid) => {
+      this.$refs[formName].validate(async (valid) => {
         if (valid) {
-          this.productForm.id = parseInt(Math.random() * 100) + 1024
-          this.productForm.created_time = getYmdHmsTimeStr()
-          this.productForm.updated_time = getYmdHmsTimeStr()
-          this.productForm.subscription = 0
-          createMedia(this.productForm).then(() => {
-            this.list.unshift(this.productForm)
-            this.dialogVisible = false;
-            this.$notify({
-              message: '',
-              type: "success",
-              title: '成功',
-              duration: 2000
-            })
-          })
+          this.btnLoading = true
+          await create(this.productForm)
+          this.btnLoading = false
+          this.dialogVisible = false;
+          this.getList()
+          this.$notify.success('创建成功')
         }
       })
     },
@@ -372,25 +421,22 @@ export default {
     editMedia(row) {
       this.dialogStatus = 'edit'
       this.productForm = Object.assign({}, row)
+      this.fileList = [{
+        name: row.cover,
+        url: row.cover
+      }]
       this.dialogVisible = true;
     },
     //更新media
     updateMedia(formName) {
-      this.$refs[formName].validate((valid) => {
+      this.$refs[formName].validate(async (valid) => {
         if (valid) {
-          let temp = Object.assign({}, this.productForm)
-          temp.updated_time = getYmdHmsTimeStr()
-          updateMedia(temp).then(() => {
-            let index = this.list.findIndex(item => item.id === temp.id)
-            this.list.splice(index, 1, temp)
-            this.dialogVisible = false
-            this.$notify({
-              type: "success",
-              title: '成功',
-              message: '更新成功',
-              duration: 2000
-            })
-          })
+          this.btnLoading = true
+          await update(this.productForm)
+          this.btnLoading = false
+          this.dialogVisible = false
+          this.$message.success('更新成功');
+          this.getList()
         }
       })
     }
diff --git a/src/views/course/video.vue b/src/views/course/video.vue
index 4e45159..ed92121 100644
--- a/src/views/course/video.vue
+++ b/src/views/course/video.vue
@@ -11,6 +11,7 @@
           v-model="listQuery.status"
           placeholder="商品状态"
           clearable
+          @clear="getList"
           style="width: 110px;margin-right: 10px"
           class="filter-item"
         >
@@ -18,7 +19,7 @@
         </el-select>
         <el-input
           v-model="listQuery.title"
-          placeholder="Title"
+          placeholder="请输入搜索内容"
           style="width: 200px;margin-right: 10px"
           class="filter-item"
         />
@@ -59,7 +60,7 @@
 
       <el-table-column label="订阅量" width="110px" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.subscription }}</span>
+          <span>{{ row.sub_count }}</span>
         </template>
       </el-table-column>
 
@@ -73,13 +74,13 @@
 
       <el-table-column label="创建时间" width="180px" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.created_time }}</span>
+          <span>{{ row.created_time | timeFilter }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="更新时间" width="180px" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.updated_time }}</span>
+          <span>{{ row.updated_time | timeFilter }}</span>
         </template>
       </el-table-column>
 
@@ -118,11 +119,14 @@
         <el-form-item label="封面">
           <!--图片上传组件-->
           <el-upload
-            action="https://jsonplaceholder.typicode.com/posts/"
+            :action="uploadOptions.action"
+            :headers="uploadOptions.header"
             list-type="picture-card"
+            :limit="1"
             :on-preview="handlePictureCardPreview"
             :on-remove="handleCoverRemove"
-            :on-success="handleUploadSuccess">
+            :on-success="handleUploadSuccess"
+            :file-list="coverFileList">
             <i class="el-icon-plus"></i>
           </el-upload>
           <!--图片预览Dialog-->
@@ -131,21 +135,25 @@
           </el-dialog>
         </el-form-item>
 
-        <el-form-item label="课程介绍" required prop="introduce">
+        <el-form-item label="课程介绍" required prop="try">
           <template>
-            <tinymce ref="introduceTinymce" v-model="productForm.introduce" :height="300" :width="600"/>
+            <tinymce ref="introduceTinymce" v-model="productForm.try" :height="300" :width="600"/>
           </template>
         </el-form-item>
 
         <el-form-item label="课程内容" required prop="content">
           <template>
             <el-upload
-              action="https://jsonplaceholder.typicode.com/posts/"
+              :action="uploadOptions.action"
+              :headers="uploadOptions.header"
+              :before-remove="handleVideoBeforeRemove"
               :on-remove="handleVideoRemove"
+              :on-success="handleVideoUploadSuccess"
+              :on-exceed="onVideoExceed"
               :limit="1"
               style="width: 600px"
-              accept=".mp4,.avi,.wmv,.mov,.flv,.rmvb,.3gp,.m4v,.mkv"
-              :file-list="productForm.fileList">
+              accept=".mp3,.mp4,.avi,.wmv,.mov,.flv,.rmvb,.3gp,.m4v,.mkv"
+              :file-list="videoFileList">
               <el-button size="small" type="primary">上传视频</el-button>
               <div slot="tip" class="el-upload__tip">支持mp4,avi,wmv,mov,flv,rmvb,3gp,m4v,mkv，且不超过100M</div>
             </el-upload>
@@ -154,19 +162,27 @@
 
         <el-form-item label="商品状态" required prop="status">
           <el-radio-group v-model="productForm.status">
-            <el-radio label="1">上架</el-radio>
-            <el-radio label="0">下架</el-radio>
+            <el-radio :label="1">上架</el-radio>
+            <el-radio :label="0">下架</el-radio>
           </el-radio-group>
         </el-form-item>
 
         <el-form-item label="商品价格" required prop="price">
-          <el-input-number v-model="productForm.price" :min="0" label="商品价格"></el-input-number>
+          <el-input-number v-model="productForm.price" :precision="1" :step="0.1" label="商品价格"></el-input-number>
+        </el-form-item>
+
+        <el-form-item label="划线价格" required prop="t_price">
+          <el-input-number v-model="productForm.t_price" :precision="1" :step="0.1" label="划线价格"></el-input-number>
         </el-form-item>
       </el-form>
       <span style="display:block;text-align: center">
         <el-button @click="cancelForm('productForm')">取 消</el-button>
         <el-button type="primary"
-                   @click="dialogStatus === 'create' ? createVideo('productForm') : updateVideo('productForm')">提 交</el-button>
+                   @click="dialogStatus === 'create' ? createVideo('productForm') : updateVideo('productForm')"
+                   :loading="btnLoading">
+          {{dialogStatus === 'create' ? (btnLoading ? '提交中...' : '提 交') : (
+          btnLoading ? '更新中...' : '更 新')}}
+        </el-button>
       </span>
     </el-dialog>
 
@@ -176,9 +192,11 @@
 <script>
 import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
-import {fetchList, createVideo, updateVideo} from '@/api/video'
+import {createVideo, updateVideo} from '@/api/video'
 import Tinymce from '@/components/Tinymce'
-import {getYmdHmsTimeStr} from '@/utils'
+import {getYmdHmsTimeStr, parseTime} from '@/utils'
+import {fetchList, create, update, remove, updateStatus} from '@/api/course'
+import {uploadOptions} from "@/utils/upload";
 
 export default {
   name: 'Video',
@@ -191,10 +209,15 @@ export default {
         '0': 'info'
       }
       return statusMap[status]
+    },
+    timeFilter(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
     }
   },
   data() {
     return {
+      uploadOptions,
       tableKey: 0,
       list: undefined,
       total: 0,
@@ -203,7 +226,7 @@ export default {
         limit: 10,
         status: undefined,
         title: undefined,
-        type: undefined,
+        type: 'video',
         sort: '+id'
       },
       listLoading: true,
@@ -213,11 +236,13 @@ export default {
       //添加和修改商品表单数据
       productForm: {
         id: undefined,
-        cover: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif?imageView2/1/w/80/h/80',
+        cover: '',
         title: '',
-        introduce: '',
-        fileList: [],
+        try: '',
+        content: '',
         price: undefined,
+        t_price: undefined,
+        type: 'video',
         //status初始值设置为undefined才能进行校验
         status: undefined
       },
@@ -227,7 +252,7 @@ export default {
           {required: true, message: '请输入商品名称', trigger: 'blur'},
           {min: 3, max: 5, message: '长度在 3 到 10 个字符', trigger: 'blur'}
         ],
-        introduce: [
+        try: [
           {required: true, message: '请输入课程介绍', trigger: 'blur'},
         ],
         content: [
@@ -238,11 +263,17 @@ export default {
         ],
         price: [
           {required: true, message: '请输入商品价格', trigger: 'change'},
+        ],
+        t_price: [
+          {required: true, message: '请输入划线价格', trigger: 'change'},
         ]
       },
       newCoverUrl: '',
       preDialogImageUrl: '',
       preDialogVisible: false,
+      coverFileList: [],
+      videoFileList: [],
+      btnLoading: false
     }
   },
   mounted() {
@@ -283,7 +314,6 @@ export default {
     },
     sortChange(data) {
       const {prop, order} = data
-      console.log('order', order)
       if (prop === 'id') {
         this.sortByID(order)
       }
@@ -305,16 +335,18 @@ export default {
       this.getList()
     },
     //改变商品状态
-    changeProductStatus(row, status) {
-      row.status = status
+    async changeProductStatus(row, status) {
+      await updateStatus({id: row.id, status})
       this.$message({
         message: '操作成功',
         type: "success"
       })
+      await this.getList()
     },
     //删除封面
     handleCoverRemove(file, fileList) {
-      console.log(file, fileList);
+      this.productForm.cover = ''
+      this.coverFileList = []
     },
     //预览封面
     handlePictureCardPreview(file) {
@@ -323,21 +355,55 @@ export default {
     },
     //封面上传成功
     handleUploadSuccess(response, file, fileList) {
-      console.log(response, file, fileList)
+      if(response.msg === 'ok' && response.code === 20000) {
+        this.productForm.cover = response.data
+        this.coverFileList = [{
+          name: response.data,
+          url: response.data
+        }]
+      } else {
+        this.$message.error('上传失败: ' + response.msg);
+      }
+    },
+    //文件超出个数限制时的钩子
+    onCoverExceed(files, fileList){
+      this.$message.info('只允许上传一张封面')
+    },
+    //视频上传成功
+    handleVideoUploadSuccess(response, file, fileList) {
+      if(response.msg === 'ok' && response.code === 20000) {
+        this.productForm.content = response.data
+        this.videoFileList = [{
+          name: response.data,
+          url: response.data
+        }]
+      } else {
+        this.$message.error('上传失败: ' + response.msg);
+      }
+    },
+    handleVideoBeforeRemove(file, fileList){
+      return this.$confirm(`确定移除 ${ file.name }？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+      // return this.$confirm(`确定移除 ${ file.name }？`);
     },
     //音频删除
     handleVideoRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${ file.name }？`);
+      this.productForm.content = ''
+      this.videoFileList = []
+    },
+    onVideoExceed(){
+      this.$message.info('只允许上传一个视频')
     },
     //删除记录
-    handleDelete(row, index) {
-      this.$notify({
-        title: '提示',
-        message: '删除成功',
-        type: 'success',
-        duration: 2000
-      })
-      this.list.splice(index, 1)
+    async handleDelete(row, index) {
+      let ids = []
+      ids.push(row.id)
+      await remove({ids})
+      this.$notify.success('删除成功');
+      await this.getList()
     },
     //新增
     showDialog() {
@@ -348,6 +414,21 @@ export default {
     beforeRemove(file, fileList) {
       return this.$confirm(`确定移除 ${ file.name }？`);
     },
+    reset() {
+      this.productForm = {
+        id: undefined,
+        cover: '',
+        title: '',
+        try: '',
+        content: '',
+        price: undefined,
+        t_price: undefined,
+        type: 'video',
+        status: undefined
+      }
+      this.coverFileList = []
+      this.videoFileList = []
+    },
     //打开新增文章对话框
     openedDialog() {
       //需要使用opened事件，不能是open事件，因为open事件时$refs还未创建
@@ -355,27 +436,29 @@ export default {
         //如果是创建则清空上次数据
         //清除表单内容
         this.$refs['productForm'].resetFields();
-        //清空富文本内容
-        this.$refs.introduceTinymce.setContent('')
+        this.reset()
+        this.$nextTick(() => {
+          //清空富文本内容
+          this.$refs.introduceTinymce.setContent('')
+          this.$refs['productForm'].clearValidate()
+        })
       }
     },
     //新增文章
     createVideo(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.productForm.id = parseInt(Math.random() * 100) + 1024
-          this.productForm.created_time = getYmdHmsTimeStr()
-          this.productForm.updated_time = getYmdHmsTimeStr()
-          this.productForm.subscription = 0
-          createVideo(this.productForm).then(() => {
-            this.list.unshift(this.productForm)
+          this.btnLoading = true
+          create(this.productForm).then(() => {
             this.dialogVisible = false;
+            this.btnLoading = false
             this.$notify({
               message: '',
               type: "success",
               title: '成功',
               duration: 2000
             })
+            this.getList()
           })
         }
       })
@@ -388,17 +471,23 @@ export default {
     editVideo(row) {
       this.dialogStatus = 'edit'
       this.productForm = Object.assign({}, row)
+      this.coverFileList = [{
+        name: this.productForm.cover,
+        url: this.productForm.cover
+      }]
+      this.videoFileList = [{
+        name: this.productForm.content,
+        url: this.productForm.content
+      }]
       this.dialogVisible = true;
     },
     //更新
     updateVideo(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          let temp = Object.assign({}, this.productForm)
-          temp.updated_time = getYmdHmsTimeStr()
-          updateVideo(temp).then(() => {
-            let index = this.list.findIndex(item => item.id === temp.id)
-            this.list.splice(index, 1, temp)
+          this.btnLoading = true
+          update(this.productForm).then(() => {
+            this.btnLoading = false
             this.dialogVisible = false
             this.$notify({
               type: "success",
@@ -406,6 +495,7 @@ export default {
               message: '更新成功',
               duration: 2000
             })
+            this.getList()
           })
         }
       })
diff --git a/src/views/dashboard/admin/components/CardBox.vue b/src/views/dashboard/admin/components/CardBox.vue
new file mode 100644
index 0000000..a6f2ad7
--- /dev/null
+++ b/src/views/dashboard/admin/components/CardBox.vue
@@ -0,0 +1,43 @@
+<template>
+  <div>
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span>{{title}}</span>
+      </div>
+      <div style="padding: 30px 0 15px 0">
+        <el-row :gutter="20">
+         <el-col :span="12" v-for="item in data">
+           <div style="display: flex;align-items: center;border: 1px solid #cccccc;padding: 15px;border-radius: 8px;margin-bottom: 15px;cursor: pointer"
+                @click="goto(item.path)">
+             <i :class="item.icon" style="padding: 20px;background-color: pink;border-radius: 8px;font-size: 30px;color: red"></i>
+              <div style="margin-left: 15px">
+                <div>{{item.name}}</div>
+                <small style="margin-top: 10px">{{item.remark}}</small>
+              </div>
+           </div>
+         </el-col>
+        </el-row>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "CardBox",
+  props: {
+    title: String,
+    data: Array
+  },
+  methods: {
+    goto(name){
+      console.log(name)
+      this.$router.push({name})
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/admin/components/Course.vue b/src/views/dashboard/admin/components/Course.vue
new file mode 100644
index 0000000..be43b77
--- /dev/null
+++ b/src/views/dashboard/admin/components/Course.vue
@@ -0,0 +1,83 @@
+<template>
+  <div>
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span>{{title}}</span>
+      </div>
+      <div>
+        <el-table
+          :data="list"
+          v-loading="listLoading"
+          fit
+          highlight-current-row
+          style="width: 100%;">
+
+          <el-table-column label="标题" min-width="150px" align="center">
+            <template slot-scope="{row}">
+              <div style="display: flex">
+                <img
+                  :src="row.cover"
+                  style="width: 100px;height: 50px">
+                <div
+                  style="display: flex;flex-direction: column;justify-content: space-between;align-items:flex-start;margin-left: 10px">
+                  <span style="color:#0485fd;">{{ row.title }}</span>
+                  <span style="color: red">${{ row.price }}</span>
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="创建时间" width="180px" align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.created_time | timeFilter }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {fetchList} from '@/api/course'
+import {parseTime} from "@/utils";
+
+export default {
+  name: "Course",
+  props: {
+    title: String,
+  },
+  filters: {
+    timeFilter(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
+    }
+  },
+  data(){
+    return {
+      list: undefined,
+      listLoading: true,
+      listQuery: {
+        page: 1,
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.listLoading = true
+      fetchList(this.listQuery).then(response => {
+        this.list = response.data.items
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/admin/components/Order.vue b/src/views/dashboard/admin/components/Order.vue
new file mode 100644
index 0000000..28e8bcf
--- /dev/null
+++ b/src/views/dashboard/admin/components/Order.vue
@@ -0,0 +1,94 @@
+<template>
+  <div>
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span>{{title}}</span>
+      </div>
+      <div>
+        <el-table
+          ref="multiTable"
+          :data="list"
+          fit
+          v-loading="tableLoading"
+          highlight-current-row
+          style="width: 100%;height: 100%;overflow: auto">
+
+          <el-table-column label="订单号" width="110px" align="center">
+            <template slot-scope="{row}">
+              {{ row.no }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="商品名称" min-width="150px" align="center">
+            <template slot-scope="{row}">
+              {{ row.title }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="订单状态" width="110px" align="center">
+            <template slot-scope="{row}">
+              {{ statusOptions[row.status] }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="创建时间/支付时间" width="200px" align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.created_time | timeFilter }}</span><br/>
+              <span>{{ row.pay_time | timeFilter }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {fetchOrders} from '@/api/pay'
+import {parseTime} from "@/utils";
+
+export default {
+  name: "Order",
+  props: {
+    title: String,
+  },
+  filters: {
+    timeFilter(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
+    }
+  },
+  data() {
+    return {
+      statusOptions: {
+        'pending': '等待',
+        'success': '成功',
+        'fail': '失败'
+      },
+      list: [],
+      total: 0,
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      tableLoading: false
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      this.tableLoading = true
+      let res = await fetchOrders(this.listQuery)
+      this.tableLoading = false
+      this.list = res.data.items
+      this.total = res.data.total
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/dashboard/admin/components/PanelGroup.vue b/src/views/dashboard/admin/components/PanelGroup.vue
index 589236e..b8b6346 100644
--- a/src/views/dashboard/admin/components/PanelGroup.vue
+++ b/src/views/dashboard/admin/components/PanelGroup.vue
@@ -7,9 +7,9 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            New Visits
+            今日收入（元）
           </div>
-          <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="detail.today_income" :duration="2600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -20,9 +20,9 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            Messages
+            今日付费用户
           </div>
-          <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="detail.today_pay_user" :duration="3000" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -33,9 +33,9 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            Purchases
+            总付费用户
           </div>
-          <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="detail.total_pay_user" :duration="3200" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -46,9 +46,9 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            Shoppings
+            可提现（元）
           </div>
-          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="detail.balance" :duration="3600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -57,12 +57,30 @@
 
 <script>
 import CountTo from 'vue-count-to'
+import {statistics} from '@/api/school'
 
 export default {
   components: {
     CountTo
   },
+  created() {
+    this.getData()
+  },
+  data(){
+    return {
+      detail: {
+        "today_income": 0,
+        "today_pay_user": 0,
+        "total_pay_user": 0,
+        "balance": 0
+      }
+    }
+  },
   methods: {
+    async getData() {
+      const res = await statistics()
+      this.detail = res.data
+    },
     handleSetLineChartData(type) {
       this.$emit('handleSetLineChartData', type)
     }
diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue
index 8cb557b..3678211 100644
--- a/src/views/dashboard/admin/index.vue
+++ b/src/views/dashboard/admin/index.vue
@@ -1,96 +1,100 @@
 <template>
   <div class="dashboard-editor-container">
-    <github-corner class="github-corner" />
-
     <panel-group @handleSetLineChartData="handleSetLineChartData" />
 
-    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-      <line-chart :chart-data="lineChartData" />
-    </el-row>
-
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <raddar-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <pie-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <bar-chart />
-        </div>
-      </el-col>
+    <el-row :gutter="40">
+     <el-col :span="12">
+       <card-box title="运营小助手" :data="cardData1"></card-box>
+     </el-col>
+     <el-col :span="12">
+       <card-box title="常见功能" :data="cardData2"></card-box>
+     </el-col>
     </el-row>
 
-    <el-row :gutter="8">
-      <el-col :xs="{span: 24}" :sm="{span: 24}" :md="{span: 24}" :lg="{span: 12}" :xl="{span: 12}" style="padding-right:8px;margin-bottom:30px;">
-        <transaction-table />
-      </el-col>
-      <el-col :xs="{span: 24}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 6}" style="margin-bottom:30px;">
-        <todo-list />
+    <el-row :gutter="40" style="margin-top: 40px">
+      <el-col :span="12">
+        <course title="最新课程" :data="cardData1"></course>
       </el-col>
-      <el-col :xs="{span: 24}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 6}" style="margin-bottom:30px;">
-        <box-card />
+      <el-col :span="12">
+        <order title="最近订单" :data="cardData2"></order>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import GithubCorner from '@/components/GithubCorner'
 import PanelGroup from './components/PanelGroup'
-import LineChart from './components/LineChart'
-import RaddarChart from './components/RaddarChart'
-import PieChart from './components/PieChart'
-import BarChart from './components/BarChart'
-import TransactionTable from './components/TransactionTable'
-import TodoList from './components/TodoList'
-import BoxCard from './components/BoxCard'
-
-const lineChartData = {
-  newVisitis: {
-    expectedData: [100, 120, 161, 134, 105, 160, 165],
-    actualData: [120, 82, 91, 154, 162, 140, 145]
-  },
-  messages: {
-    expectedData: [200, 192, 120, 144, 160, 130, 140],
-    actualData: [180, 160, 151, 106, 145, 150, 130]
-  },
-  purchases: {
-    expectedData: [80, 100, 121, 104, 105, 90, 100],
-    actualData: [120, 90, 100, 138, 142, 130, 130]
-  },
-  shoppings: {
-    expectedData: [130, 140, 141, 142, 145, 150, 160],
-    actualData: [120, 82, 91, 154, 162, 140, 130]
-  }
-}
+import CardBox from './components/CardBox'
+import Course from './components/Course'
+import Order from './components/Order'
 
 export default {
   name: 'DashboardAdmin',
   components: {
-    GithubCorner,
     PanelGroup,
-    LineChart,
-    RaddarChart,
-    PieChart,
-    BarChart,
-    TransactionTable,
-    TodoList,
-    BoxCard
+    CardBox,
+    Course,
+    Order
   },
   data() {
     return {
-      lineChartData: lineChartData.newVisitis
+      cardData1: [
+        {
+          name: '拼团',
+          remark: '多人拼团享受优惠',
+          icon: 'el-icon-user',
+          path: 'Group'
+        },
+        {
+          name: '秒杀',
+          remark: '限时秒杀享低价',
+          icon: 'el-icon-info',
+          path: 'Flashsale'
+        },
+        {
+          name: '优惠卷',
+          remark: '有偿课程激励推广',
+          icon: 'el-icon-upload',
+          path: 'Coupon'
+        },
+        {
+          name: '限时折扣',
+          remark: '限时限量打折降价',
+          icon: 'el-icon-s-platform',
+          path: 'Flashsale'
+        },
+      ],
+      cardData2: [
+        {
+          name: '图文',
+          remark: '图文课程',
+          icon: 'el-icon-user',
+          path: 'Media'
+        },
+        {
+          name: '音频',
+          remark: '音频课程',
+          icon: 'el-icon-info',
+          path: 'Audio'
+        },
+        {
+          name: '视频',
+          remark: '视频课程',
+          icon: 'el-icon-upload',
+          path: 'Video'
+        },
+        {
+          name: '专栏',
+          remark: '专栏课程',
+          icon: 'el-icon-s-platform',
+          path: 'Column'
+        },
+      ]
     }
   },
   methods: {
     handleSetLineChartData(type) {
-      this.lineChartData = lineChartData[type]
+
     }
   }
 }
@@ -101,19 +105,6 @@ export default {
   padding: 32px;
   background-color: rgb(240, 242, 245);
   position: relative;
-
-  .github-corner {
-    position: absolute;
-    top: 0px;
-    border: 0;
-    right: 0;
-  }
-
-  .chart-wrapper {
-    background: #fff;
-    padding: 16px 16px 0;
-    margin-bottom: 32px;
-  }
 }
 
 @media (max-width:1024px) {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 1720ea8..3592e88 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -23,9 +23,9 @@ export default {
     ])
   },
   created() {
-    if (!this.roles.includes('admin')) {
-      this.currentRole = 'editorDashboard'
-    }
+    // if (!this.roles.includes('admin')) {
+    //   this.currentRole = 'editorDashboard'
+    // }
   }
 }
 </script>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index b873caf..3cca43d 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -3,7 +3,7 @@
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on" label-position="left">
 
       <div class="title-container">
-        <h3 class="title">Login Form</h3>
+        <h3 class="title">欢迎{{isLogin ? '登录' : '注册'}}</h3>
       </div>
 
       <el-form-item prop="username">
@@ -13,7 +13,7 @@
         <el-input
           ref="username"
           v-model="loginForm.username"
-          placeholder="Username"
+          placeholder="用户名"
           name="username"
           type="text"
           tabindex="1"
@@ -31,23 +31,44 @@
             ref="password"
             v-model="loginForm.password"
             :type="passwordType"
-            placeholder="Password"
+            placeholder="请输入密码"
             name="password"
             tabindex="2"
             autocomplete="on"
             @keyup.native="checkCapslock"
             @blur="capsTooltip = false"
-            @keyup.enter.native="handleLogin"
-          />
+            @keyup.enter.native="handleLoginOrReg"/>
           <span class="show-pwd" @click="showPwd">
             <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
           </span>
         </el-form-item>
       </el-tooltip>
 
-      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">Login</el-button>
+      <el-tooltip v-if="!isLogin" v-model="capsTooltip" content="Caps lock is On" placement="right" manual>
+        <el-form-item prop="repassword">
+          <span class="svg-container">
+            <svg-icon icon-class="password" />
+          </span>
+          <el-input
+            :key="repasswordType"
+            ref="repassword"
+            v-model="loginForm.repassword"
+            :type="repasswordType"
+            placeholder="请输入确认密码"
+            name="repassword"
+            tabindex="2"
+            autocomplete="on"
+            @keyup.enter.native="handleLoginOrReg"/>
+          <span class="show-pwd" @click="showRePwd">
+            <svg-icon :icon-class="repasswordType === 'password' ? 'eye' : 'eye-open'" />
+          </span>
+        </el-form-item>
+      </el-tooltip>
 
-      <div style="position:relative">
+      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:15px;margin-top: 10px" @click.native.prevent="handleLoginOrReg">{{isLogin ? '登 录' : '注 册'}}</el-button>
+      <el-button type="text" style="margin-left: 0;width: 100%;text-align: right;color: white" @click="change">{{isLogin ? '注 册' : '登 录'}}</el-button>
+
+<!--      <div style="position:relative">
         <div class="tips">
           <span>Username : admin</span>
           <span>Password : any</span>
@@ -56,57 +77,64 @@
           <span style="margin-right:18px;">Username : editor</span>
           <span>Password : any</span>
         </div>
-
-        <el-button class="thirdparty-button" type="primary" @click="showDialog=true">
-          Or connect with
-        </el-button>
-      </div>
+      </div>-->
     </el-form>
-
-    <el-dialog title="Or connect with" :visible.sync="showDialog">
-      Can not be simulated on local, so please combine you own business simulation! ! !
-      <br>
-      <br>
-      <br>
-      <social-sign />
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { validUsername } from '@/utils/validate'
-import SocialSign from './components/SocialSignin'
+
+import {login, register} from "@/api/user";
+import { Message } from 'element-ui'
 
 export default {
   name: 'Login',
-  components: { SocialSign },
-  data() {
-    const validateUsername = (rule, value, callback) => {
-      if (!validUsername(value)) {
-        callback(new Error('Please enter the correct user name'))
-      } else {
-        callback()
+  computed: {
+    loginRules() {
+      let validatePassword = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入密码'));
+        } else {
+          if (this.loginForm.repassword !== '') {
+            this.$refs.loginForm.validateField('repassword');
+          }
+          callback();
+        }
       }
-    }
-    const validatePassword = (rule, value, callback) => {
-      if (value.length < 6) {
-        callback(new Error('The password can not be less than 6 digits'))
-      } else {
-        callback()
+      let validateRePassword = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请再次输入密码'));
+        } else if (value !== this.loginForm.password) {
+          callback(new Error('两次输入密码不一致!'));
+        } else {
+          callback();
+        }
+      }
+      let rules = {
+        username: [{ required: true, trigger: 'blur', message: "请输入用户名" }],
+        password: [{ required: true, trigger: 'blur', validator: validatePassword }]
       }
+
+      if(!this.isLogin) {
+        rules['repassword'] = [{ required: true, trigger: 'blur', validator: validateRePassword }]
+      }
+
+      return rules
     }
+  },
+  data() {
     return {
+      isLogin: true,
       loginForm: {
-        username: 'admin',
-        password: '111111'
-      },
-      loginRules: {
-        username: [{ required: true, trigger: 'blur', validator: validateUsername }],
-        password: [{ required: true, trigger: 'blur', validator: validatePassword }]
+        username: '',
+        password: '',
+        repassword: '',
       },
       passwordType: 'password',
+      repasswordType: 'password',
       capsTooltip: false,
       loading: false,
+      regLoading: false,
       showDialog: false,
       redirect: undefined,
       otherQuery: {}
@@ -115,6 +143,8 @@ export default {
   watch: {
     $route: {
       handler: function(route) {
+        //解析地址http://localhost:9527/#/login?redirect=/marketing/splashsale&key=value
+        //redirect未跳转地址，其它为跳转地址的参数
         const query = route.query
         if (query) {
           this.redirect = query.redirect
@@ -152,25 +182,69 @@ export default {
         this.$refs.password.focus()
       })
     },
-    handleLogin() {
+    showRePwd(){
+      if (this.repasswordType === 'password') {
+        this.repasswordType = ''
+      } else {
+        this.repasswordType = 'password'
+      }
+      this.$nextTick(() => {
+        this.$refs.repassword.focus()
+      })
+    },
+    handleLoginOrReg() {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
-          this.$store.dispatch('user/login', this.loginForm)
-            .then(() => {
-              // this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
-              this.$router.push({ path: '/' })
-              this.loading = false
-            })
-            .catch(() => {
-              this.loading = false
-            })
+          if(this.isLogin) {
+            this.login()
+          }else {
+            this.register()
+          }
         } else {
           console.log('error submit!!')
           return false
         }
       })
     },
+    login() {
+      this.$store.dispatch('user/login', this.loginForm)
+        .then(() => {
+          //前面解析得到的数据在这里进行目标地址跳转，我们这里暂时用不到
+          // this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
+          Message.success('登录成功')
+          this.$router.push({ path: '/' })
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    register() {
+      this.$store.dispatch('user/register', this.loginForm)
+        .then(() => {
+          Message.success('注册成功')
+          this.isLogin = true
+          this.resetForm()
+          this.$router.push({ path: '/login' })
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    change() {
+      this.isLogin = !this.isLogin
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs.loginForm.clearValidate()
+      })
+    },
+    resetForm() {
+      this.loginForm.username = ''
+      this.loginForm.password = ''
+      this.loginForm.repassword = ''
+    },
     getOtherQuery(query) {
       return Object.keys(query).reduce((acc, cur) => {
         if (cur !== 'redirect') {
diff --git a/src/views/marketing/coupon.vue b/src/views/marketing/coupon.vue
index 1b23bb3..75d4b59 100644
--- a/src/views/marketing/coupon.vue
+++ b/src/views/marketing/coupon.vue
@@ -41,13 +41,13 @@
 
       <el-table-column label="发行量" width="120px" align="center">
         <template slot-scope="{row}">
-          {{ row.circulation }}
+          {{ row.c_num }}
         </template>
       </el-table-column>
 
       <el-table-column label="已领取" width="120px" align="center">
         <template slot-scope="{row}">
-          {{ row.received }}
+          {{ row.received_num }}
         </template>
       </el-table-column>
 
@@ -109,8 +109,12 @@
           <el-input-number v-model="form.price" :min="0" label="面值"></el-input-number>
         </el-form-item>
 
-        <el-form-item label="发行量" required prop="circulation">
-          <el-input-number v-model="form.circulation" :min="0" label="发行量"></el-input-number>
+        <el-form-item label="发行量" required prop="c_num">
+          <el-input-number v-model="form.c_num" :min="0" label="发行量"></el-input-number>
+        </el-form-item>
+
+        <el-form-item label="使用条件" required prop="condition">
+          <el-input-number v-model="form.condition" :min="0" label="使用条件"></el-input-number>
         </el-form-item>
 
         <el-form-item label="使用期限" required prop="startEndTime">
@@ -143,6 +147,7 @@ import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import {fetchCoupon, couponTakeOff, couponAdd, couponEdit} from '@/api/marketing'
 import ChooseCourse from "@/components/ChooseCourse";
+import {parseTime} from "@/utils";
 
 export default {
   name: "coupon",
@@ -180,9 +185,14 @@ export default {
       form: {
         id: undefined,
         type: '',
+        goods_id: undefined,
         associateCourse: undefined,
         price: undefined,
-        circulation: undefined,
+        c_num: undefined,
+        condition: undefined,
+        status: 1,
+        start_time: undefined,
+        end_time: undefined,
         startEndTime: undefined,
       },
       rules: {
@@ -195,9 +205,12 @@ export default {
         price: [
           {required: true, message: '请设置面值', trigger: 'change'},
         ],
-        circulation: [
+        c_num: [
           {required: true, message: '请设置发行量', trigger: 'change'},
         ],
+        condition: [
+          {required: true, message: '请设置满多少元可用', trigger: 'change'},
+        ],
         startEndTime: [
           {required: true, message: '请选择使用期限', trigger: 'change'},
         ]
@@ -231,6 +244,8 @@ export default {
       if (res.code === 20000) {
         this.list = res.data.items.map(item => {
           item.time_status = this.getTimeStatus(item)
+          item.start_time = this.timeFormat(item.start_time)
+          item.end_time = this.timeFormat(item.end_time)
           return item
         })
         this.total = res.data.total
@@ -244,12 +259,14 @@ export default {
       this.dialogType = 'edit'
       this.form.id = row.id
       this.form.type = row.type
+      this.form.goods_id = row.goods_id
       this.form.associateCourse = {}
       this.form.associateCourse.cover = row.value.cover
       this.form.associateCourse.title = row.value.title
       this.form.associateCourse.price = row.value.price
       this.form.price = row.price
-      this.form.circulation = row.circulation
+      this.form.c_num = row.c_num
+      this.form.condition = row.condition
       this.form.startEndTime = [row.start_time, row.end_time]
       this.dialogVisible = true
     },
@@ -281,6 +298,8 @@ export default {
       })
     },
     async commit(){
+      this.form.start_time = this.form.startEndTime[0]
+      this.form.end_time = this.form.startEndTime[1]
       if(this.dialogType === 'add') {
         const res = await couponAdd(this.form)
         this.dialogVisible = false
@@ -305,19 +324,29 @@ export default {
       this.form = {
         id: undefined,
         type: '',
+        goods_id: undefined,
         associateCourse: undefined,
         price: undefined,
-        circulation: undefined,
+        c_num: undefined,
+        condition: undefined,
+        status: 1,
+        start_time: undefined,
+        end_time: undefined,
         startEndTime: undefined,
       }
     },
     associateCourse(){
       this.$refs.chooseCourse.open(data => {
         this.form.associateCourse = {}
+        this.form.goods_id = data[0].id
         this.form.associateCourse.cover = data[0].cover
         this.form.associateCourse.title = data[0].title
         this.form.associateCourse.price = data[0].price
       })
+    },
+    timeFormat(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
     }
   }
 }
diff --git a/src/views/marketing/group.vue b/src/views/marketing/group.vue
index 6b3be5a..da6b8b4 100644
--- a/src/views/marketing/group.vue
+++ b/src/views/marketing/group.vue
@@ -91,17 +91,17 @@
           </el-card>
         </el-form-item>
 
-        <el-form-item label="拼团价" required prop="groupPrice">
-          <el-input-number v-model="form.groupPrice" :min="0" label="拼团价"></el-input-number>
+        <el-form-item label="拼团价" required prop="price">
+          <el-input-number v-model="form.price" :min="0" label="拼团价"></el-input-number>
         </el-form-item>
 
-        <el-form-item label="拼团人数" required prop="groupPeople">
-          <el-input-number v-model="form.groupPeople" :min="0" label="拼团人数"></el-input-number>
+        <el-form-item label="拼团人数" required prop="p_num">
+          <el-input-number v-model="form.p_num" :min="0" label="拼团人数"></el-input-number>
         </el-form-item>
 
-        <el-form-item label="是否开启凑团" prop="isCouTuan">
+        <el-form-item label="是否开启凑团" prop="auto">
           <template>
-            <el-radio-group v-model="form.isCouTuan">
+            <el-radio-group v-model="form.auto">
               <el-radio :label="0">否</el-radio>
               <el-radio :label="1">是</el-radio>
             </el-radio-group>
@@ -147,6 +147,7 @@ import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import {fetchGroup, groupTakeOff, groupAdd, groupEdit} from '@/api/marketing'
 import ChooseCourse from "@/components/ChooseCourse";
+import {parseTime} from '@/utils'
 
 export default {
   name: "group",
@@ -183,11 +184,15 @@ export default {
       form: {
         id: undefined,
         type: '',
+        goods_id: undefined,
         associateCourse: undefined,
-        groupPrice: undefined,
-        groupPeople: undefined,
-        isCouTuan: undefined,
+        price: undefined,
+        p_num: undefined,
+        auto: undefined,
         expire: undefined,
+        status: 1,
+        start_time: undefined,
+        end_time: undefined,
         startEndTime: undefined,
       },
       rules: {
@@ -197,13 +202,13 @@ export default {
         associateCourse: [
           {required: true, validator: validateAssociateCourse, trigger: 'blur'},
         ],
-        groupPrice: [
+        price: [
           {required: true, message: '请设置拼团价格', trigger: 'change'},
         ],
-        groupPeople: [
+        p_num: [
           {required: true, message: '请设置拼团人数', trigger: 'change'},
         ],
-        isCouTuan: [
+        auto: [
           {required: true, message: '请选择是否开启凑团', trigger: 'change'},
         ],
         expire: [
@@ -242,6 +247,8 @@ export default {
       if (res.code === 20000) {
         this.list = res.data.items.map(item => {
           item.time_status = this.getTimeStatus(item)
+          item.start_time = this.timeFormat(item.start_time)
+          item.end_time = this.timeFormat(item.end_time)
           return item
         })
         this.total = res.data.total
@@ -253,19 +260,18 @@ export default {
     },
     editItem(row) {
       this.dialogType = 'edit'
-      console.log(row)
       this.form.id = row.id
       this.form.type = row.type
-      this.form.associateCourse = {},
+      this.form.goods_id = row.goods_id
+      this.form.associateCourse = {}
       this.form.associateCourse.cover = row.value.cover
       this.form.associateCourse.title = row.value.title
       this.form.associateCourse.price = row.value.price
-      this.form.groupPrice = row.price
-      this.form.groupPeople = row.p_num
-      this.form.isCouTuan = row.auto
+      this.form.price = row.price
+      this.form.p_num = row.p_num
+      this.form.auto = row.auto
       this.form.expire = row.expire
       this.form.startEndTime = [row.start_time, row.end_time]
-      console.log(this.form)
       this.dialogVisible = true
     },
     deleteItem(row) {
@@ -274,7 +280,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(action => {
-        groupTakeOff({id: row.id}).then(res => {
+        groupTakeOff({id: row.id, status: 1}).then(res => {
           console.log(this.list)
           this.$message.success('下架成功')
           this.getList()
@@ -296,7 +302,8 @@ export default {
       })
     },
     async commit(){
-      console.log(this.form)
+      this.form.start_time = this.form.startEndTime[0]
+      this.form.end_time = this.form.startEndTime[1]
       if(this.dialogType === 'add') {
         const res = await groupAdd(this.form)
         this.dialogVisible = false
@@ -321,21 +328,30 @@ export default {
       this.form = {
         id: undefined,
         type: '',
+        goods_id: undefined,
         associateCourse: undefined,
-        groupPrice: undefined,
-        groupPeople: undefined,
-        isCouTuan: undefined,
-        startEndTime: undefined,
+        price: undefined,
+        p_num: undefined,
+        auto: undefined,
         expire: undefined,
+        status: 1,
+        start_time: undefined,
+        end_time: undefined,
+        startEndTime: undefined,
       }
     },
     associateCourse(){
       this.$refs.chooseCourse.open(data => {
         this.form.associateCourse = {}
+        this.form.goods_id = data[0].id
         this.form.associateCourse.cover = data[0].cover
         this.form.associateCourse.title = data[0].title
         this.form.associateCourse.price = data[0].price
       })
+    },
+    timeFormat(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
     }
   }
 }
diff --git a/src/views/marketing/splashsale.vue b/src/views/marketing/splashsale.vue
index 8ed79e4..2e287ea 100644
--- a/src/views/marketing/splashsale.vue
+++ b/src/views/marketing/splashsale.vue
@@ -33,7 +33,7 @@
 
       <el-table-column label="限制人数" width="250px" align="center">
         <template slot-scope="{row}">
-          {{ row.limit_num }}
+          {{ row.s_num }}
         </template>
       </el-table-column>
 
@@ -91,12 +91,12 @@
           </el-card>
         </el-form-item>
 
-        <el-form-item label="秒杀价" required prop="groupPrice">
-          <el-input-number v-model="form.groupPrice" :min="0" label="秒杀价"></el-input-number>
+        <el-form-item label="秒杀价" required prop="price">
+          <el-input-number v-model="form.price" :min="0" label="秒杀价"></el-input-number>
         </el-form-item>
 
-        <el-form-item label="秒杀人数" required prop="groupPeople">
-          <el-input-number v-model="form.groupPeople" :min="0" label="秒杀人数"></el-input-number>
+        <el-form-item label="秒杀人数" required prop="s_num">
+          <el-input-number v-model="form.s_num" :min="0" label="秒杀人数"></el-input-number>
         </el-form-item>
 
         <el-form-item label="秒杀活动时间" required prop="startEndTime">
@@ -129,6 +129,7 @@ import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import {fetchSplash, splashTakeOff, splashAdd, splashEdit} from '@/api/marketing'
 import ChooseCourse from "@/components/ChooseCourse";
+import {parseTime} from "@/utils";
 
 export default {
   name: "splashsale",
@@ -165,9 +166,13 @@ export default {
       form: {
         id: undefined,
         type: '',
+        goods_id: undefined,
         associateCourse: undefined,
-        groupPrice: undefined,
-        groupPeople: undefined,
+        price: undefined,
+        s_num: undefined,
+        status: 1,
+        start_time: undefined,
+        end_time: undefined,
         startEndTime: undefined,
       },
       rules: {
@@ -177,10 +182,10 @@ export default {
         associateCourse: [
           {required: true, validator: validateAssociateCourse, trigger: 'blur'},
         ],
-        groupPrice: [
+        price: [
           {required: true, message: '请设置秒杀价格', trigger: 'change'},
         ],
-        groupPeople: [
+        s_num: [
           {required: true, message: '请设置秒杀人数', trigger: 'change'},
         ],
         startEndTime: [
@@ -216,6 +221,8 @@ export default {
       if (res.code === 20000) {
         this.list = res.data.items.map(item => {
           item.time_status = this.getTimeStatus(item)
+          item.start_time = this.timeFormat(item.start_time)
+          item.end_time = this.timeFormat(item.end_time)
           return item
         })
         this.total = res.data.total
@@ -229,12 +236,13 @@ export default {
       this.dialogType = 'edit'
       this.form.id = row.id
       this.form.type = row.type
+      this.form.goods_id = row.goods_id
       this.form.associateCourse = {}
       this.form.associateCourse.cover = row.value.cover
       this.form.associateCourse.title = row.value.title
       this.form.associateCourse.price = row.value.price
-      this.form.groupPrice = row.price
-      this.form.groupPeople = row.limit_num
+      this.form.price = row.price
+      this.form.s_num = row.s_num
       this.form.startEndTime = [row.start_time, row.end_time]
       this.dialogVisible = true
     },
@@ -244,7 +252,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(action => {
-        splashTakeOff({id: row.id}).then(res => {
+        splashTakeOff({id: row.id, status: 1}).then(res => {
           console.log(this.list)
           this.$message.success('下架成功')
           this.getList()
@@ -266,7 +274,8 @@ export default {
       })
     },
     async commit(){
-      console.log(this.form)
+      this.form.start_time = this.form.startEndTime[0]
+      this.form.end_time = this.form.startEndTime[1]
       if(this.dialogType === 'add') {
         const res = await splashAdd(this.form)
         this.dialogVisible = false
@@ -291,19 +300,28 @@ export default {
       this.form = {
         id: undefined,
         type: '',
+        goods_id: '',
         associateCourse: undefined,
-        groupPrice: undefined,
-        groupPeople: undefined,
+        price: undefined,
+        s_num: undefined,
+        status: 1,
+        start_time: undefined,
+        end_time: undefined,
         startEndTime: undefined,
       }
     },
     associateCourse(){
       this.$refs.chooseCourse.open(data => {
         this.form.associateCourse = {}
+        this.form.goods_id = data[0].id
         this.form.associateCourse.cover = data[0].cover
         this.form.associateCourse.title = data[0].title
         this.form.associateCourse.price = data[0].price
       })
+    },
+    timeFormat(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
     }
   }
 }
diff --git a/src/views/my-pay/asset.vue b/src/views/my-pay/asset.vue
index fc97043..56fc513 100644
--- a/src/views/my-pay/asset.vue
+++ b/src/views/my-pay/asset.vue
@@ -2,39 +2,39 @@
   <div class="app-container">
     <div>
       <el-row :gutter="20">
-        <el-col :span="6">
+        <el-col :span="8">
           <el-card class="box-card">
             <div slot="header" style="font-size: 16px;display: flex;justify-content: space-between;align-items: center;height: 18.4px">
               <span>可用余额（元）</span>
               <el-button type="primary" @click="cashOut">申请提现</el-button>
             </div>
-            <span style="font-size: 40px;font-weight: bold">{{ availableAmount }}</span>
+            <span style="font-size: 40px;font-weight: bold">{{ schoolDetail.balance }}</span>
           </el-card>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-card class="box-card">
             <div slot="header" class="clearfix" style="font-size: 16px">
               <span>累计收入（元）</span>
             </div>
-            <span style="font-size: 40px;font-weight: bold">20.00</span>
+            <span style="font-size: 40px;font-weight: bold">{{ schoolDetail.w_balance }}</span>
           </el-card>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-card class="box-card">
             <div slot="header" class="clearfix" style="font-size: 16px">
               <span>待结算金额（元）</span>
             </div>
-            <span style="font-size: 40px;font-weight: bold">20.00</span>
+            <span style="font-size: 40px;font-weight: bold">{{ schoolDetail.t_balance }}</span>
           </el-card>
         </el-col>
-        <el-col :span="6">
+<!--        <el-col :span="6">
           <el-card class="box-card">
             <div slot="header" class="clearfix" style="font-size: 16px">
               <span>冻结金额（元）</span>
             </div>
             <span style="font-size: 40px;font-weight: bold">10.00</span>
           </el-card>
-        </el-col>
+        </el-col>-->
       </el-row>
     </div>
 
@@ -50,7 +50,7 @@
 
       <el-table-column label="交易日期" width="200px" align="center">
         <template slot-scope="{row}">
-          {{ row.created_time }}
+          {{ row.created_time | timeFilter }}
         </template>
       </el-table-column>
 
@@ -92,8 +92,8 @@
           <el-input-number v-model="form.price" :min="0" label="提现金额"></el-input-number>
         </el-form-item>
 
-        <el-form-item label="提现账户" required prop="accountId">
-          <el-select v-model="form.accountId" placeholder="请选择" style="width: 270px">
+        <el-form-item label="提现账户" required prop="cash_id">
+          <el-select v-model="form.cash_id" placeholder="请选择" style="width: 270px">
             <el-option
               v-for="item in accounts"
               :key="item.id"
@@ -119,10 +119,18 @@
 import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import {fetchCashOut, fetchAccounts, cashOut} from '@/api/pay'
+import {fetchSchoolDetail} from '@/api/school'
+import {parseTime} from "@/utils";
 export default {
   name: "Asset",
   components: {Pagination},
   directives: {waves},
+  filters: {
+    timeFilter(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
+    }
+  },
   data(){
     const validatePrice = (rule, value, callback) => {
       if (value > this.availableAmount) {
@@ -134,7 +142,6 @@ export default {
       }
     }
     return {
-      availableAmount: 20.00,
       showLoading: false,
       list: [],
       total: 0,
@@ -145,17 +152,22 @@ export default {
       dialogVisible: false,
       form: {
         price: 0,
-        accountId: ''
+        cash_id: ''
       },
       rules: {
         price: [
           {validator: validatePrice, trigger: 'blur'},
         ],
-        accountId: [
+        cash_id: [
           {required: true, message: '请输入提现账户', trigger: 'change'},
         ]
       },
       accounts: [],
+      schoolDetail: {
+        balance: 0,
+        w_balance: 0,
+        t_balance: 0,
+      }
     }
   },
   created(){
@@ -163,8 +175,11 @@ export default {
   },
   methods: {
     async getList() {
+      let res = await fetchSchoolDetail()
+      this.schoolDetail = res.data
+
       this.showLoading = true
-      const res = await fetchCashOut(this.listQuery)
+      res = await fetchCashOut(this.listQuery)
       this.showLoading = false
       if(res.code === 20000) {
         this.list = res.data.items
@@ -197,7 +212,7 @@ export default {
           this.dialogVisible = false;
           this.form = {
             price: 0,
-            accountId: ''
+            cash_id: ''
           }
           if(res.code === 20000) {
             this.$message.success('提现成功')
diff --git a/src/views/my-pay/order.vue b/src/views/my-pay/order.vue
index d4febe7..4decede 100644
--- a/src/views/my-pay/order.vue
+++ b/src/views/my-pay/order.vue
@@ -29,6 +29,7 @@
       :data="list"
       border
       fit
+      v-loading="tableLoading"
       highlight-current-row
       style="width: 100%;height: 100%;overflow: auto"
       @selection-change="handleSelectionChange">
@@ -77,8 +78,8 @@
 
       <el-table-column label="创建时间/支付时间" width="200px" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.created_time }}</span><br/>
-          <span>{{ row.pay_time }}</span>
+          <span>{{ row.created_time | timeFilter }}</span><br/>
+          <span>{{ row.pay_time | timeFilter }}</span>
         </template>
       </el-table-column>
 
@@ -101,7 +102,7 @@
 <script>
 import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
-import {getOrders, orderDel} from '@/api/pay'
+import {fetchOrders, removeOrder} from '@/api/pay'
 import {parseTime} from "@/utils";
 
 
@@ -109,6 +110,12 @@ export default {
   name: "Order",
   components: {Pagination},
   directives: {waves},
+  filters: {
+    timeFilter(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
+    }
+  },
   data() {
     return {
       list: [],
@@ -132,7 +139,8 @@ export default {
         'wechat': '微信',
       },
       multiSelections: [],
-      downloadLoading: false
+      downloadLoading: false,
+      tableLoading: false
     }
   },
   created() {
@@ -140,11 +148,11 @@ export default {
   },
   methods: {
     async getList() {
-      let res = await getOrders(this.listQuery)
-      if (res.code === 20000) {
-        this.list = res.data.items
-        this.total = res.data.total
-      }
+      this.tableLoading = true
+      let res = await fetchOrders(this.listQuery)
+      this.tableLoading = false
+      this.list = res.data.items
+      this.total = res.data.total
     },
     handleSelectionChange(val) {
       this.multiSelections = val
@@ -155,11 +163,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(action => {
-        // let index = this.list.findIndex(item => row.no == item.no)
-        // console.log(row.no, index)
-        // this.list.splice(index, 1)
-        // console.log(this.list)
-        orderDel({no: row.no}).then(res => {
+        removeOrder({ids: [row.id]}).then(res => {
           if (res.code === 20000) {
             this.getList()
             this.$notify({
diff --git a/src/views/my-pay/payment.vue b/src/views/my-pay/payment.vue
index 418b8a3..135e93f 100644
--- a/src/views/my-pay/payment.vue
+++ b/src/views/my-pay/payment.vue
@@ -27,9 +27,9 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="开户行" width="250px" align="center">
+      <el-table-column label="开户行" width="400px" align="center">
         <template slot-scope="{row}">
-          {{ row.address }}
+          {{ row.province }} {{ row.city }} {{ row.area }} {{ row.bank }}
         </template>
       </el-table-column>
 
@@ -76,8 +76,8 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="地址" required prop="address">
-          <el-input v-model="form.address" style="width: 250px"
+        <el-form-item label="地址" required prop="path">
+          <el-input v-model="form.path" style="width: 250px"
                     type="textarea"
                     :rows="2"></el-input>
         </el-form-item>
@@ -86,13 +86,13 @@
           <el-input v-model="form.name" style="width: 250px"></el-input>
         </el-form-item>
 
-        <el-form-item label="身份证" required prop="cardId">
+<!--        <el-form-item label="身份证" required prop="cardId">
           <el-input v-model="form.cardId" style="width: 250px"></el-input>
         </el-form-item>
 
         <el-form-item label="手机号" required prop="phoneNumber">
           <el-input v-model="form.phoneNumber" style="width: 250px"></el-input>
-        </el-form-item>
+        </el-form-item>-->
 
       </el-form>
       <span style="display:block;text-align: center">
@@ -108,7 +108,7 @@ import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import VDistpicker from 'v-distpicker'
 import {getBank} from '@/utils/bank.js'
-import {fetchAccounts, delAccount, addAccount} from '@/api/pay'
+import {fetchAccounts, addAccount, delAccount, updateAccount} from '@/api/pay'
 
 export default {
   name: "Payment",
@@ -135,7 +135,8 @@ export default {
         province: '',
         city: '',
         area: '',
-        address: ''
+        path: '',
+        status: 1
       },
       rules: {
         account: [
@@ -154,11 +155,11 @@ export default {
         bank: [
           {required: true, message: '请选择银行', trigger: 'change'},
         ],
-        address: [
+        path: [
           {required: true, message: '请输入地址', trigger: 'blur'},
         ]
       },
-      banks: [],
+      banks: []
     }
   },
   created() {
@@ -170,11 +171,8 @@ export default {
       this.loadingShow = true
       const res = await fetchAccounts(this.listQuery)
       this.loadingShow = false
-      console.log(res)
-      if(res.code === 20000) {
-        this.list = res.data.items
-        this.total = res.data.total
-      }
+      this.list = res.data.items
+      this.total = res.data.total
     },
     addAccount(){
       this.form.dialogType = 'add'
@@ -191,7 +189,7 @@ export default {
       this.form.province = row.province
       this.form.city = row.city
       this.form.area = row.area
-      this.form.address = row.address
+      this.form.path = row.path
       this.dialogVisible = true;
     },
     deleteItem(row){
@@ -200,7 +198,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(action => {
-        delAccount({accountId: row.account}).then(res => {
+        delAccount({ids: [row.id]}).then(res => {
           if (res.code === 20000) {
             this.getList()
             this.$notify({
@@ -218,7 +216,7 @@ export default {
       })
     },
     submit() {
-      this.$refs.form.validate(valid => {
+      this.$refs.form.validate( async valid => {
         if(!valid){
           return
         }
@@ -229,18 +227,14 @@ export default {
           return;
         }
 
-        addAccount(this.form).then(res => {
-          this.dialogVisible = false
-          if(res.code === 20000) {
-            this.getList()
-            this.$notify({
-              type: 'success',
-              message: this.form.dialogType === 'add' ? '添加成功' : '更新成功',
-              duration: 2000,
-              title: '成功'
-            })
-          }
-        })
+        if(this.form.dialogType === 'add') {
+          await addAccount(this.form)
+        }else {
+          await updateAccount(this.form)
+        }
+        this.dialogVisible = false
+        this.$notify.success(this.form.dialogType === 'add' ? '添加成功' : '更新成功')
+        await this.getList()
       })
     },
     reset() {
@@ -254,7 +248,7 @@ export default {
         province: '',
         city: '',
         area: '',
-        address: ''
+        path: ''
       }
     },
     province(e, key){
diff --git a/src/views/platform/index.vue b/src/views/platform/index.vue
new file mode 100644
index 0000000..9adaa2f
--- /dev/null
+++ b/src/views/platform/index.vue
@@ -0,0 +1,293 @@
+<template>
+  <div class="app-container">
+    <Navbar :isShowMenu="false"></Navbar>
+
+    <div class="filter-container" style="display: flex;justify-content: space-between">
+      <el-button v-waves class="filter-item" type="primary"
+                 @click="createRole" style="margin-left: 20px">创建角色
+      </el-button>
+    </div>
+
+    <el-table
+      ref="multiTable"
+      :data="list"
+      border
+      fit
+      v-loading="loadingShow"
+      highlight-current-row
+      style="width: 100%;height: 100%;overflow: auto">
+
+      <el-table-column label="角色key" width="250px" align="center">
+        <template slot-scope="{row}">
+          {{ row.role_id }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="角色名称" width="300px" align="center">
+        <template slot-scope="{row}">
+          {{ row.name }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="角色描述" min-width="200px" align="center">
+        <template slot-scope="{row}">
+          {{ row.desc }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" width="300px" align="center">
+        <template slot-scope="{row, $index}">
+          <el-button v-if="row.id === 2 || row.id === 4" type="info" size="mini" @click="checkAuth(row)">
+            查看权限
+          </el-button>
+          <div v-else>
+            <el-button type="success" size="mini" @click="updateRole(row)">
+              修改
+            </el-button>
+
+            <el-button type="primary" size="mini" @click="checkAuth(row)">
+              配置权限
+            </el-button>
+
+            <el-button type="danger" size="mini" @click="delRole(row)">
+              删除
+            </el-button>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!--分页-->
+    <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit"
+                @pagination="getList" style="padding-left: 0;text-align: center;margin-top: 0px"/>
+
+    <el-dialog
+      title="创建角色"
+      :visible.sync="createRoleDialogVisible"
+      @close='closeRoleDialog'>
+      <el-form :model="createRoleForm" :rules="createRoleRules" ref="createRoleform" label-width="130px">
+
+        <el-form-item label="角色名称" required prop="name">
+          <el-input v-model="createRoleForm.name" placeholder="角色名称"></el-input>
+        </el-form-item>
+
+        <el-form-item label="角色唯一标识" required prop="role_id">
+          <el-input v-model="createRoleForm.role_id" placeholder="角色唯一标识"></el-input>
+        </el-form-item>
+
+        <el-form-item label="角色描述">
+          <el-input v-model="createRoleForm.desc" placeholder="角色描述"></el-input>
+        </el-form-item>
+
+      </el-form>
+      <span style="display:block;text-align: center">
+        <el-button @click="createRoleDialogVisible=false">取 消</el-button>
+        <el-button type="primary" @click="submitRole">{{ roleDialogType === 'create' ? '创 建' : '更 新' }}</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog
+      :title="showCheckbox ? '配置权限' : '查看权限'"
+      :visible.sync="dialogVisible"
+      @close='closeCheckAuthDialog'>
+      <el-form :model="roleForm" label-width="130px" v-loading="dialogLoadingShow">
+        <el-form-item label="角色名称">
+          {{ roleForm.name }}
+        </el-form-item>
+
+        <el-form-item label="菜单">
+<!--          因为el-tree设置默认选中项有缓存不会重新加载数据，因此使用v-if的方式让其重新渲染-->
+          <el-tree ref="menuRef" v-if="loadTree" :data="showCheckbox ? all.menus : role.menus" :props="treeProps" :show-checkbox="showCheckbox"
+                   node-key="id" :default-checked-keys="role.menuId"/>
+        </el-form-item>
+
+        <el-form-item label="权限">
+          <el-tree ref="accessRef" v-if="loadTree" :data="showCheckbox ? all.accesses : role.accesses" :props="treeProps" :show-checkbox="showCheckbox"
+                   node-key="id"  :default-checked-keys="role.accessId"/>
+        </el-form-item>
+      </el-form>
+
+      <span style="display:block;text-align: center">
+        <el-button @click="dialogVisible=false">取 消</el-button>
+        <el-button type="primary" @click="updateMenuAndAccess" v-loading="btnLoading">{{btnLoading ? '提交中...' : '提 交'}}</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import waves from '@/directive/waves' // waves directive
+import Pagination from '@/components/Pagination' // secondary package based on el-pagination
+import {fetchRoles, createRole, updateRole, removeRole, fetchRoleAuth, fetchAllMenu, fetchAllAccess
+ ,setMenuAccess} from '@/api/platform'
+import Navbar from "@/layout/components/Navbar";
+
+export default {
+  name: "role",
+  components: {Navbar, Pagination},
+  directives: {waves},
+  data() {
+    return {
+      list: [],
+      total: 0,
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      loadingShow: false,
+      dialogVisible: false,
+      roleForm: {
+        name: undefined
+      },
+      showCheckbox: true,
+      all: {
+        menus: [],
+        accesses: []
+      },
+      role: {
+        id: undefined,
+        menus: [],
+        accesses: [],
+        menuId: [],
+        accessId: [],
+      },
+      treeProps: {
+        children: 'children',
+        label: 'title'
+      },
+      roleDialogType: '',
+      createRoleDialogVisible: false,
+      createRoleForm: {
+        id: undefined,
+        name: undefined,
+        role_id: undefined,
+        status: 1,
+        desc: undefined
+      },
+      createRoleRules: {
+        name: [
+          {required: true, message: '请输入角色名称', trigger: 'blur'},
+        ],
+        role_id: [
+          {required: true, message: '请输入角色唯一标识', trigger: 'blur'},
+        ]
+      },
+      dialogLoadingShow: false,
+      loadTree: false,
+      btnLoading: false
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      this.loadingShow = true
+      const res = await fetchRoles(this.listQuery)
+      this.loadingShow = false
+      this.list = res.data.items
+      this.total = res.data.total
+    },
+    async getAllMenuAndAccesses(){
+      //加载所有menu和access
+      if(this.all.menus.length === 0){
+        const res = await fetchAllMenu()
+        this.all.menus = res.data.items
+      }
+      if(this.all.accesses.length === 0) {
+        const res = await fetchAllAccess()
+        this.all.accesses = res.data.items
+      }
+    },
+    async checkAuth(row) {
+      this.showCheckbox = !(row.id === 2 || row.id === 4)
+      this.loadTree = false
+      this.dialogVisible = true
+
+      //加载所有menu和access
+      this.dialogLoadingShow = true
+      await this.getAllMenuAndAccesses()
+
+      //加载该角色对应的menu和access
+      this.roleForm.name = row.name
+      const res = await fetchRoleAuth({id: row.id})
+      this.role.id = row.id
+      this.role.menus = res.data.menus
+      this.role.menuId = res.data.menusId
+      this.role.accesses = res.data.accesses
+      this.role.accessId = res.data.accessesId
+      this.loadTree = true//开始让tree渲染新的选中项
+      this.dialogLoadingShow = false
+    },
+    closeCheckAuthDialog() {
+
+    },
+    createRole() {
+      this.roleDialogType = 'create'
+      this.createRoleDialogVisible = this
+    },
+    closeRoleDialog() {
+      this.reset()
+      this.$nextTick(() => {
+        this.$refs.createRoleform.clearValidate()
+      })
+    },
+    reset() {
+      this.createRoleForm = {
+        name: undefined,
+      }
+    },
+    submitRole() {
+      this.$refs.createRoleform.validate(valid => {
+        if (!valid) {
+          return
+        }
+        this.commit()
+      })
+    },
+    async commit() {
+      if (this.roleDialogType === 'update') {
+        await updateRole(this.createRoleForm)
+        this.$message.success('更新成功')
+      } else {
+        await createRole(this.createRoleForm)
+        this.$message.success('创建成功')
+      }
+      this.createRoleDialogVisible = false
+      await this.getList()
+    },
+    async updateRole(row) {
+      this.roleDialogType = 'update'
+      this.createRoleForm = row
+      this.createRoleDialogVisible = true
+    },
+    delRole(row) {
+      this.$confirm('此操作将永久删除该角色, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        await removeRole({ids: [row.id]})
+        this.$message.success('删除成功!');
+        await this.getList()
+      })
+    },
+    async updateMenuAndAccess(){
+      this.btnLoading = true
+      await setMenuAccess({role_id: this.role.id, access_ids: [...this.$refs.menuRef.getCheckedKeys(),
+        ...this.$refs.accessRef.getCheckedKeys()]})
+      this.btnLoading = false
+      this.dialogVisible = false
+      this.$message.success('更新成功');
+      await this.getList()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
+
+
+
diff --git a/src/views/school/index.vue b/src/views/school/index.vue
index 6101013..36c360f 100644
--- a/src/views/school/index.vue
+++ b/src/views/school/index.vue
@@ -49,6 +49,7 @@ import Navbar from '@/layout/components/Navbar'
 import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import {fetchSchool, addSchool} from '@/api/school'
+import {setSchoolId} from '@/utils/auth'
 import {staffAdd} from "@/api/setting";
 export default {
   name: "school",
@@ -91,6 +92,7 @@ export default {
       this.dialogVisible = true
     },
     entrySchool(item){
+      setSchoolId(item.id)
       this.$router.push({ path: '/dashboard/index' })
     },
     closeDialog() {
diff --git a/src/views/setting/role.vue b/src/views/setting/role.vue
index ea4b534..7a90edc 100644
--- a/src/views/setting/role.vue
+++ b/src/views/setting/role.vue
@@ -64,7 +64,7 @@
 <script>
 import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
-import {fetchRole, staffDel, staffAdd, setRole} from '@/api/setting'
+import {fetchRole, fetchRoleAuth} from '@/api/setting'
 
 export default {
   name: "role",
@@ -83,83 +83,15 @@ export default {
       roleForm: {
         name: undefined
       },
-      menuData: [{
-        label: '一级 1',
-        children: [{
-          label: '二级 1-1',
-          children: [{
-            label: '三级 1-1-1'
-          }]
-        }]
-      }, {
-        label: '一级 2',
-        children: [{
-          label: '二级 2-1',
-          children: [{
-            label: '三级 2-1-1'
-          }]
-        }, {
-          label: '二级 2-2',
-          children: [{
-            label: '三级 2-2-1'
-          }]
-        }]
-      }, {
-        label: '一级 3',
-        children: [{
-          label: '二级 3-1',
-          children: [{
-            label: '三级 3-1-1'
-          }]
-        }, {
-          label: '二级 3-2',
-          children: [{
-            label: '三级 3-2-1'
-          }]
-        }]
-      }],
+      menuData: [],
       menuProps: {
         children: 'children',
-        label: 'label'
+        label: 'title'
       },
-      authData: [{
-        label: '一级 1',
-        children: [{
-          label: '二级 1-1',
-          children: [{
-            label: '三级 1-1-1'
-          }]
-        }]
-      }, {
-        label: '一级 2',
-        children: [{
-          label: '二级 2-1',
-          children: [{
-            label: '三级 2-1-1'
-          }]
-        }, {
-          label: '二级 2-2',
-          children: [{
-            label: '三级 2-2-1'
-          }]
-        }]
-      }, {
-        label: '一级 3',
-        children: [{
-          label: '二级 3-1',
-          children: [{
-            label: '三级 3-1-1'
-          }]
-        }, {
-          label: '二级 3-2',
-          children: [{
-            label: '三级 3-2-1'
-          }]
-        }]
-      }],
+      authData: [],
       authProps: {
         children: 'children',
-        label: 'label'
+        label: 'title'
       }
     }
   },
@@ -176,9 +108,12 @@ export default {
         this.total = res.data.total
       }
     },
-    checkAuth(row) {
+    async checkAuth(row) {
       this.dialogVisible = true
       this.roleForm.name = row.name
+      const res = await fetchRoleAuth({id: row.id})
+      this.menuData= res.data.menus
+      this.authData= res.data.accesses
     },
     closeCheckAuthDialog() {
 
diff --git a/src/views/setting/shop.vue b/src/views/setting/shop.vue
index 05099aa..456480d 100644
--- a/src/views/setting/shop.vue
+++ b/src/views/setting/shop.vue
@@ -1,48 +1,140 @@
 <template>
-  <div>
-    <el-card class="box-card" shadow="never">
+  <div class="app-container">
+    <el-card class="box-card" shadow="never" v-loading="loading">
       <div slot="header" class="clearfix">
         <span>店铺设置</span>
       </div>
       <el-form ref="form" label-position="left" label-width="120px">
         <el-form-item label="店铺名称">
-<!--          <el-row :gutter="20" type="flex" style="border-bottom: #dddddd solid 1px;">-->
-<!--           <el-col :span="12">笛莎学院</el-col>-->
-<!--           <el-col :span="12">设置</el-col>-->
-<!--          </el-row>-->
-
-          <div style="display: flex;justify-content: space-between;border-bottom: #dddddd solid 1px;margin-left: 5px;padding-left:15px;padding-right: 30px">
-            <span>笛莎学院</span>
-            <el-button type="text">设置</el-button>
+          <!--          <el-row :gutter="20" type="flex" style="border-bottom: #dddddd solid 1px;">-->
+          <!--           <el-col :span="12">笛莎学院</el-col>-->
+          <!--           <el-col :span="12">设置</el-col>-->
+          <!--          </el-row>-->
+
+          <div
+            style="display: flex;justify-content: space-between;border-bottom: #dddddd solid 1px;margin-left: 5px;padding-left:15px;padding-right: 30px">
+            <span>{{ schoolInfo.name }}</span>
+            <el-button type="text" @click="dialogVisible = true">设置</el-button>
           </div>
         </el-form-item>
 
         <el-form-item label="店铺地址">
-          <div style="display: flex;justify-content: space-between;border-bottom: #dddddd solid 1px;margin-left: 5px;padding-left:15px;padding-right: 30px">
-            <span>https://www.qq.com</span>
-            <el-button type="text">复制地址</el-button>
+          <div
+            style="display: flex;justify-content: space-between;border-bottom: #dddddd solid 1px;margin-left: 5px;padding-left:15px;padding-right: 30px">
+            <span>{{ schoolInfo.webUrl }}</span>
+            <el-button type="text" v-clipboard:copy="schoolInfo.webUrl"
+                       v-clipboard:success="onCopy"
+                       v-clipboard:error="onError">复制地址</el-button>
           </div>
         </el-form-item>
 
         <el-form-item label="店铺管理员">
-          <div style="display: flex;justify-content: space-between;border-bottom: #dddddd solid 1px;margin-left: 5px;padding-left:15px;padding-right: 30px">
-            <span>138****5678</span>
+          <div
+            style="display: flex;justify-content: space-between;border-bottom: #dddddd solid 1px;margin-left: 5px;padding-left:15px;padding-right: 30px">
+            <span>{{ schoolInfo.username }}</span>
           </div>
         </el-form-item>
 
         <el-form-item label="店铺AppId">
-          <div style="display: flex;justify-content: space-between;border-bottom: #dddddd solid 1px;margin-left: 5px;padding-left:15px;padding-right: 30px">
-            <span>abcdefg</span>
+          <div
+            style="display: flex;justify-content: space-between;border-bottom: #dddddd solid 1px;margin-left: 5px;padding-left:15px;padding-right: 30px">
+            <span>{{ schoolInfo.appid }}</span>
           </div>
         </el-form-item>
       </el-form>
     </el-card>
+
+    <el-dialog
+      title="修改店铺"
+      :visible.sync="dialogVisible"
+      @close='closeStaffDialog'>
+      <el-form :model="form" :rules="rules" ref="form" label-width="130px">
+
+        <el-form-item label="店铺名称" required prop="name">
+          <el-input v-model="form.name" placeholder="新店铺名称"></el-input>
+        </el-form-item>
+
+      </el-form>
+      <span style="display:block;text-align: center">
+        <el-button @click="dialogVisible=false">取 消</el-button>
+        <el-button type="primary" @click="submit">添 加</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import {fetchSchoolDetail, updateSchool} from '@/api/school'
+import {getSchoolId} from '@/utils/auth'
+
 export default {
-  name: "shop"
+  name: "shop",
+  data() {
+    return {
+      schoolInfo: {
+        webUrl: '',
+        name: '',
+        appid: '',
+        username: ''
+      },
+      loading: false,
+      dialogVisible: false,
+      form: {
+        id: getSchoolId(),
+        name: undefined
+      },
+      rules: {
+        name: [
+          {required: true, message: '请输入新的店铺名称', trigger: 'blur'},
+        ]
+      },
+    }
+  },
+  created() {
+    this.getDetail()
+  },
+  methods: {
+    async getDetail() {
+      this.loading = true
+      const res = await fetchSchoolDetail({id: getSchoolId()})
+      this.loading = false
+      this.schoolInfo.webUrl = res.data.weburl
+      this.schoolInfo.appid = res.data.appid
+      this.schoolInfo.name = res.data.name
+      this.schoolInfo.username = res.data.user.username
+    },
+    closeStaffDialog() {
+      this.reset()
+      this.$nextTick(() => {
+        this.$refs.form.clearValidate()
+      })
+    },
+    reset() {
+      this.form = {
+        name: undefined,
+      }
+    },
+    submit() {
+      this.$refs.form.validate(valid => {
+        if (!valid) {
+          return
+        }
+        this.commit()
+      })
+    },
+    async commit() {
+      await updateSchool(this.form)
+      this.dialogVisible = false
+      this.schoolInfo.name = this.form.name
+      this.$message.success('修改成功')
+    },
+    onCopy: function (e) {
+      this.$message.success('拷贝成功')
+    },
+    onError: function (e) {
+      this.$message.warning('拷贝失败')
+    }
+  }
 }
 </script>
 
diff --git a/src/views/setting/staff.vue b/src/views/setting/staff.vue
index 61849e0..28756fd 100644
--- a/src/views/setting/staff.vue
+++ b/src/views/setting/staff.vue
@@ -18,7 +18,7 @@
       <el-table-column label="用户" min-width="250px" align="center">
         <template slot-scope="{row}">
           <div style="display: flex;align-items: center">
-            <img :src="row.user.avatar" style="width: 50px;height: 50px;border-radius: 25px;margin-right: 15px">
+            <img :src="row.user.avatar || 'https://img.zcool.cn/community/01e4ea57a6e2550000018c1bfdce56.jpg'" style="width: 50px;height: 50px;border-radius: 25px;margin-right: 15px">
             {{ row.user.username || row.user.nickname }}
           </div>
         </template>
@@ -30,21 +30,21 @@
             创建人{{ row.roles && row.roles.length > 0 ? ", " : ""}}
           </span>
           <span>
-            {{ row.roles.map(role => role.name).join(', ') }}
+            {{ row.roles.map(role => role.name).join(', ') || '暂无角色' }}
           </span>
         </template>
       </el-table-column>
 
       <el-table-column label="创建时间" width="300px" align="center">
         <template slot-scope="{row}">
-          {{ row.created_time }}
+          {{ row.created_time | timeFilter }}
         </template>
       </el-table-column>
 
       <el-table-column label="操作" width="300px" align="center">
         <template slot-scope="{row, $index}">
           <el-button type="primary" size="mini" @click="authConfig(row)">
-            配置权限
+            设置角色
           </el-button>
 
           <el-button type="danger" size="mini" @click="deleteItem(row)" :disabled="row.status === 0">
@@ -64,8 +64,8 @@
       @close='closeStaffDialog'>
       <el-form :model="staffForm" :rules="staffRules" ref="staffForm" label-width="130px">
 
-        <el-form-item label="关键词" required prop="name">
-          <el-input v-model="staffForm.name" placeholder="用户名/手机/邮箱"></el-input>
+        <el-form-item label="关键词" required prop="keyword">
+          <el-input v-model="staffForm.keyword" placeholder="用户名/手机/邮箱"></el-input>
         </el-form-item>
 
       </el-form>
@@ -81,12 +81,9 @@
       @close='closeAuthDialog'>
       <el-form :model="authForm" :rules="authRules" label-position="center" ref="authForm" label-width="200px">
 
-        <el-form-item label="角色" required prop="roles">
-          <el-checkbox-group v-model="authForm.roles"  style="margin-left: 40px">
-            <el-checkbox label="超级管理员"></el-checkbox>
-            <el-checkbox label="运营"></el-checkbox>
-            <el-checkbox label="开发"></el-checkbox>
-            <el-checkbox label="产品"></el-checkbox>
+        <el-form-item label="角色" required prop="role_ids">
+          <el-checkbox-group v-model="authForm.role_ids"  style="margin-left: 40px">
+            <el-checkbox v-for="(item, index) in roles" :key="index" :label="item.id">{{item.name}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
 
@@ -102,12 +99,19 @@
 <script>
 import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
-import {fetchStaff, staffDel, staffAdd, setRole} from '@/api/setting'
+import {fetchStaff, staffDel, staffAdd, setRole, fetchRole} from '@/api/setting'
+import {parseTime} from "@/utils";
 
 export default {
   name: "staff",
   components: {Pagination},
   directives: {waves},
+  filters: {
+    timeFilter(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
+    }
+  },
   data() {
     return {
       list: [],
@@ -119,23 +123,24 @@ export default {
       loadingShow: false,
       dialogVisible: false,
       staffForm: {
-        name: undefined
+        keyword: undefined
       },
       staffRules: {
-        name: [
+        keyword: [
           {required: true, message: '请输入关键词', trigger: 'blur'},
         ]
       },
       authDialogVisible: false,
       authForm: {
         id: undefined,
-        roles: []
+        role_ids: []
       },
       authRules: {
-        roles: [
+        role_ids: [
           {type: 'array', required: true, message: '请选择角色', trigger: 'change'},
         ]
       },
+      roles: []
     }
   },
   created() {
@@ -144,12 +149,15 @@ export default {
   methods: {
     async getList() {
       this.loadingShow = true
-      const res = await fetchStaff(this.listQuery)
+      let res = await fetchStaff(this.listQuery)
       this.loadingShow = false
       if (res.code === 20000) {
         this.list = res.data.items
         this.total = res.data.total
       }
+
+      res = await fetchRole({page: 1})
+      this.roles = res.data.items
     },
     addStaff() {
       this.dialogVisible = true
@@ -158,7 +166,7 @@ export default {
       this.authDialogVisible = true
       this.authForm.id = row.id
       row.roles.map(item => {
-        this.authForm.roles.push(item.name)
+        this.authForm.role_ids.push(item.id)
       })
     },
     deleteItem(row) {
@@ -167,8 +175,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(action => {
-        staffDel({id: row.id}).then(res => {
-          console.log(this.list)
+        staffDel({staff_id: row.id}).then(res => {
           this.$message.success('删除成功')
           this.getList()
         })
@@ -200,7 +207,7 @@ export default {
     },
     resetStaff() {
       this.staffForm = {
-        name: undefined,
+        keyword: undefined,
       }
     },
     closeAuthDialog(){
@@ -212,7 +219,7 @@ export default {
     resetAuth() {
       this.authForm = {
         id: undefined,
-        roles: []
+        role_ids: []
       }
     },
     submitAuth() {
diff --git a/src/views/user/info.vue b/src/views/user/info.vue
index a57646b..7651539 100644
--- a/src/views/user/info.vue
+++ b/src/views/user/info.vue
@@ -8,16 +8,16 @@
       <el-container style="height: 600px;">
         <el-header style="width: 100%">
           <el-row style="height: 50px">
-            <el-col :span="6"><div>ID: {{userDetail.user_id}}</div></el-col>
-            <el-col :span="6"><div>用户名: {{userDetail.username}}</div></el-col>
-            <el-col :span="6"><div>昵称: {{userDetail.nickname}}</div></el-col>
-            <el-col :span="6"><div>手机号: {{userDetail.phone}}</div></el-col>
+            <el-col :span="6"><div>ID: {{userDetail.id}}</div></el-col>
+            <el-col :span="6"><div>用户名: {{userDetail.user.username}}</div></el-col>
+            <el-col :span="6"><div>昵称: {{userDetail.user.nickname}}</div></el-col>
+            <el-col :span="6"><div>手机号: {{userDetail.user.phone}}</div></el-col>
           </el-row>
           <el-row>
             <el-col :span="6"><div>锁定: {{userDetail.status === 0 ? '未锁定' : '已锁定'}}</div></el-col>
             <el-col :span="6"><div>会员: {{userDetail.user_level}}</div></el-col>
-            <el-col :span="6"><div>会员到期时间: {{userDetail.user_level_expire}}</div></el-col>
-            <el-col :span="6"><div>注册时间: {{userDetail.created_time}}</div></el-col>
+            <el-col :span="6"><div>会员到期时间: {{userDetail.user_level_expire | timeFilter}}</div></el-col>
+            <el-col :span="6"><div>注册时间: {{userDetail.created_time | timeFilter}}</div></el-col>
           </el-row>
         </el-header>
 
@@ -28,6 +28,7 @@
                 :data="item.data"
                 border
                 fit
+                v-loading="tableLoading"
                 highlight-current-row
                 style="width: 100%;height: 100%;overflow: auto">
                 <el-table-column v-for="(d, dI) in item.ths" :key="dI" :label="d.lab" :prop="d.prop" min-width="150px" align="center">
@@ -48,15 +49,11 @@
 </template>
 
 <script>
-import {
-  getUserDetail,
-  fetchCourseSubscription,
-  fetchColumnSubscription,
-  fetchOrderRecord,
+import {fetchUserDetail, fetchCourseSubscription, fetchColumnSubscription, fetchOrderRecord,
   fetchHistory,
-  fetchComment
-} from '@/api/my_user'
+  fetchComment} from '@/api/user'
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
+import {parseTime} from '@/utils'
 
 let statusOptions = {
   'succ': '支持成功',
@@ -74,9 +71,18 @@ let typeOptions = {
 export default {
   name: "info",
   components: {Pagination},
+  filters: {
+    timeFilter(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
+    }
+  },
   computed: {
     currentTab: function (){
       return this.tabs.find( item => item.name === this.activeName)
+    },
+    tableLoading: function () {
+      return this.currentTab.tableLoading
     }
   },
   data() {
@@ -110,7 +116,8 @@ export default {
           form: {
             page: 1,
             limit: 10
-          }
+          },
+          tableLoading: false
         },
         {
           name: 'column',
@@ -126,7 +133,8 @@ export default {
           form: {
             page: 1,
             limit: 10
-          }
+          },
+          tableLoading: false
         },
         {
           name: 'order',
@@ -145,7 +153,8 @@ export default {
           form: {
             page: 1,
             limit: 10
-          }
+          },
+          tableLoading: false
         },
         {
           name: 'history',
@@ -153,7 +162,7 @@ export default {
           ths: [
             {lab: '课程标题', prop: 'title'},
             {lab: '课程类型', prop: 'type'},
-            {lab: '学习时长', prop: 'created_time'}
+            {lab: '学习时长', prop: 'total_time'}
           ],
           data: [],
           total: 0,
@@ -161,7 +170,8 @@ export default {
           form: {
             page: 1,
             limit: 10
-          }
+          },
+          tableLoading: false
         },
         {
           name: 'comment',
@@ -178,10 +188,11 @@ export default {
           form: {
             page: 1,
             limit: 10
-          }
+          },
+          tableLoading: false
         }
       ],
-      activeName: 'course'
+      activeName: 'course',
     }
   },
   methods: {
@@ -192,14 +203,14 @@ export default {
       this.getTableData()
     },
     async getUserDetail() {
-      const res = await getUserDetail({id: this.id})
-      if(res.code === 20000) {
-        this.userDetail = res.data
-      }
+      const res = await fetchUserDetail({id: this.id})
+      this.userDetail = res.data
     },
     async getTableData() {
-      let query = {id: this.id, ...this.currentTab.form}
+      let query = {user_id: this.id, ...this.currentTab.form}
+      this.currentTab.tableLoading = true
       const res = await this.currentTab.req(query)
+      this.currentTab.tableLoading = false
       if(res.code === 20000) {
         this.currentTab.data = res.data.items
         if(this.currentTab.name === 'order') {
@@ -207,11 +218,16 @@ export default {
         }else if(this.currentTab.name === 'history' || this.currentTab.name === 'comment') {
           this.currentTab.data.map(item => item.type = typeOptions[item.type])
         }
+        this.currentTab.data.map(item => item.created_time = this.timeFormat(item.created_time))
         this.currentTab.total = res.data.total
       }
     },
     handleTabClick(){
       this.getTableData()
+    },
+    timeFormat(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
     }
   }
 
diff --git a/src/views/user/user.vue b/src/views/user/user.vue
index e656363..bfc80a4 100644
--- a/src/views/user/user.vue
+++ b/src/views/user/user.vue
@@ -13,7 +13,7 @@
 
       <div>
         <el-input
-          v-model="listQuery.title"
+          v-model="listQuery.keyword"
           placeholder="昵称/用户名"
           style="width: 200px;margin-right: 10px"
           class="filter-item"
@@ -28,6 +28,7 @@
       :data="list"
       border
       fit
+      v-loading="tableLoading"
       highlight-current-row
       style="width: 100%;height: 100%;overflow: auto"
       @selection-change="handleSelectionChange">
@@ -42,11 +43,11 @@
         <template slot-scope="{row}">
           <div style="display: flex">
             <img
-              :src="row.cover"
+              :src="row.user.avatar || 'https://img.zcool.cn/community/01e4ea57a6e2550000018c1bfdce56.jpg'"
               style="width: 50px;height: 50px;border-radius: 50px">
             <div
               style="display: flex;flex-direction: column;justify-content: center;align-items:flex-start;margin-left: 10px">
-              <span style="color:#0485fd;">{{ row.title }}</span>
+              <span style="color:#0485fd;">{{ row.user.username}}</span>
             </div>
           </div>
         </template>
@@ -54,13 +55,13 @@
 
       <el-table-column label="消费总额" width="110px" align="center">
         <template slot-scope="{row}">
-          <span>{{row.totalConsumption}}</span>
+          <span>{{row.total_consume}}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="创建时间" width="180px" align="center">
         <template slot-scope="{row}">
-          <span>{{row.created_time}}</span>
+          <span>{{row.created_time | timeFilter}}</span>
         </template>
       </el-table-column>
 
@@ -77,8 +78,8 @@
               黑名单设置<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item @click.native="changeCommentStatus(row)">{{row.comment === 0 ? '允许评论' : '禁止评论'}}</el-dropdown-item>
-              <el-dropdown-item @click.native="changeAccessStatus(row)">{{row.access === 0 ? '允许访问' : '禁止访问'}}</el-dropdown-item>
+              <el-dropdown-item @click.native="changeCommentStatus(row)">{{row.no_comment === 0 ? '禁止评论' : '允许评论'}}</el-dropdown-item>
+              <el-dropdown-item @click.native="changeAccessStatus(row)">{{row.no_access === 0 ? '禁止访问' : '允许访问'}}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -98,33 +99,41 @@ import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import Info from '@/views/user/info.vue'
 import {fetchComment, fetchList, changeComment, changeAccess, disableComment, disableAccess} from '@/api/my_user'
+import {fetchUserList, updateAccess, updateComment} from '@/api/user'
+import {parseTime} from '@/utils'
 export default {
   name: "user",
   components: {Pagination, Info},
   directives: {waves},
+  filters: {
+    timeFilter(time) {
+      let date = new Date(time)
+      return parseTime(date.getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
+    }
+  },
   created() {
     this.getList()
   },
   data() {
     return {
       listQuery: {
-        title: '',
+        keyword: undefined,
         page: 1,
         limit: 10
       },
       list: [],
       total: 0,
-      multipleSelection: []
+      multipleSelection: [],
+      tableLoading: false
     }
   },
   methods: {
     getList(){
-      fetchList(this.listQuery).then(res => {
-        if(res.code === 20000) {
-          this.list = res.data.items
-          this.total = res.data.total
-          console.log(this.list)
-        }
+      this.tableLoading = true
+      fetchUserList(this.listQuery).then(res => {
+        this.tableLoading = false
+        this.list = res.data.items
+        this.total = res.data.total
       })
     },
     addBlackList(){},
@@ -132,34 +141,30 @@ export default {
       this.multipleSelection = val
     },
     userDetail(row){
-      this.$refs.userInfo.open(row.user_id)
+      this.$refs.userInfo.open(row.id)
     },
     changeCommentStatus(row){
-      let msg = row.comment === 0 ? '是否允许当前用户评论' : '是否禁止当前用户评论'
+      let msg = row.no_comment === 0 ? '是否禁止当前用户评论' : '是否允许当前用户评论'
       this.$confirm(msg, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(action => {
-        changeComment({user_id: row.user_id}).then(res => {
-          if(res.code === 20000) {
-            this.getList()
-            this.$notify.success('更新成功')
-          }})
+      }).then(async action => {
+        await updateComment({id: row.id, no_comment: (row.no_comment === 0 ? 1 : 0)})
+        this.$notify.success('更新成功')
+        this.getList()
       })
     },
     changeAccessStatus(row){
-      let msg = row.comment === 0 ? '是否允许当前用户访问' : '是否禁止当前用户访问'
+      let msg = row.no_access === 0 ? '是否禁止当前用户访问' : '是否允许当前用户访问'
       this.$confirm(msg, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(action => {
-        changeAccess({user_id: row.user_id}).then(res => {
-          if(res.code === 20000) {
-            this.getList()
-            this.$notify.success('更新成功')
-          }})
+      }).then(async action => {
+        await updateAccess({id: row.id, no_access: (row.no_access === 0 ? 1 : 0)})
+        this.$notify.success('更新成功')
+        this.getList()
       })
     },
     disableComment(){
@@ -172,16 +177,12 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(action => {
-        let ids = this.multipleSelection.map(user => user.user_id)
-        disableComment({ids}).then(res => {
-          console.log(res)
-          if(res.code === 20000) {
-            this.getList()
-            this.$notify.success('更新成功')
-            this.$refs.multiTable.clearSelection()
-          }
-        })
+      }).then(async action => {
+        let ids = this.multipleSelection.map(user => user.id)
+        await updateComment({id: ids[0], no_comment: 1})
+        this.$notify.success('更新成功')
+        this.$refs.multiTable.clearSelection()
+        this.getList()
       })
     },
     disableAccess(){
@@ -194,16 +195,12 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(action => {
-        let ids = this.multipleSelection.map(user => user.user_id)
-        disableAccess({ids}).then(res => {
-          console.log(res)
-          if(res.code === 20000) {
-            this.getList()
-            this.$notify.success('更新成功')
-            this.$refs.multiTable.clearSelection()
-          }
-        })
+      }).then(async action => {
+        let ids = this.multipleSelection.map(user => user.id)
+        await updateAccess({id: ids[0], no_access: 1})
+        this.$notify.success('更新成功')
+        this.$refs.multiTable.clearSelection()
+        this.getList()
       })
     }
   }
diff --git a/vue.config.js b/vue.config.js
index 3f1ea12..d7d5305 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,7 +37,17 @@ module.exports = {
       warnings: false,
       errors: true
     },
-    before: require('./mock/mock-server.js')
+    // before: require('./mock/mock-server.js')
+    proxy: {
+      '/dev-api' : {
+        target: 'http://demonuxtapi.dishait.cn/',
+        ws: true, // proxy websockets
+        changeOrigin: true, // 是否跨域
+        pathRewrite: { //重写路径
+          '^/dev-api': ''
+        }
+      }
+    }
   },
   configureWebpack: {
     // provide the app's title in webpack's name field, so that
diff --git "a/\351\227\256\351\242\230\346\200\273\347\273\223.md" "b/\351\227\256\351\242\230\346\200\273\347\273\223.md"
index 7c01386..88739c6 100644
--- "a/\351\227\256\351\242\230\346\200\273\347\273\223.md"
+++ "b/\351\227\256\351\242\230\346\200\273\347\273\223.md"
@@ -97,6 +97,17 @@ find
 forEach
 map
 ```
+```js
+getOtherQuery(query) {
+//reduce使用
+return Object.keys(query).reduce((acc, cur) => {
+if (cur !== 'redirect') {
+acc[cur] = query[cur]
+}
+return acc
+}, {})
+}
+```
 5.带索引插槽
 ```vue
 <template slot-scope="{row, $index}">