Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
A
admin-base
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
new-sing
admin-base
Commits
a57e31b9
Commit
a57e31b9
authored
Aug 15, 2019
by
赵茹林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 编辑商品看不到课程列表的问题
parent
fa719c17
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
201 additions
and
201 deletions
+201
-201
App.vue
src/App.vue
+179
-159
index.vue
src/components/autoClass/index.vue
+1
-1
userList.vue
src/components/class/userList.vue
+1
-1
index.vue
src/components/oldUser/index.vue
+1
-1
dialog.vue
src/components/shop/dialog.vue
+13
-33
index.vue
src/components/shop/index.vue
+6
-6
No files found.
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
{
export
default
{
name
:
"App"
,
name
:
"App"
,
data
()
{
data
()
{
return
{};
return
{};
...
@@ -74,83 +75,90 @@ export default {
...
@@ -74,83 +75,90 @@ export default {
this
.
$store
.
dispatch
(
"setMenu"
,
menuList
);
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;
padding: @gutterSize @gutterSize 0 @gutterSize;
background-color: #fff;
background-color: #fff;
border-bottom: solid 1px #ebeef5;
border-bottom: solid 1px #ebeef5;
&.search-single {
&.search-single {
font-size: 0; // 去掉空隙
font-size: 0; // 去掉空隙
/*.el-form-item__content {
/*.el-form-item__content {
font-size: 0; // 去掉空隙
font-size: 0; // 去掉空隙
}*/
}*/
.el-form-item {
.el-form-item {
margin-bottom: 0;
margin-bottom: 0;
}
}
}
}
.el-form--inline {
.el-form--inline, &.el-form--inline {
.el-form-item {
.el-form-item {
margin-right: 0;
margin-right: 0;
margin-bottom: @gutterSize;
& + .el-form-item {
& + .el-form-item {
margin-left: 10px
;
margin-left: @gutterSize
;
}
}
}
}
}
}
.search-btn-wrapper {
.search-btn-wrapper {
display: flex;
display: flex;
}
}
...
@@ -159,21 +167,24 @@ html, body {
...
@@ -159,21 +167,24 @@ html, body {
.page-div {
.page-div {
padding: 0;
padding: 0;
}
}
.el-pagination {
.el-pagination {
padding: @gutterSize 0;
padding: @gutterSize 0;
background-color: #fff;
background-color: #fff;
border-bottom: solid 1px #ebeef5;
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 {
.avatar {
width: 50px;
width: 50px;
margin-right: 8px;
margin-right: 8px;
border-radius: 50%;
border-radius: 50%;
height: 50px;
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
:
50
px
;
height
:
50
px
;
}
}
.
user
{
.
user
{
height
:
100
%
;
/*height: 100%;*/
overflow
:
auto
;
overflow
:
auto
;
padding
:
20
px
0
;
padding
:
20
px
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,7 +669,7 @@
...
@@ -690,7 +669,7 @@
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
)
{
...
@@ -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=
"se
arch-form
"
inline
>
<el-form
ref=
"searchFrom"
size=
"small"
:model=
"searchFrom"
label-width=
"100px"
class=
"se
ction-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;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment