Skip to content

A
admin-base
Commit 0650be82 authored by 王's avatar 王
Browse files
Options

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

parents 7fdf4bae c62094c2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 19 deletions
dev/index.html
View file @ 0650be82
<!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.2957b6748accbfaf9def.js></script><script type=text/javascript src=/static/js/vendor.44e1e5644ae24f910e52.js></script><script type=text/javascript src=/static/js/app.18d9ba04e79d5018e975.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.3a07ed835efb37bc1a22.js></script><script type=text/javascript src=/static/js/vendor.44e1e5644ae24f910e52.js></script><script type=text/javascript src=/static/js/app.18d9ba04e79d5018e975.js></script></body><script>let el = document.getElementsByTagName("script");
el.onerror = function(a,b,c){ el.onerror = function(a,b,c){
console.log('error:',a,b,c); console.log('error:',a,b,c);
}; };
......
dev/static/js/1.4fe38c33cd5dabed9219.js 0 → 100644
View file @ 0650be82
This diff is collapsed.
dev/static/js/1.adb29d26517f1d833674.js 0 → 100644
View file @ 0650be82
This diff is collapsed.
dev/static/js/1.c0efca96892f3469ecfb.js 0 → 100644
View file @ 0650be82
This diff is collapsed.
dev/static/js/1.db0ab82113b733fc3bef.js 0 → 100644
View file @ 0650be82
This diff is collapsed.
dev/static/js/1.edea5a2e8c2f9ca4bbef.js 0 → 100644
View file @ 0650be82
This diff is collapsed.
dev/static/js/manifest.292cefee5af1dc0fb016.js 0 → 100644
View file @ 0650be82
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={42:0};function n(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,n),f.l=!0,f.exports}n.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,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"53afe6475f3a9c5a4cb7",1:"4fe38c33cd5dabed9219",2:"4c183436d5446cece479",3:"1984648477db2ab41ac7",4:"8d048ac62c9635b95e1c",5:"56ccc28818550654eba5",6:"4c1a43dc0060d89ba9dd",7:"984e0ffc6b0871ee9622",8:"bb9cdd49f15f1a45fce6",9:"e56273193d82dc9daa87",10:"8f785e4335cdb987dc3d",11:"92c4756735cf7f92294c",12:"53d4e5a5ecf493cde3f2",13:"5eada2208ca5971fcf28",14:"8eb0f551a78806da01a0",15:"1c93652d6950e50d383e",16:"2dd9992de78fde8322d8",17:"82da55ae0d64f7599736",18:"692489712d3f7e7b75f2",19:"a54c6b36a122b4fd13bd",20:"a45e736554777aaeb89c",21:"70caa9fd338476f2acf7",22:"c4394f2a0fd74168b28b",23:"3c28a097b66ff5b3057e",24:"0c8eae9a6f96382f1a26",25:"8bae274439d940c1630b",26:"be3a2c64fca880ac9773",27:"a0ce4cf364c89e293f73",28:"586ff288516e66f5c379",29:"dad2437060a95a66b1a7",30:"fa9f517f244298c3ee8e",31:"de67c709d07948e5725e",32:"db1daa6bef63faedf8df",33:"dc5441f221181c75b830",34:"4eccfaf85ffe323736f9",35:"9fa70099b272fee5b92d",36:"59545b937a125c147025",37:"c7b7a8ab0c7da87074a3",38:"a329d65cf6c7338b630e",39:"58270d116696b8b057e7"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="/",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dev/static/js/manifest.3a07ed835efb37bc1a22.js 0 → 100644
View file @ 0650be82
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var d,o,b,i=0,u=[];i<c.length;i++)o=c[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[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],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"53afe6475f3a9c5a4cb7",1:"adb29d26517f1d833674",2:"4c183436d5446cece479",3:"1984648477db2ab41ac7",4:"8d048ac62c9635b95e1c",5:"56ccc28818550654eba5",6:"4c1a43dc0060d89ba9dd",7:"984e0ffc6b0871ee9622",8:"bb9cdd49f15f1a45fce6",9:"e56273193d82dc9daa87",10:"8f785e4335cdb987dc3d",11:"92c4756735cf7f92294c",12:"53d4e5a5ecf493cde3f2",13:"5eada2208ca5971fcf28",14:"8eb0f551a78806da01a0",15:"1c93652d6950e50d383e",16:"2dd9992de78fde8322d8",17:"82da55ae0d64f7599736",18:"692489712d3f7e7b75f2",19:"a54c6b36a122b4fd13bd",20:"a45e736554777aaeb89c",21:"70caa9fd338476f2acf7",22:"c4394f2a0fd74168b28b",23:"3c28a097b66ff5b3057e",24:"0c8eae9a6f96382f1a26",25:"8bae274439d940c1630b",26:"be3a2c64fca880ac9773",27:"a0ce4cf364c89e293f73",28:"586ff288516e66f5c379",29:"dad2437060a95a66b1a7",30:"fa9f517f244298c3ee8e",31:"de67c709d07948e5725e",32:"db1daa6bef63faedf8df",33:"dc5441f221181c75b830",34:"4eccfaf85ffe323736f9",35:"9fa70099b272fee5b92d",36:"59545b937a125c147025",37:"c7b7a8ab0c7da87074a3",38:"a329d65cf6c7338b630e",39:"58270d116696b8b057e7"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),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
dev/static/js/manifest.44d7cdd668aac45ae301.js 0 → 100644
View file @ 0650be82
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={42:0};function n(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,n),f.l=!0,f.exports}n.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,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"53afe6475f3a9c5a4cb7",1:"db0ab82113b733fc3bef",2:"4c183436d5446cece479",3:"1984648477db2ab41ac7",4:"8d048ac62c9635b95e1c",5:"56ccc28818550654eba5",6:"4c1a43dc0060d89ba9dd",7:"984e0ffc6b0871ee9622",8:"bb9cdd49f15f1a45fce6",9:"e56273193d82dc9daa87",10:"8f785e4335cdb987dc3d",11:"92c4756735cf7f92294c",12:"53d4e5a5ecf493cde3f2",13:"5eada2208ca5971fcf28",14:"8eb0f551a78806da01a0",15:"1c93652d6950e50d383e",16:"2dd9992de78fde8322d8",17:"82da55ae0d64f7599736",18:"692489712d3f7e7b75f2",19:"a54c6b36a122b4fd13bd",20:"a45e736554777aaeb89c",21:"70caa9fd338476f2acf7",22:"c4394f2a0fd74168b28b",23:"3c28a097b66ff5b3057e",24:"0c8eae9a6f96382f1a26",25:"8bae274439d940c1630b",26:"be3a2c64fca880ac9773",27:"a0ce4cf364c89e293f73",28:"586ff288516e66f5c379",29:"dad2437060a95a66b1a7",30:"fa9f517f244298c3ee8e",31:"de67c709d07948e5725e",32:"db1daa6bef63faedf8df",33:"dc5441f221181c75b830",34:"4eccfaf85ffe323736f9",35:"9fa70099b272fee5b92d",36:"59545b937a125c147025",37:"c7b7a8ab0c7da87074a3",38:"a329d65cf6c7338b630e",39:"58270d116696b8b057e7"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="/",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dev/static/js/manifest.5e3b75bb160dc296d720.js 0 → 100644
View file @ 0650be82
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var d,o,b,i=0,u=[];i<c.length;i++)o=c[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[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],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"53afe6475f3a9c5a4cb7",1:"edea5a2e8c2f9ca4bbef",2:"4c183436d5446cece479",3:"1984648477db2ab41ac7",4:"8d048ac62c9635b95e1c",5:"56ccc28818550654eba5",6:"4c1a43dc0060d89ba9dd",7:"984e0ffc6b0871ee9622",8:"bb9cdd49f15f1a45fce6",9:"e56273193d82dc9daa87",10:"8f785e4335cdb987dc3d",11:"92c4756735cf7f92294c",12:"53d4e5a5ecf493cde3f2",13:"5eada2208ca5971fcf28",14:"8eb0f551a78806da01a0",15:"1c93652d6950e50d383e",16:"2dd9992de78fde8322d8",17:"82da55ae0d64f7599736",18:"692489712d3f7e7b75f2",19:"a54c6b36a122b4fd13bd",20:"a45e736554777aaeb89c",21:"70caa9fd338476f2acf7",22:"c4394f2a0fd74168b28b",23:"3c28a097b66ff5b3057e",24:"0c8eae9a6f96382f1a26",25:"8bae274439d940c1630b",26:"be3a2c64fca880ac9773",27:"a0ce4cf364c89e293f73",28:"586ff288516e66f5c379",29:"dad2437060a95a66b1a7",30:"fa9f517f244298c3ee8e",31:"de67c709d07948e5725e",32:"db1daa6bef63faedf8df",33:"dc5441f221181c75b830",34:"4eccfaf85ffe323736f9",35:"9fa70099b272fee5b92d",36:"59545b937a125c147025",37:"c7b7a8ab0c7da87074a3",38:"a329d65cf6c7338b630e",39:"58270d116696b8b057e7"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),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
dev/static/js/manifest.d0b2b27d5300df76fba2.js 0 → 100644
View file @ 0650be82
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={42:0};function n(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,n),f.l=!0,f.exports}n.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,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"53afe6475f3a9c5a4cb7",1:"c0efca96892f3469ecfb",2:"4c183436d5446cece479",3:"1984648477db2ab41ac7",4:"8d048ac62c9635b95e1c",5:"56ccc28818550654eba5",6:"4c1a43dc0060d89ba9dd",7:"984e0ffc6b0871ee9622",8:"bb9cdd49f15f1a45fce6",9:"e56273193d82dc9daa87",10:"8f785e4335cdb987dc3d",11:"92c4756735cf7f92294c",12:"53d4e5a5ecf493cde3f2",13:"5eada2208ca5971fcf28",14:"8eb0f551a78806da01a0",15:"1c93652d6950e50d383e",16:"2dd9992de78fde8322d8",17:"82da55ae0d64f7599736",18:"692489712d3f7e7b75f2",19:"a54c6b36a122b4fd13bd",20:"a45e736554777aaeb89c",21:"70caa9fd338476f2acf7",22:"c4394f2a0fd74168b28b",23:"3c28a097b66ff5b3057e",24:"0c8eae9a6f96382f1a26",25:"8bae274439d940c1630b",26:"be3a2c64fca880ac9773",27:"a0ce4cf364c89e293f73",28:"586ff288516e66f5c379",29:"dad2437060a95a66b1a7",30:"fa9f517f244298c3ee8e",31:"de67c709d07948e5725e",32:"db1daa6bef63faedf8df",33:"dc5441f221181c75b830",34:"4eccfaf85ffe323736f9",35:"9fa70099b272fee5b92d",36:"59545b937a125c147025",37:"c7b7a8ab0c7da87074a3",38:"a329d65cf6c7338b630e",39:"58270d116696b8b057e7"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="/",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/resources/editorDialog.vue
View file @ 0650be82
...@@ -123,7 +123,6 @@ ...@@ -123,7 +123,6 @@
message: '保存成功!' message: '保存成功!'
}); });
this.$emit('reflash'); this.$emit('reflash');
this.editorObj.show=false
}) })
} }
} }
......
src/components/textarea/index.vue
View file @ 0650be82
...@@ -211,10 +211,17 @@ ...@@ -211,10 +211,17 @@
}) })
}, },
showDialogMP3(){ showDialogMP3(){
this.dialogVisibleMp3 = true this.dialogVisibleMp3 = true;
this.radio = []
}, },
showDialog(){ showDialog(){
this.dialogVisible = true this.dialogVisible = true;
this.form={
imgList:[],
big:false,
weight:'',
center:true
}
}, },
insertContent(content) { insertContent(content) {
if (!content) {//如果插入的内容为空则返回 if (!content) {//如果插入的内容为空则返回
......
src/components/textarea/videoUpload.vue
View file @ 0650be82
...@@ -263,9 +263,9 @@ ...@@ -263,9 +263,9 @@
} }
}, },
methods:{ methods:{
beforeAvatarImage(){ beforeAvatarImage(file){
const isJPG = (file.type === 'image/jpeg' || file.type === 'image/png' ); const isJPG = (file.type === 'image/jpeg' || file.type === 'image/png' );
const isLt2M = file.size / 1024 < 200; const isLt2M = file.size / 1024 < 400;
if (!isJPG) { if (!isJPG) {
this.$message.error('上传头像图片只能是 JPG 或 PNG 格式!'); this.$message.error('上传头像图片只能是 JPG 或 PNG 格式!');
} }
...@@ -387,21 +387,14 @@ ...@@ -387,21 +387,14 @@
handleExceed(){ handleExceed(){
}, },
uploadFileImage(a){ uploadFileImage(a){
if( a.file.size < 200 * 1024) { uploadFileApi({file:a.file,type:'local',obj:a}).then(res=>{
uploadFileApi({file:a.file,type:'local',obj:a}).then(res=>{ a.data.image = process.env.IMAGE_URL_HEAD + res.url;
a.data.image = process.env.IMAGE_URL_HEAD + res.url;
this.$message({
type: 'success',
message: '上传成功!'
});
a.onSuccess('上传成功')
});
}else{
this.$message({ this.$message({
type: 'error', type: 'success',
message: '文件过大' message: '上传成功!'
}); });
} a.onSuccess('上传成功')
});
}, },
uploadImgSuccess(a,b,c){ uploadImgSuccess(a,b,c){
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment