+
{{ item.title }}
{{ item.show_price_symbol }}{{ item.min_price }}
diff --git a/src/components/model-data-magic/components/magic-cube-settings/tabs-content.vue b/src/components/model-data-magic/components/magic-cube-settings/tabs-content.vue
index 77eabff9..fa711a6c 100644
--- a/src/components/model-data-magic/components/magic-cube-settings/tabs-content.vue
+++ b/src/components/model-data-magic/components/magic-cube-settings/tabs-content.vue
@@ -36,7 +36,7 @@
左图右文
上图下文
- 上图下文(价格浮动)
+ 上图下文(价格浮动)
@@ -204,6 +204,9 @@ const url_value_dialog_call_back = (item: any[]) => {
width: 100%;
height: 12.4rem;
}
+.col-price-style {
+ color: red;
+}
:deep(.el-checkbox-group .el-checkbox) {
margin-right: 2rem;
}
diff --git a/src/components/model-data-magic/index.vue b/src/components/model-data-magic/index.vue
index 507cd1a3..f2e8319a 100644
--- a/src/components/model-data-magic/index.vue
+++ b/src/components/model-data-magic/index.vue
@@ -20,14 +20,14 @@
{{ item.data_content.subtitle || '' }}
-
-
+
@@ -51,7 +51,7 @@
-
+
@@ -67,13 +67,13 @@
{{ item.data_content.subtitle || '' }}
-
+
-
+
@@ -134,9 +134,9 @@ const div_width = ref(390);
// 如果容器高度为空,则取容器宽度
const container_height = computed(() => is_number(form.value.container_height) ? form.value.container_height : div_width.value);
// 是否不限尺寸
-const is_unlimited_size = computed(() => form.value.style_actived === 9 && form.value.limit_size == '0');
+// const is_unlimited_size = computed(() => form.value.style_actived === 9 && form.value.limit_size == '0');
-const container_size = computed(() => is_unlimited_size.value ? '100%' : container_height.value + 'px');
+const container_size = computed(() => container_height.value + 'px');
//#endregion
//#region 图片位置计算
//计算选中层的宽度。
diff --git a/src/components/model-data-magic/model-data-magic-content.vue b/src/components/model-data-magic/model-data-magic-content.vue
index 0658fc60..45a0908d 100644
--- a/src/components/model-data-magic/model-data-magic-content.vue
+++ b/src/components/model-data-magic/model-data-magic-content.vue
@@ -10,22 +10,15 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
展示设置
-
+
@@ -47,7 +40,7 @@
-
+
@@ -76,7 +69,7 @@ const props = defineProps({
},
});
// 风格数组
-const style_list = ['heng2', 'shu2', 'shang2xia1', 'shang1xia2', 'zuo1you2', 'zuo2you1', 'tianzige', 'shang2xia3', 'zuo1youshang1youxia2', 'a-1ge', 'a-4x4'];
+const style_list = ['heng2', 'shu2', 'shang2xia1', 'shang1xia2', 'zuo1you2', 'zuo2you1', 'tianzige', 'shang2xia3', 'zuo1youshang1youxia2', 'a-4x4'];
// 每个小模块独立的样式
const data_style = {
color_list: [{ color: '#FFD9C3', color_percentage: 0 }, { color: '#FFECE2', color_percentage: 12 }, { color: '#FFFFFF', color_percentage: 30 }],
@@ -241,8 +234,7 @@ const style_show_list = [
[{ start: {x: 1, y: 1}, end: {x: 2, y: 2}, num: 2, flex: 'col_price_float', outerflex: 'row', title_text_gap: 10, width: 195 }, { start: {x: 3, y: 1}, end: {x: 4, y: 2}, num: 2, flex: 'col_price_float', outerflex: 'row', title_text_gap: 10, width: 195 }, { start: {x: 1, y: 3}, end: {x: 2, y: 4}, num: 2, flex: 'col_price_float', outerflex: 'row', title_text_gap: 10, width: 195 }, { start: {x: 3, y: 3}, end: {x: 4, y: 4}, num: 2, flex: 'col_price_float', outerflex: 'row', title_text_gap: 10, width: 195 }],// 风格7
[{ start: {x: 1, y: 1}, end: {x: 2, y: 4}, num: 2, flex: 'col_price_float', outerflex: 'row', title_text_gap: 10, width: 195 }, { start: {x: 3, y: 1}, end: {x: 4, y: 2}, num: 2, flex: 'col_price_float', outerflex: 'row', title_text_gap: 10, width: 195 }, { start: {x: 3, y: 3}, end: {x: 3, y: 4}, num: 1, flex: 'col', outerflex: 'col', title_text_gap: 20, width: 130 }, { start: {x: 4, y: 3}, end: {x: 4, y: 4}, num: 1, flex: 'col', outerflex: 'col', title_text_gap: 20, width: 130 }, { start: {x: 4, y: 3}, end: {x: 4, y: 4}, num: 1, flex: 'col', outerflex: 'col', title_text_gap: 20, width: 130 }],// 风格8
[{ start: {x: 1, y: 1}, end: {x: 2, y: 4}, num: 3, flex: 'row', outerflex: 'col', title_text_gap: 20, width: 195 }, { start: {x: 3, y: 1}, end: {x: 4, y: 2}, num: 2, flex: 'col_price_float', outerflex: 'row', title_text_gap: 10, width: 195 }, { start: {x: 3, y: 3}, end: {x: 3, y: 4}, num: 1, flex: 'col_price_float', outerflex: 'col', title_text_gap: 10, width: 98 }, { start: {x: 4, y: 3}, end: {x: 4, y: 4}, num: 1, flex: 'col_price_float', outerflex: 'col', title_text_gap: 10, width: 98 }],// 风格9
- [{ start: {x: 1, y: 1}, end: {x: 4, y: 4}, num: 3, flex: 'row', outerflex: 'col', title_text_gap: 20, width: 390 }],// 风格10
- [], //风格11
+ [], //风格10
]
const tabs_name = ref('content');
const state = reactive({
@@ -291,7 +283,7 @@ const selected_active = ref(0);
// 切换风格
const style_click = (index: number) => {
form.value.style_actived = index;
- if (index !== 10) {
+ if (index !== 9) {
form.value.magic_cube_density = 4;
form.value.data_magic_list = magic_list(index);
} else {
diff --git a/src/components/model-nav-group/index.ts b/src/components/model-nav-group/index.ts
index ea940f85..f4346c99 100644
--- a/src/components/model-nav-group/index.ts
+++ b/src/components/model-nav-group/index.ts
@@ -34,6 +34,7 @@ interface nav_group_styles {
indicator_location: string;
indicator_size: number;
indicator_radius: radiusStyle;
+ data_padding: paddingStyle;
actived_color: string;
color: string;
title_color: string;
diff --git a/src/components/model-nav-group/index.vue b/src/components/model-nav-group/index.vue
index ca075d69..2f81e6bc 100644
--- a/src/components/model-nav-group/index.vue
+++ b/src/components/model-nav-group/index.vue
@@ -3,7 +3,7 @@