Browse Source

01/08 15:28

新增查询红包页面
mo 5 years ago
parent
commit
a1d887a3f1

+ 0 - 0
dist/css/Approval.61a71453.css → dist/css/Approval.56c0da3c.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/CallNames.446859c1.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/CallNames.ab471200.css


File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/js/Approval.0865c14e.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/Approval~Attendance~CallNames~IStarted~Leave~PeriodAdjust~PeriodChange~TeachingSchool~TeachingSet~VI~165bd079.138093c5.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/Attendance.110fa41c.js


+ 0 - 0
dist/js/BookingSet.68bf1b09.js → dist/js/BookingSet.6b9c54a8.js


+ 0 - 0
dist/js/Business.15a345fa.js → dist/js/Business.a2ab9f61.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/CallNames.c27e009a.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/CallNames.f1e2d8b3.js


+ 0 - 0
dist/js/CcMe.aa62976b.js → dist/js/CcMe.394544d6.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/IStarted.59ddbc33.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/Leave.ad8776b0.js


+ 0 - 0
dist/js/PeriodAdjust.a3ddba79.js → dist/js/PeriodAdjust.cc4fd8f5.js


+ 0 - 0
dist/js/PeriodAdjust~PeriodChange.24bae92c.js → dist/js/PeriodAdjust~PeriodChange.6b7f9168.js


+ 0 - 0
dist/js/PeriodChange.7582b34f.js → dist/js/PeriodChange.94c0e446.js


+ 0 - 0
dist/js/StartedDetail.b4cdf0bb.js → dist/js/StartedDetail.00237b08.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/TeachingSchool.1946b361.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/TeachingSet.c3514496.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/VIPApply.de6c63ec.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.2c819738.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.a3393c8f.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/order.8d2c61fa.js


+ 0 - 0
dist/js/privacy.16d90f3f.js → dist/js/privacy.30b19f4b.js


+ 159 - 150
src/api/teacher.js

@@ -7,254 +7,263 @@ const api = '/api-teacher'
 
 // 查询我发起的任务列表
 const queryMyCreatedList = (data) => {
-    return axios({
-        url: api + '/snaker/task/queryMyCreatedList',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/snaker/task/queryMyCreatedList',
+    method: 'get',
+    params: data
+  })
 }
 
 // 查询我待办任务列表
 const queryWaitList = (data) => {
-    return axios({
-        url: api + '/snaker/task/queryWaitList',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/snaker/task/queryWaitList',
+    method: 'get',
+    params: data
+  })
 }
 
 // 查询我已办任务列表
 const queryProcessedList = (data) => {
-    return axios({
-        url: api + '/snaker/task/queryProcessedList',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/snaker/task/queryProcessedList',
+    method: 'get',
+    params: data
+  })
 }
 
 // 活动分类
 const findSubSubjects = (data) => {
-    return axios({
-        url: api + '/subject/findTeacherSubjets',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/subject/findTeacherSubjets',
+    method: 'get',
+    params: data
+  })
 }
 
 // vip课类别
 const vipGroupCategory = (data) => {
-    return axios({
-        url: api + '/vipGroupCategory/queryAll',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/vipGroupCategory/queryAll',
+    method: 'get',
+    params: data
+  })
 }
 
 // 根据课程类型获取对应课程活动方案
 const findByVipGroupCategory = (data) => {
-    return axios({
-        url: api + '/vipGroupActivity/findByVipGroupCategory',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/vipGroupActivity/findByVipGroupCategory',
+    method: 'get',
+    params: data
+  })
 }
 
 // 获取教师vip课教学点
 const findVipSchoolByTeacher = (data) => {
-    return axios({
-        url: api + '/school/findVipSchoolByTeacher',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/school/findVipSchoolByTeacher',
+    method: 'get',
+    params: data
+  })
 }
 
 // 获取教师vip课教学点(vip申请里面)
 const findVipSchoolByTeacher2 = (data) => {
-    return axios({
-        url: api + '/school/findVipSchoolByTeacher2',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/school/findVipSchoolByTeacher2',
+    method: 'get',
+    params: data
+  })
 }
 
 // 新增学校
 const schoolAdd = (data) => {
-    return axios({
-        url: api + '/school/add',
-        method: 'post',
-        data: qs.stringify(data)
-    })
+  return axios({
+    url: api + '/school/add',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
 // 删除学校
 const schoolDel = (data) => {
-    return axios({
-        url: api + '/school/del',
-        method: 'post',
-        data: qs.stringify(data)
-    })
+  return axios({
+    url: api + '/school/del',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
 // 修改学校
 const schoolUpdate = (data) => {
-    return axios({
-        url: api + '/school/update',
-        method: 'post',
-        data: qs.stringify(data)
-    })
+  return axios({
+    url: api + '/school/update',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
 // 根据老师编号及课程类型编号获取默认课酬
 const findByTeacherAndCategory = (data) => {
-    return axios({
-        url: api + '/teacherDefaultVipGroupSalary/findByTeacherAndCategory',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/teacherDefaultVipGroupSalary/findByTeacherAndCategory',
+    method: 'get',
+    params: data
+  })
 }
 
 // vip课申请
 const vipGroupApply = (data) => {
-    return axios({
-        url: api + '/teacherVipGroup/vipGroupApply',
-        method: 'post',
-        data: data
-    })
+  return axios({
+    url: api + '/teacherVipGroup/vipGroupApply',
+    method: 'post',
+    data: data
+  })
 }
 
 // 查询vip课列表
 const queryVipCourseScheduleList = (data) => {
-    return axios({
-        url: api + '/teacherLeaveRecord/queryVipCourseScheduleList',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/teacherLeaveRecord/queryVipCourseScheduleList',
+    method: 'get',
+    params: data
+  })
 }
 
 // 分页查询请假类型列表
 const leaveCategoryPage = (data) => {
-    return axios({
-        url: api + '/leaveCategory/queryPage',
-        method: 'post',
-        data: data
-    })
+  return axios({
+    url: api + '/leaveCategory/queryPage',
+    method: 'post',
+    data: data
+  })
 }
 
 // 请假
 const askForLeave = (data) => {
-    return axios({
-        url: api + '/teacherLeaveRecord/askForLeave',
-        method: 'post',
-        data: qs.stringify(data)
-    })
+  return axios({
+    url: api + '/teacherLeaveRecord/askForLeave',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
 // 根据日期获取当日排课
 const getCourseSchedulesWithDate = (data) => {
-    return axios({
-        url: api + '/teacherCourseSchedule/getCourseSchedulesWithDate',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/teacherCourseSchedule/getCourseSchedulesWithDate',
+    method: 'get',
+    params: data
+  })
 }
 
 // 根据月份获取该月有课的日期
 const getCourseScheduleDateByMonth = (data) => {
-    return axios({
-        url: api + '/teacherCourseSchedule/getCourseScheduleDateByMonth',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/teacherCourseSchedule/getCourseScheduleDateByMonth',
+    method: 'get',
+    params: data
+  })
 }
 
 // 课时调整
 const classStartDateAdjust = (data) => {
-    return axios({
-        url: api + '/teacherCourseSchedule/classStartDateAdjust',
-        method: 'post',
-        data: qs.stringify(data)
-    })
+  return axios({
+    url: api + '/teacherCourseSchedule/classStartDateAdjust',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
 // 课时交换
 const courseSwap = (data) => {
-    return axios({
-        url: api + '/teacherCourseSchedule/courseSwap',
-        method: 'post',
-        data: qs.stringify(data)
-    })
+  return axios({
+    url: api + '/teacherCourseSchedule/courseSwap',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
 // 历史考勤统计-头信息
 const statisticsInfo = (data) => {
-    return axios({
-        url: api + '/teacherCourseSchedule/statisticsInfo',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/teacherCourseSchedule/statisticsInfo',
+    method: 'get',
+    params: data
+  })
 }
 
 // 历史考勤统计-考勤列表
 const statisticsList = (data) => {
-    return axios({
-        url: api + '/teacherCourseSchedule/statisticsList',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/teacherCourseSchedule/statisticsList',
+    method: 'get',
+    params: data
+  })
 }
 
 // 获取乐团学院学员报名列表
 const queryStudentApply = (data) => {
-    return axios({
-        url: api + '/teacher/queryStudentApply',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/teacher/queryStudentApply',
+    method: 'get',
+    params: data
+  })
 }
 
 // 获取乐团学院学员报名列表
 const querySubByMusicGroupId = (data) => {
-    return axios({
-        url: api + '/teacher/querySubByMusicGroupId',
-        method: 'get',
-        params: data
-    })
+  return axios({
+    url: api + '/teacher/querySubByMusicGroupId',
+    method: 'get',
+    params: data
+  })
 }
 
 // 调剂
 const updateSubject = (data) => {
-    return axios({
-        url: api + '/studentRegistration/updateSubject',
-        method: 'post',
-        data: qs.stringify(data)
-    })
+  return axios({
+    url: api + '/studentRegistration/updateSubject',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
+// 查询福袋数据
+const getFortuneBag = () => {
+  return axios({
+    url: '/api-student/studentOrder/getLuckStatis',
+    method: 'get',
+
+  })
+}
 
 export {
-    queryMyCreatedList,
-    queryWaitList,
-    queryProcessedList,
-    findSubSubjects,
-    vipGroupCategory,
-    findByVipGroupCategory,
-    findVipSchoolByTeacher,
-    schoolAdd,
-    schoolDel,
-    schoolUpdate,
-    findByTeacherAndCategory,
-    vipGroupApply,
-    queryVipCourseScheduleList,
-    leaveCategoryPage,
-    askForLeave,
-    getCourseSchedulesWithDate,
-    getCourseScheduleDateByMonth,
-    classStartDateAdjust,
-    courseSwap,
-    statisticsInfo,
-    statisticsList,
-    queryStudentApply,
-    querySubByMusicGroupId,
-    updateSubject,
-    findVipSchoolByTeacher2
+  queryMyCreatedList,
+  queryWaitList,
+  queryProcessedList,
+  findSubSubjects,
+  vipGroupCategory,
+  findByVipGroupCategory,
+  findVipSchoolByTeacher,
+  schoolAdd,
+  schoolDel,
+  schoolUpdate,
+  findByTeacherAndCategory,
+  vipGroupApply,
+  queryVipCourseScheduleList,
+  leaveCategoryPage,
+  askForLeave,
+  getCourseSchedulesWithDate,
+  getCourseScheduleDateByMonth,
+  classStartDateAdjust,
+  courseSwap,
+  statisticsInfo,
+  statisticsList,
+  queryStudentApply,
+  querySubByMusicGroupId,
+  updateSubject,
+  findVipSchoolByTeacher2,
+  getFortuneBag
 }

+ 26 - 18
src/router/index.js

@@ -6,30 +6,38 @@ import TeacherRouter from './teacherRouter'
 Vue.use(Router)
 
 let defaultRouter = [
-    {
-        path: '/',
-        redirect:  {
-            name: 'business'
-        }
-    }]
+  {
+    path: '/',
+    redirect: {
+      name: 'business'
+    }
+  }, {
+    path: '/queryFortuneBag',
+    name: 'FortuneBag',
+    component: () => import(/* webpackChunkName:'CallNames'*/'@/views/teacher/queryList/queryFortuneBag'),
+    meta: {
+      descrition: '页面查看',
+      weight: 1 // 页面权重
+    }
+  }]
 
 defaultRouter = defaultRouter.concat(TeacherRouter)
 
 const router = new Router({
-    // mode: 'history',
-    base: process.env.BASE_URL,
-    routes: defaultRouter,
-    scrollBehavior() {
-        return { x: 0, y: 0 }
-    }
+  // mode: 'history',
+  base: process.env.BASE_URL,
+  routes: defaultRouter,
+  scrollBehavior () {
+    return { x: 0, y: 0 }
+  }
 })
 router.onError((error) => {
-    const pattern = /Loading chunk (\d)+ failed/g;
-    const isChunkLoadFailed = error.message.match(pattern);
-    const targetPath = router.history.pending.fullPath;
-    if (isChunkLoadFailed) {
-        router.replace(targetPath);
-    }
+  const pattern = /Loading chunk (\d)+ failed/g;
+  const isChunkLoadFailed = error.message.match(pattern);
+  const targetPath = router.history.pending.fullPath;
+  if (isChunkLoadFailed) {
+    router.replace(targetPath);
+  }
 })
 
 export default router

+ 82 - 0
src/views/teacher/queryList/queryFortuneBag.vue

@@ -0,0 +1,82 @@
+<template>
+  <div class="m-container">
+    <p class="title">零星订单</p>
+    <van-cell-group>
+      <van-cell title="总收入"
+                :value="totalMoney" />
+      <van-cell title="总笔数"
+                :value="totalNum" />
+    </van-cell-group>
+    <div class="tableWrap">
+      <div class="item">
+        <span>分部名</span>
+        <span>总笔数</span>
+        <span>总收入</span>
+      </div>
+      <div class="item"
+           v-for='(item,index) in orangeList'
+           :key="index">
+        <span>{{  item.organName}}</span>
+        <span>{{ item.nums}}</span>
+        <span>{{ item.money}}</span>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getFortuneBag } from '@/api/teacher'
+export default {
+  name: 'FortuneBag',
+  data () {
+    return {
+      totalNum: null,
+      totalMoney: null,
+      orangeList: []
+    }
+  },
+  mounted () {
+    getFortuneBag().then(res => {
+      if (res.data.code == 200) {
+        this.totalNum = res.data.data.totalNum + ' 笔'
+        this.totalMoney = res.data.data.totalMoney + ' 元'
+        this.orangeList = res.data.data.orderStatisDtoList
+      }
+    })
+  }
+}
+</script>
+<style lang="less">
+.m-container {
+  background-color: #fff;
+}
+.title {
+  height: 0.4rem;
+  line-height: 0.4rem;
+  text-align: center;
+  background-color: #14928a;
+  color: #fff;
+}
+.tableWrap {
+  .item {
+    padding: 0 15px;
+    height: 44px;
+    line-height: 44px;
+    background-color: #fff;
+    border-bottom: 1px solid #ebedf0;
+    font-size: 14px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    &:nth-child(1) {
+      background-color: #ebedf0;
+    }
+    span {
+      display: inline-block;
+      width: 33%;
+      text-align: center;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+}
+</style>

+ 72 - 71
vue.config.js

@@ -1,78 +1,79 @@
-let targetUrl = 'http://47.99.212.176:8000'
+// let targetUrl = 'http://47.99.212.176:8000'
+let targetUrl = 'http://192.168.3.27:8000'
 // let targetUrl = 'https://online.dayaedu.com'
 // let targetUrl = 'http://testadm.dayaedu.com/'
 // let targetUrl = 'http://192.168.3.48:8080'
 module.exports = {
-    publicPath: './',
-    // 生产环境 sourceMap
-    productionSourceMap: false,
-    // 调整内部的 webpack 配置。
-    // 查阅 https://github.com/vuejs/vue-doc-zh-cn/vue-cli/webpack.md
-    chainWebpack: config => {
-      config.plugin('html').tap(args => {
-          args[0].minify = {
-              removeAttributeQuotes: false
-          }
-          return args
-      })
-    },
-    configureWebpack: () => {},
-    // 配置 webpack-dev-server 行为。
-    devServer: {
-        open: process.platform === 'darwin',
-        host: '0.0.0.0',
-        port: 9999,
-        https: false,
-        hotOnly: false,
-        // 查阅 https://github.com/vuejs/vue-doc-zh-cn/vue-cli/cli-service.md#配置代理
-        proxy: {
-            '/contracts': {
-                target: targetUrl,
-                changeOrigin: true,
-                ws: true,
-                '^/contracts': '/contracts',
-                xfwd: true
-            },
-            '/api-student': {
-                target: targetUrl,
-                changeOrigin: true,
-                ws: true,
-                '^/api-student': '/api-student',
-                xfwd: true
-            },
-            '/api-cms': {
-                target: targetUrl,
-                changeOrigin: true,
-                ws: true,
-                '^/api-cms': '/api-cms',
-                xfwd: true
-            },
-            '/api-teacher': {
-                target: targetUrl,
-                changeOrigin: true,
-                ws: true,
-                '^/api-teacher': '/api-teacher',
-                xfwd: true
-            },
-            '/api-web': {
-                target: targetUrl,
-                changeOrigin: true,
-                ws: true,
-                '^/api-web': '/api-web',
-                xfwd: true
-            }
-        }, // string | Object
-    },
-    css: {
-      loaderOptions: {
-        less: {
-          modifyVars: {
-            // red: '#03a9f4',
-            blue: '#14928A',
-            // orange: '#f08d49',
-            // 'text-color': '#111'
-          }
+  publicPath: './',
+  // 生产环境 sourceMap
+  productionSourceMap: false,
+  // 调整内部的 webpack 配置。
+  // 查阅 https://github.com/vuejs/vue-doc-zh-cn/vue-cli/webpack.md
+  chainWebpack: config => {
+    config.plugin('html').tap(args => {
+      args[0].minify = {
+        removeAttributeQuotes: false
+      }
+      return args
+    })
+  },
+  configureWebpack: () => { },
+  // 配置 webpack-dev-server 行为。
+  devServer: {
+    open: process.platform === 'darwin',
+    host: '0.0.0.0',
+    port: 9999,
+    https: false,
+    hotOnly: false,
+    // 查阅 https://github.com/vuejs/vue-doc-zh-cn/vue-cli/cli-service.md#配置代理
+    proxy: {
+      '/contracts': {
+        target: targetUrl,
+        changeOrigin: true,
+        ws: true,
+        '^/contracts': '/contracts',
+        xfwd: true
+      },
+      '/api-student': {
+        target: targetUrl,
+        changeOrigin: true,
+        ws: true,
+        '^/api-student': '/api-student',
+        xfwd: true
+      },
+      '/api-cms': {
+        target: targetUrl,
+        changeOrigin: true,
+        ws: true,
+        '^/api-cms': '/api-cms',
+        xfwd: true
+      },
+      '/api-teacher': {
+        target: targetUrl,
+        changeOrigin: true,
+        ws: true,
+        '^/api-teacher': '/api-teacher',
+        xfwd: true
+      },
+      '/api-web': {
+        target: targetUrl,
+        changeOrigin: true,
+        ws: true,
+        '^/api-web': '/api-web',
+        xfwd: true
+      }
+    }, // string | Object
+  },
+  css: {
+    loaderOptions: {
+      less: {
+        modifyVars: {
+          // red: '#03a9f4',
+          blue: '#14928A',
+          // orange: '#f08d49',
+          // 'text-color': '#111'
         }
       }
-    },
+    }
+  },
 }

Some files were not shown because too many files changed in this diff