Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
Y
ybf
Project
Project
Details
Activity
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
xulili
ybf
Commits
93c100b7
Commit
93c100b7
authored
Jan 08, 2020
by
Z
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://114.67.93.201/xulili/ybf
parents
660b60cd
7127565a
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
270 additions
and
67 deletions
+270
-67
.env
ybf_admin/.env
+1
-1
.env.development
ybf_admin/.env.development
+2
-2
App.vue
ybf_admin/src/App.vue
+3
-2
index.scss
ybf_admin/src/assets/style/button/index.scss
+42
-0
index.scss
ybf_admin/src/assets/style/pagination/index.scss
+41
-0
public-class.scss
ybf_admin/src/assets/style/public-class.scss
+4
-0
setting.scss
ybf_admin/src/assets/style/theme/d2/setting.scss
+4
-3
theme-base.scss
ybf_admin/src/assets/style/theme/theme-base.scss
+2
-5
theme.scss
ybf_admin/src/assets/style/theme/theme.scss
+4
-5
index.vue
ybf_admin/src/pages/goods/main/index.vue
+166
-4
mail.vue
ybf_admin/src/pages/in/contact/mail.vue
+1
-45
No files found.
ybf_admin/.env
View file @
93c100b7
# 所有环境默认
# 所有环境默认
# 页面 title 前缀
# 页面 title 前缀
VUE_APP_TITLE
=D2Admin
VUE_APP_TITLE
= 亿百分
# 网络请求公用地址
# 网络请求公用地址
VUE_APP_API=/api/
VUE_APP_API=/api/
...
...
ybf_admin/.env.development
View file @
93c100b7
# 开发环境
# 开发环境
# 页面 title 前缀
# 页面 title 前缀
# VUE_APP_TITLE=D2Admin Dev
# VUE_APP_TITLE=
D2Admin Dev
VUE_APP_TITLE
=
亿百分
VUE_APP_TITLE
=
亿百分
ybf_admin/src/App.vue
View file @
93c100b7
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
</
script
>
</
script
>
<
style
lang=
"scss"
>
<
style
lang=
"scss"
>
@import
'~@/assets/style/public-class.scss'
;
@import
'~@/assets/style/public-class.scss'
;
@import
'~@/assets/style/button/index.scss'
;
@import
'~@/assets/style/pagination/index.scss'
;
</
style
>
</
style
>
ybf_admin/src/assets/style/button/index.scss
0 → 100644
View file @
93c100b7
.searchs
{
height
:
40px
;
width
:
100%
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
space-between
;
align-items
:
center
;
margin
:
16px
0
20px
0
;
.buttons
{
width
:
266px
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
flex-start
;
}
.buttonlight
{
width
:
88px
;
height
:
32px
;
background-color
:
#e8e9fe
;
color
:
#4e59c7
;
border
:
1px
solid
#4e59c7
;
box-sizing
:
border-box
;
margin-top
:
4px
;
&
:hover
{
background-color
:
rgba
(
78
,
89
,
199
,
0
.8
);
color
:
#fff
;
}
}
.buttondark
{
width
:
88px
;
height
:
32px
;
background-color
:
#4e59c7
;
color
:
#ffffff
;
border
:
1px
solid
#4e59c7
;
box-sizing
:
border-box
;
margin-top
:
4px
;
&
:hover
{
background-color
:
rgba
(
78
,
89
,
199
,
0
.8
);
color
:
#fff
;
}
}
}
ybf_admin/src/assets/style/pagination/index.scss
0 → 100644
View file @
93c100b7
.el-pagination
{
position
:
absolute
;
bottom
:
00px
;
right
:
30px
;
}
/*修改滚动条样式*/
div
:
:-
webkit-scrollbar
{
width
:
10px
;
height
:
10px
;
/**/
}
div
:
:-
webkit-scrollbar-track
{
background
:
rgb
(
239
,
239
,
239
);
border-radius
:
2px
;
}
div
:
:-
webkit-scrollbar-thumb
{
background
:
#bfbfbf
;
border-radius
:
10px
;
}
div
:
:-
webkit-scrollbar-thumb
:
hover
{
background
:
#555
;
}
div
:
:-
webkit-scrollbar-corner
{
background
:
#179a16
;
}
.el-table.list
{
.el-button--text
{
color
:
#666666
;
font-weight
:
normal
;
&
:hover
{
color
:
#333333
;
}
&
.listButtonRed
{
color
:
#D0021B
;
&
:hover
{
color
:
red
;
}
}
}
}
ybf_admin/src/assets/style/public-class.scss
View file @
93c100b7
...
@@ -55,3 +55,7 @@ $sizes: (0, 5, 10, 15, 20);
...
@@ -55,3 +55,7 @@ $sizes: (0, 5, 10, 15, 20);
.
#{
$prefix
}
-pr
{
padding-right
:
20px
!
important
;
}
.
#{
$prefix
}
-pr
{
padding-right
:
20px
!
important
;
}
.
#{
$prefix
}
-pb
{
padding-bottom
:
20px
!
important
;
}
.
#{
$prefix
}
-pb
{
padding-bottom
:
20px
!
important
;
}
.
#{
$prefix
}
-pl
{
padding-left
:
20px
!
important
;
}
.
#{
$prefix
}
-pl
{
padding-left
:
20px
!
important
;
}
.pRelative
{
position
:
relative
;
}
ybf_admin/src/assets/style/theme/d2/setting.scss
View file @
93c100b7
...
@@ -4,12 +4,13 @@ $theme-name: 'd2';
...
@@ -4,12 +4,13 @@ $theme-name: 'd2';
$theme-bg-color
:
#ebf1f6
;
$theme-bg-color
:
#ebf1f6
;
// 主题背景图片遮罩
// 主题背景图片遮罩
$theme-bg-mask
:
rgba
(
#000
,
0
);
$theme-bg-mask
:
rgba
(
#000
,
0
);
$theme-border-color
:
#EEEEEE
;
// container组件
// container组件
$theme-container-background-color
:
rgba
(
#FFF
,
1
);
$theme-container-background-color
:
rgba
(
#FFF
,
1
);
$theme-container-header-footer-background-color
:
#FFF
;
$theme-container-header-footer-background-color
:
#FFF
;
$theme-container-border-inner
:
1px
solid
#cfd7e5
;
$theme-container-border-inner
:
1px
solid
$theme-border-color
;
$theme-container-border-outer
:
1px
solid
#cfd7e5
;
$theme-container-border-outer
:
1px
solid
$theme-border-color
;
$theme-multiple-page-control-color
:
$color-text-normal
;
$theme-multiple-page-control-color
:
$color-text-normal
;
$theme-multiple-page-control-color-active
:
#2f74ff
;
$theme-multiple-page-control-color-active
:
#2f74ff
;
...
@@ -58,4 +59,4 @@ $theme-aside-menu-empty-text-color: $color-text-normal;
...
@@ -58,4 +59,4 @@ $theme-aside-menu-empty-text-color: $color-text-normal;
$theme-aside-menu-empty-background-color
:
rgba
(
#000
,
.03
);
$theme-aside-menu-empty-background-color
:
rgba
(
#000
,
.03
);
$theme-aside-menu-empty-icon-color-hover
:
$color-text-main
;
$theme-aside-menu-empty-icon-color-hover
:
$color-text-main
;
$theme-aside-menu-empty-text-color-hover
:
$color-text-main
;
$theme-aside-menu-empty-text-color-hover
:
$color-text-main
;
$theme-aside-menu-empty-background-color-hover
:
rgba
(
#000
,
.05
);
$theme-aside-menu-empty-background-color-hover
:
rgba
(
#000
,
.05
);
\ No newline at end of file
ybf_admin/src/assets/style/theme/theme-base.scss
View file @
93c100b7
...
@@ -288,16 +288,13 @@
...
@@ -288,16 +288,13 @@
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
overflow
:
hidden
;
overflow
:
hidden
;
padding
:
16px
;
.d2-container-full__header
{
.d2-container-full__header
{
padding
:
20
px
;
padding
:
0
16px
16px
16
px
;
}
}
.d2-container-full__body
{
.d2-container-full__body
{
flex-grow
:
1
;
flex-grow
:
1
;
// height: 100%;
// Z-style
// border: 2px solid red;
height
:
100%
;
height
:
100%
;
padding
:
20px
20px
;
overflow
:
auto
;
overflow
:
auto
;
position
:
relative
;
position
:
relative
;
}
}
...
...
ybf_admin/src/assets/style/theme/theme.scss
View file @
93c100b7
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
.el-menu--horizontal
.el-menu
.el-submenu__title
:hover
{
.el-menu--horizontal
.el-menu
.el-submenu__title
:hover
{
@include
theme-menu-hover-style
;
@include
theme-menu-hover-style
;
}
}
// 顶栏
// 顶栏
.d2-theme-header
{
.d2-theme-header
{
// 顶栏菜单空间不足时显示的滚动控件
// 顶栏菜单空间不足时显示的滚动控件
...
@@ -296,15 +296,14 @@
...
@@ -296,15 +296,14 @@
// [组件]
// [组件]
// d2-container-full 填充型
// d2-container-full 填充型
.d2-container-full
{
.d2-container-full
{
border
:
$theme-container-border-outer
;
background-color
:
$theme-container-header-footer-background-color
;
border-top
:
none
;
border-bottom
:
none
;
.d2-container-full__header
{
.d2-container-full__header
{
border-bottom
:
$theme-container-border-inner
;
border-bottom
:
$theme-container-border-inner
;
background
:
$theme-container-header-footer-background-color
;
background
:
$theme-container-header-footer-background-color
;
}
}
.d2-container-full__body
{
.d2-container-full__body
{
background
:
$theme-container-background-color
;
//
background: $theme-container-background-color;
}
}
.d2-container-full__footer
{
.d2-container-full__footer
{
border-top
:
$theme-container-border-inner
;
border-top
:
$theme-container-border-inner
;
...
...
ybf_admin/src/pages/goods/main/index.vue
View file @
93c100b7
<
template
>
<
template
>
<d2-container>
<d2-container
class=
"pRelative"
>
<template
slot=
"header"
>
header
</
template
>
<template
slot=
"header"
>
goods/main/index.vue
全部商品( 共5个 )
<
template
slot=
"footer"
>
footer
</
template
>
</
template
>
<div
class=
"searchs"
>
<div
class=
"buttons"
>
<el-button
class=
"button buttonlight"
size=
"small"
>
添加商品
</el-button>
<el-button
class=
"button buttondark"
size=
"small"
>
批量删除
</el-button>
</div>
<!-- 搜索区 -->
<el-form
class=
"searchzone"
:inline=
"true"
:model=
"formData"
label-width=
"auto"
>
<el-form-item
label=
"状态"
>
<el-select
size=
"small"
v-model=
"formData.status"
placeholder=
"请选择状态"
style=
"width:160px;"
>
<el-option
v-for=
"item in statusList"
:key=
"item.id"
:label=
"item.name"
:value=
"item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
""
>
<el-input
size=
"small"
v-model=
"formData.keys"
style=
"width:160px"
placeholder=
"请输入关键词"
/>
</el-form-item>
<el-button
class=
"button buttondark"
size=
"small"
>
搜索
</el-button>
</el-form>
</div>
<el-table
:data=
"data"
class=
"list"
style=
"width: 100%"
empty-text=
"暂无商品信息"
height=
"calc(100% - 120px)"
>
<el-table-column
type=
"selection"
width=
"55"
>
</el-table-column>
<el-table-column
prop=
"name"
label=
"商品图片"
></el-table-column>
<el-table-column
prop=
"name"
label=
"商品名称"
></el-table-column>
<el-table-column
prop=
"name"
label=
"商品价格"
></el-table-column>
<el-table-column
prop=
"name"
label=
"库存"
></el-table-column>
<el-table-column
prop=
"name"
label=
"佣金"
></el-table-column>
<el-table-column
prop=
"message"
label=
"状态"
></el-table-column>
<!-- 查看详情 -->
<el-table-column
fixed=
"right"
align=
"center"
label=
"操作"
width=
"140"
@
selection-change=
"listPick"
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"text"
@
click=
""
>
详情
</el-button>
<el-button
type=
"text"
@
click=
""
>
编辑
</el-button>
<el-button
type=
"text"
@
click=
""
class=
"listButtonRed"
>
删除
</el-button>
</
template
>
</el-table-column>
</el-table>
<el-pagination
@
current-change=
"handleCurrentChange"
:current-page=
"page.currentPage"
:page-size=
"page.size"
layout=
"total, prev, pager, next, jumper"
:total=
"page.total"
>
</el-pagination>
</d2-container>
</d2-container>
</template>
</template>
<
script
>
export
default
{
data
()
{
return
{
formData
:{
status
:
''
,
keys
:
''
},
statusList
:[],
data
:
[
{
date
:
'2016-05-02'
,
name
:
'王小虎'
,
address
:
'上海市普陀区金沙江路 1518 弄'
,
forbidEdit
:
true
,
showEditButton
:
true
},
{
date
:
'2016-05-04'
,
name
:
'王小虎'
,
address
:
'上海市普陀区金沙江路 1517 弄'
,
forbidEdit
:
false
,
showEditButton
:
true
},
{
date
:
'2016-05-01'
,
name
:
'王小虎'
,
address
:
'上海市普陀区金沙江路 1519 弄'
,
forbidEdit
:
false
,
showEditButton
:
false
},
{
date
:
'2016-05-03'
,
name
:
'王小虎'
,
address
:
'上海市普陀区金沙江路 1516 弄'
,
forbidEdit
:
false
,
showEditButton
:
true
},
{
date
:
'2016-05-03'
,
name
:
'王小虎'
,
address
:
'上海市普陀区金沙江路 1516 弄'
,
forbidEdit
:
false
,
showEditButton
:
true
},
{
date
:
'2016-05-03'
,
name
:
'王小虎'
,
address
:
'上海市普陀区金沙江路 1516 弄'
,
forbidEdit
:
false
,
showEditButton
:
true
},
{
date
:
'2016-05-03'
,
name
:
'王小虎'
,
address
:
'上海市普陀区金沙江路 1516 弄'
,
forbidEdit
:
false
,
showEditButton
:
true
},
{
date
:
'2016-05-03'
,
name
:
'王小虎'
,
address
:
'上海市普陀区金沙江路 1516 弄'
,
forbidEdit
:
false
,
showEditButton
:
true
},
{
date
:
'2016-05-03'
,
name
:
'王小虎'
,
address
:
'上海市普陀区金沙江路 1516 弄'
,
forbidEdit
:
false
,
showEditButton
:
true
},
{
date
:
'2016-05-03'
,
name
:
'王小虎'
,
address
:
'上海市普陀区金沙江路 1516 弄'
,
forbidEdit
:
false
,
showEditButton
:
true
},
],
page
:{
currentPage
:
1
,
size
:
20
,
total
:
100
}
}
},
methods
:
{
handleCurrentChange
(
val
)
{
console
.
log
(
`当前页:
${
val
}
`
);
},
listPick
()
{
},
}
}
</
script
>
<
style
lang=
"scss"
>
</
style
>
ybf_admin/src/pages/in/contact/mail.vue
View file @
93c100b7
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
<el-button
class=
"button buttondark"
size=
"small"
<el-button
class=
"button buttondark"
size=
"small"
>
移动
</el-button
>
移动
</el-button
>
>
</div>
</div>
<!-- 搜索区 -->
<!-- 搜索区 -->
...
@@ -389,57 +389,13 @@ main {
...
@@ -389,57 +389,13 @@ main {
flex-direction
:
column
;
flex-direction
:
column
;
justify-content
:
flex-start
;
justify-content
:
flex-start
;
}
}
.searchs
{
/* // border: 2px solid red; */
height
:
40px
;
width
:
100%
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
space-between
;
align-items
:
center
;
}
.buttons
{
/* // border: 2px solid darkcyan;
// width: 30%;
// min-width: 266px; */
width
:
266px
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
flex-start
;
}
.buttonlight
{
width
:
88px
;
height
:
32px
;
margin-top
:
4px
;
background-color
:
#e8e9fe
;
color
:
#4e59c7
;
border
:
1px
solid
#4e59c7
;
box-sizing
:
border-box
;
}
.buttonlight
:hover
{
}
.buttondark
{
width
:
88px
;
height
:
32px
;
background-color
:
#4e59c7
;
color
:
#ffffff
;
border
:
1px
solid
#4e59c7
;
box-sizing
:
border-box
;
margin-top
:
4px
;
}
.buttondark
:hover
{
}
.searchzone
{
.searchzone
{
/* // border: 2px solid orange; */
height
:
40px
;
height
:
40px
;
width
:
auto
;
width
:
auto
;
min-width
:
654px
;
min-width
:
654px
;
}
}
.lists
{
.lists
{
/* // border: 2px solid greenyellow; */
height
:
auto
;
height
:
auto
;
/* // min-height: 400px; */
min-height
:
70%
;
min-height
:
70%
;
width
:
100%
;
width
:
100%
;
margin-top
:
20px
;
margin-top
:
20px
;
...
...
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