fix: eslint

liutao_branch
xingyu 3 years ago
parent 3f36b57363
commit 8e78975521

@ -222,7 +222,9 @@ $prefix-cls: #{$namespace}-cropper-am;
transparent 75%, transparent 75%,
rgb(0 0 0 / 25%) 0 rgb(0 0 0 / 25%) 0
); );
background-position: 0 0, 12px 12px; background-position:
0 0,
12px 12px;
background-size: 24px 24px; background-size: 24px 24px;
} }

@ -114,7 +114,9 @@ $prefix-cls: #{$namespace}-input-password;
height: inherit; height: inherit;
background-color: transparent; background-color: transparent;
border-radius: inherit; 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'] { &[data-score='0'] {
width: 20%; width: 20%;

@ -35,9 +35,12 @@ onMounted(() => {
// //
getUnreadCount() getUnreadCount()
// //
setInterval(() => { setInterval(
getUnreadCount() () => {
}, 1000 * 60 * 2) getUnreadCount()
},
1000 * 60 * 2
)
}) })
</script> </script>
<template> <template>

@ -410,7 +410,7 @@ watch(
{ {
icon: 'ep:close', icon: 'ep:close',
label: t('common.closeTab'), label: t('common.closeTab'),
disabled: !!visitedViews?.length && selectedTag?.meta.affix, disabled: !!visitedViews?.length && selectedTag?.meta.affix,
command: () => { command: () => {
closeSelectedTag(selectedTag!) closeSelectedTag(selectedTag!)
} }

@ -23,7 +23,9 @@
} }
& .peg { & .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 { & .spinner-icon {

@ -443,14 +443,15 @@ const generateTableData = (propertyList: any[]) => {
*/ */
const validateData = (propertyList: any[]) => { const validateData = (propertyList: any[]) => {
const skuPropertyIds: number[] = [] const skuPropertyIds: number[] = []
formData.value!.skus!.forEach((sku) => formData.value!.skus!.forEach(
sku.properties (sku) =>
?.map((property) => property.propertyId) sku.properties
?.forEach((propertyId) => { ?.map((property) => property.propertyId)
if (skuPropertyIds.indexOf(propertyId!) === -1) { ?.forEach((propertyId) => {
skuPropertyIds.push(propertyId!) if (skuPropertyIds.indexOf(propertyId!) === -1) {
} skuPropertyIds.push(propertyId!)
}) }
})
) )
const propertyIds = propertyList.map((item) => item.id) const propertyIds = propertyList.map((item) => item.id)
return skuPropertyIds.length === propertyIds.length return skuPropertyIds.length === propertyIds.length

@ -134,11 +134,7 @@ const open = async (type: string, id?: number) => {
const data = (await CombinationActivityApi.getCombinationActivity( const data = (await CombinationActivityApi.getCombinationActivity(
id id
)) as CombinationActivityApi.CombinationActivityVO )) as CombinationActivityApi.CombinationActivityVO
await getSpuDetails( await getSpuDetails(data.spuId!, data.products?.map((sku) => sku.skuId), data.products)
data.spuId!,
data.products?.map((sku) => sku.skuId),
data.products
)
formRef.value.setValues(data) formRef.value.setValues(data)
} finally { } finally {
formLoading.value = false formLoading.value = false

@ -144,11 +144,7 @@ const open = async (type: string, id?: number) => {
const data = (await SeckillActivityApi.getSeckillActivity( const data = (await SeckillActivityApi.getSeckillActivity(
id id
)) as SeckillActivityApi.SeckillActivityVO )) as SeckillActivityApi.SeckillActivityVO
await getSpuDetails( await getSpuDetails(data.spuId!, data.products?.map((sku) => sku.skuId), data.products)
data.spuId!,
data.products?.map((sku) => sku.skuId),
data.products
)
formRef.value.setValues(data) formRef.value.setValues(data)
} finally { } finally {
formLoading.value = false formLoading.value = false

@ -12,7 +12,7 @@
<el-select class="!w-280px" v-model="queryParams.status" clearable placeholder="全部"> <el-select class="!w-280px" v-model="queryParams.status" clearable placeholder="全部">
<el-option <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.TRADE_ORDER_STATUS)" v-for="dict in getStrDictOptions(DICT_TYPE.TRADE_ORDER_STATUS)"
:key="(dict.value as string)" :key="dict.value as string"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
@ -27,7 +27,7 @@
> >
<el-option <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.PAY_CHANNEL_CODE_TYPE)" v-for="dict in getStrDictOptions(DICT_TYPE.PAY_CHANNEL_CODE_TYPE)"
:key="(dict.value as string)" :key="dict.value as string"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
@ -48,7 +48,7 @@
<el-select class="!w-280px" v-model="queryParams.terminal" clearable placeholder="全部"> <el-select class="!w-280px" v-model="queryParams.terminal" clearable placeholder="全部">
<el-option <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.TERMINAL)" v-for="dict in getStrDictOptions(DICT_TYPE.TERMINAL)"
:key="(dict.value as string)" :key="dict.value as string"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
@ -58,7 +58,7 @@
<el-select class="!w-280px" v-model="queryParams.type" clearable placeholder="全部"> <el-select class="!w-280px" v-model="queryParams.type" clearable placeholder="全部">
<el-option <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.TRADE_ORDER_TYPE)" v-for="dict in getStrDictOptions(DICT_TYPE.TRADE_ORDER_TYPE)"
:key="(dict.value as string)" :key="dict.value as string"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />

@ -90,8 +90,19 @@
padding: 15px; padding: 15px;
overflow: hidden; overflow: hidden;
background: #fff; background: #fff;
font-family: Segoe UI, Lucida Grande, Helvetica, Arial, Microsoft YaHei, FreeSans, Arimo, font-family:
Droid Sans, wenquanyi micro hei, Hiragino Sans GB, Hiragino Sans GB W3, FontAwesome, 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; sans-serif;
color: #333; color: #333;
font-size: 14px; font-size: 14px;
@ -99,7 +110,16 @@
blockquote { blockquote {
margin: 0; 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; padding: 1px 0 1px 15px;
border-left: 4px solid #ddd; border-left: 4px solid #ddd;
} }

Loading…
Cancel
Save