月课看板滚动

8fc07a00 · wangwei · b9e32560 · 8fc07a00 · 8fc07a00 · 8fc07a00
Commit 8fc07a00 authored Mar 06, 2019 by wangwei
46 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://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://cdn.jsdelivr.net/npm/vue@2.5.17/dist/vue.js></script><script src=https://cdn.jsdelivr.net/npm/vuex@3.0.1/dist/vuex.min.js></script><script src=https://cdn.jsdelivr.net/npm/axios@0.18.0/dist/axios.min.js></script><script src=https://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.f45394276c2cf77b7f7a.js></script><script type=text/javascript src=/static/js/vendor.18089792bba27580caa0.js></script><script type=text/javascript src=/static/js/app.ef2d3881b56918e94b8e.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://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://cdn.jsdelivr.net/npm/vue@2.5.17/dist/vue.js></script><script src=https://cdn.jsdelivr.net/npm/vuex@3.0.1/dist/vuex.min.js></script><script src=https://cdn.jsdelivr.net/npm/axios@0.18.0/dist/axios.min.js></script><script src=https://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.ef32891ce651f66659e0.js></script><script type=text/javascript src=/static/js/vendor.18089792bba27580caa0.js></script><script type=text/javascript src=/static/js/app.ef2d3881b56918e94b8e.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.029bd1f696ba3517767f.js
+++ b/dev/static/js/0.029bd1f696ba3517767f.js
--- a/dev/static/js/10.fe8e79580c18307f4d55.js
+++ b/dev/static/js/10.fe8e79580c18307f4d55.js
--- a/dev/static/js/11.ff7d2429de6821ce6b49.js
+++ b/dev/static/js/11.ff7d2429de6821ce6b49.js
--- a/dev/static/js/12.8012a162feedb29b11e3.js
+++ b/dev/static/js/12.8012a162feedb29b11e3.js
--- a/dev/static/js/13.da71758e6f41faca1499.js
+++ b/dev/static/js/13.da71758e6f41faca1499.js
--- a/dev/static/js/15.92a989af1458dbf4c85d.js
+++ b/dev/static/js/15.92a989af1458dbf4c85d.js
--- a/dev/static/js/16.66b55ee0ebdd9db2e02a.js
+++ b/dev/static/js/16.66b55ee0ebdd9db2e02a.js
--- a/dev/static/js/19.1ed575c39b52d8460084.js
+++ b/dev/static/js/19.1ed575c39b52d8460084.js
--- a/dev/static/js/2.feae7841e02e6d969941.js
+++ b/dev/static/js/2.feae7841e02e6d969941.js
--- a/dev/static/js/21.bec51c604aff9435ff66.js
+++ b/dev/static/js/21.bec51c604aff9435ff66.js
--- a/dev/static/js/22.d9ccfd21a6f1639fdb15.js
+++ b/dev/static/js/22.d9ccfd21a6f1639fdb15.js
--- a/dev/static/js/3.7f5112704467ad3ccd7e.js
+++ b/dev/static/js/3.7f5112704467ad3ccd7e.js
--- a/dev/static/js/4.e4d787a0e604af5f106b.js
+++ b/dev/static/js/4.e4d787a0e604af5f106b.js
--- a/dev/static/js/41.6317d7b88f514cc6f48d.js
+++ b/dev/static/js/41.6317d7b88f514cc6f48d.js
--- a/dev/static/js/6.c09ab9b7d0da3595ccfd.js
+++ b/dev/static/js/6.c09ab9b7d0da3595ccfd.js
--- a/dev/static/js/7.469bb4da0cd70630279f.js
+++ b/dev/static/js/7.469bb4da0cd70630279f.js
--- a/dev/static/js/8.e7a33209898b64d304d4.js
+++ b/dev/static/js/8.e7a33209898b64d304d4.js
--- a/dev/static/js/manifest.ef32891ce651f66659e0.js
+++ b/dev/static/js/manifest.ef32891ce651f66659e0.js
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,b,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],c[t]&&u.push(c[t][0]),c[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(f,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var f={},c={55:0};function d(a){if(f[a])return f[a].exports;var c=f[a]={i:a,l:!1,exports:{}};return e[a].call(c.exports,c,c.exports,d),c.l=!0,c.exports}d.e=function(e){var a=c[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var f=new Promise(function(f,d){a=c[e]=[f,d]});a[2]=f;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"029bd1f696ba3517767f",1:"3369cf5de88f8eeb94e1",2:"feae7841e02e6d969941",3:"7f5112704467ad3ccd7e",4:"e4d787a0e604af5f106b",5:"6e90bab48b8c5a7dfcad",6:"c09ab9b7d0da3595ccfd",7:"469bb4da0cd70630279f",8:"e7a33209898b64d304d4",9:"e53977448c04faf8b1f7",10:"fe8e79580c18307f4d55",11:"ff7d2429de6821ce6b49",12:"8012a162feedb29b11e3",13:"da71758e6f41faca1499",14:"ad09c492158f9b361b74",15:"92a989af1458dbf4c85d",16:"66b55ee0ebdd9db2e02a",17:"b103bf50ef28292bb992",18:"879fa566c8d1aa481000",19:"1ed575c39b52d8460084",20:"586abfced5fabb7f8880",21:"bec51c604aff9435ff66",22:"d9ccfd21a6f1639fdb15",23:"38a50bdc059b1c8fccb6",24:"e1c9571aa7eb07b57c95",25:"abdfb89c9d0ed13ca070",26:"807cd2f79bbd0c7052d6",27:"a78d2ba7f049e4da0fa6",28:"3f3542a409376c79986f",29:"eca8b585d056cf7c5371",30:"d7641f317c3b1d80ce6a",31:"2b571de951a3858fd06e",32:"89d3b687c58a229d9fd9",33:"39c10f211d37cd204252",34:"91ac8721f696e4d61dc1",35:"dba70f3fa5c0d6321bd3",36:"c91456cf223465e3d648",37:"a0d681fa6de26993615d",38:"891d189001ee4d389be8",39:"c78d66fc7e111c33bb62",40:"90e34cb1ae89979c4fb3",41:"6317d7b88f514cc6f48d",42:"8aa39a0a1198dff6e736",43:"9f4919346b391979f066",44:"4464e6b2a829e3803640",45:"befa6924f14e83196746",46:"864ad3d78552719eb6e2",47:"331285b3b23aafbb17b7",48:"ea3e525eef66fa3ec45d",49:"a2e0409e72fc7a5eb075",50:"247a097533008b185f20",51:"371c12cec09c0f7f4155",52:"4ea3e0ffa7015040b44e"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),f},d.m=e,d.c=f,d.d=function(e,a,f){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="/",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dev/static/外部订单模板.xlsx
+++ b/dev/static/外部订单模板.xlsx
--- 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://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.d2b48233506914838857831c75d6e944.css rel=stylesheet></head><body><script src=https://cdn.jsdelivr.net/npm/vue@2.5.17/dist/vue.js></script><script src=https://cdn.jsdelivr.net/npm/vuex@3.0.1/dist/vuex.min.js></script><script src=https://cdn.jsdelivr.net/npm/axios@0.18.0/dist/axios.min.js></script><script src=https://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.2e47d36a8e4276c066e7.js></script><script type=text/javascript src=/static/js/vendor.db61706235b22f8a2d19.js></script><script type=text/javascript src=/static/js/app.dcd760000752c0485e40.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://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.eceea4112610dc38c2ef61d5da186eca.css rel=stylesheet></head><body><script src=https://cdn.jsdelivr.net/npm/vue@2.5.17/dist/vue.js></script><script src=https://cdn.jsdelivr.net/npm/vuex@3.0.1/dist/vuex.min.js></script><script src=https://cdn.jsdelivr.net/npm/axios@0.18.0/dist/axios.min.js></script><script src=https://cdn.jsdelivr.net/npm/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.5b1bbac7bd23b536e73a.js></script><script type=text/javascript src=/static/js/vendor.db61706235b22f8a2d19.js></script><script type=text/javascript src=/static/js/app.dcd760000752c0485e40.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.eceea4112610dc38c2ef61d5da186eca.css
+++ b/dist/static/css/app.eceea4112610dc38c2ef61d5da186eca.css
--- a/dist/static/js/0.464a4506f3b5d6c198d4.js
+++ b/dist/static/js/0.464a4506f3b5d6c198d4.js
--- a/dist/static/js/10.3d264b74fc269a8ee41e.js
+++ b/dist/static/js/10.3d264b74fc269a8ee41e.js
--- a/dist/static/js/11.477032ad40dc08676db1.js
+++ b/dist/static/js/11.477032ad40dc08676db1.js
--- a/dist/static/js/12.258780b713881c6cbfdf.js
+++ b/dist/static/js/12.258780b713881c6cbfdf.js
--- a/dist/static/js/13.9686e8295c97872aeaa4.js
+++ b/dist/static/js/13.9686e8295c97872aeaa4.js
--- a/dist/static/js/14.627295f72db06306fb23.js
+++ b/dist/static/js/14.627295f72db06306fb23.js
--- a/dist/static/js/15.cc5ffce79dea16f9d562.js
+++ b/dist/static/js/15.cc5ffce79dea16f9d562.js
--- a/dist/static/js/2.fbe02cbbd13b6ce4e84d.js
+++ b/dist/static/js/2.fbe02cbbd13b6ce4e84d.js
--- a/dist/static/js/20.245eea742446222b95e6.js
+++ b/dist/static/js/20.245eea742446222b95e6.js
--- a/dist/static/js/22.f94a87a6de5aa6f1adbd.js
+++ b/dist/static/js/22.f94a87a6de5aa6f1adbd.js
--- a/dist/static/js/23.76f8239f8c10471a1a3a.js
+++ b/dist/static/js/23.76f8239f8c10471a1a3a.js
--- a/dist/static/js/3.af03d07a378a5371bae3.js
+++ b/dist/static/js/3.af03d07a378a5371bae3.js
--- a/dist/static/js/41.c2d5f85335cfed9223f0.js
+++ b/dist/static/js/41.c2d5f85335cfed9223f0.js
--- a/dist/static/js/5.9579673ab8c830d1aafd.js
+++ b/dist/static/js/5.9579673ab8c830d1aafd.js
--- a/dist/static/js/6.37a38ad9ffa4a8c73ded.js
+++ b/dist/static/js/6.37a38ad9ffa4a8c73ded.js
--- a/dist/static/js/7.69571d68f2d852b2a8df.js
+++ b/dist/static/js/7.69571d68f2d852b2a8df.js
--- a/dist/static/js/8.70a7c1243c34a240aba0.js
+++ b/dist/static/js/8.70a7c1243c34a240aba0.js
--- a/dist/static/js/manifest.5b1bbac7bd23b536e73a.js
+++ b/dist/static/js/manifest.5b1bbac7bd23b536e73a.js
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,n,r){for(var t,o,b,i=0,u=[];i<c.length;i++)o=c[i],d[o]&&u.push(d[o][0]),d[o]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(a&&a(c,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=f(f.s=r[i]);return b};var c={},d={55:0};function f(a){if(c[a])return c[a].exports;var d=c[a]={i:a,l:!1,exports:{}};return e[a].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var a=d[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,f){a=d[e]=[c,f]});a[2]=c;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,f.nc&&r.setAttribute("nonce",f.nc),r.src=f.p+"static/js/"+e+"."+{0:"464a4506f3b5d6c198d4",1:"91d651405586caf3e299",2:"fbe02cbbd13b6ce4e84d",3:"af03d07a378a5371bae3",4:"fed2f7b31564d9c2f338",5:"9579673ab8c830d1aafd",6:"37a38ad9ffa4a8c73ded",7:"69571d68f2d852b2a8df",8:"70a7c1243c34a240aba0",9:"e14f9683afd99694acdb",10:"3d264b74fc269a8ee41e",11:"477032ad40dc08676db1",12:"258780b713881c6cbfdf",13:"9686e8295c97872aeaa4",14:"627295f72db06306fb23",15:"cc5ffce79dea16f9d562",16:"84ee74b0de5e2a50afe3",17:"6d1f922593a8c5e18eb0",18:"87d918cf5cc4cd623c7f",19:"46f118dfa948cb2db80f",20:"245eea742446222b95e6",21:"0e7cba7ae1225e0f176d",22:"f94a87a6de5aa6f1adbd",23:"76f8239f8c10471a1a3a",24:"550f4cab02d07d987e34",25:"b17ef1ded13dddcf317e",26:"505c85c1ea2e5fdc01f9",27:"17deaa9357785cec4854",28:"826f29ddac12da56aa1a",29:"8ed0f67ac4d72aa33c99",30:"83c2031aca8b1bf2a47c",31:"26be139d8e445659c02e",32:"7828d1dd4898699bcfeb",33:"5e95a5d22f55fac6c576",34:"da024e493eb052f65d93",35:"20a6e4606e96023c6a3d",36:"b5c16c6b5feb80f1fe8a",37:"dec70a0689ec38198e45",38:"6fe3032d9ded904c4900",39:"bb4ab46d94c0c955a235",40:"1f6959fb6c775947c973",41:"c2d5f85335cfed9223f0",42:"4be137392ad152f31ff0",43:"2eebffed77d2ad1f0384",44:"3a03435c87d8689f6ad0",45:"246aca1a9929a29bf712",46:"359b058822a43d0f58eb",47:"7baa41494d9c7c475908",48:"723c605d50c8d05799d6",49:"833edae113915f1f0c49",50:"c02fbfb7e059b68f324c",51:"8214785d0ad9ebfe583d",52:"904dc5d3fe3995300891"}[e]+".js";var t=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(t);var a=d[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return r.onerror=r.onload=o,n.appendChild(r),c},f.m=e,f.c=c,f.d=function(e,a,c){f.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(a,"a",a),a},f.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},f.p="/",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dist/static/外部订单模板.xlsx
+++ b/dist/static/外部订单模板.xlsx
--- a/src/components/class/dialog.vue
+++ b/src/components/class/dialog.vue
@@ -29,6 +29,16 @@
      <el-form-item label="最大学员">
        <el-input-number v-model="form.max_join_num"></el-input-number>
      </el-form-item>
+      <el-form-item label="招生来源">
+        <el-select v-model="form.source" placeholder="请选择" filterable>
+          <el-option
+            v-for="(data,index) in classSource"
+            :key="index"
+            :label="data.label"
+            :value="data.value" >
+          </el-option>
+        </el-select>
+      </el-form-item>
    </el-form>
    <span slot="footer" class="dialog-footer">
        <el-button @click="dialogObj.show = false">取 消</el-button>
@@ -39,18 +49,24 @@

 <script>
  import {getTeacherListApi,getClassDetailApi,editClassApi,addClassApi,getPeriodsApi,getGoodsListApi,getPeriodsTeacherApi} from "../../service/api";
-  import {GOODSTYPE} from '../../util/wordbook';
+  import {GOODSTYPE,CLASSSOURCE} from '../../util/wordbook';
  export default {
    props:[
      'dialogObj'
    ],
    data(){
+      let classSource=[];
+      for (let x in CLASSSOURCE ) {
+        classSource.push({label:CLASSSOURCE[x],value:Number(x)})
+      }
      return{
        form:{
          teacher_id:'',
          max_join_num:'',
-          class_name:""
+          class_name:"",
+          source:""
        },
+        classSource:classSource,
        teacherList:[],
        exitTeacherList: [],
        goodsList: [],
@@ -89,7 +105,8 @@
            }
            this.form = {
              teacher_id:'',
-              max_join_num:''
+              max_join_num:'',
+              source:''
            };
            this.getTeacher();
            break;
@@ -98,7 +115,8 @@
              this.form = {
                teacher_id: parseInt(res.teacher_id),
                max_join_num:res.max_join_num,
-                class_name:res.class_name
+                class_name:res.class_name,
+                source:res.source
              };
              this.getTeacher();
            })
@@ -121,13 +139,16 @@
        });
      },
      onSave(){
-         this.form.max_join_num=String(this.form.max_join_num);
-         this.form.teacher_id=String(this.form.teacher_id);
-
+        let json = {
+          max_join_num:String(this.form.max_join_num),
+          teacher_id:String(this.form.teacher_id),
+          source : this.form.source,
+          class_name:this.form.class_name
+        };
        switch (this.dialogObj.type) {
          case 0:
            let id = this.dialogObj.periodsId ? this.dialogObj.periodsId : this.periods.id;
-            addClassApi(id,this.form).then(res=>{
+            addClassApi(id,json).then(res=>{
              this.$message({
                type: 'success',
                message: '添加成功!'
@@ -137,7 +158,7 @@
            });
            break;
          case 1:
-            editClassApi(this.dialogObj.id,this.form).then(res=>{
+            editClassApi(this.dialogObj.id,json).then(res=>{
              this.$message({
                type: 'success',
                message: '修改成功!'

--- a/src/components/class/index.vue
+++ b/src/components/class/index.vue
@@ -158,6 +158,13 @@
          prop="join_num"
          label="现有人数">
        </el-table-column>
+        <el-table-column
+          prop="source"
+          label="招生来源">
+          <template slot-scope="scope">
+            {{scope.row.source | classSourceFilter}}
+          </template>
+        </el-table-column>
        <el-table-column
          width="250"
          label="操作">
@@ -177,7 +184,7 @@
 <script>
  import {getGoodsListApi,getPeriodsApi,getClassListApi,getPeriodsTeacherApi,delClassApi,getClassStatisticsApi,getDefaultPeriodsApi} from "../../service/api";
  import classDialog from './dialog'
-  import {GOODSTYPE} from '../../util/wordbook';
+  import {GOODSTYPE,CLASSSOURCE} from '../../util/wordbook';
  import UserList from './userList'
  import page from '../framework/page'
  export default {
@@ -226,6 +233,9 @@
            return ''
        }
      },
+      classSourceFilter(val){
+        return CLASSSOURCE[val]
+      },
      percent(val){
        return (val * 100).toFixed(2)+'%'
      }

--- a/src/components/yunji/index.vue
+++ b/src/components/yunji/index.vue
@@ -569,11 +569,15 @@ export default {
        if (this.searchFrom.invite_type) {
          json.invite_type = this.searchFrom.invite_type;
        }
-        if (this.searchFrom.createTime.length === 2){
+        if (this.searchFrom.createTime && this.searchFrom.createTime.length === 2){
          json.start_at = this.searchFrom.createTime[0];
          json.end_at = this.searchFrom.createTime[1]
        }
-        if (this.searchFrom.pullTime.length === 2){
+        if (this.searchFrom.active_at&&this.searchFrom.active_at.length === 2){
+          json.active_start_at = this.searchFrom.active_at[0];
+          json.active_end_at = this.searchFrom.active_at[1]
+        }
+        if (this.searchFrom.pullTime&&this.searchFrom.pullTime.length === 2){
          json.pay_start_at = this.searchFrom.pullTime[0];
          json.pay_end_at = this.searchFrom.pullTime[1];
        }

--- a/src/util/wordbook.js
+++ b/src/util/wordbook.js
@@ -166,3 +166,9 @@ export const INTEGRALFUN={
  3:'后台手动加积分',
  4:'后台手动减积分',
 };
+export const CLASSSOURCE = {
+  1:'所有来源随机',
+  2:'系统订单随机',
+  3:'渠道1订单随机',
+  4:'渠道2订单随机'
+};
--- a/static/外部订单模板.xlsx
+++ b/static/外部订单模板.xlsx