diff --git a/src/components/common/upload/index.vue b/src/components/common/upload/index.vue index 1a322fd1..1dcb345a 100644 --- a/src/components/common/upload/index.vue +++ b/src/components/common/upload/index.vue @@ -297,9 +297,7 @@ watch( get_tree(); // 获取附件列表 get_attachment_list(); - - icon_value.value = ''; - temp_icon_value.value = ''; + icon_index.value = -1; } } diff --git a/src/components/footer-nav/index.vue b/src/components/footer-nav/index.vue index e8a041dc..c42d5903 100644 --- a/src/components/footer-nav/index.vue +++ b/src/components/footer-nav/index.vue @@ -5,9 +5,9 @@
  • - +
    - {{ item.name }} + {{ item.name }}
    • diff --git a/src/components/model-article-list/index.vue b/src/components/model-article-list/index.vue index 7b07e080..a272395d 100644 --- a/src/components/model-article-list/index.vue +++ b/src/components/model-article-list/index.vue @@ -14,7 +14,12 @@
    {{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}
    {{ field_show.includes('0') ? (!is_obj_empty(item.data) ? item.data.add_time : '2020-06-05 15:20') : '' }}
    - {{ item.data.access_count ? item.data.access_count : '16' }} +
    + +
    + {{ item.data.access_count ? item.data.access_count : '16' }} +
    +
    @@ -89,7 +94,6 @@ const default_data_list: ArticleList = { watch( props.value, (newVal, oldValue) => { - console.log(newVal); const new_content = newVal?.content; const new_style = newVal?.style; // 内容 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 1ec5f00a..4e5355cf 100644 --- a/src/components/model-article-list/model-article-list-content.vue +++ b/src/components/model-article-list/model-article-list-content.vue @@ -70,8 +70,26 @@ const props = defineProps({ type: Object, default: () => ({}), }, + styles: { + type: Object, + default: () => ({}), + }, + defaultConfig: { + type: Object, + default: () => ({ + // 图片不同风格下的圆角 + img_radius_0: 4, + img_radius_1: 0, + }), + }, }); -const form = reactive(props.value); +// 默认值 +const state = reactive({ + form: props.value, + data: props.styles, +}); +// 如果需要解构，确保使用toRefs +const { form, data } = toRefs(state); const base_list = reactive({ theme_list: [ { name: '单列展示', value: '0' }, @@ -121,17 +139,34 @@ const init = () => { }; const theme_change = (val: any) => { if (val == '3' || val == '4') { - form.field_show = ['1']; + form.value.field_show = ['1']; } else { - form.field_show = ['0', '1']; + form.value.field_show = ['0', '1']; + } + if (val == '0') { + if (data.value.img_radius.radius == props.defaultConfig.img_radius_0 || (data.value.img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && data.value.img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && data.value.img_radius.radius_top_left == props.defaultConfig.img_radius_1 && data.value.img_radius.radius_top_right == props.defaultConfig.img_radius_1)) { + data.value.img_radius.radius = props.defaultConfig.img_radius_0; + data.value.img_radius.radius_bottom_left = props.defaultConfig.img_radius_0; + data.value.img_radius.radius_bottom_right = props.defaultConfig.img_radius_0; + data.value.img_radius.radius_top_left = props.defaultConfig.img_radius_0; + data.value.img_radius.radius_top_right = props.defaultConfig.img_radius_0; + } + } else { + if (data.value.img_radius.radius == props.defaultConfig.img_radius_0 || (data.value.img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && data.value.img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && data.value.img_radius.radius_top_left == props.defaultConfig.img_radius_1 && data.value.img_radius.radius_top_right == props.defaultConfig.img_radius_1)) { + data.value.img_radius.radius = props.defaultConfig.img_radius_1; + data.value.img_radius.radius_bottom_left = props.defaultConfig.img_radius_1; + data.value.img_radius.radius_bottom_right = props.defaultConfig.img_radius_1; + data.value.img_radius.radius_top_left = props.defaultConfig.img_radius_1; + data.value.img_radius.radius_top_right = props.defaultConfig.img_radius_1; + } } }; const data_list_remove = (index: number) => { - form.data_list.splice(index, 1); + form.value.data_list.splice(index, 1); }; const data_list_sort = (item: any) => { - form.data_list = item; + form.value.data_list = item; }; const add = () => { url_value_dialog_visible.value = true; @@ -140,7 +175,7 @@ const add = () => { const url_value_dialog_visible = ref(false); const url_value_dialog_call_back = (item: any[]) => { item.forEach((child: any) => { - form.data_list.push({ + form.value.data_list.push({ id: get_math(), new_title: '', new_cover: [], diff --git a/src/components/model-article-list/model-article-list-setting.vue b/src/components/model-article-list/model-article-list-setting.vue index 89fa7f1b..31d02562 100644 --- a/src/components/model-article-list/model-article-list-setting.vue +++ b/src/components/model-article-list/model-article-list-setting.vue @@ -1,10 +1,10 @@ @@ -19,4 +19,9 @@ const props = defineProps({ default: () => ({}), }, }); +const data_config = reactive({ + // 图片不同风格下的圆角 + img_radius_0: 4, + img_radius_1: 0, +}); diff --git a/src/components/model-article-list/model-article-list-styles.vue b/src/components/model-article-list/model-article-list-styles.vue index 4b9edab6..8fca22bb 100644 --- a/src/components/model-article-list/model-article-list-styles.vue +++ b/src/components/model-article-list/model-article-list-styles.vue @@ -57,6 +57,14 @@ const props = defineProps({ type: Object, default: () => ({}), }, + defaultConfig: { + type: Object, + default: () => ({ + // 图片不同风格下的圆角 + img_radius_0: 4, + img_radius_1: 0, + }), + }, }); // 默认值 const state = reactive({ @@ -66,11 +74,24 @@ const state = reactive({ // 如果需要解构，确保使用toRefs const { form, data } = toRefs(state); const theme = computed(() => data.value.theme); +if (theme.value == '0') { + if (form.value.img_radius.radius == props.defaultConfig.img_radius_0 || (form.value.img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_top_left == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_top_right == props.defaultConfig.img_radius_1)) { + form.value.img_radius.radius = props.defaultConfig.img_radius_0; + form.value.img_radius.radius_bottom_left = props.defaultConfig.img_radius_0; + form.value.img_radius.radius_bottom_right = props.defaultConfig.img_radius_0; + form.value.img_radius.radius_top_left = props.defaultConfig.img_radius_0; + form.value.img_radius.radius_top_right = props.defaultConfig.img_radius_0; + } +} else { + if (form.value.img_radius.radius == props.defaultConfig.img_radius_0 || (form.value.img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_top_left == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_top_right == props.defaultConfig.img_radius_1)) { + form.value.img_radius.radius = props.defaultConfig.img_radius_1; + form.value.img_radius.radius_bottom_left = props.defaultConfig.img_radius_1; + form.value.img_radius.radius_bottom_right = props.defaultConfig.img_radius_1; + form.value.img_radius.radius_top_left = props.defaultConfig.img_radius_1; + form.value.img_radius.radius_top_right = props.defaultConfig.img_radius_1; + } +} const emit = defineEmits(['update:value']); -const font_weight = reactive([ - { name: '加粗', value: '500' }, - { name: '正常', value: '400' }, -]); const common_style_update = (value: any) => { form.value.common_style = value; }; diff --git a/src/components/model-article-tabs/model-article-tabs-content.vue b/src/components/model-article-tabs/model-article-tabs-content.vue index 43b4343c..19fde939 100644 --- a/src/components/model-article-tabs/model-article-tabs-content.vue +++ b/src/components/model-article-tabs/model-article-tabs-content.vue @@ -96,7 +96,15 @@ const props = defineProps({ tabStyle: { type: Object, default: () => ({}), - } + }, + defaultConfig: { + type: Object, + default: () => ({ + // 图片不同风格下的圆角 + img_radius_0: 4, + img_radius_1: 0, + }), + }, }); const form = reactive(props.value); const base_list = reactive({ @@ -158,6 +166,23 @@ const article_theme_change = (val: any) => { } else { form.field_show = ['0', '1']; } + if (val == '0') { + if (styles.img_radius.radius == props.defaultConfig.img_radius_0 || (styles.img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && styles.img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && styles.img_radius.radius_top_left == props.defaultConfig.img_radius_1 && styles.img_radius.radius_top_right == props.defaultConfig.img_radius_1)) { + styles.img_radius.radius = props.defaultConfig.img_radius_0; + styles.img_radius.radius_bottom_left = props.defaultConfig.img_radius_0; + styles.img_radius.radius_bottom_right = props.defaultConfig.img_radius_0; + styles.img_radius.radius_top_left = props.defaultConfig.img_radius_0; + styles.img_radius.radius_top_right = props.defaultConfig.img_radius_0; + } + } else { + if (styles.img_radius.radius == props.defaultConfig.img_radius_0 || (styles.img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && styles.img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && styles.img_radius.radius_top_left == props.defaultConfig.img_radius_1 && styles.img_radius.radius_top_right == props.defaultConfig.img_radius_1)) { + styles.img_radius.radius = props.defaultConfig.img_radius_1; + styles.img_radius.radius_bottom_left = props.defaultConfig.img_radius_1; + styles.img_radius.radius_bottom_right = props.defaultConfig.img_radius_1; + styles.img_radius.radius_top_left = props.defaultConfig.img_radius_1; + styles.img_radius.radius_top_right = props.defaultConfig.img_radius_1; + } + } }; // 开启关闭链接 @@ -216,7 +241,7 @@ const url_value_dialog_call_back = (item: any[]) => { }; const styles = reactive(props.tabStyle); -const tabs_theme_change = (val: string | number | boolean | undefined):void => { +const tabs_theme_change = (val: string | number | boolean | undefined): void => { styles.tabs_color_checked = tabs_style(styles.tabs_color_checked, val); }; diff --git a/src/components/model-article-tabs/model-article-tabs-setting.vue b/src/components/model-article-tabs/model-article-tabs-setting.vue index 4a3db026..95475382 100644 --- a/src/components/model-article-tabs/model-article-tabs-setting.vue +++ b/src/components/model-article-tabs/model-article-tabs-setting.vue @@ -1,10 +1,10 @@ @@ -19,4 +19,9 @@ const props = defineProps({ default: () => ({}), }, }); +const data_config = reactive({ + // 图片不同风格下的圆角 + img_radius_0: 4, + img_radius_1: 0, +}); diff --git a/src/components/model-article-tabs/model-article-tabs-styles.vue b/src/components/model-article-tabs/model-article-tabs-styles.vue index f4dc5fd9..2ae8a3e4 100644 --- a/src/components/model-article-tabs/model-article-tabs-styles.vue +++ b/src/components/model-article-tabs/model-article-tabs-styles.vue @@ -67,6 +67,14 @@ const props = defineProps({ type: Object, default: () => ({}), }, + defaultConfig: { + type: Object, + default: () => ({ + // 图片不同风格下的圆角 + img_radius_0: 4, + img_radius_1: 0, + }), + }, }); // 默认值 const state = reactive({ @@ -76,6 +84,23 @@ const state = reactive({ // 如果需要解构，确保使用toRefs const { form, data } = toRefs(state); const theme = computed(() => data.value.theme); +if (theme.value == '0') { + if (form.value.img_radius.radius == props.defaultConfig.img_radius_0 || (form.value.img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_top_left == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_top_right == props.defaultConfig.img_radius_1)) { + form.value.img_radius.radius = props.defaultConfig.img_radius_0; + form.value.img_radius.radius_bottom_left = props.defaultConfig.img_radius_0; + form.value.img_radius.radius_bottom_right = props.defaultConfig.img_radius_0; + form.value.img_radius.radius_top_left = props.defaultConfig.img_radius_0; + form.value.img_radius.radius_top_right = props.defaultConfig.img_radius_0; + } +} else { + if (form.value.img_radius.radius == props.defaultConfig.img_radius_0 || (form.value.img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_top_left == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_top_right == props.defaultConfig.img_radius_1)) { + form.value.img_radius.radius = props.defaultConfig.img_radius_1; + form.value.img_radius.radius_bottom_left = props.defaultConfig.img_radius_1; + form.value.img_radius.radius_bottom_right = props.defaultConfig.img_radius_1; + form.value.img_radius.radius_top_left = props.defaultConfig.img_radius_1; + form.value.img_radius.radius_top_right = props.defaultConfig.img_radius_1; + } +} const font_weight = reactive([ { name: '加粗', value: '500' }, { name: '正常', value: '400' }, diff --git a/src/components/model-hot-zone/index.vue b/src/components/model-hot-zone/index.vue index d7854301..84520d61 100644 --- a/src/components/model-hot-zone/index.vue +++ b/src/components/model-hot-zone/index.vue @@ -73,10 +73,10 @@ const rect_style = computed(() => { .hot { min-height: 1rem; .hot_box { - background: rgba(42, 148, 255, 0.25); - border: 1px dashed #8ec6ff; + background: rgba(42, 148, 255, 0.15); + border: 1px dashed rgba(142, 198, 255, 0.5); position: absolute; - opacity: 0.6; + opacity: 0.4; } } diff --git a/src/components/model-shop-list/model-shop-list-content.vue b/src/components/model-shop-list/model-shop-list-content.vue index 389f78d5..202a0067 100644 --- a/src/components/model-shop-list/model-shop-list-content.vue +++ b/src/components/model-shop-list/model-shop-list-content.vue @@ -67,12 +67,25 @@ const props = defineProps({ type: Object, default: () => ({}), }, + styles: { + type: Object, + default: () => ({}), + }, + defaultConfig: { + type: Object, + default: () => ({ + // 图片不同风格下的圆角 + img_radius_0: 4, + img_radius_1: 0, + }), + }, }); const state = reactive({ form: props.value, + data: props.styles, }); // 如果需要解构，确保使用toRefs -const { form } = toRefs(state); +const { form, data } = toRefs(state); const base_list = reactive({ product_style_list: [ @@ -159,6 +172,23 @@ const change_style = (val: any): void => { form.value.shop_type = 'text'; } } + if (['0', '4'].includes(val)) { + if (data.value.shop_img_radius.radius == props.defaultConfig.img_radius_0 || (data.value.shop_img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && data.value.shop_img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && data.value.shop_img_radius.radius_top_left == props.defaultConfig.img_radius_1 && data.value.shop_img_radius.radius_top_right == props.defaultConfig.img_radius_1)) { + data.value.shop_img_radius.radius = props.defaultConfig.img_radius_0; + data.value.shop_img_radius.radius_bottom_left = props.defaultConfig.img_radius_0; + data.value.shop_img_radius.radius_bottom_right = props.defaultConfig.img_radius_0; + data.value.shop_img_radius.radius_top_left = props.defaultConfig.img_radius_0; + data.value.shop_img_radius.radius_top_right = props.defaultConfig.img_radius_0; + } + } else { + if (data.value.shop_img_radius.radius == props.defaultConfig.img_radius_0 || (data.value.shop_img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && data.value.shop_img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && data.value.shop_img_radius.radius_top_left == props.defaultConfig.img_radius_1 && data.value.shop_img_radius.radius_top_right == props.defaultConfig.img_radius_1)) { + data.value.shop_img_radius.radius = props.defaultConfig.img_radius_1; + data.value.shop_img_radius.radius_bottom_left = props.defaultConfig.img_radius_1; + data.value.shop_img_radius.radius_bottom_right = props.defaultConfig.img_radius_1; + data.value.shop_img_radius.radius_top_left = props.defaultConfig.img_radius_1; + data.value.shop_img_radius.radius_top_right = props.defaultConfig.img_radius_1; + } + } }; const is_revise = ref(false); const change_shop_type = () => { diff --git a/src/components/model-shop-list/model-shop-list-setting.vue b/src/components/model-shop-list/model-shop-list-setting.vue index cec858ee..acb22b41 100644 --- a/src/components/model-shop-list/model-shop-list-setting.vue +++ b/src/components/model-shop-list/model-shop-list-setting.vue @@ -1,10 +1,10 @@ @@ -19,6 +19,11 @@ const props = defineProps({ default: () => ({}), }, }); +const data_config = reactive({ + // 图片不同风格下的圆角 + img_radius_0: 4, + img_radius_1: 0, +});