外部订单修改

1a0d1149 · wangwei · e7ec3c2a · 1a0d1149 · 1a0d1149 · 1a0d1149
Commit 1a0d1149 authored Feb 25, 2019 by wangwei
21 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.7e56fbf441dc0afa258c.js></script><script type=text/javascript src=/static/js/vendor.19b07206259747695190.js></script><script type=text/javascript src=/static/js/app.98b6f56b70d99673cb72.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.81029d0b1efde4af6943.js></script><script type=text/javascript src=/static/js/vendor.19b07206259747695190.js></script><script type=text/javascript src=/static/js/app.98b6f56b70d99673cb72.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/2.8066380c636c5a4d54c1.js
+++ b/dev/static/js/2.8066380c636c5a4d54c1.js
--- a/dev/static/js/33.0724d9cbd0fa9847046b.js
+++ b/dev/static/js/33.0724d9cbd0fa9847046b.js
--- a/dev/static/js/33.41e72bf4eb20b18aa3d8.js
+++ b/dev/static/js/33.41e72bf4eb20b18aa3d8.js
--- a/dev/static/js/manifest.557ef55de091c19a4c50.js
+++ b/dev/static/js/manifest.557ef55de091c19a4c50.js
+!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(c,d,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],a[t]&&u.push(a[t][0]),a[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(f&&f(c,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var c={},a={54:0};function b(f){if(c[f])return c[f].exports;var a=c[f]={i:f,l:!1,exports:{}};return e[f].call(a.exports,a,a.exports,b),a.l=!0,a.exports}b.e=function(e){var f=a[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var c=new Promise(function(c,b){f=a[e]=[c,b]});f[2]=c;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"04bf919ed842b80d7220",1:"2986755771d6f9468ac4",2:"8066380c636c5a4d54c1",3:"d3357b1ed08b66f1a86b",4:"5620f17caa462c82a635",5:"f218afafb2e40e96d640",6:"a841f01ea8066dee0a27",7:"4fcd67c46a13752c259f",8:"d5231b311359b23e1ef3",9:"4b8ac3d5ebf7b3bfda29",10:"c9e3b5aa885939de201f",11:"ac8986889fec6c74b1ac",12:"b3660f902b31d5c48386",13:"77a298bd19618ee2538f",14:"2dbaab6f43f082f81abd",15:"2b0e60f40c1121a444b3",16:"fad604299c1b2a499a5e",17:"6eb3ef4203d4f6a8d953",18:"170aef10203adbdf8021",19:"ce5dfd067bfd66280e90",20:"c17b708bc639618d0920",21:"b03cf5da73c1bf67d6b8",22:"368f36b786b9be8b5c21",23:"28cc04887c08dba6ae7f",24:"3b8952fc7fb1daec0bb5",25:"ccd69bc6af3124b367b5",26:"6705de133151a4b5fee2",27:"f0c59af27f26ea551288",28:"6c479b0bfd18a411961b",29:"f0b9af575881808ecd60",30:"d3e8171a0bd91a933ea7",31:"7ba7cdfdfddd25f68ab2",32:"b90c3ebc73b1c9d51189",33:"0724d9cbd0fa9847046b",34:"2d1a136a2b9762d4e8cf",35:"c9f96d4ec23eff355efb",36:"16cd28b70a7a3775e8c6",37:"e1c592fa214a6c8c6129",38:"1bb5790354d045aad532",39:"e18473babf9e603ffcbf",40:"c8ebdbef45c03495b29b",41:"6dba200c8bc974d91e61",42:"b44529aaa35c8b216c7e",43:"0f7d0e326122debd9bef",44:"4b19f6f3220644b1b9da",45:"f002ee4b50549513cd1e",46:"54e60f6cb95f5cffeffb",47:"f4be4ca985e3de9d7b96",48:"bc0fe2b189cc5bce9fc3",49:"fbf52427fa2bf5238803",50:"d6a82a99b4801fe9625a",51:"a861f6172353c9391d2b"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var f=a[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),c},b.m=e,b.c=c,b.d=function(e,f,c){b.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:c})},b.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(f,"a",f),f},b.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},b.p="/",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dev/static/js/manifest.81029d0b1efde4af6943.js
+++ b/dev/static/js/manifest.81029d0b1efde4af6943.js
+!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(a,d,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],c[t]&&u.push(c[t][0]),c[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(f&&f(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},c={54:0};function b(f){if(a[f])return a[f].exports;var c=a[f]={i:f,l:!1,exports:{}};return e[f].call(c.exports,c,c.exports,b),c.l=!0,c.exports}b.e=function(e){var f=c[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var a=new Promise(function(a,b){f=c[e]=[a,b]});f[2]=a;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"04bf919ed842b80d7220",1:"2986755771d6f9468ac4",2:"8066380c636c5a4d54c1",3:"d3357b1ed08b66f1a86b",4:"5620f17caa462c82a635",5:"f218afafb2e40e96d640",6:"a841f01ea8066dee0a27",7:"4fcd67c46a13752c259f",8:"d5231b311359b23e1ef3",9:"4b8ac3d5ebf7b3bfda29",10:"c9e3b5aa885939de201f",11:"ac8986889fec6c74b1ac",12:"b3660f902b31d5c48386",13:"77a298bd19618ee2538f",14:"2dbaab6f43f082f81abd",15:"2b0e60f40c1121a444b3",16:"fad604299c1b2a499a5e",17:"6eb3ef4203d4f6a8d953",18:"170aef10203adbdf8021",19:"ce5dfd067bfd66280e90",20:"c17b708bc639618d0920",21:"b03cf5da73c1bf67d6b8",22:"368f36b786b9be8b5c21",23:"28cc04887c08dba6ae7f",24:"3b8952fc7fb1daec0bb5",25:"ccd69bc6af3124b367b5",26:"6705de133151a4b5fee2",27:"f0c59af27f26ea551288",28:"6c479b0bfd18a411961b",29:"f0b9af575881808ecd60",30:"d3e8171a0bd91a933ea7",31:"7ba7cdfdfddd25f68ab2",32:"b90c3ebc73b1c9d51189",33:"41e72bf4eb20b18aa3d8",34:"2d1a136a2b9762d4e8cf",35:"c9f96d4ec23eff355efb",36:"16cd28b70a7a3775e8c6",37:"e1c592fa214a6c8c6129",38:"1bb5790354d045aad532",39:"e18473babf9e603ffcbf",40:"c8ebdbef45c03495b29b",41:"6dba200c8bc974d91e61",42:"b44529aaa35c8b216c7e",43:"0f7d0e326122debd9bef",44:"4b19f6f3220644b1b9da",45:"f002ee4b50549513cd1e",46:"54e60f6cb95f5cffeffb",47:"f4be4ca985e3de9d7b96",48:"bc0fe2b189cc5bce9fc3",49:"fbf52427fa2bf5238803",50:"d6a82a99b4801fe9625a",51:"a861f6172353c9391d2b"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var f=c[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,f,a){b.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(f,"a",f),f},b.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},b.p="/",b.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.e69d0422591cc476330bb28000d714ee.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.5a62a0a11a50d6c24f8c.js></script><script type=text/javascript src=/static/js/vendor.dabb3afa5856b271bc7f.js></script><script type=text/javascript src=/static/js/app.8c51ef96cf61fae0c2f8.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.f2d09c2a3ed332944872c770e32e8da5.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.905d821a52bd4755c9a7.js></script><script type=text/javascript src=/static/js/vendor.dabb3afa5856b271bc7f.js></script><script type=text/javascript src=/static/js/app.31f83bf60f37566d05b5.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.d6a062b2fa16abb66a4eff8f55585c77.css
+++ b/dist/static/css/app.d6a062b2fa16abb66a4eff8f55585c77.css
--- a/dist/static/css/app.f2d09c2a3ed332944872c770e32e8da5.css
+++ b/dist/static/css/app.f2d09c2a3ed332944872c770e32e8da5.css
--- a/dist/static/js/2.e10cd218f4c9bb84034d.js
+++ b/dist/static/js/2.e10cd218f4c9bb84034d.js
--- a/dist/static/js/26.2f82f16a371e8c1af772.js
+++ b/dist/static/js/26.2f82f16a371e8c1af772.js
--- a/dist/static/js/28.1ee5c08dab7cacec7069.js
+++ b/dist/static/js/28.1ee5c08dab7cacec7069.js
+webpackJsonp([28],{AmP7:function(t,e){},CGL6:function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=i("CCn6"),a={name:"banner",components:{page:i("kmJW").a},data:function(){return{loading:!1,bannerList:[],searchFrom:{status:"-1"},total:0,nowPage:1,uploadShow:!0,limit:10,dialog:{title:"新增Banner",show:!1,rules:{title:[{required:!0,message:"请填写Banner名称",trigger:"change"}],link:[{required:!0,message:"请填写Banner链接",trigger:"change"}]},form:{title:"",url:"",link:"",id:""}},imageList:[]}},created:function(){this.getList()},filters:{status:function(t){return 1===t?"上架中":"已下架"}},methods:{onPageChange:function(t){this.nowPage=t,this.getList()},changeStatus:function(t){var e=this,i=void 0,a=void 0;1===t.status?(i="此操作将下架该Banner，是否继续？",a=2):(i="此操作将上架该Banner，是否继续？",a=1),this.$confirm(i,"提示",{confirmButtonText:"继续",cancelButtonText:"取消",type:"warning"}).then(function(){var i={status:a};Object(n.s)(t.id,i).then(function(t){e.$message({type:"success",message:"修改成功!"}),e.getList()})})},onSizeChange:function(t){this.nowPage=1,this.limit=t,this.getList()},getList:function(){var t=this;this.loading=!0;var e={limit:this.limit,page:this.nowPage};"-1"!==this.searchFrom.status&&(e.status=this.searchFrom.status),Object(n._20)(e).then(function(e){e&&(t.bannerList=e.list,t.total=e.total,t.loading=!1)})},edit:function(t){var e=this;this.dialog.form.id=t.id,this.dialog.title="编辑Banner",Object(n._19)(t.id).then(function(t){e.dialog.form.title=t.title,e.dialog.form.link=t.link,e.imageList=[{name:t.url,url:t.url}],e.dialog.show=!0,e.uploadShow=!1})},add:function(){this.dialog.show=!0,this.dialog.form.id="",this.dialog.title="新增Banner",this.dialog.form.title="",this.dialog.form.link="",this.imageList=[],this.uploadShow=!0},del:function(t){var e=this;this.$confirm("此操作将删除该Banner?","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){Object(n.D)(t.id).then(function(t){e.$message({type:"success",message:"删除成功!"}),e.getList()})})},handleAvatarSuccess:function(t){this.imageList=[{name:t.data.url,url:"https://cdn.singsingenglish.com/"+t.data.url}],this.dialog.form.url="https://cdn.singsingenglish.com/"+t.data.url},beforeAvatarUpload:function(){this.uploadShow=!1},handleRemove:function(){this.uploadShow=!0},sub:function(){var t=this;this.$refs.form.validate(function(e){if(e){var i=t.dialog;if(i.form.id){var a={title:i.form.title,link:i.form.link};t.imageList.length>0&&(a.url=t.imageList[0].url),t.$confirm("确认修改Banner","提示",{confirmButtonText:"继续",cancelButtonText:"取消",type:"warning"}).then(function(){Object(n.X)(i.form.id,a).then(function(){t.$message({type:"success",message:"修改成功!"}),i.show=!1,t.getList()})})}else{var s={title:i.form.title,link:i.form.link};t.imageList.length>0&&(s.url=t.imageList[0].url),t.$confirm("确认添加Banner","提示",{confirmButtonText:"继续",cancelButtonText:"取消",type:"warning"}).then(function(){Object(n.b)(s).then(function(){t.$message({type:"success",message:"添加成功!"}),i.show=!1,t.getList()})})}}})},moveUp:function(t){var e=this.bannerList;this.sort(e[t].id,e[t-1].id)},moveDown:function(t){var e=this.bannerList;this.sort(e[t+1].id,e[t].id)},sort:function(t,e){var i=this;this.loading=!0,Object(n._84)(t,e).then(function(){i.loading=!1,i.getList()})},uploadFile:function(t){var e=this;this.loading=!0,this.$store.dispatch("setProgress",{type:"new",id:t.file.uid}),this.fileUid=t.file.uid,Object(n._116)({file:t.file,type:"local"}).then(function(t){e.imageList=[{name:t.url,url:"https://cdn.singsingenglish.com/"+t.url}],e.loading=!1,e.$message({type:"success",message:"上传成功!"})}).catch(function(){e.loading=!1})}}},s={render:function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"banner"},[i("div",{staticClass:"head clear-both"},[t.$store.state.readonly?t._e():i("el-button",{staticStyle:{float:"right"},attrs:{plain:"",type:"success"},on:{click:t.add}},[t._v("新增banner")])],1),t._v(" "),i("el-tabs",{staticStyle:{background:"white","padding-top":"10px"},attrs:{type:"card"},on:{"tab-click":t.getList},model:{value:t.searchFrom.status,callback:function(e){t.$set(t.searchFrom,"status",e)},expression:"searchFrom.status"}},[i("el-tab-pane",{attrs:{label:"全部",name:"-1"}}),t._v(" "),i("el-tab-pane",{attrs:{label:"上架",name:"1"}}),t._v(" "),i("el-tab-pane",{attrs:{label:"下架",name:"2"}})],1),t._v(" "),i("el-table",{staticStyle:{width:"100%"},attrs:{data:t.bannerList}},[i("el-table-column",{attrs:{prop:"id",label:"ID"}}),t._v(" "),i("el-table-column",{attrs:{prop:"title",label:"标题"}}),t._v(" "),i("el-table-column",{attrs:{prop:"url",label:"图片"},scopedSlots:t._u([{key:"default",fn:function(t){return[i("a",{attrs:{href:t.row.url,target:"_blank"}},[i("img",{staticClass:"short-banner",attrs:{src:t.row.url}})])]}}])}),t._v(" "),i("el-table-column",{attrs:{label:"状态"},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n        "+t._s(t._f("status")(e.row.status))+"\n      ")]}}])}),t._v(" "),i("el-table-column",{attrs:{prop:"link",label:"链接"}}),t._v(" "),t.$store.state.readonly?t._e():i("el-table-column",{attrs:{label:"操作",width:"100"},scopedSlots:t._u([{key:"default",fn:function(e){return[i("el-popover",{attrs:{placement:"top",width:"280"}},[i("div",{staticStyle:{"text-align":"center"}},[i("el-button",{attrs:{size:"mini",plain:"",type:"primary"},on:{click:function(i){t.edit(e.row)}}},[t._v("\n              编辑\n            ")]),t._v(" "),t.$store.state.deletePermission?i("el-button",{attrs:{size:"mini",type:"danger",plain:""},on:{click:function(i){t.del(e.row)}}},[t._v("\n              删除\n            ")]):t._e(),t._v(" "),2==e.row.status?i("el-button",{attrs:{size:"mini",type:"primary",plain:""},on:{click:function(i){t.changeStatus(e.row)}}},[t._v("\n              上架\n            ")]):t._e(),t._v(" "),1==e.row.status?i("el-button",{attrs:{size:"mini",type:"primary",plain:""},on:{click:function(i){t.changeStatus(e.row)}}},[t._v("\n              下架\n            ")]):t._e(),t._v(" "),e.$index>0?i("el-button",{attrs:{size:"mini",type:"primary",plain:""},on:{click:function(i){t.moveUp(e.$index)}}},[t._v("\n              上移\n            ")]):t._e(),t._v(" "),e.$index!==t.bannerList.length-1?i("el-button",{attrs:{size:"mini",type:"primary",plain:""},on:{click:function(i){t.moveDown(e.$index)}}},[t._v("\n              下移\n            ")]):t._e()],1),t._v(" "),i("el-button",{attrs:{slot:"reference",size:"mini",type:"text"},slot:"reference"},[t._v("操作")])],1)]}}])})],1),t._v(" "),i("page",{attrs:{nowPage:t.nowPage,total:t.total,limit:t.limit},on:{pageChange:t.onPageChange,sizeChange:t.onSizeChange}}),t._v(" "),i("el-dialog",{attrs:{title:t.dialog.title,center:"","append-to-body":"",visible:t.dialog.show,width:"30%"},on:{"update:visible":function(e){t.$set(t.dialog,"show",e)}}},[i("el-form",{ref:"form",attrs:{rules:t.dialog.rules,model:t.dialog.form,"label-width":"100px"}},[i("el-form-item",{attrs:{label:"banner名称",prop:"title"}},[i("el-input",{model:{value:t.dialog.form.title,callback:function(e){t.$set(t.dialog.form,"title",e)},expression:"dialog.form.title"}})],1),t._v(" "),i("el-form-item",{attrs:{label:"banner链接",prop:"link"}},[i("el-input",{model:{value:t.dialog.form.link,callback:function(e){t.$set(t.dialog.form,"link",e)},expression:"dialog.form.link"}})],1),t._v(" "),i("div",{staticClass:"upload-block"},[i("el-upload",{class:{disabled:!t.uploadShow},attrs:{action:"/api/public/upload/zone","http-request":t.uploadFile,"before-upload":t.beforeAvatarUpload,"list-type":"picture-card","file-list":t.imageList,"on-success":t.handleAvatarSuccess,"on-remove":t.handleRemove}},[i("i",{staticClass:"el-icon-plus"})]),t._v(" "),i("p",{staticClass:"size"},[t._v("750*400")])],1)],1),t._v(" "),i("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[i("el-button",{on:{click:function(e){t.dialog.show=!1}}},[t._v("取 消")]),t._v(" "),i("el-button",{attrs:{type:"primary"},on:{click:t.sub}},[t._v("确 定")])],1)],1)],1)},staticRenderFns:[]};var o=i("VU/8")(a,s,!1,function(t){i("AmP7"),i("RZiP")},null,null);e.default=o.exports},RZiP:function(t,e){}});
\ No newline at end of file
--- a/dist/static/js/29.7ae681ddd0c4b533ca17.js
+++ b/dist/static/js/29.7ae681ddd0c4b533ca17.js
--- a/dist/static/js/30.adf9b72b924502cb9e23.js
+++ b/dist/static/js/30.adf9b72b924502cb9e23.js
--- a/dist/static/js/31.bbf27fbad613724913f6.js
+++ b/dist/static/js/31.bbf27fbad613724913f6.js
--- a/dist/static/js/app.31f83bf60f37566d05b5.js
+++ b/dist/static/js/app.31f83bf60f37566d05b5.js
--- a/dist/static/js/app.f56ddb4d285a60f8e3bb.js
+++ b/dist/static/js/app.f56ddb4d285a60f8e3bb.js
--- a/dist/static/js/manifest.4910ec0bd8a5627671ea.js
+++ b/dist/static/js/manifest.4910ec0bd8a5627671ea.js
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,d,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 d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(c&&c(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},f={54:0};function b(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,b),f.l=!0,f.exports}b.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,b){c=f[e]=[a,b]});c[2]=a;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"f5968bd457f58cea9e47",1:"41d25c420bebbfeb3e4a",2:"e10cd218f4c9bb84034d",3:"32f0b58fb70ae670879a",4:"fde890a507adaae38acc",5:"6d8b5af736d77152fd1a",6:"2be9167b26eabe4481bc",7:"59e4edb7b6eac2020982",8:"a5f40934f3974f707e64",9:"6688151182d21126708a",10:"56579e1bf4ca204c596c",11:"cb3b7c8e4baffcc80a23",12:"51ce873b57f738c82875",13:"2469a1a353028cb19b89",14:"89fab4d4cc8dbfd3f8a7",15:"3f6c1b93e21902aef4bc",16:"4653ad18dc393d3e1926",17:"cb9326471c103373a0db",18:"5f68acc44c3be4b6dc35",19:"31902118fec68a6b11ef",20:"f85417f0cd9027f554c4",21:"07a3cd605956fd8c1e18",22:"7724849c255db8abb274",23:"8f75bf7e8de3b73e642d",24:"390eeb03771cf0ab539f",25:"8ff7fac165d2fcea8b28",26:"a9c1788f8d8fa32c24da",27:"86827c45da28bb0e25ae",28:"1ee5c08dab7cacec7069",29:"7ae681ddd0c4b533ca17",30:"adf9b72b924502cb9e23",31:"bbf27fbad613724913f6",32:"d9035fc49e9fe4192059",33:"58a2e0af685001378440",34:"9795847fe16fa99a1aa0",35:"8af8020979de9eb5fa3a",36:"30f6c5df3a57e073a8f4",37:"c231c3e8c02b52d7fb39",38:"7a1401a413510ac96b63",39:"b5bf6e2956e31106fce4",40:"29fb35d600d185c701c6",41:"9386854e603ecf256a40",42:"45b43e4e59ef68d11090",43:"0488afb66241270d05d8",44:"c5a276600bb2a8665c39",45:"739493ada2bdbb1408e7",46:"bb6300d45a8d30e88a68",47:"cf4b655b9d6eaf21030c",48:"b163cd5e2750e3f00800",49:"668613c777307089d478",50:"c56cb86db8e51549da41",51:"d11b1ca4f96751ce46db"}[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,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="/",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dist/static/js/manifest.905d821a52bd4755c9a7.js
+++ b/dist/static/js/manifest.905d821a52bd4755c9a7.js
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var d,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(d in n)Object.prototype.hasOwnProperty.call(n,d)&&(e[d]=n[d]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=b(b.s=r[i]);return o};var a={},f={54:0};function b(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,b),f.l=!0,f.exports}b.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,b){c=f[e]=[a,b]});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,b.nc&&r.setAttribute("nonce",b.nc),r.src=b.p+"static/js/"+e+"."+{0:"f5968bd457f58cea9e47",1:"41d25c420bebbfeb3e4a",2:"e10cd218f4c9bb84034d",3:"32f0b58fb70ae670879a",4:"fde890a507adaae38acc",5:"6d8b5af736d77152fd1a",6:"2be9167b26eabe4481bc",7:"59e4edb7b6eac2020982",8:"a5f40934f3974f707e64",9:"6688151182d21126708a",10:"56579e1bf4ca204c596c",11:"cb3b7c8e4baffcc80a23",12:"51ce873b57f738c82875",13:"2469a1a353028cb19b89",14:"89fab4d4cc8dbfd3f8a7",15:"3f6c1b93e21902aef4bc",16:"4653ad18dc393d3e1926",17:"cb9326471c103373a0db",18:"5f68acc44c3be4b6dc35",19:"31902118fec68a6b11ef",20:"f85417f0cd9027f554c4",21:"07a3cd605956fd8c1e18",22:"7724849c255db8abb274",23:"8f75bf7e8de3b73e642d",24:"390eeb03771cf0ab539f",25:"8ff7fac165d2fcea8b28",26:"2f82f16a371e8c1af772",27:"f9a43f4677ab67070a04",28:"8264fa436ddc75b940d6",29:"b6c67cb52e8fb4ac3de3",30:"775f819861de0b44705d",31:"fa2cff02b35eace0df5f",32:"d9035fc49e9fe4192059",33:"58a2e0af685001378440",34:"9795847fe16fa99a1aa0",35:"8af8020979de9eb5fa3a",36:"30f6c5df3a57e073a8f4",37:"c231c3e8c02b52d7fb39",38:"7a1401a413510ac96b63",39:"b5bf6e2956e31106fce4",40:"29fb35d600d185c701c6",41:"9386854e603ecf256a40",42:"45b43e4e59ef68d11090",43:"0488afb66241270d05d8",44:"c5a276600bb2a8665c39",45:"739493ada2bdbb1408e7",46:"bb6300d45a8d30e88a68",47:"cf4b655b9d6eaf21030c",48:"b163cd5e2750e3f00800",49:"668613c777307089d478",50:"c56cb86db8e51549da41",51:"d11b1ca4f96751ce46db"}[e]+".js";var d=setTimeout(t,12e4);function t(){r.onerror=r.onload=null,clearTimeout(d);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},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="/",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/shop/index.vue
+++ b/src/components/shop/index.vue
 <template>
  <div class="user">
-    <el-form ref="searchFrom" :model="searchFrom" label-width="100px" class="search-form" inline>
+    <el-form ref="searchFrom" size="small" :model="searchFrom" label-width="100px" class="search-form" inline>
          <el-form-item label="商品名称">
            <el-input v-model="searchFrom.name"></el-input>
          </el-form-item>
          <el-form-item label="商品类型">
-            <el-select v-model="searchFrom.goods_type" placeholder="请选择" @change="getUser">
+            <el-select v-model="searchFrom.goods_type" style="width: 120px" placeholder="请选择" @change="getUser">
              <el-option value="" label="请选择"></el-option>
              <el-option
                :label="'普通商品'"
@@ -30,7 +30,7 @@
            </el-select>
          </el-form-item>
          <el-form-item label="课程">
-            <el-select v-model="searchFrom.course_id" placeholder="请选择" @change="getUser">
+            <el-select v-model="searchFrom.course_id" placeholder="请选择" style="width: 150px" @change="getUser">
              <el-option value="" label="请选择"></el-option>
              <el-option
                v-for="(data,index) in classList"
@@ -41,7 +41,7 @@
            </el-select>
          </el-form-item>
            <el-form-item label="课程类别">
-        <el-select v-model="searchFrom.course_type" placeholder="请选择" @change="getUser" clearable>
+        <el-select v-model="searchFrom.course_type" style="width: 100px" placeholder="请选择" @change="getUser" clearable>
          <el-option v-for="item in classType" :key="item.course_type" :label="item.value" :value="item.course_type">
          </el-option>
        </el-select>
@@ -52,13 +52,11 @@
      <el-form-item>
        <div class="search-btn-block">
          <el-button type="primary" plain @click="getUser" icon="el-icon-search">搜索</el-button>
+          <el-button type="success" plain @click="add" v-if="!$store.state.readonly">添加商品</el-button>
        </div>
      </el-form-item>
    </el-form>
-    <div class="new-block">
-      <el-button type="success" plain @click="add" v-if="!$store.state.readonly">添加商品</el-button>
-    </div>
    <el-tabs v-model="searchFrom.status" type="card" style="background: white;padding-top: 10px" @tab-click="getUser">
      <el-tab-pane label="上架" name="1"></el-tab-pane>
      <el-tab-pane label="编辑中" name="0"></el-tab-pane>
@@ -66,6 +64,7 @@
      <el-tab-pane label="全部" name="-1"></el-tab-pane>
    </el-tabs>
    <el-table
+      size="small"
      :data="userList"
      style="width: 100%"  fixed>
      <el-table-column

--- a/src/components/yunji/index.vue
+++ b/src/components/yunji/index.vue
 <template>
  <div class="sms">
    <el-form ref="searchFrom" size="small" inline :model="searchFrom" label-width="80px">
-      <el-form-item label="订单号">
+      <el-form-item label="用户ID">
-        <el-input v-model="searchFrom.order_id"></el-input>
+        <el-input v-model="searchFrom.user_id"></el-input>
      </el-form-item>
-       <el-form-item label="购买人">
+       <el-form-item label="用户昵称">
        <el-input v-model="searchFrom.nickname"></el-input>
-      </el-form-item>
-       <el-form-item label="购买人ID">
-        <el-input v-model="searchFrom.user_id"></el-input>
      </el-form-item>
      <el-form-item label="手机号">
        <el-input v-model="searchFrom.mobile"></el-input>
      </el-form-item>
-      <el-form-item label="绑定状态">
-        <el-select v-model="searchFrom.user_buy" placeholder="请选择" @change="getList" clearable>
-          <el-option v-for="item in useTypeList" :key="item.user_buy" :label="item.value" :value="item.user_buy">
-          </el-option>
-        </el-select>
-      </el-form-item>
      <el-form-item label="商品名称">
        <el-select v-model="searchFrom.goods_id" placeholder="请选择" @change="getList" clearable>
          <el-option v-for="(data,index) in goodList" :key="index" :label="data | filterGoods" :value="data.id">
          </el-option>
        </el-select>
      </el-form-item>
+      <el-form-item label="绑定状态">
+        <el-select v-model="searchFrom.user_buy" placeholder="请选择" @change="getList" clearable>
+          <el-option v-for="item in useTypeList" :key="item.user_buy" :label="item.value" :value="item.user_buy">
+          </el-option>
+        </el-select>
+      </el-form-item>
      <el-form-item label="老师">
        <el-select v-model="searchFrom.teacher_id" placeholder="请选择" @change="getList" clearable filterable>
          <el-option v-for="(data,index) in teacherList" :key="index" :label="data.name" :value="data.id">
          </el-option>
        </el-select>
      </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="订单号">
+        <el-input v-model="searchFrom.order_id"></el-input>
+      </el-form-item>
+      <el-form-item label="下单时间">
        <el-date-picker
          v-model="searchFrom.createTime"
          type="datetimerange"
@@ -95,15 +95,13 @@
          </div>
        </template>
      </el-table-column>
+      <el-table-column prop="periods_title" label="期数">
+      </el-table-column>
      <el-table-column prop="goods_name" label="商品名称">
      </el-table-column>
-      <el-table-column label="收货地址">
+      <el-table-column prop="invite_type" label="来源">
        <template slot-scope="scope">
-          姓名：{{scope.row.receiver_name}}
+          {{scope.row.invite_type}}（{{scope.row.invite_name}}）
-          <br>
-          tel：{{scope.row.receiver_phone}}
-          <br>
-          {{scope.row.receiver_province}} {{scope.row.receiver_city}} {{scope.row.receiver_area}} {{scope.row.receiver_address}}
        </template>
      </el-table-column>
      <el-table-column prop="teacher_name" label="班级老师">
@@ -113,15 +111,22 @@
          {{scope.row.money/100}}元
        </template>
      </el-table-column>
-      <el-table-column prop="create_time" label="创建时间" sortable>
+      <el-table-column label="收货地址" width="150px">
+        <template slot-scope="scope">
+          姓名：{{scope.row.receiver_name}}
+          <br>
+          tel：{{scope.row.receiver_phone}}
+          <br>
+          {{scope.row.receiver_province}} {{scope.row.receiver_city}} {{scope.row.receiver_area}} {{scope.row.receiver_address}}
+        </template>
      </el-table-column>
-      <el-table-column prop="invite_type" label="来源">
+      <el-table-column prop="create_time" label="下单时间" width="140px" sortable>
      </el-table-column>
-      <el-table-column prop="pay_time" label="支付时间" sortable>
+      <el-table-column prop="pay_time" label="付款时间" width="140px" sortable>
      </el-table-column>
      <el-table-column prop="desc" label="备注">
      </el-table-column>
-      <el-table-column label="操作" v-if="!$store.state.readonly" width="120">
+      <el-table-column label="操作" fixed="right" v-if="!$store.state.readonly" width="120">
        <template slot-scope="scope">
          <el-button @click="editNote(scope.row.id, scope.row.desc)" size="mini" plain type="primary">编辑备注</el-button>
        </template>