Merge branch 'dev' of git.singsingenglish.com:new-sing/admin into dev

c0bb4e35 · 赵茹林 · 55a2fe29 · 82c6eb09 · c0bb4e35 · c0bb4e35
Commit c0bb4e35 authored Aug 14, 2019 by 赵茹林
91 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://cdn.bootcss.com/vue/2.5.17/vue.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.11.1/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.cdf56b45a8e5181ef9d6.js></script><script type=text/javascript src=/static/js/vendor.e17f712b043f8cffc82a.js></script><script type=text/javascript src=/static/js/app.48d3b40842e2ec606eff.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></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.f65bbf04a81d309f7ecc.js></script><script type=text/javascript src=/static/js/vendor.e17f712b043f8cffc82a.js></script><script type=text/javascript src=/static/js/app.48d3b40842e2ec606eff.js></script></body><script>let el = document.getElementsByTagName("script");
    el.onerror = function(a,b,c){
      console.log('error:',a,b,c);
    };

--- a/dev/static/js/0.6189c3fa952472539b78.js
+++ b/dev/static/js/0.6189c3fa952472539b78.js
--- a/dev/static/js/0.bb9c73b269e32912d4f9.js
+++ b/dev/static/js/0.bb9c73b269e32912d4f9.js
--- a/dev/static/js/1.2e662c3669ee86bf9f96.js
+++ b/dev/static/js/1.2e662c3669ee86bf9f96.js
--- a/dev/static/js/10.e84121479d160a906b96.js
+++ b/dev/static/js/10.e84121479d160a906b96.js
--- a/dev/static/js/11.ea003377a45110fb8533.js
+++ b/dev/static/js/11.ea003377a45110fb8533.js
--- a/dev/static/js/12.9d5d20ebc6e7c9c4d16d.js
+++ b/dev/static/js/12.9d5d20ebc6e7c9c4d16d.js
--- a/dev/static/js/12.ce1f91ddd6ea31edb4b6.js
+++ b/dev/static/js/12.ce1f91ddd6ea31edb4b6.js
--- a/dev/static/js/13.5846f7712ac30dcea2c9.js
+++ b/dev/static/js/13.5846f7712ac30dcea2c9.js
--- a/dev/static/js/14.4263541ccf2f3c383d44.js
+++ b/dev/static/js/14.4263541ccf2f3c383d44.js
--- a/dev/static/js/15.e28be0c804d03b4b1772.js
+++ b/dev/static/js/15.e28be0c804d03b4b1772.js
--- a/dev/static/js/16.cb2d55614d0bbca15441.js
+++ b/dev/static/js/16.cb2d55614d0bbca15441.js
--- a/dev/static/js/17.091228f0725776097583.js
+++ b/dev/static/js/17.091228f0725776097583.js
--- a/dev/static/js/18.660d113e5cf2cf4ae32f.js
+++ b/dev/static/js/18.660d113e5cf2cf4ae32f.js
--- a/dev/static/js/18.b154c417f09a47fa818d.js
+++ b/dev/static/js/18.b154c417f09a47fa818d.js
--- a/dev/static/js/19.1e9f66a0d124bb915224.js
+++ b/dev/static/js/19.1e9f66a0d124bb915224.js
--- a/dev/static/js/2.9b3c089f33d6d4854835.js
+++ b/dev/static/js/2.9b3c089f33d6d4854835.js
--- a/dev/static/js/2.aaf67bba437922eee62d.js
+++ b/dev/static/js/2.aaf67bba437922eee62d.js
--- a/dev/static/js/20.64fc5ea1ff8059e5e194.js
+++ b/dev/static/js/20.64fc5ea1ff8059e5e194.js
--- a/dev/static/js/21.ae135f845d1a2399c64e.js
+++ b/dev/static/js/21.ae135f845d1a2399c64e.js
--- a/dev/static/js/22.346017995ba33b4184c2.js
+++ b/dev/static/js/22.346017995ba33b4184c2.js
--- a/dev/static/js/23.462b8e0eebdeee60147c.js
+++ b/dev/static/js/23.462b8e0eebdeee60147c.js
--- a/dev/static/js/23.e93c6feb862a38b62b33.js
+++ b/dev/static/js/23.e93c6feb862a38b62b33.js
--- a/dev/static/js/24.293d5ebaf6d436b09f25.js
+++ b/dev/static/js/24.293d5ebaf6d436b09f25.js
--- a/dev/static/js/24.9853ee128425be5aab59.js
+++ b/dev/static/js/24.9853ee128425be5aab59.js
--- a/dev/static/js/25.2cc8f85527653dd2ea8a.js
+++ b/dev/static/js/25.2cc8f85527653dd2ea8a.js
--- a/dev/static/js/25.aa37245954240b966e6f.js
+++ b/dev/static/js/25.aa37245954240b966e6f.js
--- a/dev/static/js/26.54499cd1b2e4136c3322.js
+++ b/dev/static/js/26.54499cd1b2e4136c3322.js
--- a/dev/static/js/27.cbd1f14ea8459cdc523f.js
+++ b/dev/static/js/27.cbd1f14ea8459cdc523f.js
--- a/dev/static/js/28.27e0be14db0b302f2b18.js
+++ b/dev/static/js/28.27e0be14db0b302f2b18.js
--- a/dev/static/js/29.f6f2b79af6173afde29f.js
+++ b/dev/static/js/29.f6f2b79af6173afde29f.js
--- a/dev/static/js/3.8ea6fdcfd8f46913476a.js
+++ b/dev/static/js/3.8ea6fdcfd8f46913476a.js
--- a/dev/static/js/30.37d3ff7c8f46c888c00f.js
+++ b/dev/static/js/30.37d3ff7c8f46c888c00f.js
--- a/dev/static/js/31.a8b24c9276375d6e8841.js
+++ b/dev/static/js/31.a8b24c9276375d6e8841.js
--- a/dev/static/js/32.e0a6595be2d74995a950.js
+++ b/dev/static/js/32.e0a6595be2d74995a950.js
--- a/dev/static/js/33.f5c013df00eed62a4dca.js
+++ b/dev/static/js/33.f5c013df00eed62a4dca.js
--- a/dev/static/js/34.e853c96815a6e97497d6.js
+++ b/dev/static/js/34.e853c96815a6e97497d6.js
--- a/dev/static/js/35.42cd2ab7093f20f22b8d.js
+++ b/dev/static/js/35.42cd2ab7093f20f22b8d.js
--- a/dev/static/js/36.3a5e579e09e3dadae0df.js
+++ b/dev/static/js/36.3a5e579e09e3dadae0df.js
--- a/dev/static/js/37.1e422ea84dc78ce45d88.js
+++ b/dev/static/js/37.1e422ea84dc78ce45d88.js
--- a/dev/static/js/38.a109e74c89849c1009c9.js
+++ b/dev/static/js/38.a109e74c89849c1009c9.js
--- a/dev/static/js/39.78aa12bff38f31a7418e.js
+++ b/dev/static/js/39.78aa12bff38f31a7418e.js
--- a/dev/static/js/4.16b223d5652398e52691.js
+++ b/dev/static/js/4.16b223d5652398e52691.js
--- a/dev/static/js/4.27abbf4756e705c91b28.js
+++ b/dev/static/js/4.27abbf4756e705c91b28.js
--- a/dev/static/js/40.7079c4a1c8249a2a1886.js
+++ b/dev/static/js/40.7079c4a1c8249a2a1886.js
--- a/dev/static/js/41.1e28bdfe96b606d751a4.js
+++ b/dev/static/js/41.1e28bdfe96b606d751a4.js
--- a/dev/static/js/43.825eda8e291ec4ac118c.js
+++ b/dev/static/js/43.825eda8e291ec4ac118c.js
--- a/dev/static/js/43.9a357063cd460b22b773.js
+++ b/dev/static/js/43.9a357063cd460b22b773.js
--- a/dev/static/js/44.02a1e5d2c35a2112852e.js
+++ b/dev/static/js/44.02a1e5d2c35a2112852e.js
--- a/dev/static/js/45.67faab77365023387b94.js
+++ b/dev/static/js/45.67faab77365023387b94.js
--- a/dev/static/js/46.8e8c9184a8151f4a6de2.js
+++ b/dev/static/js/46.8e8c9184a8151f4a6de2.js
--- a/dev/static/js/47.dbbe737e2b5cdf5120a5.js
+++ b/dev/static/js/47.dbbe737e2b5cdf5120a5.js
--- a/dev/static/js/48.0a56b2e8cded7536605c.js
+++ b/dev/static/js/48.0a56b2e8cded7536605c.js
--- a/dev/static/js/48.0d37aec78d225be03b17.js
+++ b/dev/static/js/48.0d37aec78d225be03b17.js
--- a/dev/static/js/49.2bef17ca92260964110f.js
+++ b/dev/static/js/49.2bef17ca92260964110f.js
--- a/dev/static/js/5.5b71ff9fabd3e6c20409.js
+++ b/dev/static/js/5.5b71ff9fabd3e6c20409.js
--- a/dev/static/js/5.9bc1cb6928f4d8a76d84.js
+++ b/dev/static/js/5.9bc1cb6928f4d8a76d84.js
--- a/dev/static/js/50.3845d6551721972a30c0.js
+++ b/dev/static/js/50.3845d6551721972a30c0.js
+webpackJsonp([50],{hLMI:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=a("kmJW"),r=a("sf/l"),i=a("CCn6"),o={name:"index",components:{page:s.a},data:function(){return{total:0,nowPage:1,limit:10,searchFrom:{source:""},tableData:[]}},created:function(){this.initPage()},methods:{initPage:function(){var e=this,t={limit:this.limit,page:this.nowPage};this.searchFrom.time&&(t.time=this.searchFrom.time),this.searchFrom.source&&(t.source=this.searchFrom.source),this.searchFrom.time&&this.searchFrom.time.length>0&&(t.date_start=r.a.dateFmt(this.searchFrom.time[0],"yyyy-MM-dd hh:mm:ss"),t.date_end=r.a.dateFmt(this.searchFrom.time[1],"yyyy-MM-dd hh:mm:ss")),Object(i._34)(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()},doExport:function(){var e="?type=export";this.searchFrom.source&&(e=e+"&source="+this.searchFrom.source),this.searchFrom.time&&this.searchFrom.time.length>0&&(e=(e=e+"&date_start="+r.a.dateFmt(this.searchFrom.time[0],"yyyy-MM-dd hh:mm:ss"))+"&date_end="+r.a.dateFmt(this.searchFrom.time[1],"yyyy-MM-dd hh:mm:ss")),window.open("/api/public/ads/export/all"+e)}}},n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"index"},[a("el-form",{ref:"searchFrom",attrs:{model:e.searchFrom,"label-width":"80px"}},[a("el-row",[a("el-col",{attrs:{lg:10,sm:24,md:24}},[a("el-form-item",{attrs:{label:"购买时间"}},[a("el-date-picker",{attrs:{type:"datetimerange","range-separator":"至","start-placeholder":"开始日期","end-placeholder":"结束日期","default-time":["00:00:00","23:59:59"]},model:{value:e.searchFrom.time,callback:function(t){e.$set(e.searchFrom,"time",t)},expression:"searchFrom.time"}})],1)],1),e._v(" "),a("el-col",{attrs:{lg:4,sm:24,md:12}},[a("el-form-item",{attrs:{label:"来源"}},[a("el-input",{attrs:{placeholder:"名称",size:"small"},model:{value:e.searchFrom.source,callback:function(t){e.$set(e.searchFrom,"source",t)},expression:"searchFrom.source"}})],1)],1),e._v(" "),a("el-col",{attrs:{lg:4,sm:24,md:12}},[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:{lg:4,sm:24,md:12}},[a("el-form-item",[a("el-button",{attrs:{type:"primary",plain:"",size:"small"},on:{click:e.doExport}},[e._v("\n            导出\n          ")])],1)],1)],1)],1),e._v(" "),a("el-table",{staticStyle:{width:"100%"},attrs:{data:e.tableData}},[a("el-table-column",{attrs:{prop:"name",label:"宝贝名称"}}),e._v(" "),a("el-table-column",{attrs:{prop:"create_at",label:"添加时间"}}),e._v(" "),a("el-table-column",{attrs:{prop:"source",label:"来源"}})],1),e._v(" "),a("page",{attrs:{total:e.total,limit:e.limit},on:{pageChange:e.onPageChange,sizeChange:e.onSizeChange}})],1)};n._withStripped=!0;var l={render:n,staticRenderFns:[]},m=l;var c=!1;var h=a("VU/8")(o,m,!1,function(e){c||a("vAaB")},"data-v-b4cf6fce",null);h.options.__file="src\\components\\promotion\\index.vue";t.default=h.exports},i72k:function(e,t,a){(e.exports=a("FZ+f")(!0)).push([e.i,"\n.index[data-v-b4cf6fce] {\n  padding: 20px 0;\n}\n","",{version:3,sources:["C:/Users/Administrator/Desktop/后台/admin/src/components/promotion/index.vue"],names:[],mappings:";AACA;EACE,gBAAgB;CACjB",file:"index.vue",sourcesContent:["\n.index[data-v-b4cf6fce] {\n  padding: 20px 0;\n}\n"],sourceRoot:""}])},vAaB:function(e,t,a){var s=a("i72k");"string"==typeof s&&(s=[[e.i,s,""]]),s.locals&&(e.exports=s.locals);a("rjj0")("367b0d72",s,!1,{})}});
\ No newline at end of file
--- a/dev/static/js/51.9948210c0c42b3ca42b6.js
+++ b/dev/static/js/51.9948210c0c42b3ca42b6.js
--- a/dev/static/js/51.9c6e828abb62cf74de5f.js
+++ b/dev/static/js/51.9c6e828abb62cf74de5f.js
--- a/dev/static/js/52.81ba56f89ba8770e0767.js
+++ b/dev/static/js/52.81ba56f89ba8770e0767.js
--- a/dev/static/js/53.3be3d0c6bd9f4be64506.js
+++ b/dev/static/js/53.3be3d0c6bd9f4be64506.js
--- a/dev/static/js/54.1685f8c534d136c9a18f.js
+++ b/dev/static/js/54.1685f8c534d136c9a18f.js
--- a/dev/static/js/55.aa82545f4fd5bbba4499.js
+++ b/dev/static/js/55.aa82545f4fd5bbba4499.js
--- a/dev/static/js/56.851204d8b934744850e3.js
+++ b/dev/static/js/56.851204d8b934744850e3.js
--- a/dev/static/js/56.96da86e78f9e1445a262.js
+++ b/dev/static/js/56.96da86e78f9e1445a262.js
--- a/dev/static/js/57.56d0d4a303b6c1f38705.js
+++ b/dev/static/js/57.56d0d4a303b6c1f38705.js
--- a/dev/static/js/58.a02fa31df751466c1c66.js
+++ b/dev/static/js/58.a02fa31df751466c1c66.js
--- a/dev/static/js/59.04bb4bde128d457015af.js
+++ b/dev/static/js/59.04bb4bde128d457015af.js
--- a/dev/static/js/6.26b81b7a4ab007ca3bea.js
+++ b/dev/static/js/6.26b81b7a4ab007ca3bea.js
--- a/dev/static/js/6.642e1e7bd32162f3466f.js
+++ b/dev/static/js/6.642e1e7bd32162f3466f.js
--- a/dev/static/js/60.842c9a034ca7b2c7417c.js
+++ b/dev/static/js/60.842c9a034ca7b2c7417c.js
--- a/dev/static/js/62.68b458d68c66dc7e0f3a.js
+++ b/dev/static/js/62.68b458d68c66dc7e0f3a.js
--- a/dev/static/js/62.815d4d7be0dd0d8b54a9.js
+++ b/dev/static/js/62.815d4d7be0dd0d8b54a9.js
--- a/dev/static/js/63.07dab85e0749d929647f.js
+++ b/dev/static/js/63.07dab85e0749d929647f.js
--- a/dev/static/js/64.803d196ea9bfb44a9d7a.js
+++ b/dev/static/js/64.803d196ea9bfb44a9d7a.js
--- a/dev/static/js/65.1a25ee4f3b00aba1e025.js
+++ b/dev/static/js/65.1a25ee4f3b00aba1e025.js
--- a/dev/static/js/66.665af2c3f174bcb04e93.js
+++ b/dev/static/js/66.665af2c3f174bcb04e93.js
--- a/dev/static/js/67.57863445ab51e8844fdf.js
+++ b/dev/static/js/67.57863445ab51e8844fdf.js
--- a/dev/static/js/68.96b8a2495be5ed93778f.js
+++ b/dev/static/js/68.96b8a2495be5ed93778f.js
--- a/dev/static/js/68.9a7f0be0a7d9f93e42cd.js
+++ b/dev/static/js/68.9a7f0be0a7d9f93e42cd.js
--- a/dev/static/js/69.0fe4587975d6af5be31b.js
+++ b/dev/static/js/69.0fe4587975d6af5be31b.js
--- a/dev/static/js/7.f2bcdd0454c0ef02a67f.js
+++ b/dev/static/js/7.f2bcdd0454c0ef02a67f.js
--- a/dev/static/js/70.315688773d1677e814e8.js
+++ b/dev/static/js/70.315688773d1677e814e8.js
--- a/dev/static/js/70.472ddea6d45014642469.js
+++ b/dev/static/js/70.472ddea6d45014642469.js
--- a/dev/static/js/8.6fb3230d361e7ed1059c.js
+++ b/dev/static/js/8.6fb3230d361e7ed1059c.js
--- a/dev/static/js/8.ea75e758386b24475a68.js
+++ b/dev/static/js/8.ea75e758386b24475a68.js
--- a/dev/static/js/9.7ff64e20489dbd6ef591.js
+++ b/dev/static/js/9.7ff64e20489dbd6ef591.js
--- a/dev/static/js/manifest.7e5d8084ef5f63f3b93f.js
+++ b/dev/static/js/manifest.7e5d8084ef5f63f3b93f.js
--- a/dev/static/js/manifest.f65bbf04a81d309f7ecc.js
+++ b/dev/static/js/manifest.f65bbf04a81d309f7ecc.js
--- a/src/components/achievement/index.vue
+++ b/src/components/achievement/index.vue