710

760c0d07 · chenyishuai@singsingenglish.com · ad99b21d · c7356ded · 760c0d07 · 760c0d07
Commit 760c0d07 authored Jul 10, 2019 by chenyishuai@singsingenglish.com
133 changed files
--- a/dev/index.html
+++ b/dev/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.7.2/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://cdn.bootcss.com/vue/2.5.17/vue.min.js></script><script src=https://unpkg.com/vuex@3.0.1></script><script src=https://cdn.bootcss.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.7.2/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.13838134adaa08f73824.js></script><script type=text/javascript src=/static/js/vendor.f41ae949fa9e59980239.js></script><script type=text/javascript src=/static/js/app.c0e487111aa2fbe4ddfd.js></script></body><script>let el = document.getElementsByTagName("script");
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https:////at.alicdn.com/t/font_746649_x1rivf5f5.css><link rel=stylesheet href=https://lib.baomitu.com/element-ui/2.7.2/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://cdn.bootcss.com/vue/2.5.17/vue.min.js></script><script src=https://unpkg.com/vuex@3.0.1></script><script src=https://cdn.bootcss.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.7.2/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.7fcbbb00251f51e28cb6.js></script><script type=text/javascript src=/static/js/vendor.f41ae949fa9e59980239.js></script><script type=text/javascript src=/static/js/app.4fd70260bf78d7cdff23.js></script></body><script>let el = document.getElementsByTagName("script");
+>>>>>>> c7356dedc26357af488e4501f5f82964a45d6df1
    el.onerror = function(a,b,c){
      console.log('error:',a,b,c);
    };

--- a/dev/static/js/0.298944284a819edbca0b.js
+++ b/dev/static/js/0.298944284a819edbca0b.js
--- a/dev/static/js/0.9a388b56b37577c647e7.js
+++ b/dev/static/js/0.9a388b56b37577c647e7.js
--- a/dev/static/js/1.0561c4a31ddd5938a660.js
+++ b/dev/static/js/1.0561c4a31ddd5938a660.js
--- a/dev/static/js/1.f07a520e008cc86d7c43.js
+++ b/dev/static/js/1.f07a520e008cc86d7c43.js
--- a/dev/static/js/10.5eb4fd26b2094b0ceba5.js
+++ b/dev/static/js/10.5eb4fd26b2094b0ceba5.js
--- a/dev/static/js/10.93a58ce18920f52ac781.js
+++ b/dev/static/js/10.93a58ce18920f52ac781.js
--- a/dev/static/js/11.55a1cc1eacca69589731.js
+++ b/dev/static/js/11.55a1cc1eacca69589731.js
--- a/dev/static/js/11.b646e87217b258ad8345.js
+++ b/dev/static/js/11.b646e87217b258ad8345.js
--- a/dev/static/js/12.8d198e757f5f4a9ae487.js
+++ b/dev/static/js/12.8d198e757f5f4a9ae487.js
--- a/dev/static/js/12.e55547b880ce00e4064a.js
+++ b/dev/static/js/12.e55547b880ce00e4064a.js
--- a/dev/static/js/13.799818dca042b732c66a.js
+++ b/dev/static/js/13.799818dca042b732c66a.js
--- a/dev/static/js/13.a233d9735ec6a7e3e27c.js
+++ b/dev/static/js/13.a233d9735ec6a7e3e27c.js
--- a/dev/static/js/14.5577bf9e971cf1740f82.js
+++ b/dev/static/js/14.5577bf9e971cf1740f82.js
--- a/dev/static/js/14.66614c675e382d4cf54d.js
+++ b/dev/static/js/14.66614c675e382d4cf54d.js
--- a/dev/static/js/15.094fb16fd76c90cc9675.js
+++ b/dev/static/js/15.094fb16fd76c90cc9675.js
--- a/dev/static/js/15.b51037f70d6c9cd401a2.js
+++ b/dev/static/js/15.b51037f70d6c9cd401a2.js
--- a/dev/static/js/16.6772adb6fdbdc0929a8a.js
+++ b/dev/static/js/16.6772adb6fdbdc0929a8a.js
--- a/dev/static/js/16.8c091322039ec939709d.js
+++ b/dev/static/js/16.8c091322039ec939709d.js
--- a/dev/static/js/17.bc42ba061d91fbd94e34.js
+++ b/dev/static/js/17.bc42ba061d91fbd94e34.js
--- a/dev/static/js/17.fa88564ce62366e69830.js
+++ b/dev/static/js/17.fa88564ce62366e69830.js
--- a/dev/static/js/18.535154e104d240db41ad.js
+++ b/dev/static/js/18.535154e104d240db41ad.js
--- a/dev/static/js/18.6805b7be9f2353069cc7.js
+++ b/dev/static/js/18.6805b7be9f2353069cc7.js
--- a/dev/static/js/19.d0e0c4b71bdc3f31679e.js
+++ b/dev/static/js/19.d0e0c4b71bdc3f31679e.js
--- a/dev/static/js/19.e1d3558096ac72f10aaf.js
+++ b/dev/static/js/19.e1d3558096ac72f10aaf.js
--- a/dev/static/js/2.2a60385a7d8ce516cccf.js
+++ b/dev/static/js/2.2a60385a7d8ce516cccf.js
--- a/dev/static/js/2.babebe26839c380536da.js
+++ b/dev/static/js/2.babebe26839c380536da.js
--- a/dev/static/js/20.53f927a71601a046537c.js
+++ b/dev/static/js/20.53f927a71601a046537c.js
--- a/dev/static/js/20.84901e286c7caa382517.js
+++ b/dev/static/js/20.84901e286c7caa382517.js
--- a/dev/static/js/21.7184137f18183cbac6cd.js
+++ b/dev/static/js/21.7184137f18183cbac6cd.js
--- a/dev/static/js/21.cec3d0960bb1ae18f437.js
+++ b/dev/static/js/21.cec3d0960bb1ae18f437.js
--- a/dev/static/js/22.0e3bde27401812469087.js
+++ b/dev/static/js/22.0e3bde27401812469087.js
--- a/dev/static/js/22.a5312ad65b528e59253c.js
+++ b/dev/static/js/22.a5312ad65b528e59253c.js
--- a/dev/static/js/23.0fa5d9e75574ecda1325.js
+++ b/dev/static/js/23.0fa5d9e75574ecda1325.js
--- a/dev/static/js/23.a66e5fc9fe8a90bdeff7.js
+++ b/dev/static/js/23.a66e5fc9fe8a90bdeff7.js
--- a/dev/static/js/24.8c201530097e83cc4a51.js
+++ b/dev/static/js/24.8c201530097e83cc4a51.js
--- a/dev/static/js/24.c9d4b8ede11c3cfffdf3.js
+++ b/dev/static/js/24.c9d4b8ede11c3cfffdf3.js
--- a/dev/static/js/25.e7b1f58e5dd8f7c99974.js
+++ b/dev/static/js/25.e7b1f58e5dd8f7c99974.js
--- a/dev/static/js/25.f1cbccdf712aebe37437.js
+++ b/dev/static/js/25.f1cbccdf712aebe37437.js
--- a/dev/static/js/26.da89e6bfe5f81dc025a3.js
+++ b/dev/static/js/26.da89e6bfe5f81dc025a3.js
--- a/dev/static/js/26.db27662b1361a493af23.js
+++ b/dev/static/js/26.db27662b1361a493af23.js
--- a/dev/static/js/27.96b11bd86bcb1da150a0.js
+++ b/dev/static/js/27.96b11bd86bcb1da150a0.js
--- a/dev/static/js/27.d514e3ce30ed26d279a9.js
+++ b/dev/static/js/27.d514e3ce30ed26d279a9.js
--- a/dev/static/js/28.2f91745f799c0c765ef8.js
+++ b/dev/static/js/28.2f91745f799c0c765ef8.js
--- a/dev/static/js/28.d52ae6d4cc436738c828.js
+++ b/dev/static/js/28.d52ae6d4cc436738c828.js
--- a/dev/static/js/29.1a7ef8f5447b5839bce4.js
+++ b/dev/static/js/29.1a7ef8f5447b5839bce4.js
--- a/dev/static/js/29.c9a57dd270d9d7999793.js
+++ b/dev/static/js/29.c9a57dd270d9d7999793.js
--- a/dev/static/js/3.b9ccb9c37e900dcfa73d.js
+++ b/dev/static/js/3.b9ccb9c37e900dcfa73d.js
--- a/dev/static/js/3.baea7df6e7aa79957897.js
+++ b/dev/static/js/3.baea7df6e7aa79957897.js
--- a/dev/static/js/30.682fa990a1f347d766aa.js
+++ b/dev/static/js/30.682fa990a1f347d766aa.js
--- a/dev/static/js/30.731fe8689854394e63a5.js
+++ b/dev/static/js/30.731fe8689854394e63a5.js
--- a/dev/static/js/31.a067062ece91f79c2b24.js
+++ b/dev/static/js/31.a067062ece91f79c2b24.js
--- a/dev/static/js/31.f746fb83ce1070f0a2b2.js
+++ b/dev/static/js/31.f746fb83ce1070f0a2b2.js
--- a/dev/static/js/32.46c07244ece9f251b442.js
+++ b/dev/static/js/32.46c07244ece9f251b442.js
--- a/dev/static/js/32.f420e8756b074a7bc4a4.js
+++ b/dev/static/js/32.f420e8756b074a7bc4a4.js
--- a/dev/static/js/33.78bc25b6a282f8560ef4.js
+++ b/dev/static/js/33.78bc25b6a282f8560ef4.js
--- a/dev/static/js/33.f9b3aa9c1067ce341072.js
+++ b/dev/static/js/33.f9b3aa9c1067ce341072.js
--- a/dev/static/js/34.aacf387150946239740e.js
+++ b/dev/static/js/34.aacf387150946239740e.js
--- a/dev/static/js/34.bca177b4237eb1be5071.js
+++ b/dev/static/js/34.bca177b4237eb1be5071.js
--- a/dev/static/js/35.bc5722c8c5dd5d70bb31.js
+++ b/dev/static/js/35.bc5722c8c5dd5d70bb31.js
--- a/dev/static/js/35.ccd6e6fb205a6197a331.js
+++ b/dev/static/js/35.ccd6e6fb205a6197a331.js
--- a/dev/static/js/36.e88c94d592b15b024fc8.js
+++ b/dev/static/js/36.e88c94d592b15b024fc8.js
--- a/dev/static/js/36.ec402fbf7fb2be117294.js
+++ b/dev/static/js/36.ec402fbf7fb2be117294.js
--- a/dev/static/js/37.71cd8ebebf9e63aaea65.js
+++ b/dev/static/js/37.71cd8ebebf9e63aaea65.js
--- a/dev/static/js/37.8492ec71846ced5b4414.js
+++ b/dev/static/js/37.8492ec71846ced5b4414.js
--- a/dev/static/js/38.793f74ac5c4c1fd83a75.js
+++ b/dev/static/js/38.793f74ac5c4c1fd83a75.js
--- a/dev/static/js/38.f9bbfa64cbe6aaf07a93.js
+++ b/dev/static/js/38.f9bbfa64cbe6aaf07a93.js
--- a/dev/static/js/39.1253a66d32c9a2b58f95.js
+++ b/dev/static/js/39.1253a66d32c9a2b58f95.js
--- a/dev/static/js/39.4701ac11cb316541527e.js
+++ b/dev/static/js/39.4701ac11cb316541527e.js
--- a/dev/static/js/4.cfe45037631de24a3524.js
+++ b/dev/static/js/4.cfe45037631de24a3524.js
--- a/dev/static/js/4.f6a6a0d796828ce4a8de.js
+++ b/dev/static/js/4.f6a6a0d796828ce4a8de.js
--- a/dev/static/js/40.46facb4d8b20a6e7f21a.js
+++ b/dev/static/js/40.46facb4d8b20a6e7f21a.js
--- a/dev/static/js/40.e5d1d05e2d3dcbf02483.js
+++ b/dev/static/js/40.e5d1d05e2d3dcbf02483.js
--- a/dev/static/js/41.f246a2cbe1fa66addbcd.js
+++ b/dev/static/js/41.f246a2cbe1fa66addbcd.js
+webpackJsonp([41],{GS5V:function(n,e,t){n.exports=t.p+"static/img/img@3x.6ac2522.png"},Y0Rf:function(n,e,t){var i=t("mL20");"string"==typeof i&&(i=[[n.i,i,""]]),i.locals&&(n.exports=i.locals);t("rjj0")("391229c9",i,!1,{})},mL20:function(n,e,t){(n.exports=t("FZ+f")(!0)).push([n.i,"\n.index[data-v-4774750c] {\n  height: 100%;\n  background: #eee;\n  overflow: hidden;\n}\n.index .indexImg[data-v-4774750c] {\n  width: 90%;\n}\n.index .box[data-v-4774750c] {\n  margin: auto;\n  text-align: center;\n  font-size: 28px;\n  font-weight: bold;\n  margin-top: 130px;\n}\n.index .box img[data-v-4774750c] {\n  width: 331px;\n}\n","",{version:3,sources:["/Users/bory/Desktop/说唱教育/admin/src/components/main/index.vue"],names:[],mappings:";AACA;EACE,aAAa;EACb,iBAAiB;EACjB,iBAAiB;CAClB;AACD;EACE,WAAW;CACZ;AACD;EACE,aAAa;EACb,mBAAmB;EACnB,gBAAgB;EAChB,kBAAkB;EAClB,kBAAkB;CACnB;AACD;EACE,aAAa;CACd",file:"index.vue",sourcesContent:["\n.index[data-v-4774750c] {\n  height: 100%;\n  background: #eee;\n  overflow: hidden;\n}\n.index .indexImg[data-v-4774750c] {\n  width: 90%;\n}\n.index .box[data-v-4774750c] {\n  margin: auto;\n  text-align: center;\n  font-size: 28px;\n  font-weight: bold;\n  margin-top: 130px;\n}\n.index .box img[data-v-4774750c] {\n  width: 331px;\n}\n"],sourceRoot:""}])},sJm1:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i={data:function(){return{content:"我是富文本编辑器的内容",editorSetting:{height:400}}},mounted:function(){var n=localStorage.getItem("phoneNum");console.log(n),n&&("teacher_leader"!=(n=JSON.parse(n)).teacher_type?this.$router.push("/teacher/"+n.id):this.$router.push("/teacher"))},components:{}},a=function(){var n=this.$createElement;this._self._c;return this._m(0)},o=[function(){var n=this.$createElement,e=this._self._c||n;return e("div",{staticClass:"index"},[e("div",{staticClass:"box"},[e("img",{attrs:{src:t("GS5V"),alt:""}}),this._v(" "),e("div",{staticStyle:{"text-align":"center","margin-top":"2%"}},[this._v("Welcome！")])])])}];a._withStripped=!0;var r={render:a,staticRenderFns:o},s=r;var c=!1;var d=t("VU/8")(i,s,!1,function(n){c||t("Y0Rf")},"data-v-4774750c",null);d.options.__file="src/components/main/index.vue";e.default=d.exports}});
\ No newline at end of file
--- a/dev/static/js/42.0d23d70321796030c4bb.js
+++ b/dev/static/js/42.0d23d70321796030c4bb.js
--- a/dev/static/js/42.e62fe0f38bd0f33032b7.js
+++ b/dev/static/js/42.e62fe0f38bd0f33032b7.js
--- a/dev/static/js/43.7a0185a1270e314eab77.js
+++ b/dev/static/js/43.7a0185a1270e314eab77.js
--- a/dev/static/js/43.ccaaf244710aa3fd44d9.js
+++ b/dev/static/js/43.ccaaf244710aa3fd44d9.js
--- a/dev/static/js/44.1a3f4d0b0cec4bd4a596.js
+++ b/dev/static/js/44.1a3f4d0b0cec4bd4a596.js
--- a/dev/static/js/44.4b9a0581cf9b67e9d8aa.js
+++ b/dev/static/js/44.4b9a0581cf9b67e9d8aa.js
--- a/dev/static/js/45.1a46dbb0e365f8ced029.js
+++ b/dev/static/js/45.1a46dbb0e365f8ced029.js
--- a/dev/static/js/45.5f06095009a7cf651df4.js
+++ b/dev/static/js/45.5f06095009a7cf651df4.js
--- a/dev/static/js/46.26fe8caefb354e4b680f.js
+++ b/dev/static/js/46.26fe8caefb354e4b680f.js
--- a/dev/static/js/46.5415dd9c8d1aa3b4f2fe.js
+++ b/dev/static/js/46.5415dd9c8d1aa3b4f2fe.js
--- a/dev/static/js/47.d81647a0d576d8aacc2c.js
+++ b/dev/static/js/47.d81647a0d576d8aacc2c.js
--- a/dev/static/js/47.f33a2fc7cb6ca8fbd1bc.js
+++ b/dev/static/js/47.f33a2fc7cb6ca8fbd1bc.js
--- a/dev/static/js/48.5e6781926fc83f032efe.js
+++ b/dev/static/js/48.5e6781926fc83f032efe.js
--- a/dev/static/js/48.6b71ef333f3b14807162.js
+++ b/dev/static/js/48.6b71ef333f3b14807162.js
--- a/dev/static/js/49.09f62ef6c561c302e046.js
+++ b/dev/static/js/49.09f62ef6c561c302e046.js
--- a/dev/static/js/49.94d956d09894257c3c40.js
+++ b/dev/static/js/49.94d956d09894257c3c40.js
--- a/dev/static/js/5.12c241227399fdbb6656.js
+++ b/dev/static/js/5.12c241227399fdbb6656.js
--- a/dev/static/js/5.801beccf4f0ff06f3391.js
+++ b/dev/static/js/5.801beccf4f0ff06f3391.js
--- a/dev/static/js/50.915e66adaa973ac3a4d5.js
+++ b/dev/static/js/50.915e66adaa973ac3a4d5.js
--- a/dev/static/js/50.af1006584de2bb833165.js
+++ b/dev/static/js/50.af1006584de2bb833165.js
--- a/dev/static/js/51.57ceb569fdc964c88f17.js
+++ b/dev/static/js/51.57ceb569fdc964c88f17.js
--- a/dev/static/js/51.dd984759e38421d7de6d.js
+++ b/dev/static/js/51.dd984759e38421d7de6d.js
--- a/dev/static/js/52.169b6a447ceed80cf548.js
+++ b/dev/static/js/52.169b6a447ceed80cf548.js
--- a/dev/static/js/52.500ecfa494d70c30926b.js
+++ b/dev/static/js/52.500ecfa494d70c30926b.js
--- a/dev/static/js/53.657d52ee3ff398b7ad86.js
+++ b/dev/static/js/53.657d52ee3ff398b7ad86.js
--- a/dev/static/js/53.a1421b235305081a7eea.js
+++ b/dev/static/js/53.a1421b235305081a7eea.js
--- a/dev/static/js/53.a2908bee023a823d14e4.js
+++ b/dev/static/js/53.a2908bee023a823d14e4.js
--- a/dev/static/js/53.b4244551b889103d59e7.js
+++ b/dev/static/js/53.b4244551b889103d59e7.js
--- a/dev/static/js/53.e5893a2fb1658d73243f.js
+++ b/dev/static/js/53.e5893a2fb1658d73243f.js
--- a/dev/static/js/54.30b8eccb5acdb13d8a17.js
+++ b/dev/static/js/54.30b8eccb5acdb13d8a17.js
--- a/dev/static/js/55.bb5bfa0c5bb2c029be74.js
+++ b/dev/static/js/55.bb5bfa0c5bb2c029be74.js
--- a/dev/static/js/55.e2b4da7f1e757d85597a.js
+++ b/dev/static/js/55.e2b4da7f1e757d85597a.js
--- a/dev/static/js/56.6bb6c04cb5933e1f4465.js
+++ b/dev/static/js/56.6bb6c04cb5933e1f4465.js
--- a/dev/static/js/56.be9f95efde23398eb26a.js
+++ b/dev/static/js/56.be9f95efde23398eb26a.js
--- a/dev/static/js/57.6dea05eaa619ccc9b090.js
+++ b/dev/static/js/57.6dea05eaa619ccc9b090.js
--- a/dev/static/js/57.82e10fc71c746c7c8241.js
+++ b/dev/static/js/57.82e10fc71c746c7c8241.js
--- a/dev/static/js/58.45b860cdc059e652fa67.js
+++ b/dev/static/js/58.45b860cdc059e652fa67.js
--- a/dev/static/js/58.672d8b2e8dbee6a33442.js
+++ b/dev/static/js/58.672d8b2e8dbee6a33442.js
--- a/dev/static/js/6.ac2b8b700b49db170156.js
+++ b/dev/static/js/6.ac2b8b700b49db170156.js
--- a/dev/static/js/6.e832ad756a16a0841fdf.js
+++ b/dev/static/js/6.e832ad756a16a0841fdf.js
--- a/dev/static/js/7.3622afbe1aab1a0ef41f.js
+++ b/dev/static/js/7.3622afbe1aab1a0ef41f.js
--- a/dev/static/js/7.d08addb6bafc39a0b1ef.js
+++ b/dev/static/js/7.d08addb6bafc39a0b1ef.js
--- a/dev/static/js/8.7ef4a1e9a77d7cd62453.js
+++ b/dev/static/js/8.7ef4a1e9a77d7cd62453.js
--- a/dev/static/js/8.a662ded4553cbdc6e714.js
+++ b/dev/static/js/8.a662ded4553cbdc6e714.js
--- a/dev/static/js/9.45acd25dc3fd457a2838.js
+++ b/dev/static/js/9.45acd25dc3fd457a2838.js
--- a/dev/static/js/9.ba1c95b9ee35832f8f90.js
+++ b/dev/static/js/9.ba1c95b9ee35832f8f90.js
--- a/dev/static/js/app.4fd70260bf78d7cdff23.js
+++ b/dev/static/js/app.4fd70260bf78d7cdff23.js
--- a/dev/static/js/manifest.255cfed77972ce16b119.js
+++ b/dev/static/js/manifest.255cfed77972ce16b119.js
--- a/dev/static/js/manifest.36d6db9095a3a59fee60.js
+++ b/dev/static/js/manifest.36d6db9095a3a59fee60.js
--- a/dev/static/js/manifest.7e4447dfe90381295f25.js
+++ b/dev/static/js/manifest.7e4447dfe90381295f25.js
--- a/dev/static/js/manifest.7fcbbb00251f51e28cb6.js
+++ b/dev/static/js/manifest.7fcbbb00251f51e28cb6.js
--- a/dev/static/js/manifest.959cdb33f77a5dc2c121.js
+++ b/dev/static/js/manifest.959cdb33f77a5dc2c121.js
--- a/src/App.vue
+++ b/src/App.vue
--- a/src/components/channelTransList/index.vue
+++ b/src/components/channelTransList/index.vue
--- a/src/components/class/index.vue
+++ b/src/components/class/index.vue
--- a/src/components/framework/leftMenu.vue
+++ b/src/components/framework/leftMenu.vue
--- a/src/components/login/index.vue
+++ b/src/components/login/index.vue
--- a/src/service/api.js
+++ b/src/service/api.js
--- a/src/util/menuList.js
+++ b/src/util/menuList.js