优惠券传参修改

用户订单列表修改

优惠券传参修改
用户订单列表修改
c16d8b4f · wangwei · 37cbeb35 · c16d8b4f · c16d8b4f · c16d8b4f
Commit c16d8b4f authored Nov 22, 2018 by wangwei
33 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_bhids3f63a6.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.2bd92fe7ddc6125266c2e648a580d878.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.a1f3ca55025fad29204b.js></script><script type=text/javascript src=/static/js/vendor.44e1e5644ae24f910e52.js></script><script type=text/javascript src=/static/js/app.dd2d20555f5bf9e7f73a.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_bhids3f63a6.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.2bd92fe7ddc6125266c2e648a580d878.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.4a0f6e698f0c2282b7a0.js></script><script type=text/javascript src=/static/js/vendor.44e1e5644ae24f910e52.js></script><script type=text/javascript src=/static/js/app.6f19baf3c45266eb5182.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/10.fde3b94661820c6a9c28.js
+++ b/dev/static/js/10.fde3b94661820c6a9c28.js
--- a/dev/static/js/11.762212a93958429e3b39.js
+++ b/dev/static/js/11.762212a93958429e3b39.js
--- a/dev/static/js/12.32e37830369c7acb4ff4.js
+++ b/dev/static/js/12.32e37830369c7acb4ff4.js
--- a/dev/static/js/3.733977b2f005d4fcfe17.js
+++ b/dev/static/js/3.733977b2f005d4fcfe17.js
--- a/dev/static/js/4.061c2327852dc04cc917.js
+++ b/dev/static/js/4.061c2327852dc04cc917.js
--- a/dev/static/js/5.d76cad2bdad40828735a.js
+++ b/dev/static/js/5.d76cad2bdad40828735a.js
--- a/dev/static/js/6.517bf1ce83c868cabd14.js
+++ b/dev/static/js/6.517bf1ce83c868cabd14.js
--- a/dev/static/js/7.b2e09365b0642491f949.js
+++ b/dev/static/js/7.b2e09365b0642491f949.js
--- a/dev/static/js/8.58432c23ee74286791f2.js
+++ b/dev/static/js/8.58432c23ee74286791f2.js
--- a/dev/static/js/9.c655706558e6acbcac05.js
+++ b/dev/static/js/9.c655706558e6acbcac05.js
--- a/dev/static/js/app.6f19baf3c45266eb5182.js
+++ b/dev/static/js/app.6f19baf3c45266eb5182.js
--- a/dev/static/js/manifest.4a0f6e698f0c2282b7a0.js
+++ b/dev/static/js/manifest.4a0f6e698f0c2282b7a0.js
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,d){for(var t,o,b,i=0,u=[];i<c.length;i++)o=c[i],f[o]&&u.push(f[o][0]),f[o]=0;for(t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(a&&a(c,r,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)b=n(n.s=d[i]);return b};var c={},f={42:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,n.nc&&d.setAttribute("nonce",n.nc),d.src=n.p+"static/js/"+e+"."+{0:"4971d8839ebdf4944a90",1:"cad3642d3a7464d080d5",2:"b2cf5fa5a61806e769fc",3:"733977b2f005d4fcfe17",4:"061c2327852dc04cc917",5:"d76cad2bdad40828735a",6:"517bf1ce83c868cabd14",7:"b2e09365b0642491f949",8:"58432c23ee74286791f2",9:"c655706558e6acbcac05",10:"fde3b94661820c6a9c28",11:"762212a93958429e3b39",12:"32e37830369c7acb4ff4",13:"e9f09176ba6532fd0dda",14:"01654f4a1ab6d9368107",15:"d6544e18c88cc14ecf93",16:"8c2462234a2914856f6e",17:"65372c9c17b5b9363c91",18:"57ddb76fc0eecdefd5b8",19:"88531fffaa4f58901965",20:"f79377a0f47780fc0b31",21:"5ac21bab8470b77a04a7",22:"def1bf1cd22221d7643f",23:"673c13dd8f0e27bdc51c",24:"77629ed4b5307fed13ab",25:"48d8050e0e7cee511f68",26:"cd9d52266d2e0435d197",27:"121da1e1d8515a136dfe",28:"26a53e63f8464119c9f2",29:"a8a47c2a3db7a0a36ebd",30:"10fd2d728f9a3d2950ac",31:"6b59a1fb20db3f014f62",32:"ec52a500a5eda2a3e4db",33:"e14c5e04970ac2580876",34:"00e31d74e47bf096b364",35:"9fa70099b272fee5b92d",36:"19ff7723476f8e5d5256",37:"74745de868a06c351683",38:"42c21079714b26a911e0",39:"0490630af736f091ada5"}[e]+".js";var t=setTimeout(o,12e4);function o(){d.onerror=d.onload=null,clearTimeout(t);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return d.onerror=d.onload=o,r.appendChild(d),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="/",n.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_bhids3f63a6.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.2b76fda94711085034df291dd3813495.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.20227deaa3882d13a53d.js></script><script type=text/javascript src=/static/js/vendor.5d516f2c871df58ed6b0.js></script><script type=text/javascript src=/static/js/app.3fff0997fc0830d82269.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_bhids3f63a6.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.241afa1769157c4e690f2ed1138a0e03.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.5561d6fbc4e6cb9fc189.js></script><script type=text/javascript src=/static/js/vendor.5d516f2c871df58ed6b0.js></script><script type=text/javascript src=/static/js/app.3013a3a5aecec3e46a98.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.241afa1769157c4e690f2ed1138a0e03.css
+++ b/dist/static/css/app.241afa1769157c4e690f2ed1138a0e03.css
--- a/dist/static/js/10.a852ec28e835c1f5ef4b.js
+++ b/dist/static/js/10.a852ec28e835c1f5ef4b.js
--- a/dist/static/js/11.432edbc924b2fc7a1a04.js
+++ b/dist/static/js/11.432edbc924b2fc7a1a04.js
+webpackJsonp([11],{"1PE7":function(e,t){},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.m)(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.Y)(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._70)({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._40)(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._41)(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.G)(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("1PE7")},"data-v-76a4205f",null);t.default=m.exports},EQY0:function(e,t){},"vgm/":function(e,t){}});
\ No newline at end of file
--- a/dist/static/js/12.80a59401dda5496bb1d5.js
+++ b/dist/static/js/12.80a59401dda5496bb1d5.js
--- a/dist/static/js/13.f88f6293b7d42c1bc18b.js
+++ b/dist/static/js/13.f88f6293b7d42c1bc18b.js
--- a/dist/static/js/14.a4a5682510fc8fbffd59.js
+++ b/dist/static/js/14.a4a5682510fc8fbffd59.js
--- a/dist/static/js/15.9d0964113176d81a0a44.js
+++ b/dist/static/js/15.9d0964113176d81a0a44.js
--- a/dist/static/js/3.84969881cbd35e4a23dd.js
+++ b/dist/static/js/3.84969881cbd35e4a23dd.js
--- a/dist/static/js/4.051593d81b860823e5fa.js
+++ b/dist/static/js/4.051593d81b860823e5fa.js
--- a/dist/static/js/5.44804c6b69f7e73b5dc8.js
+++ b/dist/static/js/5.44804c6b69f7e73b5dc8.js
--- a/dist/static/js/6.35e68eec3480b8153307.js
+++ b/dist/static/js/6.35e68eec3480b8153307.js
--- a/dist/static/js/7.dea556670989530fe32b.js
+++ b/dist/static/js/7.dea556670989530fe32b.js
+webpackJsonp([7],{"32Ku":function(e,t){},P1Eu:function(e,t){},ivLs:function(e,t){},jFLA:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var l=a("CCn6"),s=a("kmJW"),i={name:"detail",props:["dialogObj"],data:function(){return{userDetail:{},show:!1}},methods:{getDetail:function(){var e=this;this.dialogObj.id&&Object(l._46)(this.dialogObj.id).then(function(t){e.userDetail=t})},initDialog:function(){this.getDetail(),this.show=this.dialogObj.show}},watch:{dialogObj:{handler:function(){this.loading=!0,this.initDialog()},deep:!0},show:function(e){this.$emit("changeShow",e)}}},o={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("el-dialog",{attrs:{title:"用户详情",center:"",visible:e.dialogObj.show,width:"800px"},on:{"update:visible":function(t){e.$set(e.dialogObj,"show",t)}}},[a("el-row",{attrs:{align:"middle",type:"flex"}},[a("el-col",{attrs:{span:4}},[a("label",[e._v("头像")])]),e._v(" "),a("el-col",{attrs:{span:8}},[a("img",{attrs:{src:e.userDetail.avatar}})]),e._v(" "),a("el-col",{attrs:{span:4}},[a("label",[e._v("昵称")])]),e._v(" "),a("el-col",{attrs:{span:8}},[e._v(e._s(e.userDetail.nickname))])],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:4}},[a("label",[e._v("手机号")])]),e._v(" "),a("el-col",{attrs:{span:8}},[e._v(e._s(e.userDetail.mobile))]),e._v(" "),a("el-col",{attrs:{span:4}},[a("label",[e._v("用户ID")])]),e._v(" "),a("el-col",{attrs:{span:8}},[e._v(e._s(e.userDetail.user_id))])],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:4}},[a("label",[e._v("生日")])]),e._v(" "),a("el-col",{attrs:{span:8}},[e._v(e._s(e.userDetail.birthday))]),e._v(" "),a("el-col",{attrs:{span:4}},[a("label",[e._v("邀请类型")])]),e._v(" "),a("el-col",{attrs:{span:8}},[e._v(e._s(e.userDetail.invite_type))])],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:4}},[a("label",[e._v("等级")])]),e._v(" "),a("el-col",{attrs:{span:8}},[e._v(e._s(e.userDetail.level))]),e._v(" "),a("el-col",{attrs:{span:4}},[a("label",[e._v("邀请人ID")])]),e._v(" "),a("el-col",{attrs:{span:8}},[e._v(e._s(e.userDetail.invite_user_id))])],1),e._v(" "),a("el-row",{attrs:{align:"middle",type:"flex"}},[a("el-col",{attrs:{span:4}},[a("label",[e._v("邀请码")])]),e._v(" "),a("el-col",{attrs:{span:8}},[e._v("\n       "+e._s(e.userDetail.invite_code)+"\n    ")]),e._v(" "),a("el-col",{attrs:{span:4}},[a("label",[e._v("老师ID")])]),e._v(" "),a("el-col",{attrs:{span:8}},[e._v("\n      "+e._s(e.userDetail.teacher_id)+"\n    ")])],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:4}},[a("label",[e._v("注册时间")])]),e._v(" "),a("el-col",{attrs:{span:8}},[e._v(e._s(e.userDetail.created_at))]),e._v(" "),a("el-col",{attrs:{span:4}},[a("label",[e._v("最后登录")])]),e._v(" "),a("el-col",{attrs:{span:8}},[e._v(e._s(e.userDetail.last_login_at))])],1)],1)},staticRenderFns:[]};var r=a("VU/8")(i,o,!1,function(e){a("lqZE")},"data-v-0e8d1f04",null).exports,n={props:["dialogObj"],data:function(){return{form:{id:"",teacher_id:""},teacherList:[]}},methods:{initPage:function(){var e=this;Object(l._45)().then(function(t){e.teacherList=t.list}),this.form={id:this.dialogObj.id,teacher_id:this.dialogObj.teacher_id?this.dialogObj.teacher_id:""}},onSave:function(){var e=this,t={teacher_id:this.form.teacher_id?this.form.teacher_id:0};Object(l.l)(this.form.id,t).then(function(t){e.$message({type:"success",message:"绑定成功!"}),e.$emit("reflash"),e.dialogObj.show=!1})}},watch:{dialogObj:function(e){this.initPage()}}},c={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-form",{ref:"form",attrs:{model:e.form,"label-width":"120px"}},[a("el-form-item",{attrs:{label:"老师"}},[a("el-select",{attrs:{placeholder:"请选择"},model:{value:e.form.teacher_id,callback:function(t){e.$set(e.form,"teacher_id",t)},expression:"form.teacher_id"}},e._l(e.teacherList,function(e,t){return a("el-option",{key:t,attrs:{label:e.name,value:e.id}})}))],1)],1),e._v(" "),a("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[a("el-button",{on:{click:function(t){e.dialogObj.show=!1}}},[e._v("取 消")]),e._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:e.onSave}},[e._v("确 定")])],1)],1)},staticRenderFns:[]};var h=a("VU/8")(n,c,!1,function(e){a("P1Eu")},"data-v-e0bbb14c",null).exports,d={name:"index",data:function(){return{searchFrom:{nickName:"",mobile:"",level:"",userId:""},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:s.a,detailDialog:r,teacherDialog:h},mounted:function(){this.getUser()},methods:{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.userId&&(t.user_id=this.searchFrom.userId),this.searchFrom.nickName&&(t.nickname=this.searchFrom.nickName),this.searchFrom.mobile&&(t.mobile=this.searchFrom.mobile),this.searchFrom.level&&(t.level=this.searchFrom.level),Object(l._47)(t).then(function(t){e.userList=t.list,e.total=t.total})},detail:function(e){this.dialogDetailObj={show:!0,id:e.user_id}},changeShow:function(e){this.dialogDetailObj.show=e},bindTeacher:function(e){this.dialogObj={show:!0,title:"绑定老师",id:e.user_id,teacher_id:e.teacher_id}},goToDetail:function(e){this.$router.push("/userDetail/"+e)},syncUser:function(){var e=this;this.loading=!0,Object(l._43)().then(function(t){e.loading=!1,e.$message({showClose:!0,message:"已更新"+t+"条用户数据",type:"success"})}).catch(function(){e.loading=!1})}}},u={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"}},[a("el-row",[a("el-col",{attrs:{span:4}},[a("el-form-item",{attrs:{label:"ID"}},[a("el-input",{model:{value:e.searchFrom.userId,callback:function(t){e.$set(e.searchFrom,"userId",t)},expression:"searchFrom.userId"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:4}},[a("el-form-item",{attrs:{label:"昵称"}},[a("el-input",{model:{value:e.searchFrom.nickName,callback:function(t){e.$set(e.searchFrom,"nickName",t)},expression:"searchFrom.nickName"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:4}},[a("el-form-item",{attrs:{label:"电话"}},[a("el-input",{model:{value:e.searchFrom.mobile,callback:function(t){e.$set(e.searchFrom,"mobile",t)},expression:"searchFrom.mobile"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:4}},[a("el-form-item",{attrs:{label:"等级"}},[a("el-input",{model:{value:e.searchFrom.level,callback:function(t){e.$set(e.searchFrom,"level",t)},expression:"searchFrom.level"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:4}},[a("el-form-item",[a("div",{staticClass:"flexRow"},[a("el-button",{attrs:{type:"primary",plain:""},on:{click:e.getUser}},[e._v("搜索")]),e._v(" "),a("el-button",{attrs:{type:"success",plain:""},on:{click:e.syncUser}},[e._v("同步最新数据")])],1)])],1)],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.avatar}}),e._v(e._s(t.row.nickname)+"(ID:"+e._s(t.row.user_id)+")\n      ")]}}])}),e._v(" "),a("el-table-column",{attrs:{prop:"mobile",label:"手机号"}}),e._v(" "),a("el-table-column",{attrs:{prop:"level",label:"等级"}}),e._v(" "),a("el-table-column",{attrs:{prop:"created_at",label:"注册时间"}}),e._v(" "),a("el-table-column",{attrs:{prop:"last_login_at",label:"最后登录时间"}}),e._v(" "),a("el-table-column",{attrs:{label:"操作"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("el-button",{attrs:{size:"mini",plain:"",type:"primary"},on:{click:function(a){e.goToDetail(t.row.user_id)}}},[e._v("\n          查看详情\n        ")])]}}])})],1),e._v(" "),a("page",{attrs:{total:e.total,limit:e.limit},on:{pageChange:e.onPageChange,sizeChange:e.onSizeChange}}),e._v(" "),a("detail-dialog",{attrs:{dialogObj:e.dialogDetailObj},on:{changeShow:e.changeShow}}),e._v(" "),a("teacher-dialog",{attrs:{dialogObj:e.dialogObj},on:{reflash:e.getUser}})],1)},staticRenderFns:[]};var _=a("VU/8")(d,u,!1,function(e){a("32Ku"),a("ivLs")},"data-v-a11638aa",null);t.default=_.exports},lqZE:function(e,t){}});
\ No newline at end of file
--- a/dist/static/js/8.e19bd80d0c5df8c1da4c.js
+++ b/dist/static/js/8.e19bd80d0c5df8c1da4c.js
--- a/dist/static/js/9.c691d649209558932f0d.js
+++ b/dist/static/js/9.c691d649209558932f0d.js
--- a/dist/static/js/app.3013a3a5aecec3e46a98.js
+++ b/dist/static/js/app.3013a3a5aecec3e46a98.js
--- a/dist/static/js/manifest.5561d6fbc4e6cb9fc189.js
+++ b/dist/static/js/manifest.5561d6fbc4e6cb9fc189.js
--- a/src/components/order/couponDialog.vue
+++ b/src/components/order/couponDialog.vue
@@ -77,7 +77,7 @@
    methods:{
      initPage(){
        let json = {
-          out_trade_no:this.dialogObj.out_trade_no,
+          order_coupon_id:this.dialogObj.order_coupon_id,
          limit:10000
        };
        getCouponListApi(json).then(res=>{

--- a/src/components/order/index.vue
+++ b/src/components/order/index.vue
@@ -276,7 +276,7 @@
          },
          couponDetail:{
            show:false,
-            out_trade_no:''
+            order_coupon_id:''
          },
          refundDetail:{
            show:false,
@@ -326,7 +326,7 @@
      },
      showCoupon(data){
        this.couponDetail.show = true;
-        this.couponDetail.out_trade_no = data.out_trade_no;
+        this.couponDetail.order_coupon_id = data.order_coupon_id;
      },
      showSource(data){
        this.sourceDialog.show = true;

--- a/src/components/userDetail/index.vue
+++ b/src/components/userDetail/index.vue