Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
肖康
/
cloudSystem
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
47f349da
authored
May 13, 2021
by
肖康
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
x
parent
bd2fc2d6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
15 deletions
src/assets/css/public/common.less
src/assets/css/public/common.min.css
src/views/Store/list.vue
src/assets/css/public/common.less
View file @
47f349da
...
...
@@ -392,7 +392,7 @@ body {
border:0px!important;
box-shadow: 0px 0px 10px #ccc;
.boxxrth2021 {
width :
28
0px;
width :
15
0px;
background : #fff;
font-size : 12px;
color : #333;
...
...
@@ -401,7 +401,7 @@ body {
line-height: 28px;
span {
width:
33.33
%;
width:
50
%;
}
}
}
...
...
src/assets/css/public/common.min.css
View file @
47f349da
html
{
-webkit-text-size-adjust
:
100%
;
-ms-text-size-adjust
:
100%
}
html
*
{
outline
:
0
;
-webkit-text-size-adjust
:
none
!important
;
-webkit-tap-highlight-color
:
rgba
(
0
,
0
,
0
,
0
)
!important
}
html
,
body
{
font-family
:
PingFangSC-Regular
,
PingFang
SC
,
'Microsoft Yahei'
,
sans-serif
;
font-style
:
normal
;
-webkit-font-smoothing
:
antialiased
;
-moz-osx-font-smoothing
:
grayscale
;
font-size
:
14px
;
color
:
#646B78
}
body
,
div
,
dl
,
dt
,
dd
,
ul
,
ol
,
li
,
h1
,
h2
,
h3
,
h4
,
h5
,
h6
,
pre
,
code
,
form
,
fieldset
,
legend
,
input
,
textarea
,
p
,
blockquote
,
th
,
td
,
hr
,
button
,
article
,
aside
,
details
,
figcaption
,
figure
,
footer
,
header
,
menu
,
nav
,
section
{
margin
:
0
;
padding
:
0
}
button
,
input
,
select
,
textarea
{
font-size
:
100%
;
border
:
none
;
-webkit-appearance
:
none
}
input
[
type
=
button
],
input
[
type
=
file
],
input
[
type
=
submit
]
{
cursor
:
pointer
}
table
{
border-collapse
:
collapse
;
border-spacing
:
0
}
ol
,
ul
,
dl
{
list-style
:
none
}
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
font-size
:
100%
;
font-weight
:
500
}
em
,
b
,
i
{
font-style
:
normal
}
a
{
text-decoration
:
none
}
img
{
border
:
none
}
.clr
{
*
zoom
:
1
;
clear
:
both
}
.clr
:after
{
content
:
"."
;
clear
:
both
;
height
:
0
;
visibility
:
hidden
;
display
:
block
}
.fl
{
float
:
left
;
_display
:
inline
}
.fr
{
float
:
right
;
_display
:
inline
}
.va-t
{
vertical-align
:
top
}
.va-m
{
vertical-align
:
middle
}
.va-b
{
vertical-align
:
bottom
}
.lineBlock
{
display
:
inline-block
;
*
display
:
inline
;
zoom
:
1
;
letter-spacing
:
normal
;
word-spacing
:
normal
}
.lbBox
{
font-size
:
0
!important
;
*
word-spacing
:
-1px
!important
}
.emptys
{
margin-left
:
-1px
;
width
:
1px
;
height
:
100%
;
font-size
:
0
;
vertical-align
:
middle
}
.boxsiz
{
-webkit-box-sizing
:
border-box
;
box-sizing
:
border-box
}
.column
{
display
:
flex
;
flex-direction
:
column
}
.row
{
display
:
flex
;
flex-direction
:
row
}
.bothSide
{
justify-content
:
space-between
}
.avarage
{
justify-content
:
space-around
}
.rowCenter
{
justify-content
:
center
}
.verCenter
{
align-items
:
center
}
.boxFlex
{
-webkit-box-flex
:
1
;
-moz-box-flex
:
1
;
-webkit-flex
:
1
;
-ms-flex
:
1
;
flex
:
1
}
html
,
body
{
width
:
100%
;
height
:
100%
;
-webkit-overflow-scrolling
:
touch
}
body
{
overflow-x
:
hidden
;
background
:
#F1F4FA
}
.f-blue
{
color
:
#1969F9
}
.f-green
{
color
:
#3FBE1B
}
.f-yellow1
{
color
:
#CC8200
}
.f-red1
{
color
:
#FC1F00
}
.el-pagination
{
text-align
:
right
;
margin-top
:
20px
}
.el-message--info
{
min-width
:
auto
!important
;
border
:
0px
!important
;
background
:
rgba
(
0
,
0
,
0
,
0.4
)
!important
;
top
:
100px
!important
}
.el-message--info
.el-icon-info
{
display
:
none
}
.el-message--info
.el-message__content
{
color
:
#fff
!important
}
.pagex
{
padding
:
20px
}
.pagex
.el-input__inner
{
height
:
38px
;
border-radius
:
2px
;
border
:
1px
solid
#BEC9DF
;
font-size
:
14px
}
.pagex
.el-input__inner
:focus
{
border
:
1px
solid
#387FFF
}
.pagex
.el-form-item__label
{
color
:
#666
}
.pagex
.el-range-editor.el-input__inner
{
width
:
257px
}
.pagex
.el-select
.el-input.is-focus
.el-input__inner
,
.pagex
.el-range-editor.is-active
,
.pagex
.el-range-editor.is-active
:hover
{
border-color
:
#387FFF
}
.pagex
.el-select
{
width
:
100px
}
.pagex
.el-form--inline
.el-form-item
{
margin-right
:
30px
}
.pagex
.el-message--info
{
min-width
:
auto
!important
;
border
:
0px
!important
;
background
:
rgba
(
0
,
0
,
0
,
0.4
)
!important
}
.pagex
.el-message--info
.el-icon-info
{
display
:
none
}
.pagex
.el-message--info
.el-message__content
{
color
:
#fff
!important
}
.pagex
.el-table
{
color
:
#646B78
}
.pagex
.el-checkbox__input.is-checked
.el-checkbox__inner
,
.pagex
.el-checkbox__input.is-indeterminate
.el-checkbox__inner
{
background-color
:
#1969F9
;
border-color
:
#1969F9
}
.pagex
.el-table__header
th
{
font-weight
:
normal
}
.pagex
.el-table__header
.el-table__body
tr
.hover-row
>
td
{
background-color
:
#F1F8FF
}
.pagex
.th-all
.el-table__header
th
{
background-color
:
#F1F4FA
}
.pagex
.el-table__fixed
.el-table__header
th
{
background-color
:
#F1F4FA
}
.pagex
.el-table__body-wrapper
::-webkit-scrollbar
{
width
:
18px
}
.pagex
.el-table__body-wrapper
::-webkit-scrollbar-thumb
{
border-radius
:
8px
;
background
:
#fff
;
width
:
18px
;
-webkit-box-shadow
:
inset
0
0
8px
rgba
(
0
,
0
,
0
,
0.2
)}
.pagex
.el-table__body-wrapper
::-webkit-scrollbar-track
{
border-radius
:
0
;
background
:
#D2D9E7
}
.el-tooltip__popper
{
border
:
0px
!important
;
box-shadow
:
0
0
10px
#ccc
}
.el-tooltip__popper
.boxxrth2021
{
width
:
280px
;
background
:
#fff
;
font-size
:
12px
;
color
:
#333
}
.el-tooltip__popper
.boxxrth2021
p
{
height
:
28px
;
line-height
:
28px
}
.el-tooltip__popper
.boxxrth2021
p
span
{
width
:
33.33%
}
.el-tooltip__popper
[
x-placement
=
"top"
]
.popper__arrow
{
border-top-color
:
#fff
!important
}
.el-tooltip__popper
[
x-placement
=
"bottom"
]
.popper__arrow
{
border-bottom-color
:
#fff
!important
}
.el-dialog__body
{
padding
:
20px
!important
}
.el-dialog__title
{
font-size
:
14px
;
color
:
#333
;
font-weight
:
bold
;
position
:
relative
}
.el-dialog__title
::after
{
content
:
""
;
position
:
absolute
;
width
:
5px
;
height
:
22px
;
background
:
#1969F9
;
left
:
-20px
;
top
:
2px
}
.el-icon-close
{
font-size
:
24px
}
.el-icon-close
:hover
,
.el-icon-close
:focus
{
color
:
#1969F9
!important
}
.el-message-box__container
{
text-align
:
center
;
padding
:
15px
0px
}
.el-message-box__message
{
display
:
inline-block
}
.el-message-box__message
p
{
color
:
#333
;
font-size
:
16px
}
.el-message-box__status.el-icon-error
{
color
:
#FC1F00
!important
;
font-size
:
25px
!important
}
.el-message-box__close
:before
{
content
:
"\E609"
}
.el-message-box__btns
.el-button
,
.dialog-footer
.el-button
{
width
:
76px
;
height
:
34px
;
text-align
:
center
;
line-height
:
34px
;
background
:
#E8ECF4
;
border
:
1px
solid
#E8ECF4
;
border-radius
:
2px
;
color
:
#8391AD
;
font-size
:
14px
;
padding
:
0px
}
.el-message-box__btns
.el-button
:hover
,
.dialog-footer
.el-button
:hover
,
.el-message-box__btns
.el-button
:focus
,
.dialog-footer
.el-button
:focus
{
color
:
#8391AD
;
background
:
#E8ECF4
;
border
:
1px
solid
#E8ECF4
}
.el-message-box__btns
.el-button.el-button--primary
,
.dialog-footer
.el-button.el-button--primary
{
border
:
1px
solid
#1969F9
;
color
:
#fff
;
background
:
#1969F9
}
.el-message-box__btns
.el-button.el-button--primary
:hover
,
.dialog-footer
.el-button.el-button--primary
:hover
,
.el-message-box__btns
.el-button.el-button--primary
:focus
,
.dialog-footer
.el-button.el-button--primary
:focus
{
color
:
#fff
;
background
:
#1969F9
;
border
:
1px
solid
#1969F9
}
\ No newline at end of file
html
{
-webkit-text-size-adjust
:
100%
;
-ms-text-size-adjust
:
100%
}
html
*
{
outline
:
0
;
-webkit-text-size-adjust
:
none
!important
;
-webkit-tap-highlight-color
:
rgba
(
0
,
0
,
0
,
0
)
!important
}
html
,
body
{
font-family
:
PingFangSC-Regular
,
PingFang
SC
,
'Microsoft Yahei'
,
sans-serif
;
font-style
:
normal
;
-webkit-font-smoothing
:
antialiased
;
-moz-osx-font-smoothing
:
grayscale
;
font-size
:
14px
;
color
:
#646B78
}
body
,
div
,
dl
,
dt
,
dd
,
ul
,
ol
,
li
,
h1
,
h2
,
h3
,
h4
,
h5
,
h6
,
pre
,
code
,
form
,
fieldset
,
legend
,
input
,
textarea
,
p
,
blockquote
,
th
,
td
,
hr
,
button
,
article
,
aside
,
details
,
figcaption
,
figure
,
footer
,
header
,
menu
,
nav
,
section
{
margin
:
0
;
padding
:
0
}
button
,
input
,
select
,
textarea
{
font-size
:
100%
;
border
:
none
;
-webkit-appearance
:
none
}
input
[
type
=
button
],
input
[
type
=
file
],
input
[
type
=
submit
]
{
cursor
:
pointer
}
table
{
border-collapse
:
collapse
;
border-spacing
:
0
}
ol
,
ul
,
dl
{
list-style
:
none
}
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
font-size
:
100%
;
font-weight
:
500
}
em
,
b
,
i
{
font-style
:
normal
}
a
{
text-decoration
:
none
}
img
{
border
:
none
}
.clr
{
*
zoom
:
1
;
clear
:
both
}
.clr
:after
{
content
:
"."
;
clear
:
both
;
height
:
0
;
visibility
:
hidden
;
display
:
block
}
.fl
{
float
:
left
;
_display
:
inline
}
.fr
{
float
:
right
;
_display
:
inline
}
.va-t
{
vertical-align
:
top
}
.va-m
{
vertical-align
:
middle
}
.va-b
{
vertical-align
:
bottom
}
.lineBlock
{
display
:
inline-block
;
*
display
:
inline
;
zoom
:
1
;
letter-spacing
:
normal
;
word-spacing
:
normal
}
.lbBox
{
font-size
:
0
!important
;
*
word-spacing
:
-1px
!important
}
.emptys
{
margin-left
:
-1px
;
width
:
1px
;
height
:
100%
;
font-size
:
0
;
vertical-align
:
middle
}
.boxsiz
{
-webkit-box-sizing
:
border-box
;
box-sizing
:
border-box
}
.column
{
display
:
flex
;
flex-direction
:
column
}
.row
{
display
:
flex
;
flex-direction
:
row
}
.bothSide
{
justify-content
:
space-between
}
.avarage
{
justify-content
:
space-around
}
.rowCenter
{
justify-content
:
center
}
.verCenter
{
align-items
:
center
}
.boxFlex
{
-webkit-box-flex
:
1
;
-moz-box-flex
:
1
;
-webkit-flex
:
1
;
-ms-flex
:
1
;
flex
:
1
}
html
,
body
{
width
:
100%
;
height
:
100%
;
-webkit-overflow-scrolling
:
touch
}
body
{
overflow-x
:
hidden
;
background
:
#F1F4FA
}
.f-blue
{
color
:
#1969F9
}
.f-green
{
color
:
#3FBE1B
}
.f-yellow1
{
color
:
#CC8200
}
.f-red1
{
color
:
#FC1F00
}
.el-pagination
{
text-align
:
right
;
margin-top
:
20px
}
.el-message--info
{
min-width
:
auto
!important
;
border
:
0px
!important
;
background
:
rgba
(
0
,
0
,
0
,
0.4
)
!important
;
top
:
100px
!important
}
.el-message--info
.el-icon-info
{
display
:
none
}
.el-message--info
.el-message__content
{
color
:
#fff
!important
}
.pagex
{
padding
:
20px
}
.pagex
.el-input__inner
{
height
:
38px
;
border-radius
:
2px
;
border
:
1px
solid
#BEC9DF
;
font-size
:
14px
}
.pagex
.el-input__inner
:focus
{
border
:
1px
solid
#387FFF
}
.pagex
.el-form-item__label
{
color
:
#666
}
.pagex
.el-range-editor.el-input__inner
{
width
:
257px
}
.pagex
.el-select
.el-input.is-focus
.el-input__inner
,
.pagex
.el-range-editor.is-active
,
.pagex
.el-range-editor.is-active
:hover
{
border-color
:
#387FFF
}
.pagex
.el-select
{
width
:
100px
}
.pagex
.el-form--inline
.el-form-item
{
margin-right
:
30px
}
.pagex
.el-message--info
{
min-width
:
auto
!important
;
border
:
0px
!important
;
background
:
rgba
(
0
,
0
,
0
,
0.4
)
!important
}
.pagex
.el-message--info
.el-icon-info
{
display
:
none
}
.pagex
.el-message--info
.el-message__content
{
color
:
#fff
!important
}
.pagex
.el-table
{
color
:
#646B78
}
.pagex
.el-checkbox__input.is-checked
.el-checkbox__inner
,
.pagex
.el-checkbox__input.is-indeterminate
.el-checkbox__inner
{
background-color
:
#1969F9
;
border-color
:
#1969F9
}
.pagex
.el-table__header
th
{
font-weight
:
normal
}
.pagex
.el-table__header
.el-table__body
tr
.hover-row
>
td
{
background-color
:
#F1F8FF
}
.pagex
.th-all
.el-table__header
th
{
background-color
:
#F1F4FA
}
.pagex
.el-table__fixed
.el-table__header
th
{
background-color
:
#F1F4FA
}
.pagex
.el-table__body-wrapper
::-webkit-scrollbar
{
width
:
18px
}
.pagex
.el-table__body-wrapper
::-webkit-scrollbar-thumb
{
border-radius
:
8px
;
background
:
#fff
;
width
:
18px
;
-webkit-box-shadow
:
inset
0
0
8px
rgba
(
0
,
0
,
0
,
0.2
)}
.pagex
.el-table__body-wrapper
::-webkit-scrollbar-track
{
border-radius
:
0
;
background
:
#D2D9E7
}
.el-tooltip__popper
{
border
:
0px
!important
;
box-shadow
:
0
0
10px
#ccc
}
.el-tooltip__popper
.boxxrth2021
{
width
:
150px
;
background
:
#fff
;
font-size
:
12px
;
color
:
#333
}
.el-tooltip__popper
.boxxrth2021
p
{
height
:
28px
;
line-height
:
28px
}
.el-tooltip__popper
.boxxrth2021
p
span
{
width
:
50%
}
.el-tooltip__popper
[
x-placement
=
"top"
]
.popper__arrow
{
border-top-color
:
#fff
!important
}
.el-tooltip__popper
[
x-placement
=
"bottom"
]
.popper__arrow
{
border-bottom-color
:
#fff
!important
}
.el-dialog__body
{
padding
:
20px
!important
}
.el-dialog__title
{
font-size
:
14px
;
color
:
#333
;
font-weight
:
bold
;
position
:
relative
}
.el-dialog__title
::after
{
content
:
""
;
position
:
absolute
;
width
:
5px
;
height
:
22px
;
background
:
#1969F9
;
left
:
-20px
;
top
:
2px
}
.el-icon-close
{
font-size
:
24px
}
.el-icon-close
:hover
,
.el-icon-close
:focus
{
color
:
#1969F9
!important
}
.el-message-box__container
{
text-align
:
center
;
padding
:
15px
0px
}
.el-message-box__message
{
display
:
inline-block
}
.el-message-box__message
p
{
color
:
#333
;
font-size
:
16px
}
.el-message-box__status.el-icon-error
{
color
:
#FC1F00
!important
;
font-size
:
25px
!important
}
.el-message-box__close
:before
{
content
:
"\E609"
}
.el-message-box__btns
.el-button
,
.dialog-footer
.el-button
{
width
:
76px
;
height
:
34px
;
text-align
:
center
;
line-height
:
34px
;
background
:
#E8ECF4
;
border
:
1px
solid
#E8ECF4
;
border-radius
:
2px
;
color
:
#8391AD
;
font-size
:
14px
;
padding
:
0px
}
.el-message-box__btns
.el-button
:hover
,
.dialog-footer
.el-button
:hover
,
.el-message-box__btns
.el-button
:focus
,
.dialog-footer
.el-button
:focus
{
color
:
#8391AD
;
background
:
#E8ECF4
;
border
:
1px
solid
#E8ECF4
}
.el-message-box__btns
.el-button.el-button--primary
,
.dialog-footer
.el-button.el-button--primary
{
border
:
1px
solid
#1969F9
;
color
:
#fff
;
background
:
#1969F9
}
.el-message-box__btns
.el-button.el-button--primary
:hover
,
.dialog-footer
.el-button.el-button--primary
:hover
,
.el-message-box__btns
.el-button.el-button--primary
:focus
,
.dialog-footer
.el-button.el-button--primary
:focus
{
color
:
#fff
;
background
:
#1969F9
;
border
:
1px
solid
#1969F9
}
\ No newline at end of file
src/views/Store/list.vue
View file @
47f349da
...
...
@@ -63,23 +63,18 @@
</el-table-column>
<el-table-column
prop=
"stock"
label=
"库存数量"
width=
"150"
>
</el-table-column>
<el-table-column
prop=
"cn_
delivery_tim
e"
label=
"国内含税价(¥)"
width=
"140"
>
<el-table-column
prop=
"cn_
ladder_pric
e"
label=
"国内含税价(¥)"
width=
"140"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
v-if=
"scope.row.cn_ladder_price&&scope.row.cn_ladder_price.length>0"
>
<div
class=
"price-more"
>
<el-tooltip
placement=
"bottom"
effect=
"light"
>
<div
slot=
"content"
>
<div
class=
"boxxrth2021"
>
<p
class=
"clr"
>
<span
class=
"fl"
>
1+
</span>
<span
class=
"fl"
>
¥
5465555555
</span>
<span
class=
"fl"
>
$5465
</span>
</p>
<p
class=
"clr"
>
<span
class=
"fl"
>
1十大打算+
</span>
<span
class=
"fl"
>
¥
5465
</span>
<span
class=
"fl"
>
$5465
</span>
<p
class=
"clr"
v-for=
"item in scope.row.cn_ladder_price"
>
<span
class=
"fl"
>
{{
item
.
purchases
}}
+
</span>
<span
class=
"fl"
>
¥
{{
item
.
price
}}
</span>
</p>
</div>
</div>
<div
class=
"more-search-btn"
>
查看更多
</div>
...
...
@@ -91,6 +86,25 @@
</
template
>
</el-table-column>
<el-table-column
prop=
"hk_delivery_time"
label=
"香港交货价($)"
width=
"150"
>
<
template
slot-scope=
"scope"
v-if=
"scope.row.hk_delivery_time&&scope.row.hk_delivery_time.length>0"
>
<div
class=
"price-more"
>
<el-tooltip
placement=
"bottom"
effect=
"light"
>
<div
slot=
"content"
>
<div
class=
"boxxrth2021"
>
<p
class=
"clr"
v-for=
"item in scope.row.hk_delivery_time"
>
<span
class=
"fl"
>
{{
item
.
purchases
}}
+
</span>
<span
class=
"fl"
>
¥
{{
item
.
price
}}
</span>
</p>
</div>
</div>
<div
class=
"more-search-btn"
>
查看更多
</div>
</el-tooltip>
</div>
</
template
>
</el-table-column>
<el-table-column
prop=
"cn_delivery_time"
label=
"大陆交期"
width=
"150"
>
</el-table-column>
...
...
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