719

d4eaf787 · chenyishuai@singsingenglish.com · 1a21ca66 · d4eaf787 · d4eaf787 · d4eaf787
Commit d4eaf787 authored Jul 19, 2019 by chenyishuai@singsingenglish.com
88 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://lib.baomitu.com/element-ui/2.7.2/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://cdn.bootcss.com/vue/2.5.17/vue.min.js></script><script src=https://unpkg.com/vuex@3.0.1></script><script src=https://cdn.bootcss.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.7.2/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.842061a7326370c2e333.js></script><script type=text/javascript src=/static/js/vendor.a8f02460e99f2b68b806.js></script><script type=text/javascript src=/static/js/app.af10b6885e22ced53008.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://lib.baomitu.com/element-ui/2.7.2/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://cdn.bootcss.com/vue/2.5.17/vue.min.js></script><script src=https://unpkg.com/vuex@3.0.1></script><script src=https://cdn.bootcss.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.7.2/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.a0a6dccae37a00d0a372.js></script><script type=text/javascript src=/static/js/vendor.a8f02460e99f2b68b806.js></script><script type=text/javascript src=/static/js/app.af10b6885e22ced53008.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/33.39f486838863bd334d1c.js
+++ b/dev/static/js/33.39f486838863bd334d1c.js
--- a/dev/static/js/42.3c224b09f50b877617d7.js
+++ b/dev/static/js/42.3c224b09f50b877617d7.js
--- a/dev/static/js/44.675dcebad5e7a11ab3e1.js
+++ b/dev/static/js/44.675dcebad5e7a11ab3e1.js
--- a/dev/static/js/48.f8ee96c4062b8880d80d.js
+++ b/dev/static/js/48.f8ee96c4062b8880d80d.js
--- a/dev/static/js/52.b346cccda489277ad326.js
+++ b/dev/static/js/52.b346cccda489277ad326.js
--- a/dev/static/js/53.2c2931a97547d58ed25e.js
+++ b/dev/static/js/53.2c2931a97547d58ed25e.js
--- a/dev/static/js/56.e15b1a8ff4fdeef5ea9d.js
+++ b/dev/static/js/56.e15b1a8ff4fdeef5ea9d.js
--- a/dev/static/js/65.0abfaf4c7368ad32c127.js
+++ b/dev/static/js/65.0abfaf4c7368ad32c127.js
--- a/dev/static/js/manifest.a0a6dccae37a00d0a372.js
+++ b/dev/static/js/manifest.a0a6dccae37a00d0a372.js
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={69: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 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:"0932aebff551d63db5fe",1:"1bbc9a5bdc5d7a57ce8e",2:"b622f945a830c1ae663a",3:"fe061a379700cdbe329c",4:"c653750e2e5d0ec57217",5:"cd21c309b18cdd4c5266",6:"3bf2886f7f9fb312d2e2",7:"4011e2f7c81874744ade",8:"d882203e5c8576b1f7c6",9:"1150eed2b10624bb7e81",10:"7899178ae664633cbd74",11:"b243373729f1ad1a76e1",12:"58c612be3791a2a851d4",13:"0f607c42c24e3c0bd4b5",14:"88e808f52eb1e3f5027f",15:"7bb95f2ee24b93cb2940",16:"7fc2cdeb46e302e78fbb",17:"b767045b60113082cd96",18:"d30018c56f344387a3a8",19:"59f619c4785701e1b8eb",20:"5ab6b53d0e97a712a0cd",21:"3391a321e5d1ca4f6fb7",22:"0d703d0a4f09c6ba72fb",23:"b75366c9e2eff425bc6b",24:"d89a0389f5a73bb42a0c",25:"fc8d8219ffd0ad9f8345",26:"549392fa11f8feb95f6f",27:"1202d4c1ff6724ac7dda",28:"168991222632a548f595",29:"a40e9e4675be270c9896",30:"953223662980a4a8ec72",31:"a806f7219d0a3d0e8eb5",32:"320871ec850dcd388682",33:"39f486838863bd334d1c",34:"23022ff06214c327b964",35:"2412e40851306bff8c8f",36:"1c2143ff6fe3efd889e7",37:"7b71cbd69a4406496914",38:"2d12d9d503d8a5a151c2",39:"40a144557a381bd99476",40:"14a6e79171721390ade0",41:"f5cbc80a06389832a034",42:"3c224b09f50b877617d7",43:"2303a8858ae9f0d560aa",44:"675dcebad5e7a11ab3e1",45:"d0c0dde4c3e938bf3250",46:"bd8790371598d1a931f5",47:"579763758c5dc830d7c2",48:"f8ee96c4062b8880d80d",49:"2c9b9d95b12fd4cdd147",50:"ba842d3aa4e20c660fbe",51:"fed9f73b1d563c8ba43c",52:"b346cccda489277ad326",53:"2c2931a97547d58ed25e",54:"5c35c8c888d41661f0ea",55:"13637ccfd7fefd693b6e",56:"e15b1a8ff4fdeef5ea9d",57:"08afe6a1839060b15104",58:"0b8da2b656cc7a1f791b",59:"22bd6ead7844e91a3f4d",60:"8814796c964cedff0170",61:"49825f3d2caba1f87f6a",62:"dd0c28ce145d622f3557",63:"bc5e18df9649297261cc",64:"86dff173ab5042e5a1a6",65:"0abfaf4c7368ad32c127",66:"62007b638d9232cd7667"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),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://lib.baomitu.com/element-ui/2.7.2/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.bf2e6746389d4266f8302abc4b4defac.css rel=stylesheet></head><body><script src=https://cdn.bootcss.com/vue/2.5.17/vue.min.js></script><script src=https://unpkg.com/vuex@3.0.1></script><script src=https://cdn.bootcss.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.7.2/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.0a5cc800e8bfb9883304.js></script><script type=text/javascript src=/static/js/vendor.c51fd44cbf7149072a68.js></script><script type=text/javascript src=/static/js/app.dc5af962deb65d80a0ad.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://lib.baomitu.com/element-ui/2.7.2/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.ce60dfc054899e4ae00baf97b478b788.css rel=stylesheet></head><body><script src=https://cdn.bootcss.com/vue/2.5.17/vue.min.js></script><script src=https://unpkg.com/vuex@3.0.1></script><script src=https://cdn.bootcss.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.7.2/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.563c2826f9b1e65b31df.js></script><script type=text/javascript src=/static/js/vendor.c51fd44cbf7149072a68.js></script><script type=text/javascript src=/static/js/app.ddc98e78179c4edd09cc.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.ce60dfc054899e4ae00baf97b478b788.css
+++ b/dist/static/css/app.ce60dfc054899e4ae00baf97b478b788.css
--- a/dist/static/js/0.15c19b76a447a12d756d.js
+++ b/dist/static/js/0.15c19b76a447a12d756d.js
--- a/dist/static/js/1.044a7d030542df584275.js
+++ b/dist/static/js/1.044a7d030542df584275.js
--- a/dist/static/js/10.ec37c82f602ec6de106e.js
+++ b/dist/static/js/10.ec37c82f602ec6de106e.js
--- a/dist/static/js/11.13f01848a13076b86344.js
+++ b/dist/static/js/11.13f01848a13076b86344.js
--- a/dist/static/js/12.a4b13f21c0f31290422f.js
+++ b/dist/static/js/12.a4b13f21c0f31290422f.js
--- a/dist/static/js/13.e8652417caf0aed65c92.js
+++ b/dist/static/js/13.e8652417caf0aed65c92.js
--- a/dist/static/js/14.dd0cda0980871c6cf0b0.js
+++ b/dist/static/js/14.dd0cda0980871c6cf0b0.js
--- a/dist/static/js/15.b8dd82e3459f388eee8a.js
+++ b/dist/static/js/15.b8dd82e3459f388eee8a.js
--- a/dist/static/js/16.5f2196e04f372846e78c.js
+++ b/dist/static/js/16.5f2196e04f372846e78c.js
--- a/dist/static/js/17.3fc6c51c5027b2e5b5ed.js
+++ b/dist/static/js/17.3fc6c51c5027b2e5b5ed.js
--- a/dist/static/js/18.c22bc15fbcc2f8142d03.js
+++ b/dist/static/js/18.c22bc15fbcc2f8142d03.js
--- a/dist/static/js/19.0b137163ed0eb62223fd.js
+++ b/dist/static/js/19.0b137163ed0eb62223fd.js
--- a/dist/static/js/2.4da079e3359b90e59e75.js
+++ b/dist/static/js/2.4da079e3359b90e59e75.js
--- a/dist/static/js/20.fa6900fa7c3aab211834.js
+++ b/dist/static/js/20.fa6900fa7c3aab211834.js
--- a/dist/static/js/21.daf10a33c24eb6379e68.js
+++ b/dist/static/js/21.daf10a33c24eb6379e68.js
+webpackJsonp([21],{B31M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=a("CCn6"),i=a("kmJW"),o={name:"dialogObj",props:["dialogObj"],data:function(){return{show:!1,id:"",loading:!0,uploadShow:!0,type:0,title:"",form:{name:"",num:0,cover:""},imageList:[],rules:{},inputVisible:!1,inputValue:"",teacherDetail:{}}},methods:{handleClose:function(e){this.form.category_name.splice(this.form.category_name.indexOf(e),1)},showInput:function(){var e=this;this.inputVisible=!0,this.$nextTick(function(t){e.$refs.saveTagInput.$refs.input.focus()})},handleInputConfirm:function(){var e=this.inputValue;e&&this.form.category_name.push(e),this.inputVisible=!1,this.inputValue=""},sub:function(){var e=this;switch(this.dialogObj.type){case 0:this.$refs.form.validate(function(t){if(t){e.imageList.length>0&&(e.form.cover=e.imageList[0].name);var a=e.form;a.category_name=a.category_name.join(","),Object(n.o)(a).then(function(){e.$message({type:"success",message:"修改成功!"}),e.$emit("reflash"),e.show=!1})}});break;case 1:this.$refs.form.validate(function(t){if(t){e.imageList.length>0&&(e.form.cover=e.imageList[0].name);var a=e.form;a.category_name=a.category_name.join(","),Object(n._21)(e.id,a).then(function(){e.$message({type:"success",message:"修改成功!"}),e.$emit("reflash"),e.show=!1})}})}},handleAvatarSuccess:function(e){this.imageList=[{name:e.data.url,url:"https://cdn.singsingenglish.com/"+e.data.url}]},beforeAvatarUpload:function(){this.uploadShow=!1},uploadFile:function(e){var t=this;this.loading=!0,this.$store.dispatch("setProgress",{type:"new",id:e.file.uid}),this.fileUid=e.file.uid,Object(n._178)({file:e.file,type:"local"}).then(function(e){t.imageList=[{name:e.url,url:"https://cdn.singsingenglish.com/"+e.url}],t.loading=!1,t.$message({type:"success",message:"上传成功!"})}).catch(function(){t.loading=!1})},handleRemove:function(){this.uploadShow=!0},initDialog:function(){var e=this;switch(this.dialogObj.type){case 0:this.title="新增单品",this.show=this.dialogObj.show,this.type=0,this.imageList=[],this.form={name:"",num:0,cover:"",category_name:[]},this.uploadShow=!0,this.loading=!1;break;case 1:this.title="编辑",this.show=this.dialogObj.show,this.id=this.dialogObj.id,this.type=1,Object(n._91)(this.dialogObj.id).then(function(t){e.loading=!1,e.form={name:t.name,num:t.num,cover:t.cover,category_name:t.category_name?t.category_name.split(","):[]},e.form.cover&&""!==e.form.cover?(e.imageList=[{name:t.cover,url:"https://cdn.singsingenglish.com/"+t.cover}],e.uploadShow=!1):(e.imageList=[],e.uploadShow=!0)})}}},watch:{dialogObj:{handler:function(){this.loading=!0,this.initDialog()},deep:!0},show:function(e){this.$emit("changeShow",e)}}},s={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("el-dialog",{attrs:{title:e.title,center:"","append-to-body":"",visible:e.show,width:"800px"},on:{"update:visible":function(t){e.show=t}}},[a("div",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}]},[a("el-form",{ref:"form",attrs:{model:e.form}},[a("el-row",[a("el-col",{attrs:{span:4}},[a("label",[e._v("单品名称")])]),e._v(" "),a("el-col",{attrs:{span:8}},[a("el-form-item",[a("el-input",{attrs:{placeholder:"规则：主题名＋单品名"},model:{value:e.form.name,callback:function(t){e.$set(e.form,"name",t)},expression:"form.name"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:4}},[a("label",[e._v("库存数量")])]),e._v(" "),a("el-col",{attrs:{span:8}},[a("el-form-item",[a("el-input-number",{model:{value:e.form.num,callback:function(t){e.$set(e.form,"num",t)},expression:"form.num"}})],1)],1)],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:4}},[a("label",[e._v("标签")])]),e._v(" "),a("el-col",{attrs:{span:20}},[a("el-form-item",[e._l(e.form.category_name,function(t,n){return a("el-tag",{key:n,attrs:{closable:"","disable-transitions":!1},on:{close:function(a){e.handleClose(t)}}},[e._v("\n              "+e._s(t)+"\n            ")])}),e._v(" "),e.inputVisible?a("el-input",{ref:"saveTagInput",staticClass:"input-new-tag",attrs:{size:"small"},on:{blur:e.handleInputConfirm},nativeOn:{keyup:function(t){return"button"in t||!e._k(t.keyCode,"enter",13,t.key,"Enter")?e.handleInputConfirm(t):null}},model:{value:e.inputValue,callback:function(t){e.inputValue=t},expression:"inputValue"}}):a("el-button",{staticClass:"button-new-tag",attrs:{size:"small"},on:{click:e.showInput}},[e._v("+ 新增")])],2)],1)],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:4}},[a("label",[e._v("封面图片")])]),e._v(" "),a("el-col",{attrs:{span:20}},[a("div",{staticClass:"upload-block"},[a("el-upload",{class:{disabled:!e.uploadShow},attrs:{action:"/api/public/upload/zone","http-request":e.uploadFile,"before-upload":e.beforeAvatarUpload,"list-type":"picture-card","file-list":e.imageList,"on-success":e.handleAvatarSuccess,"on-remove":e.handleRemove}},[a("i",{staticClass:"el-icon-plus"})])],1)])],1)],1),e._v(" "),a("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[a("el-button",{on:{click:function(t){e.show=!1}}},[e._v("取 消")]),e._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:e.sub}},[e._v("确 定")])],1)],1)])},staticRenderFns:[]};var l=a("VU/8")(o,s,!1,function(e){a("EQY0"),a("vgm/")},"data-v-6feb975c",null).exports,r={name:"index",components:{page:i.a,dialogCom:l},data:function(){return{total:0,nowPage:1,limit:10,searchFrom:{name:""},tableData:[],dialogObj:{type:0,show:!1,id:""}}},created:function(){this.initPage()},methods:{initPage:function(){var e=this,t={limit:this.limit,page:this.nowPage};this.searchFrom.name&&(t.name=this.searchFrom.name),this.searchFrom.category_name&&(t.category_name=this.searchFrom.category_name),Object(n._92)(t).then(function(t){e.tableData=t.list,e.total=t.total})},onPageChange:function(e){this.nowPage=e,this.initPage()},onSizeChange:function(e){this.nowPage=1,this.limit=e,this.initPage()},changeShow:function(){},delthat:function(e){var t=this;this.$confirm("此操作将删除该单品?","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){Object(n.S)(e.id).then(function(e){t.$message({type:"success",message:"删除成功!"})}),t.initPage()})},onAdd:function(){this.dialogObj={type:0,show:!0}},edit:function(e){this.dialogObj={type:1,show:!0,id:e.id}}}},c={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"single"},[a("el-form",{ref:"searchFrom",attrs:{model:e.searchFrom,"label-width":"80px"}},[a("el-row",[a("el-col",{attrs:{span:4}},[a("el-form-item",{attrs:{label:"分类名称"}},[a("el-input",{attrs:{placeholder:"名称",size:"small"},model:{value:e.searchFrom.category_name,callback:function(t){e.$set(e.searchFrom,"category_name",t)},expression:"searchFrom.category_name"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:4}},[a("el-form-item",{attrs:{label:"单品名称"}},[a("el-input",{attrs:{placeholder:"名称",size:"small"},model:{value:e.searchFrom.name,callback:function(t){e.$set(e.searchFrom,"name",t)},expression:"searchFrom.name"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:4}},[a("el-form-item",[a("el-button",{attrs:{type:"primary",plain:"",size:"small"},on:{click:e.initPage}},[e._v("\n            搜索\n          ")])],1)],1),e._v(" "),a("el-col",{attrs:{span:4,offset:8}},[a("el-form-item",[e.$store.state.readonly?e._e():a("el-button",{attrs:{type:"success",plain:"",size:"small"},on:{click:e.onAdd}},[e._v("\n            添加单品\n          ")])],1)],1)],1)],1),e._v(" "),a("el-table",{staticStyle:{width:"100%"},attrs:{data:e.tableData,"default-sort":{prop:"num",order:"descending"}}},[a("el-table-column",{attrs:{prop:"id",label:"id"}}),e._v(" "),a("el-table-column",{attrs:{prop:"name",label:"名称"}}),e._v(" "),a("el-table-column",{attrs:{prop:"category_name",label:"分类"}}),e._v(" "),a("el-table-column",{attrs:{prop:"num",sortable:"",label:"库存"}}),e._v(" "),e.$store.state.readonly?e._e():a("el-table-column",{attrs:{width:"200",label:"操作"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("el-button",{attrs:{size:"mini",plain:"",type:"warning"},on:{click:function(a){e.edit(t.row)}}},[e._v("\n          编辑\n        ")]),e._v(" "),e.$store.state.deletePermission?a("el-button",{attrs:{size:"mini",plain:"",type:"danger"},on:{click:function(a){e.delthat(t.row)}}},[e._v("\n          删除\n        ")]):e._e()]}}])})],1),e._v(" "),a("page",{attrs:{total:e.total,limit:e.limit},on:{pageChange:e.onPageChange,sizeChange:e.onSizeChange}}),e._v(" "),a("dialog-com",{attrs:{dialogObj:e.dialogObj},on:{changeShow:e.changeShow,reflash:e.initPage}})],1)},staticRenderFns:[]};var m=a("VU/8")(r,c,!1,function(e){a("JTBX")},"data-v-d3a26312",null);t.default=m.exports},EQY0:function(e,t){},JTBX:function(e,t){},"vgm/":function(e,t){}});
\ No newline at end of file
--- a/dist/static/js/22.6ea5e48b41b4cdd4feb9.js
+++ b/dist/static/js/22.6ea5e48b41b4cdd4feb9.js
--- a/dist/static/js/23.5bc11d74f6537b3c51fa.js
+++ b/dist/static/js/23.5bc11d74f6537b3c51fa.js
--- a/dist/static/js/24.00b676a0a88d2b6dfeec.js
+++ b/dist/static/js/24.00b676a0a88d2b6dfeec.js
--- a/dist/static/js/25.ed22b0925225d9de07c2.js
+++ b/dist/static/js/25.ed22b0925225d9de07c2.js
--- a/dist/static/js/26.93a68bdc9ad080b8c270.js
+++ b/dist/static/js/26.93a68bdc9ad080b8c270.js
--- a/dist/static/js/27.bec1a821b9fba10058fe.js
+++ b/dist/static/js/27.bec1a821b9fba10058fe.js
--- a/dist/static/js/28.70d92c5b31f1720fb9c4.js
+++ b/dist/static/js/28.70d92c5b31f1720fb9c4.js
--- a/dist/static/js/29.45de8b924d1c8a1e3326.js
+++ b/dist/static/js/29.45de8b924d1c8a1e3326.js
+webpackJsonp([29],{"8O+l":function(e,t){},"Z7Q/":function(e,t){},f9Sx:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var l=a("CCn6"),s={name:"index",data:function(){return{searchFrom:{nickName:"",mobile:"",level:"",userId:""},dialogDetail:{show:!1,id:""},userList:[],total:0,nowPage:1,limit:10,showDetail:!1,showId:"",dialogObj:{show:!1,title:"绑定老师",id:0,teacher_id:0},dialogDetailObj:{show:!1,id:""},loading:!1}},components:{page:a("kmJW").a},mounted:function(){this.getUser()},methods:{sexFormatter:function(e){return 0==e.sex?"保密":1==e.sex?"男":2==e.sex?"女":void 0},onPageChange:function(e){this.nowPage=e,this.getUser()},onSizeChange:function(e){this.limit=e,this.nowPage=1,this.getUser()},getUser:function(){var e=this,t={page:this.nowPage,limit:this.limit};this.searchFrom.user_id&&(t.user_id=this.searchFrom.user_id),Object(l._35)(t).then(function(t){console.log(t),e.userList=t.result.list,e.total=t.result.total})}}},r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],staticClass:"user"},[a("el-form",{ref:"searchFrom",attrs:{model:e.searchFrom,"label-width":"80px",inline:""}},[a("el-form-item",{attrs:{label:"ID"}},[a("el-input",{model:{value:e.searchFrom.user_id,callback:function(t){e.$set(e.searchFrom,"user_id",t)},expression:"searchFrom.user_id"}})],1),e._v(" "),a("el-form-item",[a("div",{staticClass:"flexRow"},[a("el-button",{attrs:{type:"primary",plain:""},on:{click:e.getUser}},[e._v("搜索")])],1)])],1),e._v(" "),a("el-table",{staticStyle:{width:"100%"},attrs:{data:e.userList}},[a("el-table-column",{attrs:{className:"f-c",label:"用户"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("img",{staticClass:"avatar",attrs:{src:t.row.user_avatar}}),e._v(e._s(t.row.user_nickname)+"(ID:"+e._s(t.row.user_id)+")\n      ")]}}])}),e._v(" "),a("el-table-column",{attrs:{prop:"user_mobile",label:"手机号"}}),e._v(" "),a("el-table-column",{attrs:{prop:"created_at",label:"注册时间",sortable:""}}),e._v(" "),a("el-table-column",{attrs:{prop:"last_login_at",label:"最后登录时间",sortable:""}}),e._v(" "),a("el-table-column",{attrs:{prop:"course_title",label:"课程标题"}}),e._v(" "),a("el-table-column",{attrs:{prop:"goods_name",label:"优惠券"}}),e._v(" "),a("el-table-column",{attrs:{prop:"order_id",label:"订单Id"}})],1),e._v(" "),a("page",{attrs:{total:e.total,limit:e.limit},on:{pageChange:e.onPageChange,sizeChange:e.onSizeChange}})],1)},staticRenderFns:[]};var i=a("VU/8")(s,r,!1,function(e){a("8O+l"),a("Z7Q/")},"data-v-9ca7940e",null);t.default=i.exports}});
\ No newline at end of file
--- a/dist/static/js/3.94dce5fbddd5a2966862.js
+++ b/dist/static/js/3.94dce5fbddd5a2966862.js
--- a/dist/static/js/30.0bf7c1e83ddd9fe3fd38.js
+++ b/dist/static/js/30.0bf7c1e83ddd9fe3fd38.js
--- a/dist/static/js/32.b24da3a9c1254f2cf37d.js
+++ b/dist/static/js/32.b24da3a9c1254f2cf37d.js
--- a/dist/static/js/33.5e44085ba73fed403fb9.js
+++ b/dist/static/js/33.5e44085ba73fed403fb9.js
--- a/dist/static/js/34.843c2b44b773063aecbd.js
+++ b/dist/static/js/34.843c2b44b773063aecbd.js
--- a/dist/static/js/35.660a63dc0db9209bbf9f.js
+++ b/dist/static/js/35.660a63dc0db9209bbf9f.js
--- a/dist/static/js/36.473dcf65c98f1860d3cc.js
+++ b/dist/static/js/36.473dcf65c98f1860d3cc.js
--- a/dist/static/js/37.9f218c4482ed0665d415.js
+++ b/dist/static/js/37.9f218c4482ed0665d415.js
--- a/dist/static/js/38.dd55709faba78bbead90.js
+++ b/dist/static/js/38.dd55709faba78bbead90.js
--- a/dist/static/js/39.01a532c962084731fdb1.js
+++ b/dist/static/js/39.01a532c962084731fdb1.js
--- a/dist/static/js/4.665476ee980d5759dd51.js
+++ b/dist/static/js/4.665476ee980d5759dd51.js
--- a/dist/static/js/40.38e938bbd0e95e6fe261.js
+++ b/dist/static/js/40.38e938bbd0e95e6fe261.js
--- a/dist/static/js/41.980b1c37c4e750fd355b.js
+++ b/dist/static/js/41.980b1c37c4e750fd355b.js
--- a/dist/static/js/42.7044bb372e51d738d1be.js
+++ b/dist/static/js/42.7044bb372e51d738d1be.js
--- a/dist/static/js/43.9de90f94faebbfd2e2ba.js
+++ b/dist/static/js/43.9de90f94faebbfd2e2ba.js
--- a/dist/static/js/44.7f37b6fd78e96e6359f6.js
+++ b/dist/static/js/44.7f37b6fd78e96e6359f6.js
--- a/dist/static/js/45.ed31c17b310f9dd4430e.js
+++ b/dist/static/js/45.ed31c17b310f9dd4430e.js
--- a/dist/static/js/46.29ad712f8121fa95576a.js
+++ b/dist/static/js/46.29ad712f8121fa95576a.js
--- a/dist/static/js/47.a73098c970e1ccfb420e.js
+++ b/dist/static/js/47.a73098c970e1ccfb420e.js
--- a/dist/static/js/48.cdd33425742417a47656.js
+++ b/dist/static/js/48.cdd33425742417a47656.js
--- a/dist/static/js/49.3544f15dda360ce7d8a7.js
+++ b/dist/static/js/49.3544f15dda360ce7d8a7.js
--- a/dist/static/js/5.89a24344632e896a5218.js
+++ b/dist/static/js/5.89a24344632e896a5218.js
--- a/dist/static/js/50.2b6af3d090f6fda3ddad.js
+++ b/dist/static/js/50.2b6af3d090f6fda3ddad.js
--- a/dist/static/js/51.96d43c66c4e746adc770.js
+++ b/dist/static/js/51.96d43c66c4e746adc770.js
--- a/dist/static/js/52.bf91e6c68a5c7ad4e9c4.js
+++ b/dist/static/js/52.bf91e6c68a5c7ad4e9c4.js
--- a/dist/static/js/53.1d666ae8b6837f19d124.js
+++ b/dist/static/js/53.1d666ae8b6837f19d124.js
--- a/dist/static/js/54.89a2aed18c8cf72f9dcb.js
+++ b/dist/static/js/54.89a2aed18c8cf72f9dcb.js
--- a/dist/static/js/55.48343e13a7b18c37f53e.js
+++ b/dist/static/js/55.48343e13a7b18c37f53e.js
--- a/dist/static/js/56.befa8443b0eb92cd16e8.js
+++ b/dist/static/js/56.befa8443b0eb92cd16e8.js
--- a/dist/static/js/57.a41c18e33cf562d96f9c.js
+++ b/dist/static/js/57.a41c18e33cf562d96f9c.js
+webpackJsonp([57],{iPJD:function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=i("CCn6"),l={name:"upload",data:function(){return{fileList:[]}},methods:{uploadFileVideo1Banner:function(e){var t=this;Object(n._178)({file:e.file,type:"local"}).then(function(e){e.url="https://cdn.singsingenglish.com/"+e.url,t.fileList.push(e)})}}},a={render:function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",[i("el-upload",{staticClass:"upload-demo",attrs:{action:"/api/public/upload","http-request":e.uploadFileVideo1Banner,"list-type":"picture-card",multiple:""}}),e._v(" "),i("pre",[e._v("    <p>\n  ")]),e._v(" "),e._l(e.fileList,function(t){return i("pre",[e._v('    <img src="'+e._s(t.url)+'"  style="display:block">\n  ')])}),e._v(" "),i("pre",[e._v("    </p>\n  ")])],2)},staticRenderFns:[]};var r=i("VU/8")(l,a,!1,function(e){i("wi9J")},"data-v-3a2ff3b1",null);t.default=r.exports},wi9J:function(e,t){}});
\ No newline at end of file
--- a/dist/static/js/58.e50d2f7918e20f7680f0.js
+++ b/dist/static/js/58.e50d2f7918e20f7680f0.js
--- a/dist/static/js/59.f3ee362cbcbb912b4b29.js
+++ b/dist/static/js/59.f3ee362cbcbb912b4b29.js
+webpackJsonp([59],{iXaR:function(e,n){},usUK:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var i={render:function(){var e=this.$createElement;return(this._self._c||e)("div",[this._v("\n  发货列表\n")])},staticRenderFns:[]};var a=t("VU/8")({name:"index"},i,!1,function(e){t("iXaR")},"data-v-25f084f7",null);n.default=a.exports}});
\ No newline at end of file
--- a/dist/static/js/6.128474388944d3b56961.js
+++ b/dist/static/js/6.128474388944d3b56961.js
--- a/dist/static/js/60.a44f3a39e060db7a7b06.js
+++ b/dist/static/js/60.a44f3a39e060db7a7b06.js
--- a/dist/static/js/61.6684e19ff8739446603b.js
+++ b/dist/static/js/61.6684e19ff8739446603b.js
--- a/dist/static/js/62.74e90077d6e4658b905d.js
+++ b/dist/static/js/62.74e90077d6e4658b905d.js
--- a/dist/static/js/63.1f2a8d05fdc0ee7b0f77.js
+++ b/dist/static/js/63.1f2a8d05fdc0ee7b0f77.js
--- a/dist/static/js/64.8e4d427237ad26f833d7.js
+++ b/dist/static/js/64.8e4d427237ad26f833d7.js
--- a/dist/static/js/65.7b2af02b78de13b58111.js
+++ b/dist/static/js/65.7b2af02b78de13b58111.js
--- a/dist/static/js/66.a31a76bbb62de2d1bc3a.js
+++ b/dist/static/js/66.a31a76bbb62de2d1bc3a.js
--- a/dist/static/js/7.1f128a45098797cb4bb1.js
+++ b/dist/static/js/7.1f128a45098797cb4bb1.js
--- a/dist/static/js/8.1b99d9d9b05606d3a040.js
+++ b/dist/static/js/8.1b99d9d9b05606d3a040.js
--- a/dist/static/js/9.eed5b4fe0f955df170c4.js
+++ b/dist/static/js/9.eed5b4fe0f955df170c4.js
--- a/dist/static/js/app.ddc98e78179c4edd09cc.js
+++ b/dist/static/js/app.ddc98e78179c4edd09cc.js
--- a/dist/static/js/manifest.563c2826f9b1e65b31df.js
+++ b/dist/static/js/manifest.563c2826f9b1e65b31df.js
--- a/src/components/conversionList/channelConversionList.vue
+++ b/src/components/conversionList/channelConversionList.vue
@@ -459,10 +459,6 @@ export default {
 .channel-trans-list {
  padding: 20px 0;
 }
-.el-table {
-  .cell {
-    text-align: center !important;
-  }
-}
+
 </style>

--- a/src/components/conversionList/channelGoodsConversionList.vue
+++ b/src/components/conversionList/channelGoodsConversionList.vue
--- a/src/components/conversionList/channelTransList.vue
+++ b/src/components/conversionList/channelTransList.vue
--- a/src/components/conversionList/periodsConversionList.vue
+++ b/src/components/conversionList/periodsConversionList.vue
--- a/src/components/conversionList/squadConversionList.vue
+++ b/src/components/conversionList/squadConversionList.vue
@@ -466,10 +466,6 @@ export default {
 .channel-trans-list {
  padding: 20px 0;
 }
-.el-table {
-  .cell {
-    text-align: center !important;
-  }
-}
+
 </style>

--- a/src/components/conversionList/teacherConversionList.vue
+++ b/src/components/conversionList/teacherConversionList.vue
--- a/src/components/conversionList/teacherPeriodsConversionList.vue
+++ b/src/components/conversionList/teacherPeriodsConversionList.vue
--- a/src/components/putForward/index.vue
+++ b/src/components/putForward/index.vue