Merge branch 'dev' into pre

# Conflicts: # dist/index.html

Merge branch 'dev' into pre
# Conflicts: # dist/index.html
150bfe22 · IvyXia123 · 2220c22f · cb49d752 · 150bfe22 · 150bfe22
Commit 150bfe22 authored Aug 29, 2019 by IvyXia123
160 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.11.1/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://lib.baomitu.com/vue/2.5.17/vue.js></script><script src=https://lib.baomitu.com/vuex/3.0.1/vuex.min.js></script><script src=https://lib.baomitu.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.11.1/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.4fa8c3e44c5f2cb7e588.js></script><script type=text/javascript src=/static/js/vendor.fdfa49e267f48089768a.js></script><script type=text/javascript src=/static/js/app.771316ce36eae7e98b65.js></script></body><script>let el = document.getElementsByTagName("script");
+    el.onerror = function(a,b,c){
+      console.log('error:',a,b,c);
+    };
+    // document.getElementsByTagName('script').onerror</script></html>
\ No newline at end of file
--- a/dist/index.html
+++ b/dist/index.html
+<<<<<<< HEAD
 <!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.11.1/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://lib.baomitu.com/vue/2.5.17/vue.js></script><script src=https://lib.baomitu.com/vuex/3.0.1/vuex.min.js></script><script src=https://lib.baomitu.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.11.1/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.35aa104c4caa3e9a4635.js></script><script type=text/javascript src=/static/js/vendor.195a67a672e524ccd93c.js></script><script type=text/javascript src=/static/js/app.d81550edd99da8615abf.js></script></body><script>let el = document.getElementsByTagName("script");
+=======
+<<<<<<< HEAD
+<!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.11.1/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://lib.baomitu.com/vue/2.5.17/vue.js></script><script src=https://lib.baomitu.com/vuex/3.0.1/vuex.min.js></script><script src=https://lib.baomitu.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.11.1/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.f2d2ccc82ed134046f72.js></script><script type=text/javascript src=/static/js/vendor.195a67a672e524ccd93c.js></script><script type=text/javascript src=/static/js/app.d81550edd99da8615abf.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.11.1/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.13d13cb05ba4f0132048934034fd234f.css rel=stylesheet></head><body><script src=https://lib.baomitu.com/vue/2.5.17/vue.js></script><script src=https://lib.baomitu.com/vuex/3.0.1/vuex.min.js></script><script src=https://lib.baomitu.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.11.1/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.ece792aeedc01a8ee322.js></script><script type=text/javascript src=/static/js/vendor.6d83b86ee8e55629231a.js></script><script type=text/javascript src=/static/js/app.fd53bcc525530824901f.js></script></body><script>let el = document.getElementsByTagName("script");
+>>>>>>> hotfix
+>>>>>>> dev
    el.onerror = function(a,b,c){
      console.log('error:',a,b,c);
    };

--- a/dist/static/css/app.13d13cb05ba4f0132048934034fd234f.css
+++ b/dist/static/css/app.13d13cb05ba4f0132048934034fd234f.css
--- a/dist/static/js/0.1f9330ff00e36af72503.js
+++ b/dist/static/js/0.1f9330ff00e36af72503.js
--- a/dist/static/js/0.20b5f5c317bede54371c.js
+++ b/dist/static/js/0.20b5f5c317bede54371c.js
--- a/dist/static/js/1.358bbbad7afda45562bc.js
+++ b/dist/static/js/1.358bbbad7afda45562bc.js
--- a/dist/static/js/1.cddba729a768bb71961e.js
+++ b/dist/static/js/1.cddba729a768bb71961e.js
--- a/dist/static/js/10.606373ba89afa4d56570.js
+++ b/dist/static/js/10.606373ba89afa4d56570.js
--- a/dist/static/js/10.ddcf2f5c9ba70a5b725f.js
+++ b/dist/static/js/10.ddcf2f5c9ba70a5b725f.js
--- a/dist/static/js/11.8816cbd0659f6a9bf280.js
+++ b/dist/static/js/11.8816cbd0659f6a9bf280.js
--- a/dist/static/js/11.cec0aab3845a96fcedc4.js
+++ b/dist/static/js/11.cec0aab3845a96fcedc4.js
--- a/dist/static/js/12.095596971d811f76b281.js
+++ b/dist/static/js/12.095596971d811f76b281.js
--- a/dist/static/js/12.3b4e3ce53f97f22c3e32.js
+++ b/dist/static/js/12.3b4e3ce53f97f22c3e32.js
--- a/dist/static/js/13.4939db30310368eb1e7c.js
+++ b/dist/static/js/13.4939db30310368eb1e7c.js
--- a/dist/static/js/13.a356f70c9721b8c68271.js
+++ b/dist/static/js/13.a356f70c9721b8c68271.js
--- a/dist/static/js/14.c504a593d98cd821c993.js
+++ b/dist/static/js/14.c504a593d98cd821c993.js
--- a/dist/static/js/14.e8859f654dcc1d92624e.js
+++ b/dist/static/js/14.e8859f654dcc1d92624e.js
--- a/dist/static/js/15.66441875f9d498021fd8.js
+++ b/dist/static/js/15.66441875f9d498021fd8.js
--- a/dist/static/js/15.f651603e14eb2603c93d.js
+++ b/dist/static/js/15.f651603e14eb2603c93d.js
--- a/dist/static/js/16.124c4b69437c61a8e63b.js
+++ b/dist/static/js/16.124c4b69437c61a8e63b.js
--- a/dist/static/js/16.e970b0652fb3f9050b63.js
+++ b/dist/static/js/16.e970b0652fb3f9050b63.js
--- a/dist/static/js/17.8c087629d63f32d7c113.js
+++ b/dist/static/js/17.8c087629d63f32d7c113.js
--- a/dist/static/js/17.e25c98cc372b381c941c.js
+++ b/dist/static/js/17.e25c98cc372b381c941c.js
--- a/dist/static/js/18.00eea99e1dd127dddd9a.js
+++ b/dist/static/js/18.00eea99e1dd127dddd9a.js
--- a/dist/static/js/18.0f06c30ecb1a39e1ace6.js
+++ b/dist/static/js/18.0f06c30ecb1a39e1ace6.js
--- a/dist/static/js/19.565fdddb169e63a51860.js
+++ b/dist/static/js/19.565fdddb169e63a51860.js
--- a/dist/static/js/19.56e7cfb4b183f7de30e4.js
+++ b/dist/static/js/19.56e7cfb4b183f7de30e4.js
--- a/dist/static/js/2.4f94fbd21660b7b1eaec.js
+++ b/dist/static/js/2.4f94fbd21660b7b1eaec.js
--- a/dist/static/js/2.ba4b38eeae6b7ed15dc7.js
+++ b/dist/static/js/2.ba4b38eeae6b7ed15dc7.js
--- a/dist/static/js/20.259ebc25aa042acdb3bc.js
+++ b/dist/static/js/20.259ebc25aa042acdb3bc.js
--- a/dist/static/js/20.495b9397e804d2330e8b.js
+++ b/dist/static/js/20.495b9397e804d2330e8b.js
--- a/dist/static/js/21.43a39b6c08600e73d1f3.js
+++ b/dist/static/js/21.43a39b6c08600e73d1f3.js
--- a/dist/static/js/21.e7056c1348290d411b29.js
+++ b/dist/static/js/21.e7056c1348290d411b29.js
--- a/dist/static/js/22.1cddb1b53a5ed07fd1ad.js
+++ b/dist/static/js/22.1cddb1b53a5ed07fd1ad.js
--- a/dist/static/js/22.d0b84258853476847bb8.js
+++ b/dist/static/js/22.d0b84258853476847bb8.js
--- a/dist/static/js/23.67465002260a8c56a3cf.js
+++ b/dist/static/js/23.67465002260a8c56a3cf.js
--- a/dist/static/js/23.67ad5f99ef64665c0aaa.js
+++ b/dist/static/js/23.67ad5f99ef64665c0aaa.js
--- a/dist/static/js/24.607b1da33e43e83d030d.js
+++ b/dist/static/js/24.607b1da33e43e83d030d.js
--- a/dist/static/js/24.67a9adf6d4a2831f26be.js
+++ b/dist/static/js/24.67a9adf6d4a2831f26be.js
--- a/dist/static/js/25.7da808a4a80ac674bcdb.js
+++ b/dist/static/js/25.7da808a4a80ac674bcdb.js
--- a/dist/static/js/25.eef27b0bbf52fac4038e.js
+++ b/dist/static/js/25.eef27b0bbf52fac4038e.js
--- a/dist/static/js/26.89208721f9d0301e37c3.js
+++ b/dist/static/js/26.89208721f9d0301e37c3.js
--- a/dist/static/js/26.9bccecf09238756c29b9.js
+++ b/dist/static/js/26.9bccecf09238756c29b9.js
--- a/dist/static/js/27.17e01c8332ed4f36d608.js
+++ b/dist/static/js/27.17e01c8332ed4f36d608.js
+webpackJsonp([27],{"89rD":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=n("CCn6"),s={name:"index",components:{page:n("kmJW").a},data:function(){return{nowPage:1,total:0,limit:10,refundTypeList:[{id:0,value:"退款中"},{id:1,value:"退款成功"},{id:2,value:"退款失败"}],searchFrom:{nickname:"",user_id:"",out_trade_no:"",status:"1"},list:[]}},filters:{filterStatus:function(e){var t="";return 0===e.status?t="退款中":1===e.status?t="退款成功":2===e.status&&(t="退款失败("+e.err_msg+")"),t}},mounted:function(){this.getRefundList()},methods:{editComment:function(e,t){var n=this;this.$prompt("","编辑备注",{confirmButtonText:"确定",cancelButtonText:"取消",inputType:"textarea",inputValue:t}).then(function(t){var s=t.value;Object(a._20)(e,"refund",{desc:s}).then(function(e){n.$message({type:"success",message:"编辑备注成功"}),n.getRefundList()})})},onPageChange:function(e){this.nowPage=e,this.getRefundList()},onSizeChange:function(e){this.nowPage=1,this.limit=e,this.getRefundList()},getRefundList:function(){var e=this,t={limit:this.limit,page:this.nowPage};this.searchFrom.nickname&&(t.nickname=this.searchFrom.nickname),this.searchFrom.user_id&&(t.user_id=this.searchFrom.user_id),this.searchFrom.status&&"-1"!==this.searchFrom.status&&(t.status=this.searchFrom.status),this.searchFrom.out_trade_no&&(t.out_trade_no=this.searchFrom.out_trade_no),Object(a._96)(t).then(function(t){e.total=t.total,e.list=t.list})},exportTable:function(){var e={};this.searchFrom.nickname&&(e.nickname=this.searchFrom.nickname),this.searchFrom.user_id&&(e.user_id=this.searchFrom.user_id),this.searchFrom.status&&(e.status=this.searchFrom.status),this.searchFrom.out_trade_no&&(e.out_trade_no=this.searchFrom.out_trade_no),Object(a._28)("/api/admin/refund/export",e,"退款列表")}}},r=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"refund"},[n("el-form",{ref:"searchFrom",attrs:{model:e.searchFrom,"label-width":"100px",inline:""}},[n("el-form-item",{attrs:{label:"用户昵称"}},[n("el-input",{model:{value:e.searchFrom.nickname,callback:function(t){e.$set(e.searchFrom,"nickname",t)},expression:"searchFrom.nickname"}})],1),e._v(" "),n("el-form-item",{attrs:{label:"用户ID"}},[n("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(" "),n("el-form-item",{attrs:{label:"订单编号"}},[n("el-input",{model:{value:e.searchFrom.out_trade_no,callback:function(t){e.$set(e.searchFrom,"out_trade_no",t)},expression:"searchFrom.out_trade_no"}})],1),e._v(" "),n("el-form-item",{attrs:{"label-width":"10px"}},[n("el-button",{attrs:{type:"primary"},on:{click:e.getRefundList}},[e._v("搜索")]),e._v(" "),e.$store.state.export?n("el-button",{attrs:{type:"primary",plain:""},on:{click:e.exportTable}},[e._v("导出")]):e._e()],1)],1),e._v(" "),n("el-tabs",{staticStyle:{background:"white","padding-top":"10px"},attrs:{type:"card"},on:{"tab-click":e.getRefundList},model:{value:e.searchFrom.status,callback:function(t){e.$set(e.searchFrom,"status",t)},expression:"searchFrom.status"}},[n("el-tab-pane",{attrs:{label:"退款成功",name:"1"}}),e._v(" "),n("el-tab-pane",{attrs:{label:"退款中",name:"0"}}),e._v(" "),n("el-tab-pane",{attrs:{label:"退款失败",name:"2"}}),e._v(" "),n("el-tab-pane",{attrs:{label:"全部",name:"-1"}})],1),e._v(" "),n("el-table",{staticStyle:{width:"100%"},attrs:{data:e.list}},[n("el-table-column",{attrs:{prop:"refund_no",label:"退款编号"}}),e._v(" "),n("el-table-column",{attrs:{prop:"out_trade_no",label:"订单号"}}),e._v(" "),n("el-table-column",{attrs:{label:"用户信息","min-width":"140",className:"userInfo"},scopedSlots:e._u([{key:"default",fn:function(t){return[n("img",{staticClass:"avatar",attrs:{src:t.row.user_avatar}}),e._v("\n        "+e._s(t.row.user_nickname)+"(ID:"+e._s(t.row.user_id)+")\n      ")]}}])}),e._v(" "),n("el-table-column",{attrs:{prop:"order_money",label:"订单金额"},scopedSlots:e._u([{key:"default",fn:function(t){return[e._v("\n        "+e._s(parseFloat(t.row.order_money/100))+"元\n      ")]}}])}),e._v(" "),n("el-table-column",{attrs:{prop:"refund_money",label:"退款金额"},scopedSlots:e._u([{key:"default",fn:function(t){return[e._v("\n        "+e._s(parseFloat(t.row.refund_money/100))+"元\n      ")]}}])}),e._v(" "),n("el-table-column",{attrs:{prop:"desc",label:"备注"}}),e._v(" "),n("el-table-column",{attrs:{label:"退款状态"},scopedSlots:e._u([{key:"default",fn:function(t){return[e._v("\n        "+e._s(e._f("filterStatus")(t.row))+"\n      ")]}}])}),e._v(" "),n("el-table-column",{attrs:{prop:"success_at",label:"退款成功时间",sortable:""}}),e._v(" "),e.$store.state.readonly?e._e():n("el-table-column",{attrs:{label:"操作","min-width":"80"},scopedSlots:e._u([{key:"default",fn:function(t){return[n("el-button",{attrs:{type:"warning",plain:"",size:"mini"},on:{click:function(n){e.editComment(t.row.id,t.row.desc)}}},[e._v("\n          备注\n        ")])]}}])})],1),e._v(" "),n("page",{attrs:{nowPage:e.nowPage,total:e.total},on:{pageChange:e.onPageChange,sizeChange:e.onSizeChange}})],1)};r._withStripped=!0;var o={render:r,staticRenderFns:[]},i=o;var l=!1;var u=n("VU/8")(s,i,!1,function(e){l||(n("uuI3"),n("x2ad"))},"data-v-dc9323ea",null);u.options.__file="src/components/refund/index.vue";t.default=u.exports},YT4L:function(e,t,n){(e.exports=n("FZ+f")(!0)).push([e.i,"\n.userInfo >div{\n  display: -webkit-box;\n  display: -ms-flexbox;\n  display: flex;\n  -webkit-box-orient: horizontal;\n  -webkit-box-direction: normal;\n      -ms-flex-flow: row nowrap;\n          flex-flow: row nowrap;\n  -webkit-box-pack: start;\n      -ms-flex-pack: start;\n          justify-content: flex-start;\n  -webkit-box-align: center;\n      -ms-flex-align: center;\n          align-items: center;\n}\n","",{version:3,sources:["/Users/xiaxue/Desktop/admin/src/components/refund/index.vue"],names:[],mappings:";AACA;EACE,qBAAqB;EACrB,qBAAqB;EACrB,cAAc;EACd,+BAA+B;EAC/B,8BAA8B;MAC1B,0BAA0B;UACtB,sBAAsB;EAC9B,wBAAwB;MACpB,qBAAqB;UACjB,4BAA4B;EACpC,0BAA0B;MACtB,uBAAuB;UACnB,oBAAoB;CAC7B",file:"index.vue",sourcesContent:["\n.userInfo >div{\n  display: -webkit-box;\n  display: -ms-flexbox;\n  display: flex;\n  -webkit-box-orient: horizontal;\n  -webkit-box-direction: normal;\n      -ms-flex-flow: row nowrap;\n          flex-flow: row nowrap;\n  -webkit-box-pack: start;\n      -ms-flex-pack: start;\n          justify-content: flex-start;\n  -webkit-box-align: center;\n      -ms-flex-align: center;\n          align-items: center;\n}\n"],sourceRoot:""}])},gdqx:function(e,t,n){(e.exports=n("FZ+f")(!0)).push([e.i,"\n.refund[data-v-dc9323ea]{\n  padding: 20px 0;\n}\n.avatar[data-v-dc9323ea] {\n  width:50px;\n  height: 50px;\n  border-radius: 50%;\n}\n","",{version:3,sources:["/Users/xiaxue/Desktop/admin/src/components/refund/index.vue"],names:[],mappings:";AACA;EACE,gBAAgB;CACjB;AACD;EACE,WAAW;EACX,aAAa;EACb,mBAAmB;CACpB",file:"index.vue",sourcesContent:["\n.refund[data-v-dc9323ea]{\n  padding: 20px 0;\n}\n.avatar[data-v-dc9323ea] {\n  width:50px;\n  height: 50px;\n  border-radius: 50%;\n}\n"],sourceRoot:""}])},uuI3:function(e,t,n){var a=n("gdqx");"string"==typeof a&&(a=[[e.i,a,""]]),a.locals&&(e.exports=a.locals);n("rjj0")("5d6f4860",a,!1,{})},x2ad:function(e,t,n){var a=n("YT4L");"string"==typeof a&&(a=[[e.i,a,""]]),a.locals&&(e.exports=a.locals);n("rjj0")("7a0c02b8",a,!1,{})}});
\ No newline at end of file
--- a/dist/static/js/27.b9bf7179a5ceb852c9aa.js
+++ b/dist/static/js/27.b9bf7179a5ceb852c9aa.js
--- a/dist/static/js/28.1484235cad8818f61548.js
+++ b/dist/static/js/28.1484235cad8818f61548.js
--- a/dist/static/js/28.1daf1be54fc42f32e05c.js
+++ b/dist/static/js/28.1daf1be54fc42f32e05c.js
--- a/dist/static/js/29.0248ba9f0e91ee878918.js
+++ b/dist/static/js/29.0248ba9f0e91ee878918.js
--- a/dist/static/js/29.898ae6158d6d7c4faa1a.js
+++ b/dist/static/js/29.898ae6158d6d7c4faa1a.js
--- a/dist/static/js/3.6271eab9415115708a0a.js
+++ b/dist/static/js/3.6271eab9415115708a0a.js
--- a/dist/static/js/3.e83381706da8c403900f.js
+++ b/dist/static/js/3.e83381706da8c403900f.js
--- a/dist/static/js/30.37f95b5f8bcd11592f4e.js
+++ b/dist/static/js/30.37f95b5f8bcd11592f4e.js
--- a/dist/static/js/30.6b91829f91321b43444c.js
+++ b/dist/static/js/30.6b91829f91321b43444c.js
--- a/dist/static/js/31.02c89b26e7f2b3aba116.js
+++ b/dist/static/js/31.02c89b26e7f2b3aba116.js
--- a/dist/static/js/31.e72356de4a24fd8f9b7c.js
+++ b/dist/static/js/31.e72356de4a24fd8f9b7c.js
--- a/dist/static/js/32.15676b50cca5fc48f6b8.js
+++ b/dist/static/js/32.15676b50cca5fc48f6b8.js
--- a/dist/static/js/32.9763df6b8650ad125714.js
+++ b/dist/static/js/32.9763df6b8650ad125714.js
--- a/dist/static/js/33.8b95d57912eac528a343.js
+++ b/dist/static/js/33.8b95d57912eac528a343.js
--- a/dist/static/js/33.e6f5afb4008483f98325.js
+++ b/dist/static/js/33.e6f5afb4008483f98325.js
--- a/dist/static/js/34.ce49fdcc5f87253d62d8.js
+++ b/dist/static/js/34.ce49fdcc5f87253d62d8.js
--- a/dist/static/js/34.e20a0b8975fc55fc5401.js
+++ b/dist/static/js/34.e20a0b8975fc55fc5401.js
--- a/dist/static/js/35.0d03e9be68ecdef40e8a.js
+++ b/dist/static/js/35.0d03e9be68ecdef40e8a.js
--- a/dist/static/js/35.b9f8e48022a5eb3635ab.js
+++ b/dist/static/js/35.b9f8e48022a5eb3635ab.js
--- a/dist/static/js/36.1a08019800ff4060aeed.js
+++ b/dist/static/js/36.1a08019800ff4060aeed.js
--- a/dist/static/js/36.56efd8a59865cb817d49.js
+++ b/dist/static/js/36.56efd8a59865cb817d49.js
--- a/dist/static/js/37.bdb3183bea1346621623.js
+++ b/dist/static/js/37.bdb3183bea1346621623.js
--- a/dist/static/js/37.f1b8d5433c0c203c7228.js
+++ b/dist/static/js/37.f1b8d5433c0c203c7228.js
--- a/dist/static/js/38.f10c83106ef0105243bc.js
+++ b/dist/static/js/38.f10c83106ef0105243bc.js
--- a/dist/static/js/38.f140b4acdf51f105829e.js
+++ b/dist/static/js/38.f140b4acdf51f105829e.js
--- a/dist/static/js/39.96be7f1fa76194f59d95.js
+++ b/dist/static/js/39.96be7f1fa76194f59d95.js
--- a/dist/static/js/39.fd700f4e89ae84db0ec7.js
+++ b/dist/static/js/39.fd700f4e89ae84db0ec7.js
--- a/dist/static/js/4.1b3d7eafb022fdf774bb.js
+++ b/dist/static/js/4.1b3d7eafb022fdf774bb.js
--- a/dist/static/js/4.c9a151c6c2b31c097747.js
+++ b/dist/static/js/4.c9a151c6c2b31c097747.js
--- a/dist/static/js/40.2691dd9ebdb4a70c6f1d.js
+++ b/dist/static/js/40.2691dd9ebdb4a70c6f1d.js
--- a/dist/static/js/40.bfabf7a09c813c46fc81.js
+++ b/dist/static/js/40.bfabf7a09c813c46fc81.js
--- a/dist/static/js/41.2e6add3e5228957837aa.js
+++ b/dist/static/js/41.2e6add3e5228957837aa.js
--- a/dist/static/js/41.d03457332d1f5e3c804c.js
+++ b/dist/static/js/41.d03457332d1f5e3c804c.js
--- a/dist/static/js/42.3900d5954e355c2b0432.js
+++ b/dist/static/js/42.3900d5954e355c2b0432.js
--- a/dist/static/js/42.b8d664c0e83a529aeabb.js
+++ b/dist/static/js/42.b8d664c0e83a529aeabb.js
--- a/dist/static/js/43.3b7569d381ad2b99e458.js
+++ b/dist/static/js/43.3b7569d381ad2b99e458.js
--- a/dist/static/js/44.6fb8a738eb7c2b37f078.js
+++ b/dist/static/js/44.6fb8a738eb7c2b37f078.js
--- a/dist/static/js/44.fd194cdb13393896cd30.js
+++ b/dist/static/js/44.fd194cdb13393896cd30.js
--- a/dist/static/js/45.3cfcb08e3b9855e8fdba.js
+++ b/dist/static/js/45.3cfcb08e3b9855e8fdba.js
--- a/dist/static/js/45.4e87bebef26ef39b0869.js
+++ b/dist/static/js/45.4e87bebef26ef39b0869.js
--- a/dist/static/js/46.1ab3b82fc6d16002aad5.js
+++ b/dist/static/js/46.1ab3b82fc6d16002aad5.js
--- a/dist/static/js/46.ac2ee5a1cdfde3c1303e.js
+++ b/dist/static/js/46.ac2ee5a1cdfde3c1303e.js
--- a/dist/static/js/47.b597a339ffe65b5caa4f.js
+++ b/dist/static/js/47.b597a339ffe65b5caa4f.js
--- a/dist/static/js/47.f1d1b00916ead5f4d1b4.js
+++ b/dist/static/js/47.f1d1b00916ead5f4d1b4.js
--- a/dist/static/js/48.0874b17d69582618c595.js
+++ b/dist/static/js/48.0874b17d69582618c595.js
--- a/dist/static/js/48.b208f7d57b34b574d897.js
+++ b/dist/static/js/48.b208f7d57b34b574d897.js
--- a/dist/static/js/49.ee7c13f18e8772049969.js
+++ b/dist/static/js/49.ee7c13f18e8772049969.js
--- a/dist/static/js/49.f7af631bc6c834f3bad0.js
+++ b/dist/static/js/49.f7af631bc6c834f3bad0.js
--- a/dist/static/js/5.13e53366cd4beba3a1f4.js
+++ b/dist/static/js/5.13e53366cd4beba3a1f4.js
--- a/dist/static/js/5.96e2e218ec55de303963.js
+++ b/dist/static/js/5.96e2e218ec55de303963.js
--- a/dist/static/js/50.19dd71251512b457dc85.js
+++ b/dist/static/js/50.19dd71251512b457dc85.js
--- a/dist/static/js/50.34c1b6e26bb4467231a1.js
+++ b/dist/static/js/50.34c1b6e26bb4467231a1.js
--- a/dist/static/js/51.79ed2617caa297d039cb.js
+++ b/dist/static/js/51.79ed2617caa297d039cb.js
--- a/dist/static/js/51.b3a2727489446ecc1176.js
+++ b/dist/static/js/51.b3a2727489446ecc1176.js
--- a/dist/static/js/52.ac68a4ad3a28ad0e4b1f.js
+++ b/dist/static/js/52.ac68a4ad3a28ad0e4b1f.js
--- a/dist/static/js/52.bb01cc0365ca2539cde2.js
+++ b/dist/static/js/52.bb01cc0365ca2539cde2.js
--- a/dist/static/js/53.d5a8dbedc48af3e29054.js
+++ b/dist/static/js/53.d5a8dbedc48af3e29054.js
--- a/dist/static/js/53.ecb806aa9e55104cfc69.js
+++ b/dist/static/js/53.ecb806aa9e55104cfc69.js
--- a/dist/static/js/54.30189d04a0008217fafa.js
+++ b/dist/static/js/54.30189d04a0008217fafa.js
--- a/dist/static/js/54.cced81c9bdb3da2de818.js
+++ b/dist/static/js/54.cced81c9bdb3da2de818.js
--- a/dist/static/js/55.1261ee374d24772ba763.js
+++ b/dist/static/js/55.1261ee374d24772ba763.js
--- a/dist/static/js/55.9e3ca32d759bccf4a453.js
+++ b/dist/static/js/55.9e3ca32d759bccf4a453.js
--- a/dist/static/js/56.3817359c8398b1c2f253.js
+++ b/dist/static/js/56.3817359c8398b1c2f253.js
--- a/dist/static/js/56.827213d857c295d7fced.js
+++ b/dist/static/js/56.827213d857c295d7fced.js
--- a/dist/static/js/57.1bb43261d1c17b9cb46a.js
+++ b/dist/static/js/57.1bb43261d1c17b9cb46a.js
--- a/dist/static/js/57.57c4343818b0dae5aec4.js
+++ b/dist/static/js/57.57c4343818b0dae5aec4.js
--- a/dist/static/js/58.492c00c8eba0193d77b6.js
+++ b/dist/static/js/58.492c00c8eba0193d77b6.js
--- a/dist/static/js/58.5c0af4191b4ba0dec097.js
+++ b/dist/static/js/58.5c0af4191b4ba0dec097.js
--- a/dist/static/js/59.71502dd68a0e34250e8f.js
+++ b/dist/static/js/59.71502dd68a0e34250e8f.js
--- a/dist/static/js/59.8303fae55954d06aeaef.js
+++ b/dist/static/js/59.8303fae55954d06aeaef.js
--- a/dist/static/js/6.2c45649982596cf38475.js
+++ b/dist/static/js/6.2c45649982596cf38475.js
--- a/dist/static/js/6.802c1e76cbabe3dd01e0.js
+++ b/dist/static/js/6.802c1e76cbabe3dd01e0.js
--- a/dist/static/js/60.213a6f4da1a216347096.js
+++ b/dist/static/js/60.213a6f4da1a216347096.js
--- a/dist/static/js/60.28624999803cb3ca28f7.js
+++ b/dist/static/js/60.28624999803cb3ca28f7.js
--- a/dist/static/js/61.39d8c7d1ec3e2fa53e4f.js
+++ b/dist/static/js/61.39d8c7d1ec3e2fa53e4f.js
--- a/dist/static/js/61.77207a33a40588af2c8d.js
+++ b/dist/static/js/61.77207a33a40588af2c8d.js
--- a/dist/static/js/62.169505dfb661c6dc57c3.js
+++ b/dist/static/js/62.169505dfb661c6dc57c3.js
--- a/dist/static/js/62.af205cb88542cf534c9a.js
+++ b/dist/static/js/62.af205cb88542cf534c9a.js
--- a/dist/static/js/63.1c8957947d73b5022757.js
+++ b/dist/static/js/63.1c8957947d73b5022757.js
--- a/dist/static/js/63.daefad2d63aa290c6242.js
+++ b/dist/static/js/63.daefad2d63aa290c6242.js
--- a/dist/static/js/64.bd3538a4c7530549c8ba.js
+++ b/dist/static/js/64.bd3538a4c7530549c8ba.js
--- a/dist/static/js/65.3e867c2aeaec0da084e8.js
+++ b/dist/static/js/65.3e867c2aeaec0da084e8.js
--- a/dist/static/js/65.efa0c5a40fba6db5ea92.js
+++ b/dist/static/js/65.efa0c5a40fba6db5ea92.js
--- a/dist/static/js/66.7092d2b7c802144ea812.js
+++ b/dist/static/js/66.7092d2b7c802144ea812.js
--- a/dist/static/js/66.d6253f9960b5d617783b.js
+++ b/dist/static/js/66.d6253f9960b5d617783b.js
--- a/dist/static/js/67.3467a1c5af7d3c313412.js
+++ b/dist/static/js/67.3467a1c5af7d3c313412.js
--- a/dist/static/js/67.87aee07a75eccfe32b2a.js
+++ b/dist/static/js/67.87aee07a75eccfe32b2a.js
--- a/dist/static/js/68.84a7ae508caaa9fdc2bc.js
+++ b/dist/static/js/68.84a7ae508caaa9fdc2bc.js
--- a/dist/static/js/68.b7dfe33086eb6ad1c2ba.js
+++ b/dist/static/js/68.b7dfe33086eb6ad1c2ba.js
--- a/dist/static/js/69.726f864342a5cb230ff7.js
+++ b/dist/static/js/69.726f864342a5cb230ff7.js
--- a/dist/static/js/69.b13d7bd5066b84faa1ac.js
+++ b/dist/static/js/69.b13d7bd5066b84faa1ac.js
--- a/dist/static/js/7.1bd5e17f6b99f2f16a2e.js
+++ b/dist/static/js/7.1bd5e17f6b99f2f16a2e.js
--- a/dist/static/js/7.d63f149603b281c7e4bd.js
+++ b/dist/static/js/7.d63f149603b281c7e4bd.js
--- a/dist/static/js/70.4920187cffe0c4990e4e.js
+++ b/dist/static/js/70.4920187cffe0c4990e4e.js
--- a/dist/static/js/70.8f2e7635c47559ab3056.js
+++ b/dist/static/js/70.8f2e7635c47559ab3056.js
--- a/dist/static/js/71.0e479f6431d38735705e.js
+++ b/dist/static/js/71.0e479f6431d38735705e.js
--- a/dist/static/js/71.4afa624b251d8392951f.js
+++ b/dist/static/js/71.4afa624b251d8392951f.js
--- a/dist/static/js/8.17f5f3cf5e73a2889e04.js
+++ b/dist/static/js/8.17f5f3cf5e73a2889e04.js
--- a/dist/static/js/8.2e75d3807e7ebec0e5d2.js
+++ b/dist/static/js/8.2e75d3807e7ebec0e5d2.js
--- a/dist/static/js/9.38fef76d1b35f70c1783.js
+++ b/dist/static/js/9.38fef76d1b35f70c1783.js
--- a/dist/static/js/9.7dcc0706b51fe591340e.js
+++ b/dist/static/js/9.7dcc0706b51fe591340e.js
--- a/dist/static/js/app.a31a53fb57c5b8651d7e.js
+++ b/dist/static/js/app.a31a53fb57c5b8651d7e.js
--- a/dist/static/js/app.fd53bcc525530824901f.js
+++ b/dist/static/js/app.fd53bcc525530824901f.js
--- a/dist/static/js/manifest.4ecfba8b29728bb5b57e.js
+++ b/dist/static/js/manifest.4ecfba8b29728bb5b57e.js
--- a/dist/static/js/manifest.ece792aeedc01a8ee322.js
+++ b/dist/static/js/manifest.ece792aeedc01a8ee322.js
--- a/dist/static/js/vendor.6d83b86ee8e55629231a.js
+++ b/dist/static/js/vendor.6d83b86ee8e55629231a.js
--- a/dist/static/js/vendor.9cb480843b4d598128a9.js
+++ b/dist/static/js/vendor.9cb480843b4d598128a9.js
--- a/src/components/callBack/index.vue
+++ b/src/components/callBack/index.vue
--- a/src/components/conversionList/marketEnrollmentConversionList.vue
+++ b/src/components/conversionList/marketEnrollmentConversionList.vue
--- a/src/components/framework/index.vue
+++ b/src/components/framework/index.vue
--- a/src/components/framework/teacherDesc.vue
+++ b/src/components/framework/teacherDesc.vue
--- a/src/components/lesson/dialog.vue
+++ b/src/components/lesson/dialog.vue
--- a/src/components/teacherDetail/index.vue
+++ b/src/components/teacherDetail/index.vue
--- a/src/components/teacherDetail/replayed.vue
+++ b/src/components/teacherDetail/replayed.vue
--- a/src/components/userDetail/index.vue
+++ b/src/components/userDetail/index.vue
--- a/src/util/menuList.js
+++ b/src/util/menuList.js