整理侧边栏

src/api/silder.js

@@ -12,10 +12,11 @@ export function addSilder (data) {
 }
 // : qs.stringify(data)
 // 查询菜单栏
-export function getSilder () {
+export function getSilder (data) {
   return request({
     url: '/api-auth/menu/findByUser',
-    method: 'get'
+    method: 'get',
+    params: data
   })
 }
 // 删除菜单

src/api/systemManage.js

@@ -167,38 +167,72 @@ export function roleAdd(data) {
 }
 
 // 查询规则列表
-export function courseSchedule(data) {
+export function courseScheduleRewards(data) {
     return request({
-        url: `/web-server/courseSchedule/queryPage`,
+        url: `/web-server/courseScheduleRewards/queryPage`,
         method: 'get',
         params: data
     })
 }
 
 // 单查询
-export function courseScheduleQuery(data) {
+export function courseScheduleRewardsQuery(data) {
     return request({
-        url: `/web-server/courseSchedule/query`,
+        url: `/web-server/courseScheduleRewards/query`,
         method: 'get',
         params: data
     })
 }
 
 // 添加
-export function courseScheduleAdd(data) {
+export function courseScheduleRewardsAdd(data) {
     return request({
-        url: `/web-server/courseSchedule/add`,
+        url: `/web-server/courseScheduleRewards/add`,
         method: 'post',
         data: qs.stringify(data)
     })
 }
 
 // 修改
-export function courseScheduleUpdate(data) {
+export function courseScheduleRewardsUpdate(data) {
     return request({
-        url: `/web-server/courseSchedule/Update`,
+        url: `/web-server/courseScheduleRewards/Update`,
         method: 'post',
         data: qs.stringify(data)
     })
 }
 
+// 分页查询热词列表
+export function hotWordLabelManage(data) {
+    return request({
+        url: `/web-server/hotWordLabelManage/queryPage`,
+        method: 'get',
+        params: data
+    })
+}
+
+// 新增热词标签
+export function hotWordLabelManageAdd(data) {
+    return request({
+        url: `/web-server/hotWordLabelManage/add`,
+        method: 'post',
+        data: qs.stringify(data)
+    })
+}
+
+// 修改热词标签
+export function hotWordLabelManageUpdate(data) {
+    return request({
+        url: `/web-server/hotWordLabelManage/update`,
+        method: 'post',
+        data: qs.stringify(data)
+    })
+}
+
+// 删除热词标签
+export function hotWordLabelManageDel(data) {
+    return request({
+        url: `/web-server/hotWordLabelManage/del/${data}`,
+        method: 'post'
+    })
+}

src/router/index.js

@@ -37,564 +37,16 @@ export const constantRoutes = [
     hidden: true
   },
   {
-    path: '/system/insideSetting',
-    component: Layout,
-    meta: { title: '内部分部设置' },
-    hidden: true,
-    children: [
-      {
-        path: 'adminoperation',
-        component: () => import('@/views/categroyManager/insideSetting/adminOperation'),
-        meta: { title: '侧系统角色权限管理边栏' }
-      }
-    ]
+    path: '/',
+    redirect:  {
+        path: '/main/main'
+    }
   },
-  
   {
     path: '/404',
     component: () => import('@/views/404'),
     hidden: true
-  },
-  {
-    path: '/',
-    redirect: '/main/main', // 首页
-  },
-  {
-    path: '/business',
-    redirect: '/business/teamDetail',
-  },
-  {
-    path: '/reportForm',
-    redirect: '/reportForm/index'
-  },
-  // 开发中临时侧边栏-----------------------------------
-  {
-    path: '/silder',
-    component: Layout,
-    meta: { title: '侧边栏管理' },
-    children: [
-      {
-        path: 'silderDemo',
-        component: () => import('@/views/setSilder/addSilder'),
-        meta: { title: '侧边栏' }
-      }
-    ]
-  },
-  {
-    path: '/journal',
-    component: Layout,
-    meta: { title: '系统日志' },
-    children: [
-      {
-        path: 'journal',
-        component: () => import('@/views/journal/index'),
-        meta: { title: '日志' }
-      }
-    ]
-  },
-  {
-    path: '/teamBuild', // 创建乐团
-    component: Layout,
-    meta: { title: '乐团管理' },
-    children: [
-      {
-        path: 'teamBuild',
-        name: 'teamBuild',
-        component: () => import('@/views/teamBuild/index'),
-        meta: { title: '创建乐团' }
-      },
-      {
-        path: 'sigupList',
-        name: 'sigupList',
-        component: () => import('@/views/teamBuild/signupList'),
-        meta: { title: '乐团报名' },
-        alwaysShow: false,
-        hidden: true
-
-      },
-      {
-        path: 'teamSeting',
-        name: 'teamSeting',
-        component: () => import('@/views/teamBuild/teamSeting/index'),
-        meta: { title: '报名设置' }
-      },
-      {
-        path: 'teamDetail',
-        name: 'teamDetail',
-        component: () => import('@/views/teamDetail/index'),
-        meta: { title: '乐团详情' },
-      },
-    ]
-  },
-  // {
-  //   path: '/vipBuild',
-  //   component: Layout,
-  //   meta: { title: 'vip申请' },
-  //   children: [{
-  //     path: 'baseVip',
-  //     component: () => import('@/views/buildVip/index'),
-  //     meta: { title: 'vip详情' }
-  //   }]
-  // },
-  // {
-  //   path: '/vipClass', // 小课
-  //   component: Layout,
-  //   meta: { title: 'vip管理' },
-  //   children: [
-  //     {
-  //       path: 'vipClass',
-  //       name: 'vipClass',
-  //       component: () => import('@/views/vipClass/vipList'),
-  //       meta: { title: 'vip课列表' }
-  //     },
-  //     {
-  //       path: 'vipDetail',
-  //       name: 'vipDetail',
-  //       component: () => import('@/views/vipClass/vipDetail/index'),
-  //       meta: { title: 'vip课详情' }
-  //     },
-  //     {
-  //       path: 'resetClass',
-  //       name: 'resetClass',
-  //       component: () => import('@/views/vipClass/resetClasss'),
-  //       meta: { title: '调整记录' }
-  //     }
-  //   ]
-  // },
-  {
-    path: '/teacher',
-    component: Layout,
-    meta: { title: '老师管理', icon: '' },
-    children: [
-      {
-        path: 'teacherList',
-        name: 'teacherList',
-        meta: { title: '老师列表' },
-        component: () => import('@/views/teacherManager/teacherList')
-      },
-      {
-        path: 'teacherDetail',
-        name: 'teacherDetail',
-        meta: { title: '老师详情' },
-        component: () => import('@/views/teacherManager/teacherDetail/index')
-      }
-    ]
-  },
-  {
-    path: '/student',
-    component: Layout,
-    redirect: '/student/studentList',
-    meta: { title: '学生管理' },
-    children: [
-      {
-        path: 'studentList',
-        meta: { title: '学生列表' },
-        component: () => import('@/views/studentManager/studentList'),
-      },
-      {
-        path: 'studentdetaile',
-        meta: { title: '学员详情' },
-        component: () => import('@/views/studentManager/index'),
-      }
-    ]
-  },
-  {
-    path: '/formManager',
-    component: Layout,
-    meta: { title: '报表中心' },
-    children: [{
-      path: 'reportForm',
-      meta: { title: '报表中心' },
-      component: () => import('@/views/formManager/index')
-    }]
-  },
-  {
-    path: '/teamDetail', // 乐团详情
-    component: Layout,
-    meta: { title: '乐团详情' },
-    children: [
-      {
-        path: 'teamList',
-        name: 'teamList',
-        component: () => import('@/views/teamDetail/teamList'),
-        meta: { title: '乐团列表' },
-      },
-      {
-        path: 'studentSignin',
-        name: 'studentSignin',
-        component: () => import('@/views/teamDetail/components/studentSignin'),
-        meta: { title: '学生点名' }
-      },
-      {
-        path: 'teacherSignin',
-        name: 'teacherSignin',
-        component: () => import('@/views/teamDetail/components/teacherSignin'),
-        meta: { title: '老师上课记录' }
-      }
-    ]
-  },
-  // {
-  //   path: '/vipParameterManager',
-  //   name: 'vipParameterManager',
-  //   component: Layout,
-  //   meta: { title: 'vip参数设置' },
-  //   children: [{
-  //     path: 'vipParameterManager',
-  //     meta: { title: 'vip参数设置' },
-  //     component: () => import('@/views/categroyManager/generalSettings/vipParameterManager'),
-  //   }, {
-  //     path: 'vipChargeSeting',
-  //     meta: { title: 'vip收费类型设置' },
-  //     component: () => import('@/views/categroyManager/vipChargeSeting')
-  //   }, {
-  //     path: 'vipActiveList',
-  //     meta: { title: 'vip活动方案' },
-  //     component: () => import('@/views/categroyManager/vipActiveList')
-  //   },
-  //   {
-  //     path: 'vipNewActive',
-  //     hidden: true,
-  //     meta: { title: 'vip新增活动方案' },
-  //     component: () => import('@/views/categroyManager/vipNewActive')
-  //   },
-  //   ]
-  // },
-  // {
-  //   path: '/business',
-  //   component: Layout,
-  //   redirect: '/business/orderManager/income',
-  //   meta: { title: '交易管理' },
-  //   children: [
-  //     {
-  //       path: 'order',
-  //       meta: { title: '订单管理' },
-  //       component: () => import('@/views/businessManager/orderManager/index'),// Parent router-view
-  //       children: [{
-  //         path: 'income',
-  //         meta: { title: '收入' },
-  //         component: () => import('@/views/businessManager/orderManager/income')
-  //       }, {
-  //         path: 'backMoney',
-  //         meta: { title: '退费管理' },
-  //         component: () => import('@/views/businessManager/orderManager/backMoney')
-  //       }, {
-  //         path: 'expend',
-  //         meta: { title: '支出' },
-  //         component: () => import('@/views/businessManager/orderManager/expend')
-  //       }]
-  //     },
-  //     {
-  //       path: 'shopManager',
-  //       meta: { title: '商品管理' },
-  //       component: () => import('@/views/businessManager/shopManager/index'),
-  //       children: [
-  //         {
-  //           path: 'shopList',
-  //           meta: { title: '商品列表' },
-  //           component: () => import('@/views/businessManager/shopManager/shopList')
-  //         },
-  //         {
-  //           path: 'shopCategroy',
-  //           meta: { title: '商品分类' },
-  //           component: () => import('@/views/businessManager/shopManager/shopCategory')
-  //         }
-
-  //       ]
-  //     }
-  //   ]
-  // },
-
-  // 临时侧边栏结束-----------------------------------
-  // {
-  //   path: '/teamDetail', // 乐团详情
-  //   component: Layout,
-  //   meta: { title: '乐团详情' },
-  //   children: [
-  //     {
-  //       path: 'teamDetail',
-  //       name: 'teamDetail',
-  //       component: () => import('@/views/teamDetail/index'),
-  //       meta: { title: '乐团详情' },
-  //     },
-  //     {
-  //       path: 'studentSignin',
-  //       name: 'studentSignin',
-  //       component: () => import('@/views/teamDetail/components/studentSignin'),
-  //       meta: { title: '学生点名' }
-  //     },
-  //     {
-  //       path: 'teacherSignin',
-  //       name: 'teacherSignin',
-  //       component: () => import('@/views/teamDetail/components/teacherSignin'),
-  //       meta: { title: '老师上课记录' }
-  //     }
-  //   ]
-  // },
-  // {
-  //   path: '/teamBuild', // 创建乐团
-  //   component: Layout,
-  //   children: [
-  //     {
-  //       path: 'teamBuild',
-  //       name: 'teamBuild',
-  //       component: () => import('@/views/teamBuild/index'),
-  //       meta: { title: '创建乐团' }
-  //     }
-  //   ]
-  // },
-  // {
-  //   path: '/vipClass', // 小课
-  //   component: Layout,
-  //   meta: { title: 'vip管理' },
-  //   children: [
-  //     {
-  //       path: 'vipClass',
-  //       name: 'vipClass',
-  //       component: () => import('@/views/vipClass/vipList'),
-  //       meta: { title: 'vip课列表' }
-  //     },
-  //     {
-  //       path: 'vipDetail',
-  //       name: 'vipDetail',
-  //       component: () => import('@/views/vipClass/vipDetail/index'),
-  //       meta: { title: '调整记录' }
-  //     },
-  //     {
-  //       path: 'resetClass',
-  //       name: 'resetClass',
-  //       component: () => import('@/views/vipClass/resetClasss'),
-  //       meta: { title: 'vip课详情' }
-  //     }
-  //   ]
-  // }, 
-  // {
-  //   path: '/teacher',
-  //   component: Layout,
-  //   meta: { title: '老师管理', icon: '' },
-  //   children: [
-  //     {
-  //       path: 'teacherList',
-  //       name: 'teacherList',
-  //       meta: { title: '老师列表' },
-  //       component: () => import('@/views/teacherManager/teacherList')
-  //     },
-  //     {
-  //       path: 'teacherDetail',
-  //       name: 'teacherDetail',
-  //       meta: { title: '老师详情' },
-  //       component: () => import('@/views/teacherManager/teacherDetail/index')
-  //     }
-  //   ]
-  // }, 
-  // {
-  //   path: '/student',
-  //   component: Layout,
-  //   redirect: '/student/studentList',
-  //   meta: { title: '学生管理' },
-  //   children: [
-  //     {
-  //       path: 'studentList',
-  //       meta: { title: '学生列表' },
-  //       component: () => import('@/views/studentManager/studentList'),
-  //     },
-  //     {
-  //       path: 'studentdetaile',
-  //       meta: { title: '学员详情' },
-  //       component: () => import('@/views/studentManager/index'),
-  //     }
-  //   ]
-  // },
-  // {
-  //   path: '/business',
-  //   component: Layout,
-  //   redirect: '/business/orderManager/income',
-  //   meta: { title: '交易管理' },
-  //   children: [
-  //     {
-  //       path: 'order',
-  //       meta: { title: '订单管理' },
-  //       component: () => import('@/views/businessManager/orderManager/index'),// Parent router-view
-  //       children: [{
-  //         path: 'income',
-  //         meta: { title: '收入' },
-  //         component: () => import('@/views/businessManager/orderManager/income')
-  //       }, {
-  //         path: 'backMoney',
-  //         meta: { title: '退费管理' },
-  //         component: () => import('@/views/businessManager/orderManager/backMoney')
-  //       }, {
-  //         path: 'expend',
-  //         meta: { title: '支出' },
-  //         component: () => import('@/views/businessManager/orderManager/expend')
-  //       }]
-  //     },
-  //     {
-  //       path: 'shopManager',
-  //       meta: { title: '商品管理' },
-  //       component: () => import('@/views/businessManager/shopManager/index'),
-  //       children: [
-  //         {
-  //           path: 'shopList',
-  //           meta: { title: '商品列表' },
-  //           component: () => import('@/views/businessManager/shopManager/shopList')
-  //         },
-  //         {
-  //           path: 'shopCategroy',
-  //           meta: { title: '商品分类' },
-  //           component: () => import('@/views/businessManager/shopManager/shopCategory')
-  //         }
-
-  //       ]
-  //     }
-  //   ]
-  // },
-  // {
-  //   path: '/categoryManager',
-  //   component: Layout,
-  //   meta: { title: '系统内部管理' },
-  //   children: [{
-  //     path: 'adminManager',
-  //     name: 'adminManager',
-  //     meta: { title: '权限管理' },
-  //     component: () => import('@/views/categroyManager/adminManager')
-  //   },
-  //   {
-  //     path: 'staffManager',
-  //     name: 'staffManager',
-  //     meta: { title: '员工管理' },
-  //     component: () => import('@/views/categroyManager/staffManager')
-  //   }, {
-  //     path: 'branchManager',
-  //     name: 'branchManager',
-  //     meta: { title: '合作单位' },
-  //     component: () => import('@/views/categroyManager/branchManager')
-  //   }, {
-  //     path: 'addressManager',
-  //     name: 'addressManager',
-  //     meta: { title: '教学点管理' },
-  //     component: () => import('@/views/categroyManager/addressManager')
-  //   }
-  //   ]
-  // }, {
-  //   path: '/mapDemo',
-  //   component: Layout,
-  //   meta: { title: '地图案例' },
-  //   children: [
-  //     {
-  //       path: 'map',
-  //       component: () => import('@/views/mapDemo/index'),
-  //       meta: { title: '地图' }
-  //     }
-  //   ]
-  // },
-
-  // ,
-  // {
-  //   path: '/example',
-  //   component: Layout,
-  //   redirect: '/example/table',
-  //   name: 'Example',
-  //   meta: { title: 'Example', icon: 'example' },
-  //   children: [
-  //     {
-  //       path: 'table',
-  //       name: 'Table',
-  //       component: () => import('@/views/table/index'),
-  //       meta: { title: 'Table' }
-  //     },
-  //     {
-  //       path: 'tree',
-  //       name: 'Tree',
-  //       component: () => import('@/views/tree/index'),
-  //       meta: { title: 'Tree' }
-  //     }
-  //   ]
-  // },
-
-  // {
-  //   path: '/form',
-  //   component: Layout,
-  //   children: [
-  //     {
-  //       path: 'index',
-  //       name: 'Form',
-  //       component: () => import('@/views/form/index'),
-  //       meta: { title: 'Form' }
-  //     }
-  //   ]
-  // },
-
-  // , {
-  //   path: '/nested',
-  //   component: Layout,
-  //   redirect: '/nested/menu1',
-  //   name: 'Nested',
-  //   meta: {
-  //     title: 'Nested',
-  //     icon: 'nested'
-  //   },
-  //   children: [
-  //     {
-  //       path: 'menu1',
-  //       component: () => import('@/views/nested/menu1/index'), // Parent router-view
-  //       name: 'Menu1',
-  //       meta: { title: 'Menu1' },
-  //       children: [
-  //         {
-  //           path: 'menu1-1',
-  //           component: () => import('@/views/nested/menu1/menu1-1'),
-  //           name: 'Menu1-1',
-  //           meta: { title: 'Menu1-1' }
-  //         },
-  //         {
-  //           path: 'menu1-2',
-  //           component: () => import('@/views/nested/menu1/menu1-2'),
-  //           name: 'Menu1-2',
-  //           meta: { title: 'Menu1-2' },
-  //           children: [
-  //             {
-  //               path: 'menu1-2-1',
-  //               component: () => import('@/views/nested/menu1/menu1-2/menu1-2-1'),
-  //               name: 'Menu1-2-1',
-  //               meta: { title: 'Menu1-2-1' }
-  //             },
-  //             {
-  //               path: 'menu1-2-2',
-  //               component: () => import('@/views/nested/menu1/menu1-2/menu1-2-2'),
-  //               name: 'Menu1-2-2',
-  //               meta: { title: 'Menu1-2-2' }
-  //             }
-  //           ]
-  //         },
-  //         {
-  //           path: 'menu1-3',
-  //           component: () => import('@/views/nested/menu1/menu1-3'),
-  //           name: 'Menu1-3',
-  //           meta: { title: 'Menu1-3' }
-  //         }
-  //       ]
-  //     },
-  //     {
-  //       path: 'menu2',
-  //       component: () => import('@/views/nested/menu2/index'),
-  //       meta: { title: 'menu2' }
-  //     }
-  //   ]
-  // },
-
-  // {
-  //   path: 'external-link',
-  //   component: Layout,
-  //   children: [
-  //     {
-  //       path: 'https://panjiachen.github.io/vue-element-admin-site/#/',
-  //       meta: { title: 'External Link' }
-  //     }
-  //   ]
-  // },
-
-  // 404 page must be placed at the end !!!
-  // { path: '*', redirect: '/404', hidden: true }
+  }
 ]
 // export const constantRoutes = [{
 //   path: '/',
@@ -615,20 +67,40 @@ export function resetRouter () {
 }
 export const asyncRoutes = {
   Layout: Layout,
+  // 首页
   main: () => import('@/views/main/index'),
+  // 系统日志
+  journal: () => import('@/views/journal/index'),
+  // 乐团管理
   teamDetail: () => import('@/views/teamDetail/teamList'),
+  // VIP管理
   vipList: () => import('@/views/vipClass/vipList'),
+  // 教师管理
   teacherList: () => import('@/views/teacherManager/teacherList'),
+  // 老师详情
+  teacherDetail: () => import('@/views/teacherManager/teacherDetail/index'),
+  // 学员管理
   studentList: () => import('@/views/studentManager/studentList'),
+  // 学员详情
+  studentDetail: () => import('@/views/studentManager/index'),
+  // 订单管理
   orderList: () => import('@/views/businessManager/orderManager/index'),
+  // 收入
   income: () => import('@/views/businessManager/orderManager/income'),
+  // 退费订单
   backOrder: () => import('@/views/businessManager/orderManager/backMoney'),
+  // 支出
   expend: () => import('@/views/businessManager/orderManager/expend'),
+  // 商品管理
   shopManager: () => import('@/views/businessManager/shopManager/shopList'),
+  // 商品修改（添加）
   shopOperation: () => import('@/views/businessManager/shopManager/shopOperation'),
+  // 商品类型管理
   shopCategory: () => import('@/views/businessManager/shopManager/shopCategory'),
+  // 报表中心
   reportForm: () => import('@/views/reportForm/index'),
   musicalManager: () => import('@/views/categroyManager/specialSetup/musicalManager'),
+  // 系统管理
   specialSetup: () => import('@/views/categroyManager/specialSetup/index'),
   typesManager: () => import('@/views/categroyManager/specialSetup/typesManager'),
   tryClass: () => import('@/views/categroyManager/specialSetup/tryClass'),
@@ -646,6 +118,7 @@ export const asyncRoutes = {
   payManager: () => import('@/views/categroyManager/generalSettings/payManager'),
   insideSetting: () => import('@/views/categroyManager/insideSetting/index'),
   adminManager: () => import('@/views/categroyManager/insideSetting/adminManager'),
+  adminOperation: () => import('@/views/categroyManager/insideSetting/adminOperation'),
   staffManager: () => import('@/views/categroyManager/insideSetting/staffManager'),
   branchManager: () => import('@/views/categroyManager/insideSetting/branchManager'),
   addressManager: () => import('@/views/categroyManager/insideSetting/addressManager'),
@@ -656,6 +129,8 @@ export const asyncRoutes = {
   vipNewActive: () => import('@/views/categroyManager/vipNewActive'),
   vipParameterManager: () => import('@/views/categroyManager/generalSettings/vipParameterManager'),
   globalConfig: () => import('@/views/categroyManager/globalConfig'),
+  // 侧边栏管理
+  setSilder: () => import('@/views/setSilder/addSilder'), 
 
 }
 export default router

src/views/businessManager/orderManager/backMoney.vue

@@ -1,68 +1,60 @@
 <template>
-  <div>
+  <div class="m-container">
     <h2>退费管理</h2>
-    <!-- 搜索类型 -->
-    <el-form :inline="true"
-             class="searchForm"
-             v-model="searchForm">
-      <el-form-item>
-        <el-select v-model="searchForm.status"
-                   placeholder="工作类型">
-          <el-option label="哈哈哈"
-                     value="1"></el-option>
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <!-- 查询列表 -->
-    <div class="searchWrap">
-      <p>查询条件:</p>
-      <div class="searchItem"
-           @click="closeSearch(item)"
-           v-for="(item,index) in searchLsit">
-        {{ item.key }}
-        <i class="el-icon-close"></i>
+    <div class="m-core">
+      <!-- 搜索类型 -->
+      <el-form :inline="true"
+              class="searchForm"
+              v-model="searchForm">
+        <el-form-item>
+          <el-select v-model="searchForm.status"
+                    placeholder="工作类型">
+            <el-option label="哈哈哈"
+                      value="1"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <!-- 列表 -->
+      <div class="tableWrap">
+        <el-table :data='tableList'>
+          <el-table-column align='center'
+                          label="申请时间">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="原订单编号">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="应付金额">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="实付金额">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="学员姓名">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="退费说明">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="预退费金额">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="实退费金额">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="退费状态">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="操作">
+          </el-table-column>
+        </el-table>
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
       </div>
     </div>
-    <!-- 列表 -->
-    <div class="tableWrap">
-      <el-table :data='tableList'>
-        <el-table-column align='center'
-                         label="申请时间">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="原订单编号">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="应付金额">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="实付金额">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="学员姓名">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="退费说明">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="预退费金额">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="实退费金额">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="退费状态">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="操作">
-        </el-table-column>
-      </el-table>
-      <pagination :total="rules.total"
-                  :page.sync="rules.page"
-                  :limit.sync="rules.limit"
-                  :page-sizes="rules.page_size"
-                  @pagination="getList" />
-    </div>
   </div>
 </template>
 <script>

src/views/businessManager/orderManager/expend.vue

@@ -1,58 +1,60 @@
 <template>
-  <div>
+  <div class="m-container">
     <h2>支出</h2>
-    <!-- 搜索类型 -->
-    <el-form :inline="true"
-             class="searchForm"
-             v-model="searchForm">
-      <el-form-item>
-        <el-select v-model="searchForm.status"
-                   placeholder="工作类型">
-          <el-option label="哈哈哈"
-                     value="1"></el-option>
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <!-- 查询列表 -->
-    <div class="searchWrap">
-      <p>查询条件:</p>
-      <div class="searchItem"
-           @click="closeSearch(item)"
-           v-for="(item,index) in searchLsit">
-        {{ item.key }}
-        <i class="el-icon-close"></i>
+    <div class="m-core">
+      <!-- 搜索类型 -->
+      <el-form :inline="true"
+              class="searchForm"
+              v-model="searchForm">
+        <el-form-item>
+          <el-select v-model="searchForm.status"
+                    placeholder="工作类型">
+            <el-option label="哈哈哈"
+                      value="1"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <!-- 查询列表 -->
+      <div class="searchWrap">
+        <p>查询条件:</p>
+        <div class="searchItem"
+            @click="closeSearch(item)"
+            v-for="(item,index) in searchLsit">
+          {{ item.key }}
+          <i class="el-icon-close"></i>
+        </div>
+      </div>
+      <!-- 列表 -->
+      <div class="tableWrap">
+        <el-table :data='tableList'>
+          <el-table-column align='center'
+                          label="提现交易流水号">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="申请时间">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="学员姓名">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="提现金额">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="账户余额">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="提现账户">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="提现状态">
+          </el-table-column>
+        </el-table>
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
       </div>
-    </div>
-    <!-- 列表 -->
-    <div class="tableWrap">
-      <el-table :data='tableList'>
-        <el-table-column align='center'
-                         label="提现交易流水号">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="申请时间">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="学员姓名">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="提现金额">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="账户余额">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="提现账户">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="提现状态">
-        </el-table-column>
-      </el-table>
-      <pagination :total="rules.total"
-                  :page.sync="rules.page"
-                  :limit.sync="rules.limit"
-                  :page-sizes="rules.page_size"
-                  @pagination="getList" />
     </div>
   </div>
 </template>

src/views/businessManager/orderManager/income.vue

@@ -1,67 +1,69 @@
 <template>
-  <div>
+  <div class="m-container">
     <h2>收入</h2>
-    <!-- 搜索类型 -->
-    <el-form :inline="true"
-             class="searchForm"
-             v-model="searchForm">
-      <el-form-item>
-        <el-select v-model="searchForm.status"
-                   placeholder="工作类型">
-          <el-option label="哈哈哈"
-                     value="1"></el-option>
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <!-- 查询列表 -->
-    <div class="searchWrap">
-      <p>查询条件:</p>
-      <div class="searchItem"
-           @click="closeSearch(item)"
-           v-for="(item,index) in searchLsit">
-        {{ item.key }}
-        <i class="el-icon-close"></i>
+    <div class="m-core">
+      <!-- 搜索类型 -->
+      <el-form :inline="true"
+              class="searchForm"
+              v-model="searchForm">
+        <el-form-item>
+          <el-select v-model="searchForm.status"
+                    placeholder="工作类型">
+            <el-option label="哈哈哈"
+                      value="1"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <!-- 查询列表 -->
+      <div class="searchWrap">
+        <p>查询条件:</p>
+        <div class="searchItem"
+            @click="closeSearch(item)"
+            v-for="(item,index) in searchLsit">
+          {{ item.key }}
+          <i class="el-icon-close"></i>
+        </div>
+      </div>
+      <!-- 列表 -->
+      <div class="tableWrap">
+        <el-table :data='tableList'>
+          <el-table-column align='center'
+                          label="交易流水号">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="订单日期">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="交易类型">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="订单说明">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="应付金额">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="实付金额">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="学员姓名">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="交易方式">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="收款账户">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="交易状态">
+          </el-table-column>
+        </el-table>
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
       </div>
-    </div>
-    <!-- 列表 -->
-    <div class="tableWrap">
-      <el-table :data='tableList'>
-        <el-table-column align='center'
-                         label="交易流水号">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="订单日期">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="交易类型">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="订单说明">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="应付金额">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="实付金额">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="学员姓名">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="交易方式">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="收款账户">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="交易状态">
-        </el-table-column>
-      </el-table>
-      <pagination :total="rules.total"
-                  :page.sync="rules.page"
-                  :limit.sync="rules.limit"
-                  :page-sizes="rules.page_size"
-                  @pagination="getList" />
     </div>
   </div>
 </template>

src/views/businessManager/shopManager/shopList.vue

@@ -163,7 +163,7 @@ export default {
         params.id = row.id
       }
       this.$router.push({
-        path: '/orderManager/shopOperation',
+        path: '/shopManager/shopOperation',
         query: params
       })
     }

src/views/businessManager/shopManager/shopOperation.vue

@@ -147,13 +147,13 @@ export default {
           message: title + '成功',
           type: 'success'
         })
-        this.$router.push('/orderManager/shopManager')
+        this.$router.push('/shopManager/shopManager')
       } else {
         this.$message.error(res.msg)
       }
     },
     onCancel() {
-      this.$router.push('/orderManager/shopManager')
+      this.$router.push('/shopManager/shopManager')
     },
     onReSet(formName) {
       this.$refs[formName].resetFields()

src/views/categroyManager/generalSettings/errorManager.vue

@@ -1,19 +1,16 @@
 <template>
   <div class='m-container'>
-    <!-- <h2>收费类型设置</h2> -->
+    <!-- <h2>错误类型管理</h2> -->
     <div class="m-core">
       <div class='newBand' @click="openTypes('create')">添加</div>
       <!-- 列表 -->
       <div class="tableWrap">
         <el-table :data='tableList'>
-          <el-table-column align='center' prop="name"
-                           label="收费类型">
+          <el-table-column align='center' prop="id"
+                           label="编号">
           </el-table-column>
-          <el-table-column align='center' 
-                           label="声部组合">
-            <template slot-scope="scope">
-              {{ scope.row.subjectName | joinArray(',') }}
-            </template>
+          <el-table-column align='center' prop="name"
+                           label="热词标签">
           </el-table-column>
           <el-table-column align='center'
                            label="操作">
@@ -33,25 +30,9 @@
     <el-dialog :title="formTitle[formActionTitle]" :visible.sync="typeStatus"
                @close="onFormClose('ruleForm')" width="500px">
       <el-form :model="form" :rules="rules" ref="ruleForm">
-        <el-form-item label="收费类型" prop="name" :label-width="formLabelWidth">
+        <el-form-item label="热词内容" prop="name" :label-width="formLabelWidth">
           <el-input v-model="form.name" autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="声部选择" v-if="form.classGroupType != 'MIX'"
-          prop="subjectIds" :label-width="formLabelWidth">
-          <el-select v-model="form.subjectIds" multiple>
-              <el-option-group
-                v-for="group in subjectList"
-                :key="group.label"
-                :label="group.label">
-                <el-option
-                  v-for="item in group.options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-option-group>
-          </el-select>
-        </el-form-item>
       </el-form>
       <span slot="footer"
             class="dialog-footer">
@@ -64,29 +45,27 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import store from '@/store'
-import { chargeTypeList, subjectListTree, chargeTypeUpSet } from '@/api/specialSetting'
+import { hotWordLabelManage, hotWordLabelManageAdd, hotWordLabelManageUpdate, hotWordLabelManageDel } from '@/api/systemManage'
 export default {
   components: { pagination },
-  name: 'adminManager',
+  name: 'errormanager',
   data () {
     return {
       tableList: [],
       subjectList: [], // 声部列表
       formActionTitle: 'create',
       formTitle: {
-        create: '添加收费类型',
-        update: '修改收费类型'
+        create: '添加热词标签',
+        update: '修改热词标签'
       },
       typeStatus: false, // 添加教学点 
       formLabelWidth: '120px',
       form: {
-        name: null, // 作业模块名称
-        subjectIds: [],
+        name: null, // 热词标签
         organId: store.getters.organ
       },
       rules: {
-        name: [{ required: true, message: '请输入类型名称', trigger: 'blur' }],
-        subjectIds: [{ required: true, message: '请选择声部组合', trigger: 'change' }]
+        name: [{ required: true, message: '请输入热词标签', trigger: 'blur' }]
       },
       pageInfo: {
         // 分页规则
@@ -99,7 +78,6 @@ export default {
   },
   mounted() {
     this.getList()
-    this.getSubjectTree()
   },
   methods: {
     onTypesSubmit (formName) { // 添加数据
@@ -109,11 +87,11 @@ export default {
             if(this.form.id) { // 判断有没有Id，如果有则删除
               delete this.form.id
             }
-            chargeTypeUpSet(this.form).then(res => {
+            hotWordLabelManageAdd(this.form).then(res => {
               this.messageTips('添加', res)
             })
           } else if (this.formActionTitle == 'update') {
-            chargeTypeUpSet(this.form).then(res => {
+            hotWordLabelManageUpdate(this.form).then(res => {
               this.messageTips('修改', res)
             })
           }
@@ -122,6 +100,11 @@ export default {
         }
       })
     },
+    onTypesDel(row) {
+      hotWordLabelManageDel(row.id).then(res => {
+        this.messageTips('删除', res)
+      })
+    },
     messageTips(title, res) {
       if(res.code == 200) {
         this.$message({
@@ -135,23 +118,14 @@ export default {
       }
     },
     getList () { 
-      chargeTypeList({
+      hotWordLabelManage({
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {
         let result = res.data
         if(res.code == 200) {
-          result.rows.forEach(row => {
-            let subjectname = [],
-              subjectIds = []
-            row.subjects.forEach(item => {
-              subjectname.push(item.name)
-              subjectIds.push(item.id)
-            })
-            row.subjectName = subjectname
-            row.subjectIds = subjectIds
-          })
           this.tableList = result.rows
+          this.pageInfo.total = result.total
         }
       })
     },
@@ -160,10 +134,10 @@ export default {
       this.formActionTitle = type
       // 修改的时候赋值
       if (type == 'update') {
+        console.log(name)
         this.form = {
           id: row.id,
           name: row.name,
-          subjectIds: row.subjectIds,
           organId: store.getters.organ
         }
       }
@@ -176,32 +150,7 @@ export default {
       }
       this.$refs[formName].resetFields()
     },
-    getSubjectTree() { // 获取声部列表
-      subjectListTree({
-        delFlag: 0,
-        rows: 9999
-      }).then(res => {
-        let result = res.data
-        if(res.code == 200) {
-          let tempArray = []
-          result.rows.forEach((item, index) => {
-            let subject = []
-            item.subjects.forEach(s => {
-              subject.push({
-                value: s.id,
-                label: s.name
-              })
-            })
-            
-            tempArray[index] = {
-              label: item.name,
-              options: subject
-            }
-          })
-          this.subjectList = tempArray
-        }
-      })
-    }
+    
   }
 }
 </script>

src/views/categroyManager/globalConfig.vue

@@ -24,7 +24,7 @@
         <el-tab-pane label="梯度结算规则设置" name="5">
             <gradientSet v-if="activeStatus[5]" />
         </el-tab-pane>
-        <el-tab-pane label="错误类型管理" name="6">
+        <el-tab-pane label="热词标签管理" name="6">
           <errorManager v-if="activeStatus[6]" />
         </el-tab-pane>
       </el-tabs>
@@ -52,8 +52,8 @@ export default {
   name: 'globalConfig',
   data () {
     return {
-      activeIndex: '6',
-      activeStatus: [false, false, false, false, false, false, true]
+      activeIndex: '0',
+      activeStatus: [true, false, false, false, false, false, false]
     }
   },
   methods: {

src/views/categroyManager/insideSetting/adminManager.vue

@@ -65,7 +65,7 @@ export default {
     },
     onAdminOperation(type, row) {
       let params = {
-        path: '/system/insideSetting/adminoperation',
+        path: '/specialSetup/adminoperation',
         query: {
           type: type
         }

src/views/categroyManager/insideSetting/adminOperation.vue

@@ -89,13 +89,13 @@ export default {
           message: title + '成功',
           type: 'success'
         })
-        this.$router.push('/system/insideSetting/adminManager')
+        this.$router.push('/specialSetup/adminManager')
       } else {
         this.$message.error(res.msg)
       }
     },
     lookSilder () { 
-      getSilder().then(res => {
+      getSilder({ hid: 0 }).then(res => {
         if(res.code != 200) return
         this.data = this.setTableData(res.data)
       })
@@ -147,7 +147,7 @@ export default {
       this.$refs[formName].resetFields()
     },
     onCancel() {
-      this.$router.push('/system/insideSetting/adminManager')
+      this.$router.push('/specialSetup/adminManager')
     }
   }
 }

src/views/categroyManager/insideSetting/branchActive.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='m-container'>
-    <h2>分部活动设置</h2>
+    <h2>VIP分部活动设置</h2>
     <div class="m-core">
       <div @click="openActive('create')" class='newBand'>新建</div>
       <!-- 搜索类型 -->
@@ -39,7 +39,7 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { courseSchedule } from '@/api/systemManage'
+import { courseScheduleRewards } from '@/api/systemManage'
 import store from '@/store'
 export default {
   components: { pagination },
@@ -67,7 +67,7 @@ export default {
   },
   methods: {
     getList() {
-      courseSchedule({
+      courseScheduleRewards({
         organId: this.organId,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
@@ -80,7 +80,7 @@ export default {
     },
     openActive(type, row) {
       let params = {
-        path: '/system/insideSetting/branchActiveOperation',
+        path: '/specialSetup/branchActiveOperation',
         query: {
           type: type
         }

src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -55,7 +55,7 @@
 <script>
 import store from '@/store'
 import { branchQueryPage } from '@/api/specialSetting'
-import { courseScheduleQuery, getUserRole, courseScheduleAdd, courseScheduleUpdate } from '@/api/systemManage'
+import { courseScheduleRewardsQuery, getUserRole, courseScheduleRewardsAdd, courseScheduleRewardsUpdate } from '@/api/systemManage'
 export default {
   name: 'adminManager',
   data () {
@@ -106,7 +106,7 @@ export default {
         })
 
         if(this.pageType == 'update') {
-            courseScheduleQuery({ id: this.id}).then(res => {
+            courseScheduleRewardsQuery({ id: this.id}).then(res => {
                 if(res.code == 200) {
                     let data = res.data
                     let tempList = []
@@ -150,13 +150,13 @@ export default {
 
                 if(this.pageType == 'update') {
                     params.id = result.id
-                    courseScheduleUpdate(params).then(res => {
+                    courseScheduleRewardsUpdate(params).then(res => {
                     this.messageTips('修改', res)
                     })
                 } else if(this.pageType == 'create') {
                     console.log(params)
                     // return false
-                    courseScheduleAdd(params).then(res => {
+                    courseScheduleRewardsAdd(params).then(res => {
                         this.messageTips('添加', res)
                     })
                 }
@@ -172,13 +172,13 @@ export default {
           message: title + '成功',
           type: 'success'
         })
-        this.$router.push('/system/insideSetting/branchActive')
+        this.$router.push('/specialSetup/branchActive')
       } else {
         this.$message.error(res.msg)
       }
     },
     onCancel() {
-      this.$router.push('/system/insideSetting/branchActive')
+      this.$router.push('/specialSetup/branchActive')
     },
     resetForm() {
         this.result = {

src/views/categroyManager/vipActiveList.vue

@@ -565,7 +565,7 @@ export default {
       })
     },
     gotoNewActive () {
-      this.$router.push({ path: '/vipParameterManager/vipNewActive' })
+      this.$router.push({ path: '/insideSetting/vipNewActive?type=create' })
     }
   },
 }

src/views/categroyManager/vipNewActive.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="m-container">
-    <h2>VIP活动方案新增 <div class="squrt"></div>
+    <!-- <h2>VIP活动方案新增 <div class="squrt"></div> </h2> -->
+    <h2>
+      <el-page-header @back="onCancel" :content="'VIP活动方案' + (pageType == 'create' ? '新增' : '修改')"></el-page-header>
     </h2>
     <div class="m-core">
       <el-form :label-position="labelPosition"
@@ -136,10 +138,9 @@
         </div>
       </div>
     </div>
-    <div class="btnWrap">
+    <div class="btnWrap" style="justify-content:flex-start">
       <div class="closeBtn">取消</div>
-      <div class="okBtn"
-           @click='submitFrom'>确定</div>
+      <div class="okBtn" @click='submitFrom'>确定</div>
     </div>
   </div>
 </template>
@@ -148,6 +149,7 @@ import { vipGroupCategory, addVipActive } from '@/api/vipSeting'
 export default {
   data () {
     return {
+      pageType: this.$route.query.type,
       labelPosition: 'left',
       vipform: {
         name: '',
@@ -249,7 +251,6 @@ export default {
                 type: 'success',
                 message: '恭喜你,活动创建成功'
               })
-
             }
           })
         } else {
@@ -260,6 +261,9 @@ export default {
 
       // 线上线下课 勾选就传不勾选就不传
       // addVipActive().then(res => { })
+    },
+    onCancel() {
+      this.$router.push("/insideSetting/vipActiveList")
     }
   },
 }

src/views/dashboard/index.vue

@@ -1,30 +0,0 @@
-<template>
-  <div class="dashboard-container">
-    <div class="dashboard-text">name: {{ name }}</div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'Dashboard',
-  computed: {
-    ...mapGetters([
-      'name'
-    ])
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.dashboard {
-  &-container {
-    margin: 30px;
-  }
-  &-text {
-    font-size: 30px;
-    line-height: 46px;
-  }
-}
-</style>

src/views/form/index.vue

@@ -1,85 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form ref="form" :model="form" label-width="120px">
-      <el-form-item label="Activity name">
-        <el-input v-model="form.name" />
-      </el-form-item>
-      <el-form-item label="Activity zone">
-        <el-select v-model="form.region" placeholder="please select your zone">
-          <el-option label="Zone one" value="shanghai" />
-          <el-option label="Zone two" value="beijing" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="Activity time">
-        <el-col :span="11">
-          <el-date-picker v-model="form.date1" type="date" placeholder="Pick a date" style="width: 100%;" />
-        </el-col>
-        <el-col :span="2" class="line">-</el-col>
-        <el-col :span="11">
-          <el-time-picker v-model="form.date2" type="fixed-time" placeholder="Pick a time" style="width: 100%;" />
-        </el-col>
-      </el-form-item>
-      <el-form-item label="Instant delivery">
-        <el-switch v-model="form.delivery" />
-      </el-form-item>
-      <el-form-item label="Activity type">
-        <el-checkbox-group v-model="form.type">
-          <el-checkbox label="Online activities" name="type" />
-          <el-checkbox label="Promotion activities" name="type" />
-          <el-checkbox label="Offline activities" name="type" />
-          <el-checkbox label="Simple brand exposure" name="type" />
-        </el-checkbox-group>
-      </el-form-item>
-      <el-form-item label="Resources">
-        <el-radio-group v-model="form.resource">
-          <el-radio label="Sponsor" />
-          <el-radio label="Venue" />
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="Activity form">
-        <el-input v-model="form.desc" type="textarea" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="onSubmit">Create</el-button>
-        <el-button @click="onCancel">Cancel</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      form: {
-        name: '',
-        region: '',
-        date1: '',
-        date2: '',
-        delivery: false,
-        type: [],
-        resource: '',
-        desc: ''
-      }
-    }
-  },
-  methods: {
-    onSubmit() {
-      this.$message('submit!')
-    },
-    onCancel() {
-      this.$message({
-        message: 'cancel!',
-        type: 'warning'
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.line{
-  text-align: center;
-}
-</style>
-

src/views/formManager/index.vue

@@ -1,107 +0,0 @@
-<template>
-  <div class="m-container">
-    <h2>
-      <div class="squrt"></div>
-      报表中心
-    </h2>
-    <div class="m-core">
-      <p class="subTitle">请设置数据范围，选择分部，时间范围</p>
-      <el-form :inline="true"
-               :model="searchList">
-        <el-form-item label="分部名称">
-          <el-select v-model="searchList.section">
-            <el-option label="嘿嘿嘿"
-                       value="1"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="乐团名称">
-          <el-select v-model="searchList.team">
-            <el-option label="嘿嘿嘿"
-                       value="1"></el-option>
-          </el-select>
-        </el-form-item>
-        <br />
-        <el-form-item label="选择时间">
-          <el-date-picker v-model="searchList.time"
-                          type="daterange"
-                          align="right"
-                          unlink-panels
-                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
-                          :picker-options="pickerOptions">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <p class="subTitle">请选择报表查看内容</p>
-      <div class="formList">
-        <el-checkbox-group v-model="checkList">
-          <el-checkbox label="复选框 A"></el-checkbox>
-          <el-checkbox label="复选框 B"></el-checkbox>
-        </el-checkbox-group>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  data () {
-    return {
-      searchList: {
-        section: '',
-        team: '',
-        time: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick (picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick (picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick (picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
-          }
-        }]
-      },
-      checkList: []
-    }
-  }
-}
-</script>
-<style lang="scss" scope>
-.m-container {
-  .el-date-editor--daterange.el-input,
-  .el-date-editor--daterange.el-input__inner,
-  .el-date-editor--timerange.el-input,
-  .el-date-editor--timerange.el-input__inner {
-    width: 400px;
-  }
-  .subTitle {
-    width: 1203px;
-    height: 40px;
-    line-height: 40px;
-    background-color: #fefceb;
-    padding: 0 25px;
-    box-sizing: border-box;
-    font-size: 16px;
-    color: #474747;
-    margin-bottom: 20px;
-  }
-}
-</style>

src/views/mapDemo/index.vue

@@ -1,99 +0,0 @@
-<template>
-  <div>
-    <el-amap :zoom="zoom"
-             :plugin="plugin"
-             :center="center">
-      <el-amap-marker :clickable="true"
-                      :events="marker.events"
-                      :position="marker.position"
-                      v-for="(marker, index) in markers"
-                      :key="index"></el-amap-marker>
-    </el-amap>
-  </div>
-</template>
-<script>
-export default {
-  data () {
-
-    return {
-      zoom: 14,
-      center: [114.34371, 30.55939],
-      markers: [],
-      searchResult: [], // 搜索出来的数据
-      plugin: [{
-        pName: 'Geolocation',
-        events: {
-          init (o) {
-            o.getCurrentPosition((status, result) => {
-              if (result && result.position) {
-                self.lng = result.position.lng
-                self.lat = result.position.lat
-                self.center = [self.lng, self.lat]
-                self.loaded = true
-                self.$nextTick()
-              }
-            })
-          }
-        }
-      }],
-      searchOption: {
-        pageSize: 1, // 单页显示结果条数
-        pageIndex: 1, // 页码
-        autoFitView: true // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-      },
-      addressDetail: null, // 输入详情地址
-      teachingSchool: null, // 教学点
-
-    }
-  },
-  mounted () {
-    let self = this
-  },
-  methods: {
-    onSearch () {
-      if (!this.search_value) return
-      this.markers = [] // 重置位置
-      let mapSearch = new AMap.PlaceSearch(this.searchOption)
-      // 目前只需要搜索第一条数据
-      mapSearch.search(this.search_value, (status, sr) => {
-        if (sr && sr.poiList && sr.poiList.count) {
-          let pois = sr.poiList.pois[0]
-          this.searchResult.push(pois)
-          this.markers.push({
-            position: [pois.location.lng, pois.location.lat],
-            events: this.markerEvents(pois)
-          })
-          this.center = [pois.location.lng, pois.location.lat]
-        } else if (sr.poiList === undefined) {
-          throw new Error(sr);
-        }
-      })
-    },
-    markerEvents (pois) {
-      // marker 事件列表
-      let that = this
-      return {
-        click: (e) => {
-          let geocoder = new AMap.Geocoder()
-          geocoder.getAddress(e.lnglat, function (status, result) {
-            if (status === 'complete' && result.regeocode) {
-              that.addressDetail = result.regeocode.formattedAddress
-            } else {
-              that.$toast('请重新选择地址')
-            }
-          })
-        }
-      }
-    }
-  }
-}
-</script>
-<style lang="scss">
-.el-vue-amap-container {
-  width: 100%;
-  height: 500px;
-}
-* {
-  touch-action: pan-y;
-}
-</style>

src/views/nested/menu1/index.vue

@@ -1,7 +0,0 @@
-<template>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1">
-      <router-view />
-    </el-alert>
-  </div>
-</template>

src/views/nested/menu1/menu1-1/index.vue

@@ -1,7 +0,0 @@
-<template>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-1" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>

src/views/nested/menu1/menu1-2/index.vue

@@ -1,7 +0,0 @@
-<template>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>

src/views/nested/menu1/menu1-2/menu1-2-1/index.vue

@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2-1" type="warning" />
-  </div>
-</template>

src/views/nested/menu1/menu1-2/menu1-2-2/index.vue

@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2-2" type="warning" />
-  </div>
-</template>

src/views/nested/menu1/menu1-3/index.vue

@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-3" type="success" />
-  </div>
-</template>

src/views/nested/menu2/index.vue

@@ -1,5 +0,0 @@
-<template>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 2" />
-  </div>
-</template>

src/views/reportForm/index.vue

@@ -1,12 +1,107 @@
 <template>
-  <div>
-    报表中心
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>
+      报表中心
+    </h2>
+    <div class="m-core">
+      <p class="subTitle">请设置数据范围，选择分部，时间范围</p>
+      <el-form :inline="true"
+               :model="searchList">
+        <el-form-item label="分部名称">
+          <el-select v-model="searchList.section">
+            <el-option label="嘿嘿嘿"
+                       value="1"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="乐团名称">
+          <el-select v-model="searchList.team">
+            <el-option label="嘿嘿嘿"
+                       value="1"></el-option>
+          </el-select>
+        </el-form-item>
+        <br />
+        <el-form-item label="选择时间">
+          <el-date-picker v-model="searchList.time"
+                          type="daterange"
+                          align="right"
+                          unlink-panels
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          :picker-options="pickerOptions">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <p class="subTitle">请选择报表查看内容</p>
+      <div class="formList">
+        <el-checkbox-group v-model="checkList">
+          <el-checkbox label="复选框 A"></el-checkbox>
+          <el-checkbox label="复选框 B"></el-checkbox>
+        </el-checkbox-group>
+      </div>
+    </div>
   </div>
 </template>
 <script>
 export default {
-
+  data () {
+    return {
+      searchList: {
+        section: '',
+        team: '',
+        time: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick (picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick (picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick (picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+      checkList: []
+    }
+  }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scope>
+.m-container {
+  .el-date-editor--daterange.el-input,
+  .el-date-editor--daterange.el-input__inner,
+  .el-date-editor--timerange.el-input,
+  .el-date-editor--timerange.el-input__inner {
+    width: 400px;
+  }
+  .subTitle {
+    width: 1203px;
+    height: 40px;
+    line-height: 40px;
+    background-color: #fefceb;
+    padding: 0 25px;
+    box-sizing: border-box;
+    font-size: 16px;
+    color: #474747;
+    margin-bottom: 20px;
+  }
+}
 </style>

src/views/studentManager/studentList.vue

@@ -47,7 +47,7 @@
           <el-table-column align='center'
                            label="操作">
             <template slot-scope="scope">
-              <router-link style="color:#409EFF" :to="`/student/studentdetaile?userId=${scope.row.userId}`">查看</router-link>
+              <router-link style="color:#409EFF" :to="`/business/studentDetail?userId=${scope.row.userId}`">查看</router-link>
             </template>
           </el-table-column>
         </el-table>

src/views/table/index.vue

@@ -1,79 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-table
-      v-loading="listLoading"
-      :data="list"
-      element-loading-text="Loading"
-      border
-      fit
-      highlight-current-row
-    >
-      <el-table-column align="center" label="ID" width="95">
-        <template slot-scope="scope">
-          {{ scope.$index }}
-        </template>
-      </el-table-column>
-      <el-table-column label="Title">
-        <template slot-scope="scope">
-          {{ scope.row.title }}
-        </template>
-      </el-table-column>
-      <el-table-column label="Author" width="110" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.author }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="Pageviews" width="110" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.pageviews }}
-        </template>
-      </el-table-column>
-      <el-table-column class-name="status-col" label="Status" width="110" align="center">
-        <template slot-scope="scope">
-          <el-tag :type="scope.row.status | statusFilter">{{ scope.row.status }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="created_at" label="Display_time" width="200">
-        <template slot-scope="scope">
-          <i class="el-icon-time" />
-          <span>{{ scope.row.display_time }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getList } from '@/api/table'
-
-export default {
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'gray',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      list: null,
-      listLoading: true
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.listLoading = true
-      getList().then(response => {
-        this.list = response.data.items
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>

src/views/teacherManager/teacherList.vue

@@ -91,7 +91,7 @@
           <el-table-column align='center'
                            label="操作">
             <template slot-scope="scope">
-              <router-link style="color:#409EFF" :to="`/teacher/teacherDetail?userId=${scope.row.userId}`">查看</router-link>
+              <router-link style="color:#409EFF" :to="`/business/teacherDetail?userId=${scope.row.userId}`">查看</router-link>
               <el-button type="text">冻结</el-button>
               <el-button type="text">解冻</el-button>
             </template>

src/views/tree/index.vue

@@ -1,78 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-input v-model="filterText" placeholder="Filter keyword" style="margin-bottom:30px;" />
-
-    <el-tree
-      ref="tree2"
-      :data="data2"
-      :props="defaultProps"
-      :filter-node-method="filterNode"
-      class="filter-tree"
-      default-expand-all
-    />
-
-  </div>
-</template>
-
-<script>
-export default {
-
-  data() {
-    return {
-      filterText: '',
-      data2: [{
-        id: 1,
-        label: 'Level one 1',
-        children: [{
-          id: 4,
-          label: 'Level two 1-1',
-          children: [{
-            id: 9,
-            label: 'Level three 1-1-1'
-          }, {
-            id: 10,
-            label: 'Level three 1-1-2'
-          }]
-        }]
-      }, {
-        id: 2,
-        label: 'Level one 2',
-        children: [{
-          id: 5,
-          label: 'Level two 2-1'
-        }, {
-          id: 6,
-          label: 'Level two 2-2'
-        }]
-      }, {
-        id: 3,
-        label: 'Level one 3',
-        children: [{
-          id: 7,
-          label: 'Level two 3-1'
-        }, {
-          id: 8,
-          label: 'Level two 3-2'
-        }]
-      }],
-      defaultProps: {
-        children: 'children',
-        label: 'label'
-      }
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree2.filter(val)
-    }
-  },
-
-  methods: {
-    filterNode(value, data) {
-      if (!value) return true
-      return data.label.indexOf(value) !== -1
-    }
-  }
-}
-</script>
-