Skip to content

A
admin-base
Commit 39e2f92a authored by wangwei's avatar wangwei
Browse files
Options

12-18 问题修改

parent 8281daff
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 66 deletions
dev/index.html
View file @ 39e2f92a
<!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.7811aedc29ba7e845a1a.js></script><script type=text/javascript src=/static/js/vendor.14d7484eb2c1e77c5000.js></script><script type=text/javascript src=/static/js/app.0d0014dcb77feff6e486.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.f85d6386c7e8d6446a9d.js></script><script type=text/javascript src=/static/js/vendor.14d7484eb2c1e77c5000.js></script><script type=text/javascript src=/static/js/app.5a1b6dcec9f2d8c0fca5.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);
}; };
......
dist/index.html
View file @ 39e2f92a
<!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><link href=/static/css/app.cdc1608fa18c564a9f811d2c46e45c48.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.efe8aee754cb2a176601.js></script><script type=text/javascript src=/static/js/vendor.b3fa793c64cacc9d7887.js></script><script type=text/javascript src=/static/js/app.29a64e93e60dbb01937f.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><link href=/static/css/app.cdc1608fa18c564a9f811d2c46e45c48.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.cffbde75cb1e44ea63e4.js></script><script type=text/javascript src=/static/js/vendor.b3fa793c64cacc9d7887.js></script><script type=text/javascript src=/static/js/app.122aeece991280711cac.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);
}; };
......
dist/static/js/31.39e500475089e3b5ee54.js 0 → 100644
View file @ 39e2f92a
webpackJsonp([31],{"9nWa":function(e,t){},"b6P+":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=n("CCn6"),c={data:function(){return{cacheList:[{name:"主题列表",key:"course_relation_list"},{name:"课包列表",key:"course_category_list "},{name:"课包内容",key:"element_detail"}]}},methods:{cache:function(e){var t=this;this.$confirm("此操作将清除该缓存记录?","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){Object(a.u)(e).then(function(e){t.$message({type:"success",message:"清除成功!"})})})}}},s={render:function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"clearCache"},[n("el-table",{staticStyle:{width:"100%"},attrs:{data:e.cacheList}},[n("el-table-column",{staticStyle:{"padding-left":"30px"},attrs:{prop:"name",label:"缓存列表"}}),e._v(" "),e.$store.state.readonly?e._e():n("el-table-column",{attrs:{label:"操作"},scopedSlots:e._u([{key:"default",fn:function(t){return[n("el-button",{attrs:{size:"mini",type:"primary"},on:{click:function(n){e.cache(t.row.key)}}},[e._v("\n 清除缓存\n ")])]}}])})],1)],1)},staticRenderFns:[]};var i=n("VU/8")(c,s,!1,function(e){n("9nWa")},"data-v-acfd2756",null);t.default=i.exports}});
\ No newline at end of file
dist/static/js/app.122aeece991280711cac.js 0 → 100644
View file @ 39e2f92a
This diff is collapsed.
dist/static/js/manifest.cffbde75cb1e44ea63e4.js 0 → 100644
View file @ 39e2f92a
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var b,o,d,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)d=n(n.s=t[i]);return d};var a={},f={44: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:"4ce4ad0e10b321edc5cf",1:"88a7a5d5f64607f7680c",2:"05cbb5cddbb996934f87",3:"7ae24e94e14860c1eec4",4:"b62e0a48c6b3f81884fd",5:"c49513a1a31477216784",6:"0ea7fda41e8a1aaedb86",7:"f8957879794fc81298e6",8:"43978c2af5c48059ebe5",9:"a5a18cb5e331e78cc446",10:"07fb2f523be2fefdf898",11:"2f25d2d4f3787c64f11d",12:"2f3f80b3f9e1005dab5e",13:"52f31f2f1f2ec784d032",14:"671edaf32c08204c887d",15:"95c4305160cd67aadcbc",16:"bbcf5a750ae0f322d156",17:"4946ab3c8f0ad3737582",18:"bc1941a101bd47cfcc27",19:"3b0a203bf198800a9a32",20:"9ba73221b5f3631ee058",21:"a5ba24d1b30c154e6362",22:"b8d0318967f722313415",23:"48e4c4b60e8851cdb450",24:"c2a0f56496b43bb953f6",25:"64cc98ef405b27ed5ec2",26:"0c0e4e4b3b1532b1de87",27:"c72da290311c7c779c27",28:"fb148890c340592352e4",29:"e80ca28babd19c0e98eb",30:"1cf13e08b26e88cf9743",31:"39e500475089e3b5ee54",32:"6f97cba9284ebd2d315d",33:"27c9fa8c3aa2ba28f96c",34:"ef1faed5d9194e7fc894",35:"a51a27a67dc62c513a2c",36:"e743bbb5b0a15a273b49",37:"e4fba7cd617a6408a479",38:"9d3e73e68aaef44778f3",39:"03c2325a674ea03a7680",40:"32db5e6b04da31ebec3b",41:"ec024773819fe02a63e0"}[e]+".js";var b=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(b);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/orderCount/index.vue
View file @ 39e2f92a
...@@ -52,10 +52,10 @@ ...@@ -52,10 +52,10 @@
{{ scope.row['register_num'] }} {{ scope.row['register_num'] }}
</span> </span>
<span v-if="data === '总金额'"> <span v-if="data === '总金额'">
{{ scope.row['total_money'] }} {{ scope.row['total_money']}}
</span> </span>
<span v-if="data !== '时间' && data !== '注册数' && data !== '总金额'"> <span v-if="data !== '时间' && data !== '注册数' && data !== '总金额'">
{{ scope.row[data] }} {{ scope.row[data] | toFixed2}}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -82,6 +82,20 @@ ...@@ -82,6 +82,20 @@
this.defaultTime(); this.defaultTime();
this.initPage() this.initPage()
}, },
filters:{
toFixed2(value){
if(typeof value === 'number'){
let v2 = value.toString().split(".");
if(v2.length > 1 && v2[1].length > 2){
return Number(value).toFixed(2)
}else{
return value
}
}else {
return value
}
}
},
methods:{ methods:{
initPage(){ initPage(){
getGoodsListApi({limit:99999}).then(res=>{ getGoodsListApi({limit:99999}).then(res=>{
......
src/components/periods/newDialog.vue
View file @ 39e2f92a
...@@ -241,7 +241,6 @@ ...@@ -241,7 +241,6 @@
limit: 100 limit: 100
}; };
getTeacherListApi(json1).then((res)=>{ getTeacherListApi(json1).then((res)=>{
console.log(res.list)
this.teacherOptions = res.list; this.teacherOptions = res.list;
this.teacher1Options = res.list; this.teacher1Options = res.list;
this.teacher2Options = res.list; this.teacher2Options = res.list;
...@@ -295,7 +294,9 @@ ...@@ -295,7 +294,9 @@
if (this.dialogObj.form.id){ if (this.dialogObj.form.id){
this.form = this.dialogObj.form; this.form = this.dialogObj.form;
} else { } else {
this.form = {}; this.form = {
rest_week_day:[]
};
} }
if(this.dialogObj.form.course_id){ if(this.dialogObj.form.course_id){
this.getLessonDetail(this.dialogObj.form.course_id); this.getLessonDetail(this.dialogObj.form.course_id);
......
src/components/system/admin.vue
View file @ 39e2f92a
<template> <template>
<div class="admin"> <div class="admin">
<el-form ref="searchFrom" :model="searchFrom" label-width="80px"> <el-button @click="add" plain type="success" style="float: right;margin-bottom:10px;" v-if="!$store.state.readonly">新增角色</el-button>
<el-row> <el-form ref="searchFrom" :model="searchFrom" inline label-width="80px">
<el-col :span="4">
<el-form-item label="用户名"> <el-form-item label="用户名">
<el-input v-model="searchFrom.user_name"></el-input> <el-input v-model="searchFrom.user_name"></el-input>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="searchFrom.status" placeholder="请选择用户等级" @change="getList"> <el-select v-model="searchFrom.status" placeholder="请选择用户等级" @change="getList">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
...@@ -15,25 +12,17 @@ ...@@ -15,25 +12,17 @@
<el-option label="冻结" :value="1"></el-option> <el-option label="冻结" :value="1"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="角色"> <el-form-item label="角色">
<el-select v-model="searchFrom.role_name" placeholder="请选择用户等级" @change="getList"> <el-select v-model="searchFrom.role_id" placeholder="请选择用户等级" @change="getList">
<el-option label="全部" value=""></el-option> <el-option
<el-option label="超级管理员" value="超级管理员"></el-option> v-for="data in roleList"
<el-option label="管理员" value="管理员"></el-option> :label="data.name"
:value="data.id" ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item> <el-form-item>
<el-button type="primary" plain @click="getList">搜索</el-button> <el-button type="primary" plain @click="getList">搜索</el-button>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="16" :offset="8">
<el-button @click="add" plain type="success" style="float: right;margin-bottom:10px;" v-if="!$store.state.readonly">新增角色</el-button>
</el-col>
</el-row>
</el-form> </el-form>
<!--<div class="head clear-both">--> <!--<div class="head clear-both">-->
<!----> <!---->
...@@ -207,7 +196,7 @@ ...@@ -207,7 +196,7 @@
searchFrom:{ searchFrom:{
user_name: '', user_name: '',
status: '', status: '',
role_name:"" role_id:""
}, },
dialog:{ dialog:{
dialogType:0, dialogType:0,
...@@ -246,6 +235,9 @@ ...@@ -246,6 +235,9 @@
}, },
}, },
created(){ created(){
if(this.$route.query.roleId){
this.searchFrom.role_id = this.$route.query.roleId
}
this.getList(); this.getList();
this.getRoleList(); this.getRoleList();
}, },
...@@ -258,12 +250,12 @@ ...@@ -258,12 +250,12 @@
}) })
}, },
onPageChange(val){ onPageChange(val){
this.nowPage = val this.nowPage = val;
this.getList() this.getList()
}, },
onSizeChange(val){ onSizeChange(val){
this.nowPage = 1 this.nowPage = 1;
this.limit = val this.limit = val;
this.getList() this.getList()
}, },
getList(){ getList(){
...@@ -277,21 +269,21 @@ ...@@ -277,21 +269,21 @@
if (this.searchFrom.status !== ''){ if (this.searchFrom.status !== ''){
json.status = this.searchFrom.status json.status = this.searchFrom.status
} }
// if (this.searchFrom.role_id !== ''){ if (this.searchFrom.role_id !== ''){
// json.role_id = this.searchFrom.role_id json.role_id = this.searchFrom.role_id
// } }
getAdminListApi(json).then(res=>{ getAdminListApi(json).then(res=>{
if(this.searchFrom.role_name !== ''){ if(this.searchFrom.role_name !== ''){
switch(this.searchFrom.role_name){ switch(this.searchFrom.role_name){
case '超级管理员': case '超级管理员':
res.list=res.list.filter(function(item,i){ res.list=res.list.filter(function(item,i){
return item.role_name == "超级管理员" return item.role_name == "超级管理员"
}) });
break; break;
case '管理员': case '管理员':
res.list=res.list.filter(function(item,i){ res.list=res.list.filter(function(item,i){
return item.role_name == "管理员" return item.role_name == "管理员"
}) });
break; break;
} }
} }
......
src/components/system/role.vue
View file @ 39e2f92a
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
</div> </div>
<el-table <el-table
:data="roleList" :data="roleList"
@row-click="rowClick"
style="width: 100%"> style="width: 100%">
<el-table-column <el-table-column
prop="id" prop="id"
...@@ -108,6 +109,9 @@ ...@@ -108,6 +109,9 @@
this.getMenuList(); this.getMenuList();
}, },
methods:{ methods:{
rowClick(data){
this.$router.push({name:'admin',query:{roleId:data.id}})
},
getMenuList(){ getMenuList(){
getMenuListApi().then(res=>{ getMenuListApi().then(res=>{
if (res) { if (res) {
......
src/components/system/sysConfig.vue
View file @ 39e2f92a
...@@ -2,6 +2,14 @@ ...@@ -2,6 +2,14 @@
<div class="sys"> <div class="sys">
<div class="clear-both top"> <div class="clear-both top">
<el-button type="success" plain @click="add" style="float: right" v-if="!$store.state.readonly">添加配置</el-button> <el-button type="success" plain @click="add" style="float: right" v-if="!$store.state.readonly">添加配置</el-button>
<el-form inline="">
<el-form-item label="关键字">
<el-input placeholder="输入关键字搜索" v-model="searchKey"></el-input>
</el-form-item>
<el-form-item >
<el-button type="primary" @click="getList">搜索</el-button>
</el-form-item>
</el-form>
</div> </div>
<el-table <el-table
:data="list" :data="list"
...@@ -66,6 +74,7 @@ ...@@ -66,6 +74,7 @@
return { return {
total:0, total:0,
nowPage:1, nowPage:1,
searchKey:"",
limit: 10, limit: 10,
dialogObj:{ dialogObj:{
value:'', value:'',
...@@ -91,6 +100,9 @@ ...@@ -91,6 +100,9 @@
let json = { let json = {
limit: this.limit, limit: this.limit,
page: this.nowPage page: this.nowPage
};
if(this.searchKey){
json.key = this.searchKey
} }
getConfigListApi(json).then(res => { getConfigListApi(json).then(res => {
this.list = res.list this.list = res.list
......
src/components/textarea/index.vue
View file @ 39e2f92a
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
ImageStyle = 'display:block;margin:auto' ImageStyle = 'display:block;margin:auto'
} }
let str= `<img src="${this.form.imgList[0].url}" style="${ImageStyle}"/>`; let str= `<img src="${this.form.imgList[0].url}" style="${ImageStyle}"/>`;
this.insertContent(str) tinymce.activeEditor.insertContent(str);
this.dialogVisible = false this.dialogVisible = false
}, },
audioInter(){ audioInter(){
...@@ -180,11 +180,8 @@ ...@@ -180,11 +180,8 @@
}); });
return false return false
} }
let str = `<p style="text-align: center"><img class="mce-object mce-object-audio" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" width="280" height="55" data-mce-p-controls="controls" data-mce-html="%0A%3Csource%20src%3D%22https%3A//cdn.singsingenglish.com/${this.radio[0].url}%22%20type%3D%22audio/mpeg%22%20/%3E" data-mce-object="audio"></p>`; let str = `<p style="text-align: center"><img class="mce-object mce-object-audio" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" width="280" height="55" data-mce-p-controls="controls" data-mce-html="%0A%3Csource%20src%3D%22https%3A//cdn.singsingenglish.com/${this.radio[0].url}%22%20type%3D%22audio/mpeg%22%20/%3E" data-mce-object="audio"></p>`;
console.log(str); tinymce.activeEditor.insertContent(str);
this.insertContent(str);
console.log(this.lookData.content);
this.dialogVisibleMp3 = false this.dialogVisibleMp3 = false
}, },
uploadFile(a){ uploadFile(a){
...@@ -218,34 +215,6 @@ ...@@ -218,34 +215,6 @@
center:true center:true
} }
}, },
insertContent(content) {
if (!content) {//如果插入的内容为空则返回
return;
}
let sel = null;
if (document.selection) {//IE9以下
sel = document.selection;
sel.createRange().pasteHTML(content);
} else {
sel = document.getElementById('tinymce_ifr').contentWindow.getSelection();
if (sel.rangeCount > 0) {
let range = sel.getRangeAt(0); //获取选择范围
range.deleteContents(); //删除选中的内容
let el = document.createElement("div"); //创建一个空的div外壳
el.innerHTML = content; //设置div内容为我们想要插入的内容。
let frag = document.createDocumentFragment();//创建一个空白的文档片段，便于之后插入dom树
let node = el.firstChild;
let lastNode = frag.appendChild(node);
range.insertNode(frag); //设置选择范围的内容为插入的内容
let contentRange = range.cloneRange(); //克隆选区
contentRange.setStartAfter(lastNode); //设置光标位置为插入内容的末尾
contentRange.collapse(true); //移动光标位置到末尾
sel.removeAllRanges(); //移出所有选区
sel.addRange(contentRange); //添加修改后的选区
}
}
},
removeFile(){}, removeFile(){},
removeFileMp3(){}, removeFileMp3(){},
handleExceed(){} handleExceed(){}
......
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