后台修改

40fbb798 · wangwei · 0ff3d33c · 40fbb798 · 40fbb798 · 40fbb798
Commit 40fbb798 authored Jan 28, 2019 by wangwei
40 changed files
--- a/dev/index.html
+++ b/dev/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https:////at.alicdn.com/t/font_746649_x1rivf5f5.css><link rel=stylesheet href=https://unpkg.com/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://unpkg.com/vue@2.5.17/dist/vue.js></script><script src=https://unpkg.com/vuex@3.0.1/dist/vuex.min.js></script><script src=https://unpkg.com/axios@0.18.0/dist/axios.min.js></script><script src=https://unpkg.com/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.da6242474876288e9055.js></script><script type=text/javascript src=/static/js/vendor.19b07206259747695190.js></script><script type=text/javascript src=/static/js/app.a66b396d56a4c6f8f7a7.js></script></body><script>let el = document.getElementsByTagName("script");
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https:////at.alicdn.com/t/font_746649_x1rivf5f5.css><link rel=stylesheet href=https://unpkg.com/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://unpkg.com/vue@2.5.17/dist/vue.js></script><script src=https://unpkg.com/vuex@3.0.1/dist/vuex.min.js></script><script src=https://unpkg.com/axios@0.18.0/dist/axios.min.js></script><script src=https://unpkg.com/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.994daa76388effbf5c83.js></script><script type=text/javascript src=/static/js/vendor.19b07206259747695190.js></script><script type=text/javascript src=/static/js/app.a66b396d56a4c6f8f7a7.js></script></body><script>let el = document.getElementsByTagName("script");
    el.onerror = function(a,b,c){
      console.log('error:',a,b,c);
    };

--- a/dev/static/js/0.42937328c61fff5c350d.js
+++ b/dev/static/js/0.42937328c61fff5c350d.js
--- a/dev/static/js/10.f0ddad4c5a3b79c5cf4d.js
+++ b/dev/static/js/10.f0ddad4c5a3b79c5cf4d.js
--- a/dev/static/js/11.7a44a22eb870d9110c01.js
+++ b/dev/static/js/11.7a44a22eb870d9110c01.js
--- a/dev/static/js/13.9ee63470f73954888d7d.js
+++ b/dev/static/js/13.9ee63470f73954888d7d.js
--- a/dev/static/js/15.26dc61bad2cdfa04b07c.js
+++ b/dev/static/js/15.26dc61bad2cdfa04b07c.js
--- a/dev/static/js/2.01b80e53bf296c40d038.js
+++ b/dev/static/js/2.01b80e53bf296c40d038.js
--- a/dev/static/js/20.8cf2368985dacd2e943e.js
+++ b/dev/static/js/20.8cf2368985dacd2e943e.js
--- a/dev/static/js/7.4260d3feb8d39415cc24.js
+++ b/dev/static/js/7.4260d3feb8d39415cc24.js
--- a/dev/static/js/manifest.994daa76388effbf5c83.js
+++ b/dev/static/js/manifest.994daa76388effbf5c83.js
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var b,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(b in n)Object.prototype.hasOwnProperty.call(n,b)&&(e[b]=n[b]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var a={},f={54:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"42937328c61fff5c350d",1:"c0d5b8559be5c50bc9e7",2:"01b80e53bf296c40d038",3:"6d24144ee734ca14d106",4:"77a9177fe585d4389941",5:"6b10b3e75f34b98ebed3",6:"7f2ea2a144aa5858b132",7:"4260d3feb8d39415cc24",8:"3e53d262919f929cbdbe",9:"e1d696af6ef7b4fb7869",10:"f0ddad4c5a3b79c5cf4d",11:"7a44a22eb870d9110c01",12:"19c02c354c209ba9ee02",13:"9ee63470f73954888d7d",14:"5601195c7ecaa850ac1e",15:"26dc61bad2cdfa04b07c",16:"49e325f932e018d2ae1d",17:"710ef12988bf45ba25e6",18:"87d5e32ec7804c785802",19:"c45d65fe5ce700ec630a",20:"8cf2368985dacd2e943e",21:"6d93dbd5ee7844901705",22:"7089f6f1aaa9198a4f9e",23:"aadf7c5d6fe506755d4f",24:"aae231648c9f706180da",25:"402dbb9ae8e0fe0d2405",26:"da520e82f0cee71899a3",27:"3aefe3f3c631dc1e6ade",28:"6b952a0bb5929d1687c8",29:"d0eecb944b6da646b39e",30:"81a5f31c91c4d882cd3f",31:"c82e5bdfda1f915949c3",32:"ebcb28fa60e43c9209f3",33:"dd94ec439525b04bbc26",34:"98768f3425c7971517c7",35:"1f4d11b447a8e75fd3ce",36:"3499abb236cd6dde6fd3",37:"ef550c302d1eaa59a88a",38:"c60be8b7c17da8c033d7",39:"3777a282d94a61434aab",40:"18b7b7270ff32ce0ef13",41:"214a4066837e18c6b95c",42:"342ba2b586d7be7868fe",43:"ec355fc735ca813af86c",44:"cb0d607d3d9215cb6185",45:"f002ee4b50549513cd1e",46:"2f9a89c250898fcef45c",47:"2bcf8a5bef4802e4c816",48:"0f4eec4be5bf611a2879",49:"88c59ae13d1af27a2b59",50:"999a6f3c70b6de6ecb11",51:"bf1b1bdff5ff58e38d7e"}[e]+".js";var b=setTimeout(t,12e4);function t(){r.onerror=r.onload=null,clearTimeout(b);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=t,n.appendChild(r),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="/",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https:////at.alicdn.com/t/font_746649_x1rivf5f5.css><link rel=stylesheet href=https://unpkg.com/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.9965672aabb107b3155db6430ffca425.css rel=stylesheet></head><body><script src=https://unpkg.com/vue@2.5.17/dist/vue.js></script><script src=https://unpkg.com/vuex@3.0.1/dist/vuex.min.js></script><script src=https://unpkg.com/axios@0.18.0/dist/axios.min.js></script><script src=https://unpkg.com/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.0479165a87bbddcbdd59.js></script><script type=text/javascript src=/static/js/vendor.dabb3afa5856b271bc7f.js></script><script type=text/javascript src=/static/js/app.5590c1116608dd6f2795.js></script></body><script>let el = document.getElementsByTagName("script");
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https:////at.alicdn.com/t/font_746649_x1rivf5f5.css><link rel=stylesheet href=https://unpkg.com/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.b8ed6b6011cd5769d41f6c78fab39540.css rel=stylesheet></head><body><script src=https://unpkg.com/vue@2.5.17/dist/vue.js></script><script src=https://unpkg.com/vuex@3.0.1/dist/vuex.min.js></script><script src=https://unpkg.com/axios@0.18.0/dist/axios.min.js></script><script src=https://unpkg.com/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.6c378dd0c34945aad183.js></script><script type=text/javascript src=/static/js/vendor.dabb3afa5856b271bc7f.js></script><script type=text/javascript src=/static/js/app.355fd70dc578bbf3e7a3.js></script></body><script>let el = document.getElementsByTagName("script");
    el.onerror = function(a,b,c){
      console.log('error:',a,b,c);
    };

--- a/dist/static/css/app.b8ed6b6011cd5769d41f6c78fab39540.css
+++ b/dist/static/css/app.b8ed6b6011cd5769d41f6c78fab39540.css
--- a/dist/static/css/app.fb69851cff629416383df0c6c4579539.css
+++ b/dist/static/css/app.fb69851cff629416383df0c6c4579539.css
--- a/dist/static/js/0.9174028646e56aefa036.js
+++ b/dist/static/js/0.9174028646e56aefa036.js
--- a/dist/static/js/10.f511c96cc900d761a77f.js
+++ b/dist/static/js/10.f511c96cc900d761a77f.js
--- a/dist/static/js/11.361139f0d6194684222f.js
+++ b/dist/static/js/11.361139f0d6194684222f.js
--- a/dist/static/js/13.39668fa5804e339bcc9d.js
+++ b/dist/static/js/13.39668fa5804e339bcc9d.js
--- a/dist/static/js/14.018f99fadb94ec4cfead.js
+++ b/dist/static/js/14.018f99fadb94ec4cfead.js
--- a/dist/static/js/15.a5a5e8814911457480a6.js
+++ b/dist/static/js/15.a5a5e8814911457480a6.js
--- a/dist/static/js/2.05617a06ea9d4cf3508c.js
+++ b/dist/static/js/2.05617a06ea9d4cf3508c.js
--- a/dist/static/js/20.d6d2e0fa935b28ba708d.js
+++ b/dist/static/js/20.d6d2e0fa935b28ba708d.js
--- a/dist/static/js/21.36876eac5e46f66097da.js
+++ b/dist/static/js/21.36876eac5e46f66097da.js
--- a/dist/static/js/22.a2cb6e396b8bdd37ea8b.js
+++ b/dist/static/js/22.a2cb6e396b8bdd37ea8b.js
--- a/dist/static/js/23.16ae0d59e4fb7aff732c.js
+++ b/dist/static/js/23.16ae0d59e4fb7aff732c.js
--- a/dist/static/js/24.6f12a5ec0bc0acf3ed61.js
+++ b/dist/static/js/24.6f12a5ec0bc0acf3ed61.js
+webpackJsonp([24],{"0gIA":function(e,t){},"8IDT":function(e,t){},Fmgy:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var l=a("CCn6"),r={props:["dialogObj"],data:function(){return{nowPage:1,total:0,limit:10,classList:[]}},components:{page:a("kmJW").a},methods:{onPageChange:function(e){this.nowPage=e,this.classListOption()},onSizeChange:function(e){this.limit=e,this.nowPage=1,this.classListOption()},classListOption:function(){var e=this;void 0==this.dialogObj.timeValue[0]&&(this.dialogObj.timeValue[0]=""),void 0==this.dialogObj.timeValue[1]&&(this.dialogObj.timeValue[1]="");var t={page:this.nowPage,limit:this.limit,start_at:this.dialogObj.timeValue[0],end_at:this.dialogObj.timeValue[1]};Object(l._62)(t,this.dialogObj.teacher_id).then(function(t){e.classList=t.list,e.total=t.total})}},watch:{"dialogObj.show":function(e){e&&this.classListOption()}}},o={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("el-dialog",{attrs:{title:e.dialogObj.title,visible:e.dialogObj.show},on:{"update:visible":function(t){e.$set(e.dialogObj,"show",t)}}},[a("el-table",{staticStyle:{width:"100%"},attrs:{data:e.classList}},[a("el-table-column",{attrs:{label:"购买人",className:"f-c",width:"150"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("img",{staticClass:"avatar",attrs:{src:t.row.avatar}}),e._v(" "+e._s(t.row.nickname)),a("br"),e._v("(ID:"+e._s(t.row.user_id)+")\n      ")]}}])}),e._v(" "),a("el-table-column",{attrs:{prop:"out_trade_no",label:"交易订单号"}}),e._v(" "),a("el-table-column",{attrs:{prop:"goods_name",label:"商品名字"}}),e._v(" "),a("el-table-column",{attrs:{prop:"money",label:"金额(元)"}}),e._v(" "),a("el-table-column",{attrs:{prop:"pay_at",label:"支付时间"}})],1),e._v(" "),a("page",{attrs:{nowPage:e.nowPage,total:e.total,limit:e.limit},on:{pageChange:e.onPageChange,sizeChange:e.onSizeChange}})],1)},staticRenderFns:[]};var s={name:"index",data:function(){var e=this;return{activeName:"first",firstList:[],secondList:[],searchFirstFrom:{dateValue:[]},today:{text:"今天",onClick:function(){e.searchFirstFrom.dateValue=[e.formatTime(new Date),e.formatTime(new Date)],e.searchSecondFrom.dateValue=[e.formatTime(new Date),e.formatTime(new Date)]}},yesterday:{text:"昨天",onClick:function(){var t=e.formatTime(new Date((new Date).getTime()-864e5));e.searchFirstFrom.dateValue=[t,t],e.searchSecondFrom.dateValue=[t,t]}},last30Day:{text:"过去30天",onClick:function(){var t=e.formatTime(new Date((new Date).getTime()-2592e6));e.searchFirstFrom.dateValue=[t,e.formatTime(new Date)],e.searchSecondFrom.dateValue=[t,e.formatTime(new Date)]}},searchSecondFrom:{dateValue:[]},dialogObj:{show:!1,title:"售卖课程",teacher_id:"",timeValue:[]}}},components:{classDialog:a("VU/8")(r,o,!1,function(e){a("jAlk"),a("0gIA")},"data-v-43828d16",null).exports},mounted:function(){this.defaultTime(),this.searchFirstPage()},methods:{sortMoney:function(e,t){return Number(e.total_money)-Number(t.total_money)},handleClick:function(e){"first"===e.name?this.searchFirstPage():this.searchSecondPage()},searchFirstPage:function(){var e=this,t={};this.searchFirstFrom.dateValue&&(t={start_at:this.searchFirstFrom.dateValue[0],end_at:this.searchFirstFrom.dateValue[1]}),Object(l._66)(t).then(function(t){e.firstList=t})},searchSecondPage:function(){var e=this,t={};this.searchSecondFrom.dateValue&&(t={start_at:this.searchSecondFrom.dateValue[0],end_at:this.searchSecondFrom.dateValue[1]}),Object(l._63)(t).then(function(t){e.secondList=t})},formatTime:function(e){var t=e.getFullYear(),a=e.getMonth()+1;a<10&&(a="0"+a);var l=e.getDate();return l<10&&(l="0"+l),t+"-"+a+"-"+l},defaultTime:function(){var e=new Date,t=e.getFullYear(),a=e.getMonth()+1;a<10&&(a="0"+a);var l=e.getDate();l<10&&(l="0"+l);var r=t+"-"+a+"-01",o=t+"-"+a+"-"+l;this.searchFirstFrom.dateValue=[r,o],this.searchSecondFrom.dateValue=[r,o]},nameClick:function(e,t){this.dialogObj.teacher_id=e.tid,this.dialogObj.timeValue=void 0!=t?t:[e.cur_date,e.cur_date],this.dialogObj.show=!0}}},n={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("h2",{staticClass:"title"},[e._v("班主任业绩排行")]),e._v(" "),a("el-tabs",{attrs:{type:"card"},on:{"tab-click":e.handleClick},model:{value:e.activeName,callback:function(t){e.activeName=t},expression:"activeName"}},[a("el-tab-pane",{attrs:{label:"业绩总排行",name:"first"}},[a("el-form",{ref:"searchFirstFrom",attrs:{inline:"",model:e.searchFirstFrom,"label-width":"100px"}},[a("el-form-item",{attrs:{label:"起止日期"}},[a("el-date-picker",{attrs:{"unlink-panels":"",type:"daterange","picker-options":{shortcuts:[e.today,e.yesterday,e.last30Day]},"value-format":"yyyy-MM-dd","range-separator":"至","start-placeholder":"开始日期","end-placeholder":"结束日期"},on:{change:e.searchFirstPage},model:{value:e.searchFirstFrom.dateValue,callback:function(t){e.$set(e.searchFirstFrom,"dateValue",t)},expression:"searchFirstFrom.dateValue"}})],1),e._v(" "),a("el-form-item",{attrs:{label:""}},[a("el-button",{attrs:{type:"primary"},on:{click:function(t){e.searchFirstPage()}}},[e._v("\n            搜索\n          ")])],1)],1),e._v(" "),a("el-table",{staticStyle:{width:"100%"},attrs:{data:e.firstList}},[a("el-table-column",{attrs:{label:"班主任姓名"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("el-button",{attrs:{type:"text"},on:{click:function(a){e.nameClick(t.row,e.searchFirstFrom.dateValue)}}},[e._v("\n            "+e._s(t.row.teacher_name)+"\n            ")])]}}])}),e._v(" "),a("el-table-column",{attrs:{prop:"total_money",label:"销售额","sort-method":e.sortMoney,sortable:!0}}),e._v(" "),a("el-table-column",{attrs:{prop:"three_month",label:"季课",sortable:""}}),e._v(" "),a("el-table-column",{attrs:{prop:"one_year",label:"年课",sortable:""}}),e._v(" "),a("el-table-column",{attrs:{prop:"two_year",label:"2年课",sortable:""}})],1)],1),e._v(" "),a("el-tab-pane",{attrs:{label:"业绩按天排行",name:"second"}},[a("el-form",{ref:"searchSecondFrom",attrs:{inline:"",model:e.searchSecondFrom,"label-width":"100px"}},[a("el-form-item",{attrs:{label:"起止日期"}},[a("el-date-picker",{attrs:{"unlink-panels":"",type:"daterange","value-format":"yyyy-MM-dd","range-separator":"至",shortcuts:[],"start-placeholder":"开始日期","end-placeholder":"结束日期"},on:{change:e.searchSecondPage},model:{value:e.searchSecondFrom.dateValue,callback:function(t){e.$set(e.searchSecondFrom,"dateValue",t)},expression:"searchSecondFrom.dateValue"}})],1),e._v(" "),a("el-form-item",{attrs:{label:""}},[a("el-button",{attrs:{type:"primary"},on:{click:function(t){e.searchSecondPage()}}},[e._v("\n            搜索\n          ")])],1)],1),e._v(" "),a("el-table",{staticStyle:{width:"100%"},attrs:{data:e.secondList}},[a("el-table-column",{attrs:{prop:"cur_date",label:"时间",sortable:""}}),e._v(" "),a("el-table-column",{attrs:{label:"班主任姓名"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("el-button",{attrs:{type:"text"},on:{click:function(a){e.nameClick(t.row)}}},[e._v("\n            "+e._s(t.row.teacher_name)+"\n            ")])]}}])}),e._v(" "),a("el-table-column",{attrs:{prop:"total_money",label:"销售额","sort-method":e.sortMoney,sortable:!0}}),e._v(" "),a("el-table-column",{attrs:{prop:"three_month",label:"季课",sortable:""}}),e._v(" "),a("el-table-column",{attrs:{prop:"one_year",label:"年课",sortable:""}}),e._v(" "),a("el-table-column",{attrs:{prop:"two_year",label:"2年课",sortable:""}})],1)],1)],1),e._v(" "),a("class-dialog",{attrs:{dialogObj:e.dialogObj}})],1)},staticRenderFns:[]};var i=a("VU/8")(s,n,!1,function(e){a("8IDT")},"data-v-09bc9ef2",null);t.default=i.exports},jAlk:function(e,t){}});
\ No newline at end of file
--- a/dist/static/js/7.08d1c715ead8192057b3.js
+++ b/dist/static/js/7.08d1c715ead8192057b3.js
--- a/dist/static/js/7.19408b46b9bdfac2de0c.js
+++ b/dist/static/js/7.19408b46b9bdfac2de0c.js
--- a/dist/static/js/9.95d06b3ed1fd2b04a371.js
+++ b/dist/static/js/9.95d06b3ed1fd2b04a371.js
--- a/dist/static/js/app.355fd70dc578bbf3e7a3.js
+++ b/dist/static/js/app.355fd70dc578bbf3e7a3.js
--- a/dist/static/js/manifest.6c378dd0c34945aad183.js
+++ b/dist/static/js/manifest.6c378dd0c34945aad183.js
+!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],d[t]&&u.push(d[t][0]),d[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(f&&f(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=c(c.s=n[i]);return o};var a={},d={54:0};function c(f){if(a[f])return a[f].exports;var d=a[f]={i:f,l:!1,exports:{}};return e[f].call(d.exports,d,d.exports,c),d.l=!0,d.exports}c.e=function(e){var f=d[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var a=new Promise(function(a,c){f=d[e]=[a,c]});f[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,c.nc&&n.setAttribute("nonce",c.nc),n.src=c.p+"static/js/"+e+"."+{0:"9174028646e56aefa036",1:"1c87ee32f87c48211e10",2:"05617a06ea9d4cf3508c",3:"7ec694679898ed891211",4:"279db5301254b6ef2bd3",5:"dddf558ff431f453fdc8",6:"f5f52d53e8ab95aae6c0",7:"19408b46b9bdfac2de0c",8:"dabbff2c8e6702bca51c",9:"95d06b3ed1fd2b04a371",10:"f511c96cc900d761a77f",11:"361139f0d6194684222f",12:"a3e761cd50598001b352",13:"39668fa5804e339bcc9d",14:"018f99fadb94ec4cfead",15:"a5a5e8814911457480a6",16:"7c6c8b10d47ba8ca897d",17:"43d77bb9b58fb56a85af",18:"7390bf9d3a80541d2f3d",19:"f8e8efe4c00a41b4bfb1",20:"d6d2e0fa935b28ba708d",21:"36876eac5e46f66097da",22:"a2cb6e396b8bdd37ea8b",23:"16ae0d59e4fb7aff732c",24:"6f12a5ec0bc0acf3ed61",25:"9442b5b325d08f47b29a",26:"927b652ded28552062ed",27:"29df7912ecb36a35106a",28:"3da5f2e721f3bdd53cf0",29:"1688a6cba717e0bbf00c",30:"de89a5473bf98f3b7a8a",31:"607866bad3cdea8dc1d3",32:"10aa31c1d4f13e66558e",33:"628c6fa615c8a68c94bf",34:"7229fc4609f44c673897",35:"c69762c9f6ad041e6e5c",36:"2a8862e4a22c90a35cb1",37:"c725871259d25c0d23d0",38:"36d262b88ddd5b4449f9",39:"6c4642f5272af03d8d92",40:"079d6d6ba2e1b89b0ded",41:"00de844f181bd949e43f",42:"a95d3e2ff9653feed2a6",43:"8f868af21a84c5f9b885",44:"47b0502be2f4503a83dc",45:"5a98fe47ab5bd0b87961",46:"6e278b1aff1cbd6005d6",47:"9cf806e0d226649b8d50",48:"194db34e5b986520c02b",49:"2dde5f10f1fd4ba7ff31",50:"f3d387b4b31710ee95d8",51:"fc89035f1395ed8cfd2d"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var f=d[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},c.m=e,c.c=a,c.d=function(e,f,a){c.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:a})},c.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(f,"a",f),f},c.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},c.p="/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dist/static/js/manifest.7c7223428b998b3e7e69.js
+++ b/dist/static/js/manifest.7c7223428b998b3e7e69.js
+!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],d[t]&&u.push(d[t][0]),d[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(f&&f(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=c(c.s=n[i]);return o};var a={},d={54:0};function c(f){if(a[f])return a[f].exports;var d=a[f]={i:f,l:!1,exports:{}};return e[f].call(d.exports,d,d.exports,c),d.l=!0,d.exports}c.e=function(e){var f=d[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var a=new Promise(function(a,c){f=d[e]=[a,c]});f[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,c.nc&&n.setAttribute("nonce",c.nc),n.src=c.p+"static/js/"+e+"."+{0:"9174028646e56aefa036",1:"1c87ee32f87c48211e10",2:"05617a06ea9d4cf3508c",3:"7ec694679898ed891211",4:"279db5301254b6ef2bd3",5:"dddf558ff431f453fdc8",6:"f5f52d53e8ab95aae6c0",7:"08d1c715ead8192057b3",8:"dabbff2c8e6702bca51c",9:"95d06b3ed1fd2b04a371",10:"f511c96cc900d761a77f",11:"361139f0d6194684222f",12:"a3e761cd50598001b352",13:"39668fa5804e339bcc9d",14:"018f99fadb94ec4cfead",15:"a5a5e8814911457480a6",16:"7c6c8b10d47ba8ca897d",17:"43d77bb9b58fb56a85af",18:"7390bf9d3a80541d2f3d",19:"f8e8efe4c00a41b4bfb1",20:"d6d2e0fa935b28ba708d",21:"36876eac5e46f66097da",22:"a2cb6e396b8bdd37ea8b",23:"16ae0d59e4fb7aff732c",24:"6f12a5ec0bc0acf3ed61",25:"9442b5b325d08f47b29a",26:"927b652ded28552062ed",27:"29df7912ecb36a35106a",28:"3da5f2e721f3bdd53cf0",29:"1688a6cba717e0bbf00c",30:"de89a5473bf98f3b7a8a",31:"607866bad3cdea8dc1d3",32:"10aa31c1d4f13e66558e",33:"628c6fa615c8a68c94bf",34:"7229fc4609f44c673897",35:"c69762c9f6ad041e6e5c",36:"2a8862e4a22c90a35cb1",37:"c725871259d25c0d23d0",38:"36d262b88ddd5b4449f9",39:"6c4642f5272af03d8d92",40:"079d6d6ba2e1b89b0ded",41:"00de844f181bd949e43f",42:"a95d3e2ff9653feed2a6",43:"8f868af21a84c5f9b885",44:"47b0502be2f4503a83dc",45:"5a98fe47ab5bd0b87961",46:"6e278b1aff1cbd6005d6",47:"9cf806e0d226649b8d50",48:"194db34e5b986520c02b",49:"2dde5f10f1fd4ba7ff31",50:"f3d387b4b31710ee95d8",51:"fc89035f1395ed8cfd2d"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var f=d[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},c.m=e,c.c=a,c.d=function(e,f,a){c.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:a})},c.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(f,"a",f),f},c.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},c.p="/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/achievement/index.vue
+++ b/src/components/achievement/index.vue
@@ -9,6 +9,7 @@
              v-model="searchFirstFrom.dateValue"
              unlink-panels
              type="daterange"
+              :picker-options="{shortcuts:[today,yesterday,last30Day]}"
              value-format="yyyy-MM-dd"
              range-separator="至"
              start-placeholder="开始日期"
@@ -65,6 +66,7 @@
              type="daterange"
              value-format="yyyy-MM-dd"
              range-separator="至"
+              :shortcuts="[]"
              start-placeholder="开始日期"
              end-placeholder="结束日期"
              @change="searchSecondPage">
@@ -133,6 +135,29 @@
          searchFirstFrom: {
            dateValue:[]
          },
+          today:{
+            text:'今天',
+            onClick:()=>{
+              this.searchFirstFrom.dateValue = [this.formatTime(new Date()),this.formatTime(new Date())];
+              this.searchSecondFrom.dateValue = [this.formatTime(new Date()),this.formatTime(new Date())]
+            }
+          },
+          yesterday:{
+            text:'昨天',
+            onClick:()=>{
+              let preDate = this.formatTime(new Date(new Date().getTime() - 24*60*60*1000));
+              this.searchFirstFrom.dateValue = [preDate,preDate];
+              this.searchSecondFrom.dateValue = [preDate,preDate]
+            }
+          },
+          last30Day:{
+            text:'过去30天',
+            onClick:()=>{
+              let preDate = this.formatTime(new Date(new Date().getTime() - 30*24*60*60*1000));
+              this.searchFirstFrom.dateValue = [preDate,this.formatTime(new Date())];
+              this.searchSecondFrom.dateValue = [preDate,this.formatTime(new Date())]
+            }
+          },
          searchSecondFrom:{
            dateValue:[]
          },
@@ -187,6 +212,16 @@
            this.secondList = res;
          })
        },
+        formatTime(date){
+          let year = date.getFullYear();
+          let Month = date.getMonth()+1;
+          if(Month < 10){
+            Month = `0${Month}`
+          }
+          let Day = date.getDate();
+          if(Day<10)Day = `0${Day}`;
+          return `${year}-${Month}-${Day}`;
+        },
        defaultTime(){
        let date = new Date();
        let year = date.getFullYear();

--- a/src/components/class/userList.vue
+++ b/src/components/class/userList.vue
@@ -49,7 +49,7 @@
          </el-select>
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="searchList">搜索</el-button>
+          <el-button type="primary" @click="searchList(classUserLimit)">搜索</el-button>
          <el-button type="success" @click="changeClass" v-if="!$store.state.readonly">切换班级</el-button>
          <el-button type="success" @click="onAddUser(false)" v-if="!$store.state.readonly">+添加用户</el-button>
           <el-button type="primary"  @click="exportTable(userTable)">导出</el-button>
@@ -107,6 +107,7 @@
      </el-table>
      <el-table
        :data="userTable"
+        v-loading="loadingFlag"
        size="mini"
        @selection-change="handleSelectionChange123"
        style="width: 100%" fixed>
@@ -219,6 +220,16 @@
        </template>
        </el-table-column>
      </el-table>
+      <div style="text-align: center">
+        <el-pagination
+          @size-change="searchList"
+          :page-sizes="[20,50,100,200,500,1000]"
+          :page-size="classUserLimit"
+          :current-page.sync="classUserNowPage"
+          layout="total , sizes, prev, pager, next, jumper"
+          :total="classUserTotal">
+        </el-pagination>
+      </div>
    </div>
    <el-dialog :modal="false" :visible.sync="addShow">
      <el-form label-width="90px">
@@ -445,6 +456,7 @@
      return {
        userTable:[],
        addId:'',
+        loadingFlag:false,
        statistics:{
          arrive_course_rate:0,
          clock_rate:0,
@@ -465,6 +477,9 @@
          limit: 5,
          total:0
        },
+        classUserLimit:20,
+        classUserTotal:0,
+        classUserNowPage:1,
        changeClassObj:{
          show:false,
          new_periods_id:'',
@@ -669,10 +684,15 @@
        this.lookDetail.nowPage = 1;
        this.getUserLook();
      },
-      searchList(){
+      searchList(value){
+        if (value) {
+          this.classUserLimit = value;
+          this.classUserNowPage = 1
+        }
+        this.loadingFlag = true;
        let json = {
-          page:1,
+          page:this.classUserNowPage,
-          limit:1000
+          limit:this.classUserLimit
        };
        let json2 = {};
        if(this.timeLang && this.timeLang.length > 1){
@@ -711,8 +731,9 @@
            })
        });
        getClassUserApi(this.userObj.classId,json).then(res=>{
-          this.searchFrom.total=res.total;
+          this.classUserTotal=res.total;
          this.userTable = res.list;
+          this.loadingFlag = false;
        });
        this.changeClassObj={
          show:false,
@@ -744,6 +765,10 @@
            teacher_add_user_num:0,
            user_add_teacher_num:0
        };
+        this.classUserLimit=20;
+          this.classUserTotal=0;
+          this.classUserNowPage=1;
        this.searchList()
      },
      changeUser(data){
@@ -971,6 +996,9 @@
          this.initPage()
        }
      },
+      'classUserNowPage'(value){
+        this.searchList()
+      },
      "changeClassObj.show"(val){
        if(val){
          this.defaultClass()

--- a/src/components/exchange/list.vue
+++ b/src/components/exchange/list.vue
--- a/src/components/integral/index.vue
+++ b/src/components/integral/index.vue
--- a/src/components/lesson/index.vue
+++ b/src/components/lesson/index.vue
--- a/src/components/shop/index.vue
+++ b/src/components/shop/index.vue
--- a/src/components/teacherDetail/chooseGoodDialog.vue
+++ b/src/components/teacherDetail/chooseGoodDialog.vue
--- a/src/components/teacherDetail/index.vue
+++ b/src/components/teacherDetail/index.vue
@@ -145,7 +145,7 @@
        </el-table>
        <page :total="total" :limit="limit" @pageChange="onPageChange" @sizeChange="onSizeChange"/>
      </el-tab-pane>
-      <el-tab-pane label="月课订单列表">
+      <el-tab-pane label="订单列表">
        <el-form ref="form" :model="form" label-width="100px" inline>
          <el-form-item label="用户ID">
@@ -669,7 +669,6 @@
        if (this.form.mobile) {
          json.mobile = this.form.mobile
        }
-        json.course_type=0       //月课
        //  json.invite_id=this.id;
        if(this.detail.user_id !==0){
          json.invite_id=this.detail.user_id;

--- a/src/components/teacherDetail/task.vue
+++ b/src/components/teacherDetail/task.vue