Skip to content

A
admin-base
Commit a57e31b9 authored by 赵茹林's avatar 赵茹林
Browse files
Options

修复 编辑商品看不到课程列表的问题

parent fa719c17
Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 202 deletions
src/App.vue
View file @ a57e31b9
<template> <template>
<div id="app"> <div id="app">
<router-view /> <router-view/>
</div> </div>
</template> </template>
<script> <script>
import menu from "./util/menuList"; import menu from "./util/menuList";
export default {
name: "App", export default {
data() { name: "App",
return {}; data() {
}, return {};
mounted() { },
// 权限验证 动态路由 mounted() {
if (window.location.href.indexOf("login") < 0) { // 权限验证 动态路由
let permission = this.$store.state.progressList; if (window.location.href.indexOf("login") < 0) {
console.log(this.$store.state); let permission = this.$store.state.progressList;
let menuList = []; console.log(this.$store.state);
this.$router.options.routes[0].children = []; let menuList = [];
let routerUserDetail = { this.$router.options.routes[0].children = [];
path: "/userDetail/:id", let routerUserDetail = {
name: "userDetail", path: "/userDetail/:id",
component: e => require(["@/components/userDetail"], e) name: "userDetail",
}; component: e => require(["@/components/userDetail"], e)
let routerTeacherDetail = { };
path: "/teacher/:id", let routerTeacherDetail = {
name: "teacherDetail", path: "/teacher/:id",
component: e => require(["@/components/teacherDetail"], e) name: "teacherDetail",
}; component: e => require(["@/components/teacherDetail"], e)
menu.forEach(i => { };
let p = false; menu.forEach(i => {
let t = []; let p = false;
i.list.forEach(j => { let t = [];
let find = permission.find(x => { i.list.forEach(j => {
return x.cover === j.cover; let find = permission.find(x => {
}); return x.cover === j.cover;
if (find) { });
j.router.meta = {}; if (find) {
j.router.meta.readonly = !!find.readonly; j.router.meta = {};
j.router.meta.delete = !!find.delete; j.router.meta.readonly = !!find.readonly;
j.router.meta.export = !!find.export; j.router.meta.delete = !!find.delete;
j.router.meta.refund = !!find.refund; j.router.meta.export = !!find.export;
j.router.meta.distribution = !!find.distribution; j.router.meta.refund = !!find.refund;
j.router.meta.classManage = !!find.classManage; j.router.meta.distribution = !!find.distribution;
j.router.meta.classManageUnlimited = !!find.classManageUnlimited; j.router.meta.classManage = !!find.classManage;
j.router.meta.classTakeUnlimited = !!find.classTakeUnlimited; j.router.meta.classManageUnlimited = !!find.classManageUnlimited;
j.router.meta.exportFinish = !!find.exportFinish; j.router.meta.classTakeUnlimited = !!find.classTakeUnlimited;
j.router.meta.promoter = !!find.promoter; j.router.meta.exportFinish = !!find.exportFinish;
j.router.meta.import = !!find.import; j.router.meta.promoter = !!find.promoter;
t.push(j); j.router.meta.import = !!find.import;
if (find.cover === "3-1") { t.push(j);
routerTeacherDetail.meta = {}; if (find.cover === "3-1") {
routerTeacherDetail.meta.readonly = find.readonly; routerTeacherDetail.meta = {};
routerTeacherDetail.meta.delete = !!find.delete; routerTeacherDetail.meta.readonly = find.readonly;
this.$router.options.routes[0].children.push(routerTeacherDetail); routerTeacherDetail.meta.delete = !!find.delete;
} this.$router.options.routes[0].children.push(routerTeacherDetail);
if (find.cover === "3-2") { }
routerUserDetail.meta = {}; if (find.cover === "3-2") {
routerUserDetail.meta.readonly = find.readonly; routerUserDetail.meta = {};
routerUserDetail.meta.delete = !!find.delete; routerUserDetail.meta.readonly = find.readonly;
this.$router.options.routes[0].children.push(routerUserDetail); routerUserDetail.meta.delete = !!find.delete;
this.$router.options.routes[0].children.push(routerUserDetail);
}
this.$router.options.routes[0].children.push(j.router);
p = true;
} }
this.$router.options.routes[0].children.push(j.router); });
p = true; if (p) {
i.list = t;
menuList.push(i);
} }
}); });
if (p) { this.$router.addRoutes([this.$router.options.routes[0]]); //调用add;
i.list = t; this.$store.dispatch("setMenu", menuList);
menuList.push(i); }
}
});
this.$router.addRoutes([this.$router.options.routes[0]]); //调用add;
this.$store.dispatch("setMenu", menuList);
} }
} };
};
</script> </script>
<style lang="less"> <style lang="less">
#app { #app {
height: 100%; height: 100%;
} }
html, body { html, body {
height: 100%; height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.el-collapse-item__arrow { .el-collapse-item__arrow {
margin-left: 0; margin-left: 0;
} }
.fl { .fl {
float: left; float: left;
} }
.fr { .fr {
float: right; float: right;
} }
.clearfix { .clearfix {
*zoom: 1; *zoom: 1;
} }
.clearfix:after { .clearfix:after {
content: ""; content: "";
display: block; display: block;
height: 0; height: 0;
visibility: hidden; visibility: hidden;
clear: both; clear: both;
} }
.page-div { .page-div {
padding-top: 20px; padding-top: 20px;
} }
.cell-link { .cell-link {
/*color: #409EFF;*/ /*color: #409EFF;*/
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
} }
.el-table { .el-table {
/*padding: 0 20px;*/ /*padding: 0 20px;*/
} }
@gutterSize: 10px; @gutterSize: 10px;
.admin-refresh { .admin-refresh {
.section-search { .section-search {
padding: @gutterSize; margin-bottom: 10px;
background-color: #fff; padding: @gutterSize @gutterSize 0 @gutterSize;
border-bottom: solid 1px #ebeef5; background-color: #fff;
&.search-single { border-bottom: solid 1px #ebeef5;
font-size: 0; // 去掉空隙
/*.el-form-item__content { &.search-single {
font-size: 0; // 去掉空隙 font-size: 0; // 去掉空隙
}*/ /*.el-form-item__content {
.el-form-item { font-size: 0; // 去掉空隙
margin-bottom: 0; }*/
.el-form-item {
margin-bottom: 0;
}
} }
}
.el-form--inline { .el-form--inline, &.el-form--inline {
.el-form-item { .el-form-item {
margin-right: 0; margin-right: 0;
& + .el-form-item { margin-bottom: @gutterSize;
margin-left: 10px;
& + .el-form-item {
margin-left: @gutterSize;
}
} }
} }
.search-btn-wrapper {
display: flex;
}
} }
.search-btn-wrapper {
display: flex; .page-div {
padding: 0;
} }
}
.page-div { .el-pagination {
padding: 0; padding: @gutterSize 0;
} background-color: #fff;
.el-pagination { border-bottom: solid 1px #ebeef5;
padding: @gutterSize 0; }
background-color: #fff;
border-bottom: solid 1px #ebeef5;
} }
}
// cascader 支持多行 // cascader 支持多行
.refresh-cascader-multi { .refresh-cascader-multi {
&.width-480 .el-cascader-menu { &.width-480 .el-cascader-menu {
max-width: 480px; max-width: 480px;
} }
&.width-520 .el-cascader-menu { &.width-520 .el-cascader-menu {
max-width: 520px; max-width: 520px;
} }
&.width-560 .el-cascader-menu { &.width-560 .el-cascader-menu {
max-width: 560px; max-width: 560px;
} }
...@@ -181,11 +192,13 @@ html, body { ...@@ -181,11 +192,13 @@ html, body {
.el-cascader-menu { .el-cascader-menu {
.el-cascader-menu__wrap { .el-cascader-menu__wrap {
height: 360px; height: 360px;
ul { ul {
li { li {
padding: 5px 20px 5px 20px; padding: 5px 20px 5px 20px;
height: auto; height: auto;
line-height: 24px; line-height: 24px;
.el-cascader-node__label { .el-cascader-node__label {
white-space: normal; white-space: normal;
} }
...@@ -200,24 +213,30 @@ html, body { ...@@ -200,24 +213,30 @@ html, body {
&.width-320 { &.width-320 {
max-width: 320px; max-width: 320px;
} }
&.width-360 { &.width-360 {
max-width: 360px; max-width: 360px;
} }
&.width-400 { &.width-400 {
max-width: 400px; max-width: 400px;
} }
&.width-480 { &.width-480 {
max-width: 480px; max-width: 480px;
} }
&.width-520 { &.width-520 {
max-width: 520px; max-width: 520px;
} }
&.width-560 { &.width-560 {
max-width: 560px; max-width: 560px;
} }
.el-select-dropdown__wrap { .el-select-dropdown__wrap {
max-height: 360px; max-height: 360px;
ul { ul {
li { li {
padding: 5px 20px 5px 20px; padding: 5px 20px 5px 20px;
...@@ -240,20 +259,21 @@ html, body { ...@@ -240,20 +259,21 @@ html, body {
} }
} }
.el-table { .el-table {
.f-c > div { .f-c > div {
display: flex !important; display: flex !important;
flex-flow: row; flex-flow: row;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
} }
.avatar {
width: 50px; .avatar {
margin-right: 8px; width: 50px;
border-radius: 50%; margin-right: 8px;
height: 50px; border-radius: 50%;
height: 50px;
}
} }
}
.update-time { .update-time {
margin-top: -12px; margin-top: -12px;
......
src/components/autoClass/index.vue
View file @ a57e31b9
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
height: 50px; height: 50px;
} }
.user{ .user{
height: 100%; /*height: 100%;*/
overflow: auto; overflow: auto;
padding: 20px 0; padding: 20px 0;
.btn-content{ .btn-content{
......
src/components/class/userList.vue
View file @ a57e31b9
...@@ -1257,7 +1257,7 @@ ...@@ -1257,7 +1257,7 @@
height: 50px; height: 50px;
} }
.user{ .user{
height: 100%; /*height: 100%;*/
overflow: auto; overflow: auto;
padding: 20px 0; padding: 20px 0;
.btn-content{ .btn-content{
......
src/components/oldUser/index.vue
View file @ a57e31b9
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
height: 50px; height: 50px;
} }
.user{ .user{
height: 100%; /*height: 100%;*/
overflow: auto; overflow: auto;
padding: 20px 0; padding: 20px 0;
.btn-content{ .btn-content{
......
src/components/shop/dialog.vue
View file @ a57e31b9
...@@ -23,26 +23,11 @@ ...@@ -23,26 +23,11 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="商品类型" required> <el-form-item label="商品类型" required>
<el-select v-model="form.goods_type" @change="goodsChange" placeholder="请选择"> <el-select v-model="form.goods_type" @change="goodsChange" placeholder="请选择">
<el-option <el-option :label="'普通商品'" :value="1"></el-option>
:label="'普通商品'" <el-option :label="'团购商品'" :value="2"></el-option>
:value="1"> <el-option :label="'续课商品'" :value="3"></el-option>
</el-option> <el-option :label="'优惠券商品'" :value="4"></el-option>
<el-option <el-option :label="'实物商品'" :value="5"></el-option>
:label="'团购商品'"
:value="2">
</el-option>
<el-option
:label="'续课商品'"
:value="3">
</el-option>
<el-option
:label="'优惠券商品'"
:value="4">
</el-option>
<el-option
:label="'实物商品'"
:value="5">
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -56,14 +41,8 @@ ...@@ -56,14 +41,8 @@
<el-col :span="12" v-if="form.goods_type === 4"> <el-col :span="12" v-if="form.goods_type === 4">
<el-form-item label="课程类型" required> <el-form-item label="课程类型" required>
<el-select v-model="form.course_type" placeholder="请选择"> <el-select v-model="form.course_type" placeholder="请选择">
<el-option <el-option :label="'日课'" :value="1"></el-option>
:label="'日课'" <el-option :label="'月课'" :value="0"></el-option>
:value="1">
</el-option>
<el-option
:label="'月课'"
:value="0">
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -654,7 +633,7 @@ ...@@ -654,7 +633,7 @@
}, },
initDialog() { initDialog() {
switch (this.dialogObj.type) { switch (this.dialogObj.type) {
case 0: case 0: // 添加商品
this.loading = false; this.loading = false;
this.goOn_goods_Id.after_goods_id = ''; this.goOn_goods_Id.after_goods_id = '';
this.goodsYou = []; this.goodsYou = [];
...@@ -690,8 +669,8 @@ ...@@ -690,8 +669,8 @@
after_goods_id: 0 after_goods_id: 0
}, },
is_into_periods: '0' is_into_periods: '0'
}, };
this.getLessonList(); this.getLessonList();
console.log(this.form.course_type) console.log(this.form.course_type)
if (this.form.goods_type == 1 || this.form.goods_type == 2) { if (this.form.goods_type == 1 || this.form.goods_type == 2) {
let json = { let json = {
...@@ -713,8 +692,8 @@ ...@@ -713,8 +692,8 @@
}); });
} }
break; break;
case 1: case 1: // 编辑商品
case 2: case 2: // 查看商品
this.goOn_goods_Id.after_goods_id = ''; this.goOn_goods_Id.after_goods_id = '';
this.goOn_goods_Id.before_goods_id = ''; this.goOn_goods_Id.before_goods_id = '';
this.goodsYou = []; this.goodsYou = [];
...@@ -750,6 +729,7 @@ ...@@ -750,6 +729,7 @@
}, },
is_into_periods: '0' is_into_periods: '0'
}; };
this.getLessonList();
getGoodsDetailApi(this.dialogObj.id).then(res => { getGoodsDetailApi(this.dialogObj.id).then(res => {
this.loading = false; this.loading = false;
let share_desc = JSON.parse(res.share_desc); let share_desc = JSON.parse(res.share_desc);
......
src/components/shop/index.vue
View file @ a57e31b9
<template> <template>
<div class="user"> <div class="admin-refresh">
<el-form ref="searchFrom" size="small" :model="searchFrom" label-width="100px" class="search-form" inline> <el-form ref="searchFrom" size="small" :model="searchFrom" label-width="100px" class="section-search" inline>
<el-form-item label="商品名称"> <el-form-item label="商品名称">
<el-input v-model="searchFrom.name"></el-input> <el-input v-model="searchFrom.name"></el-input>
</el-form-item> </el-form-item>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<el-tab-pane label="优惠券商品" name="4"></el-tab-pane> <el-tab-pane label="优惠券商品" name="4"></el-tab-pane>
<el-tab-pane label="实物商品" name="5"></el-tab-pane> <el-tab-pane label="实物商品" name="5"></el-tab-pane>
</el-tabs> </el-tabs>
<el-tabs v-model="searchFrom.status" type="card" style="background: white;padding-top: 10px" @tab-click="getGoods"> <el-tabs v-model="searchFrom.status" type="card" style="background: white;" @tab-click="getGoods">
<el-tab-pane label="上架" name="1"></el-tab-pane> <el-tab-pane label="上架" name="1"></el-tab-pane>
<el-tab-pane label="编辑中" name="0"></el-tab-pane> <el-tab-pane label="编辑中" name="0"></el-tab-pane>
<el-tab-pane label="下架" name="2"></el-tab-pane> <el-tab-pane label="下架" name="2"></el-tab-pane>
...@@ -520,9 +520,9 @@ ...@@ -520,9 +520,9 @@
<style scoped lang="less"> <style scoped lang="less">
@import "../../util/public"; @import "../../util/public";
.user{ .user{
height: 100%; /*height: 100%;*/
overflow: auto; /*overflow: auto;*/
padding: 20px 0; /*padding: 20px 0;*/
.btn-content{ .btn-content{
text-align: center; text-align: center;
} }
......
src/util/menuList.js
View file @ a57e31b9
...@@ -425,7 +425,7 @@ export default [{ ...@@ -425,7 +425,7 @@ export default [{
component: e => require(['@/components/conversionList/channelTransList'], e), component: e => require(['@/components/conversionList/channelTransList'], e),
} }
}, },
] ]
}, },
{ {
......
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