diff --git a/src/components/base/margin/index.vue b/src/components/base/margin/index.vue new file mode 100644 index 00000000..ce6f8c59 --- /dev/null +++ b/src/components/base/margin/index.vue @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/common/common-styles/index.vue b/src/components/common/common-styles/index.vue index 053c1421..3fe0bbfe 100644 --- a/src/components/common/common-styles/index.vue +++ b/src/components/common/common-styles/index.vue @@ -29,23 +29,7 @@ - - - - - - - - - - - - - - - - - + @@ -128,39 +112,16 @@ const background_img_url_change = (arry: uploadList[]) => { form.background_img_url = arry; emit('update:value', form); }; - -const margin_event = (val: number | undefined) => { - form.margin_top = Number(val); - form.margin_bottom = Number(val); - form.margin_left = Number(val); - form.margin_right = Number(val); - emit('update:value', form); -}; -const mt_event = (val: number | undefined) => { - form.margin_top = Number(val); - form.margin = 0; - emit('update:value', form); -}; -const mb_event = (val: number | undefined) => { - form.margin_bottom = Number(val); - form.margin = 0; - emit('update:value', form); -}; -const ml_event = (val: number | undefined) => { - form.margin_left = Number(val); - form.margin = 0; - emit('update:value', form); -}; -const mr_event = (val: number | undefined) => { - form.margin_right = Number(val); - form.margin = 0; - emit('update:value', form); -}; const radius_change = (radius: any) => { form = Object.assign(form, pick(radius, ['radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right'])); emit('update:value', form); }; +const margin_change = (margin: any) => { + form = Object.assign(form, pick(margin, ['margin', 'margin_top', 'margin_bottom', 'margin_left', 'margin_right'])); + emit('update:value', form); +}; + const padding_change = (padding: any) => { form = Object.assign(form, pick(padding, ['padding', 'padding_top', 'padding_bottom', 'padding_left', 'padding_right'])); emit('update:value', form); diff --git a/src/components/model-article-list/index.vue b/src/components/model-article-list/index.vue index 26b17f4d..5e209c1f 100644 --- a/src/components/model-article-list/index.vue +++ b/src/components/model-article-list/index.vue @@ -1,33 +1,30 @@ - + - - - - - 华为荣耀畅想平板换屏服务,屏幕换外屏幕主板维修华为荣耀畅想平板换屏服务,屏幕换外屏幕主板维修华为荣耀畅想平板换屏服务,屏幕换外屏幕主板维修华为荣耀畅想平板换屏服务,屏幕换外屏幕主板维修华为荣耀畅想平板换屏服务,屏幕换外屏幕主板维修 - - {{ is_show.includes('0') ? '2020-06-05 15:20' : '' }} - 16 + + + + + + + + + + + {{ item.new_title }} + + {{ is_show.includes('0') ? '2020-06-05 15:20' : '' }} + 16 + - - - - - 华为荣耀畅想平板换屏服务,屏幕换外屏幕主板维修华为荣耀畅想平板换屏服务,屏幕换外屏幕主板维修华为荣耀畅想平板换屏服务,屏幕换外屏幕主板维修华为荣耀畅想平板换屏服务,屏幕换外屏幕主板维修华为荣耀畅想平板换屏服务,屏幕换外屏幕主板维修华为荣耀畅想平板换屏服务,屏幕换外屏幕主板维修 - - {{ is_show.includes('0') ? '2020-06-05 15:20' : '' }} - 16 - - - + diff --git a/src/components/model-article-list/model-article-list-content.vue b/src/components/model-article-list/model-article-list-content.vue index 6cbb3ce3..43ad187b 100644 --- a/src/components/model-article-list/model-article-list-content.vue +++ b/src/components/model-article-list/model-article-list-content.vue @@ -13,13 +13,13 @@ 文章设置 - + {{ item.name }} - + @@ -29,7 +29,7 @@ - {{ row.link.title }} + {{ row.new_title }} +添加 @@ -37,21 +37,21 @@ - + - + - {{ item.name }} + {{ item.name }} - {{ item.name }} + {{ item.name }} @@ -74,6 +74,7 @@