09/12 9:48

订单管理列表完成

src/App.vue

@@ -25,12 +25,12 @@ body {
 <style lang="scss">
 .el-tabs__item.is-active {
   color: #14928a;
-  font-size: 16px;
+  // font-size: 16px;
   font-weight: 600;
 }
 .el-tabs__item:hover {
   color: #14928a;
-  font-size: 16px;
+  // font-size: 16px;
   font-weight: 600;
 }
 // 选择框组件
@@ -148,4 +148,46 @@ body {
     }
   }
 }
+// 公用编剧模板
+.m-container {
+  box-sizing: border-box;
+  background-color: #fff;
+  padding: 18px 95px 55px 60px;
+  min-height: calc(100vh - 80px);
+  .m-core {
+    margin-top: 30px;
+    background-color: #fff;
+
+    position: relative;
+  }
+  h2 {
+    height: 48px;
+    line-height: 48px;
+    position: relative;
+    // padding-left: 30px;
+    margin-bottom: 30px;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center;
+    .term {
+      height: 32px;
+      line-height: 32px;
+      border-radius: 24px;
+      width: 100px;
+      color: #14928a;
+      border: 1px solid rgba(20, 146, 138, 1);
+      font-size: 16px;
+      text-align: center;
+      margin-right: 12px;
+      &:nth-child(1) {
+        margin-left: 47px;
+      }
+    }
+    .term.active {
+      color: #fff;
+      background-color: #14928a;
+    }
+  }
+}
 </style>

src/layout/components/AppMain.vue

@@ -21,10 +21,12 @@ export default {
 <style scoped>
 .app-main {
   /*50 = navbar  */
-  min-height: calc(100vh - 50px);
+  min-height: calc(100vh - 80px);
+  padding-top: 80px;
   width: 100%;
   position: relative;
   overflow: hidden;
+  box-sizing: border-box;
 }
 .fixed-header + .app-main {
   padding-top: 80px;

src/router/index.js

@@ -135,8 +135,67 @@ export const constantRoutes = [
         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: '/example',
     component: Layout,

src/views/businessManager/orderManager/backMoney.vue

@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <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>
+    </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>
+import pagination from '@/components/Pagination/index'
+export default {
+  components: { pagination },
+  name: 'income',
+  data () {
+    return {
+      searchForm: {
+        status: ''
+      },
+      searchLsit: [],
+      tableList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+    }
+  },
+  methods: {
+    getList () { }
+  }
+}
+</script>
+<style lang="scss">
+</style>

src/views/businessManager/orderManager/expend.vue

@@ -0,0 +1,86 @@
+<template>
+  <div>
+    <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>
+    </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>
+<script>
+import pagination from '@/components/Pagination/index'
+export default {
+  components: { pagination },
+  name: 'income',
+  data () {
+    return {
+      searchForm: {
+        status: ''
+      },
+      searchLsit: [],
+      tableList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+    }
+  },
+  methods: {
+    getList () { }
+  }
+}
+</script>
+<style lang="scss">
+</style>

src/views/businessManager/orderManager/income.vue

@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <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>
+    </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>
+import pagination from '@/components/Pagination/index'
+export default {
+  components: { pagination },
+  name: 'income',
+  data () {
+    return {
+      searchForm: {
+        status: ''
+      },
+      searchLsit: [],
+      tableList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+    }
+  },
+  methods: {
+    getList () { }
+  }
+}
+</script>
+<style lang="scss">
+</style>

src/views/businessManager/orderManager/index.vue

@@ -0,0 +1,13 @@
+<template>
+  <div class='m-container'>
+
+    <router-view />
+  </div>
+</template>
+<script>
+export default {
+
+}
+</script>
+<style lang="scss">
+</style>

src/views/businessManager/shopManager/index.vue

@@ -0,0 +1,12 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>
+<script>
+export default {
+
+}
+</script>
+<style lang="scss">
+</style>

src/views/businessManager/shopManager/shopCategory.vue

@@ -0,0 +1,12 @@
+<template>
+  <div>
+    商品分类
+  </div>
+</template>
+<script>
+export default {
+
+}
+</script>
+<style lang="scss">
+</style>

src/views/businessManager/shopManager/shopList.vue

@@ -0,0 +1,12 @@
+<template>
+  <div>
+    商品列表
+  </div>
+</template>
+<script>
+export default {
+
+}
+</script>
+<style lang="scss">
+</style>

src/views/main/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="m-conainer">
+  <div class="m-container">
     <h2>乐团列表</h2>
     <div class="m-core">
       <div class='newBand'>新建乐团</div>
@@ -241,25 +241,4 @@ export default {
 .select {
   font-size: 16px;
 }
-.m-conainer {
-  box-sizing: border-box;
-  background-color: #fff;
-  padding: 18px 95px 55px 60px;
-  h2 {
-    height: 48px;
-    line-height: 48px;
-    position: relative;
-  }
-  .m-core {
-    background-color: #fff;
-    min-height: calc(100vh - 160px);
-    padding: 20px 0;
-    .newBand {
-      margin-bottom: 20px;
-      background-color: #14928a;
-      border: 1px solid #14928a;
-      cursor: pointer;
-    }
-  }
-}
 </style>

src/views/studentManager/components/studentPayList.vue

@@ -0,0 +1,70 @@
+<template>
+  <div>
+    <!-- 搜索类型 -->
+    <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>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      searchForm: {
+        status: ''
+      },
+      searchLsit: [],
+      tableList: []
+    }
+  }
+}
+</script>
+<style lang="scss">
+</style>

src/views/studentManager/components/studentRecord.vue

@@ -0,0 +1,86 @@
+<template>
+  <div>
+    <!-- 搜索类型 -->
+    <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>
+</template>
+<script>
+import pagination from '@/components/Pagination/index'
+export default {
+  name: 'studentRecord',
+  components: { pagination },
+  data () {
+    return {
+      searchForm: {
+        status: ''
+      },
+      searchLsit: [],
+      tableList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+
+    }
+  },
+  methods: {
+    getList () { }
+  }
+}
+</script>
+<style lang="scss">
+</style>

src/views/studentManager/components/teamAndcourse.vue

@@ -0,0 +1,96 @@
+<template>
+  <div>
+    <div class="tabTopWrap">
+      <el-table :data='topTable'>
+        <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>
+    </div>
+    <!-- 搜索类型 -->
+    <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='topTable'>
+        <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>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      topTable: [],
+      searchLsit: [],
+      searchForm: {
+        status: ''
+      }
+
+    }
+  }
+}
+</script>
+<style lang="scss">
+.tabTopWrap {
+  margin-bottom: 30px;
+}
+</style>

src/views/studentManager/index.vue

@@ -0,0 +1,64 @@
+<template>
+  <div class="m-container">
+    <h2>
+      学员详情
+    </h2>
+    <div class="m-core">
+      <!-- navMenu -->
+      <el-tabs v-model="activeIndex"
+               type="card"
+               @tab-click="handleClick">
+        <el-tab-pane label="基本信息"
+                     name="1">
+        </el-tab-pane>
+        <el-tab-pane label="乐团&课程"
+                     name="2">
+          <teamAndcourse />
+        </el-tab-pane>
+        <el-tab-pane label="VIP课"
+                     name="3">
+
+        </el-tab-pane>
+        <el-tab-pane label="上课记录"
+                     name="4">
+          <studentRecord />
+        </el-tab-pane>
+        <el-tab-pane label="扣费记录"
+                     name="5">
+          <studentPayList />
+        </el-tab-pane>
+        <el-tab-pane label="学员订单"
+                     name="6">
+        </el-tab-pane>
+        <el-tab-pane label="学员账户"
+                     name="7">
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+</template>
+<script>
+import teamAndcourse from './components/teamAndcourse.vue';
+import studentRecord from './components/studentRecord.vue';
+import studentPayList from './components/studentPayList.vue';
+export default {
+  components: {
+    teamAndcourse,
+    studentRecord,
+    studentPayList
+  },
+  name: 'studentDetail',
+  data () {
+    return {
+      activeIndex: '2'
+    }
+  },
+  methods: {
+    handleClick (val) {
+      this.activeIndex = val.name;
+    }
+  }
+}
+</script>
+<style lang="scss">
+</style>

src/views/studentManager/studentList.vue

@@ -1,11 +1,97 @@
 <template>
-  <div>
-
+  <div class="m-container">
+    <h2>学员列表</h2>
+    <div class="m-core">
+      <div class="newBand">声部调整</div>
+      <!-- 搜索标题 -->
+      <el-form :inline="true"
+               class="searchForm"
+               v-model="searchForm">
+        <el-form-item>
+          <el-select v-model="searchForm.name"
+                     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="在读VIP课">
+          </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>
 </template>
 <script>
+import pagination from '@/components/Pagination/index'
 export default {
-
+  name: 'studentList',
+  components: { pagination },
+  data () {
+    return {
+      searchForm: {
+        name: '',
+      },
+      searchLsit: [],
+      tableList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+    }
+  },
+  methods: {
+    getList () { }
+  }
 }
 </script>
 <style lang="scss">

src/views/teacherManager/teacherDetail/index.vue

@@ -48,15 +48,4 @@ export default {
 }
 </script>
 <style lang="scss">
-.m-container {
-  box-sizing: border-box;
-  background-color: #fff;
-  padding: 18px 95px 55px 60px;
-  .m-core {
-    margin-top: 30px;
-    background-color: #fff;
-    min-height: calc(100vh - 160px);
-    position: relative;
-  }
-}
 </style>

src/views/teacherManager/teacherList.vue

@@ -102,15 +102,4 @@ export default {
 }
 </script>
 <style lang="scss">
-.m-container {
-  box-sizing: border-box;
-  background-color: #fff;
-  padding: 18px 95px 55px 60px;
-  .m-core {
-    margin-top: 30px;
-    background-color: #fff;
-    min-height: calc(100vh - 160px);
-    position: relative;
-  }
-}
 </style>

src/views/teamBuild/index.vue

@@ -22,11 +22,6 @@ export default {
 .cb-container {
   padding: 10px 30px 30px;
   h2 {
-    height: 40px;
-    line-height: 40px;
-    position: relative;
-    padding-left: 30px;
-    margin-bottom: 10px;
     .squrt {
       position: absolute;
       left: 0;

src/views/teamDetail/components/studentSignin.vue

@@ -4,9 +4,8 @@
       <div class="term">第一学期</div>
       <div class="term active">第二学期</div>
     </h2>
-    <div class="searchBtn">导出</div>
     <div class='m-core'>
-
+      <div class="searchBtn">导出</div>
       <!-- table  -->
       <div class="tableWrap">
         <el-table :data='tableList'>
@@ -42,49 +41,35 @@ export default {
 }
 </script>
 <style lang="scss" scope>
-.m-container {
-  box-sizing: border-box;
-  background-color: #fff;
-  padding: 18px 95px 55px 60px;
-  h2 {
-    height: 48px;
-    line-height: 48px;
-    position: relative;
-    padding-left: 30px;
-    margin-bottom: 30px;
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: center;
-    .term {
-      height: 32px;
-      line-height: 32px;
-      border-radius: 24px;
-      width: 100px;
-      color: #14928a;
-      border: 1px solid rgba(20, 146, 138, 1);
-      font-size: 16px;
-      text-align: center;
-      margin-right: 12px;
-      &:nth-child(1) {
-        margin-left: 47px;
-      }
-    }
-    .term.active {
-      color: #fff;
-      background-color: #14928a;
-    }
-  }
-  .m-core {
-    background-color: #fff;
-    min-height: calc(100vh - 160px);
-    padding: 20px 0;
-    .newBand {
-      margin-bottom: 20px;
-      background-color: #14928a;
-      border: 1px solid #14928a;
-      cursor: pointer;
-    }
-  }
-}
+// .m-container {
+//   h2 {
+//     height: 48px;
+//     line-height: 48px;
+//     position: relative;
+//     // padding-left: 30px;
+//     margin-bottom: 30px;
+//     display: flex;
+//     flex-direction: row;
+//     justify-content: flex-start;
+//     align-items: center;
+//     .term {
+//       height: 32px;
+//       line-height: 32px;
+//       border-radius: 24px;
+//       width: 100px;
+//       color: #14928a;
+//       border: 1px solid rgba(20, 146, 138, 1);
+//       font-size: 16px;
+//       text-align: center;
+//       margin-right: 12px;
+//       &:nth-child(1) {
+//         margin-left: 47px;
+//       }
+//     }
+//     .term.active {
+//       color: #fff;
+//       background-color: #14928a;
+//     }
+//   }
+// }
 </style>

src/views/teamDetail/components/teacherSignin.vue

@@ -41,49 +41,38 @@ export default {
 }
 </script>
 <style lang="scss" scope>
-.m-container {
-  box-sizing: border-box;
-  background-color: #fff;
-  padding: 18px 95px 55px 60px;
-  h2 {
-    height: 48px;
-    line-height: 48px;
-    position: relative;
-    padding-left: 30px;
-    margin-bottom: 30px;
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: center;
-    .term {
-      height: 32px;
-      line-height: 32px;
-      border-radius: 24px;
-      width: 100px;
-      color: #14928a;
-      border: 1px solid rgba(20, 146, 138, 1);
-      font-size: 16px;
-      text-align: center;
-      margin-right: 12px;
-      &:nth-child(1) {
-        margin-left: 47px;
-      }
-    }
-    .term.active {
-      color: #fff;
-      background-color: #14928a;
-    }
-  }
-  .m-core {
-    background-color: #fff;
-    min-height: calc(100vh - 160px);
-    padding: 20px 0;
-    .newBand {
-      margin-bottom: 20px;
-      background-color: #14928a;
-      border: 1px solid #14928a;
-      cursor: pointer;
-    }
-  }
-}
+// .m-container {
+//   box-sizing: border-box;
+//   background-color: #fff;
+//   padding: 18px 95px 55px 60px;
+//   h2 {
+//     height: 48px;
+//     line-height: 48px;
+//     position: relative;
+//     // padding-left: 30px;
+//     margin-bottom: 30px;
+//     display: flex;
+//     flex-direction: row;
+//     justify-content: flex-start;
+//     align-items: center;
+//     .term {
+//       height: 32px;
+//       line-height: 32px;
+//       border-radius: 24px;
+//       width: 100px;
+//       color: #14928a;
+//       border: 1px solid rgba(20, 146, 138, 1);
+//       font-size: 16px;
+//       text-align: center;
+//       margin-right: 12px;
+//       &:nth-child(1) {
+//         margin-left: 47px;
+//       }
+//     }
+//     .term.active {
+//       color: #fff;
+//       background-color: #14928a;
+//     }
+//   }
+// }
 </style>

src/views/teamDetail/index.vue

@@ -1,11 +1,11 @@
 <template>
-  <div class='td-container'>
+  <div class='m-container'>
     <h2>
       武汉小学乐团
       <div class="term">第一学期</div>
       <div class="term active">第二学期</div>
     </h2>
-    <div class="td-core">
+    <div class="m-core">
       <p class='msg'> <img src="@/assets/images/base/clock.png"
              alt=""> 报名中</p>
       <!-- navMenu -->
@@ -56,7 +56,7 @@ export default {
   },
   methods: {
     handleClick (val) {
-      this.activeIndex = val;
+      this.activeIndex = val.name;
     }
   },
   components: {
@@ -69,26 +69,18 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.td-container {
-  box-sizing: border-box;
-  background-color: #fff;
-  padding: 18px 95px 55px 60px;
+.m-container {
   h2 {
     height: 48px;
     line-height: 48px;
     position: relative;
-    padding-left: 30px;
     margin-bottom: 30px;
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
     align-items: center;
   }
-  .td-core {
-    background-color: #fff;
-    min-height: calc(100vh - 160px);
-    padding: 0 40px;
-    position: relative;
+  .m-core {
     .msg {
       text-align: right;
       color: #f97215;

src/views/vipClass/resetClasss.vue

@@ -70,4 +70,7 @@ export default {
 }
 </script>
 <style lang="scss">
+h2 {
+  margin-bottom: 0 !important;
+}
 </style>

src/views/vipClass/vipDetail/index.vue

@@ -43,15 +43,4 @@ export default {
 }
 </script>
 <style lang="scss">
-.m-container {
-  box-sizing: border-box;
-  background-color: #fff;
-  padding: 18px 95px 55px 60px;
-  .m-core {
-    margin-top: 30px;
-    background-color: #fff;
-    min-height: calc(100vh - 160px);
-    position: relative;
-  }
-}
 </style>

src/views/vipClass/vipList.vue

@@ -120,34 +120,5 @@ export default {
   box-sizing: border-box;
   background-color: #fff;
   padding: 18px 95px 55px 60px;
-  h2 {
-    height: 48px;
-    line-height: 48px;
-    position: relative;
-    // padding-left: 30px;
-    margin-bottom: 30px;
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: center;
-    .term {
-      height: 32px;
-      line-height: 32px;
-      border-radius: 24px;
-      width: 100px;
-      color: #14928a;
-      border: 1px solid rgba(20, 146, 138, 1);
-      font-size: 16px;
-      text-align: center;
-      margin-right: 12px;
-      &:nth-child(1) {
-        margin-left: 47px;
-      }
-    }
-    .term.active {
-      color: #fff;
-      background-color: #14928a;
-    }
-  }
 }
 </style>