Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8e789755
authored
Jul 29, 2023
by
xingyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: eslint
parent
3f36b573
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
54 additions
and
32 deletions
+54
-32
src/components/Cropper/src/CopperModal.vue
+3
-1
src/components/InputPassword/src/InputPassword.vue
+3
-1
src/layout/components/Message/src/Message.vue
+6
-3
src/layout/components/TagsView/src/TagsView.vue
+1
-1
src/styles/index.scss
+3
-1
src/views/mall/product/spu/components/SkuList.vue
+9
-8
src/views/mall/promotion/combination/activity/CombinationActivityForm.vue
+1
-5
src/views/mall/promotion/seckill/activity/SeckillActivityForm.vue
+1
-5
src/views/mall/trade/order/index.vue
+4
-4
src/views/mp/components/wx-msg/comment.scss
+23
-3
No files found.
src/components/Cropper/src/CopperModal.vue
View file @
8e789755
...
...
@@ -222,7 +222,9 @@ $prefix-cls: #{$namespace}-cropper-am;
transparent
75%
,
rgb
(
0
0
0
/
25%
)
0
);
background-position
:
0
0
,
12px
12px
;
background-position
:
0
0
,
12px
12px
;
background-size
:
24px
24px
;
}
...
...
src/components/InputPassword/src/InputPassword.vue
View file @
8e789755
...
...
@@ -114,7 +114,9 @@ $prefix-cls: #{$namespace}-input-password;
height
:
inherit
;
background-color
:
transparent
;
border-radius
:
inherit
;
transition
:
width
0.5s
ease-in-out
,
background
0.25s
;
transition
:
width
0.5s
ease-in-out
,
background
0.25s
;
&[data-score='0']
{
width
:
20%
;
...
...
src/layout/components/Message/src/Message.vue
View file @
8e789755
...
...
@@ -35,9 +35,12 @@ onMounted(() => {
// 首次加载小红点
getUnreadCount
()
// 轮询刷新小红点
setInterval
(()
=>
{
getUnreadCount
()
},
1000
*
60
*
2
)
setInterval
(
()
=>
{
getUnreadCount
()
},
1000
*
60
*
2
)
})
</
script
>
<
template
>
...
...
src/layout/components/TagsView/src/TagsView.vue
View file @
8e789755
...
...
@@ -410,7 +410,7 @@ watch(
{
icon: 'ep:close',
label: t('common.closeTab'),
disabled: !!visitedViews?.length
&&
selectedTag?.meta.affix,
disabled: !!visitedViews?.length
&&
selectedTag?.meta.affix,
command: () => {
closeSelectedTag(selectedTag!)
}
...
...
src/styles/index.scss
View file @
8e789755
...
...
@@ -23,7 +23,9 @@
}
&
.peg
{
box-shadow
:
0
0
10px
var
(
--
el-color-primary
)
,
0
0
5px
var
(
--
el-color-primary
)
!
important
;
box-shadow
:
0
0
10px
var
(
--
el-color-primary
)
,
0
0
5px
var
(
--
el-color-primary
)
!
important
;
}
&
.spinner-icon
{
...
...
src/views/mall/product/spu/components/SkuList.vue
View file @
8e789755
...
...
@@ -443,14 +443,15 @@ const generateTableData = (propertyList: any[]) => {
*/
const
validateData
=
(
propertyList
:
any
[])
=>
{
const
skuPropertyIds
:
number
[]
=
[]
formData
.
value
!
.
skus
!
.
forEach
((
sku
)
=>
sku
.
properties
?.
map
((
property
)
=>
property
.
propertyId
)
?.
forEach
((
propertyId
)
=>
{
if
(
skuPropertyIds
.
indexOf
(
propertyId
!
)
===
-
1
)
{
skuPropertyIds
.
push
(
propertyId
!
)
}
})
formData
.
value
!
.
skus
!
.
forEach
(
(
sku
)
=>
sku
.
properties
?.
map
((
property
)
=>
property
.
propertyId
)
?.
forEach
((
propertyId
)
=>
{
if
(
skuPropertyIds
.
indexOf
(
propertyId
!
)
===
-
1
)
{
skuPropertyIds
.
push
(
propertyId
!
)
}
})
)
const
propertyIds
=
propertyList
.
map
((
item
)
=>
item
.
id
)
return
skuPropertyIds
.
length
===
propertyIds
.
length
...
...
src/views/mall/promotion/combination/activity/CombinationActivityForm.vue
View file @
8e789755
...
...
@@ -134,11 +134,7 @@ const open = async (type: string, id?: number) => {
const
data
=
(
await
CombinationActivityApi
.
getCombinationActivity
(
id
))
as
CombinationActivityApi
.
CombinationActivityVO
await
getSpuDetails
(
data
.
spuId
!
,
data
.
products
?.
map
((
sku
)
=>
sku
.
skuId
),
data
.
products
)
await
getSpuDetails
(
data
.
spuId
!
,
data
.
products
?.
map
((
sku
)
=>
sku
.
skuId
),
data
.
products
)
formRef
.
value
.
setValues
(
data
)
}
finally
{
formLoading
.
value
=
false
...
...
src/views/mall/promotion/seckill/activity/SeckillActivityForm.vue
View file @
8e789755
...
...
@@ -144,11 +144,7 @@ const open = async (type: string, id?: number) => {
const
data
=
(
await
SeckillActivityApi
.
getSeckillActivity
(
id
))
as
SeckillActivityApi
.
SeckillActivityVO
await
getSpuDetails
(
data
.
spuId
!
,
data
.
products
?.
map
((
sku
)
=>
sku
.
skuId
),
data
.
products
)
await
getSpuDetails
(
data
.
spuId
!
,
data
.
products
?.
map
((
sku
)
=>
sku
.
skuId
),
data
.
products
)
formRef
.
value
.
setValues
(
data
)
}
finally
{
formLoading
.
value
=
false
...
...
src/views/mall/trade/order/index.vue
View file @
8e789755
...
...
@@ -12,7 +12,7 @@
<el-select
class=
"!w-280px"
v-model=
"queryParams.status"
clearable
placeholder=
"全部"
>
<el-option
v-for=
"dict in getStrDictOptions(DICT_TYPE.TRADE_ORDER_STATUS)"
:key=
"
(dict.value as string)
"
:key=
"
dict.value as string
"
:label=
"dict.label"
:value=
"dict.value"
/>
...
...
@@ -27,7 +27,7 @@
>
<el-option
v-for=
"dict in getStrDictOptions(DICT_TYPE.PAY_CHANNEL_CODE_TYPE)"
:key=
"
(dict.value as string)
"
:key=
"
dict.value as string
"
:label=
"dict.label"
:value=
"dict.value"
/>
...
...
@@ -48,7 +48,7 @@
<el-select
class=
"!w-280px"
v-model=
"queryParams.terminal"
clearable
placeholder=
"全部"
>
<el-option
v-for=
"dict in getStrDictOptions(DICT_TYPE.TERMINAL)"
:key=
"
(dict.value as string)
"
:key=
"
dict.value as string
"
:label=
"dict.label"
:value=
"dict.value"
/>
...
...
@@ -58,7 +58,7 @@
<el-select
class=
"!w-280px"
v-model=
"queryParams.type"
clearable
placeholder=
"全部"
>
<el-option
v-for=
"dict in getStrDictOptions(DICT_TYPE.TRADE_ORDER_TYPE)"
:key=
"
(dict.value as string)
"
:key=
"
dict.value as string
"
:label=
"dict.label"
:value=
"dict.value"
/>
...
...
src/views/mp/components/wx-msg/comment.scss
View file @
8e789755
...
...
@@ -90,8 +90,19 @@
padding
:
15px
;
overflow
:
hidden
;
background
:
#fff
;
font-family
:
Segoe
UI
,
Lucida
Grande
,
Helvetica
,
Arial
,
Microsoft
YaHei
,
FreeSans
,
Arimo
,
Droid
Sans
,
wenquanyi
micro
hei
,
Hiragino
Sans
GB
,
Hiragino
Sans
GB
W3
,
FontAwesome
,
font-family
:
Segoe
UI
,
Lucida
Grande
,
Helvetica
,
Arial
,
Microsoft
YaHei
,
FreeSans
,
Arimo
,
Droid
Sans
,
wenquanyi
micro
hei
,
Hiragino
Sans
GB
,
Hiragino
Sans
GB
W3
,
FontAwesome
,
sans-serif
;
color
:
#333
;
font-size
:
14px
;
...
...
@@ -99,7 +110,16 @@
blockquote
{
margin
:
0
;
font-family
:
Georgia
,
Times
New
Roman
,
Times
,
Kai
,
Kaiti
SC
,
KaiTi
,
BiauKai
,
FontAwesome
,
serif
;
font-family
:
Georgia
,
Times
New
Roman
,
Times
,
Kai
,
Kaiti
SC
,
KaiTi
,
BiauKai
,
FontAwesome
,
serif
;
padding
:
1px
0
1px
15px
;
border-left
:
4px
solid
#ddd
;
}
...
...
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