diff --git a/src/assets/images/components/model-seckill/theme-2.png b/src/assets/images/components/model-seckill/theme-2.png index 70ff43ce..8a776794 100644 Binary files a/src/assets/images/components/model-seckill/theme-2.png and b/src/assets/images/components/model-seckill/theme-2.png differ diff --git a/src/assets/images/components/model-seckill/time.png b/src/assets/images/components/model-seckill/time.png new file mode 100644 index 00000000..d0cacb8e Binary files /dev/null and b/src/assets/images/components/model-seckill/time.png differ diff --git a/src/components/common/mult-color-picker/index.vue b/src/components/common/mult-color-picker/index.vue index bd62f65e..f6aa86f8 100644 --- a/src/components/common/mult-color-picker/index.vue +++ b/src/components/common/mult-color-picker/index.vue @@ -79,7 +79,7 @@ const change_color = (index: number, color: string | null) => { update_value(); }; const change_color_percentage = (index: number, percentage: number | undefined) => { - color_list.value[index].color_percentage = percentage?.toString(); + color_list.value[index].color_percentage = percentage; update_value(); }; const update_value = () => { diff --git a/src/components/model-seckill/index.vue b/src/components/model-seckill/index.vue index eb880f1b..4593f88f 100644 --- a/src/components/model-seckill/index.vue +++ b/src/components/model-seckill/index.vue @@ -2,18 +2,27 @@
-
+
- {{ form.topic_text }} + {{ form.topic_text }}
-
|
- 距离结束 -
+
|
+
+ 距离结束 +
+ +
@@ -65,18 +74,33 @@ const seckill_head_style = computed(() => { }); const style = computed(() => common_styles_computer(props.value.style.common_style)); + +const url_computer = (name: string) => { + const new_url = ref(new URL(`../../assets/images/components/model-seckill/${name}.png`, import.meta.url).href).value; + return new_url; +}; diff --git a/src/components/model-seckill/model-seckill-content.vue b/src/components/model-seckill/model-seckill-content.vue index 7cbdbf96..391604c2 100644 --- a/src/components/model-seckill/model-seckill-content.vue +++ b/src/components/model-seckill/model-seckill-content.vue @@ -28,14 +28,17 @@ - - - {{ item.name }} - - - - - + +
@@ -113,6 +116,10 @@ const state = reactive({ // 如果需要解构,确保使用toRefs const { form, data } = toRefs(state); +watchEffect(() => { + form.value = props.value; +}); + const base_list = { state_list: [ { name: '显示', value: '1' }, diff --git a/src/components/model-seckill/model-seckill-setting.vue b/src/components/model-seckill/model-seckill-setting.vue index a4034c39..34b5af3a 100644 --- a/src/components/model-seckill/model-seckill-setting.vue +++ b/src/components/model-seckill/model-seckill-setting.vue @@ -1,15 +1,17 @@ diff --git a/src/components/model-seckill/model-seckill-styles.vue b/src/components/model-seckill/model-seckill-styles.vue index 8ede39b6..b22abdb6 100644 --- a/src/components/model-seckill/model-seckill-styles.vue +++ b/src/components/model-seckill/model-seckill-styles.vue @@ -9,7 +9,7 @@ - + diff --git a/src/utils/index.ts b/src/utils/index.ts index fcc4d846..cdfde37b 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -67,7 +67,7 @@ export function gradient_handle(color_list: color_list[], direction: string, is_ if (color_list.length == 1) { container_common_styles += ` ${item.color_percentage || 0}%, ${item.color} 100%`; } else { - if (!isEmpty(item.color_percentage)) { + if (typeof item.color_percentage === "number") { if (index == color_list.length - 1) { container_common_styles += ` ${item.color_percentage}%`; } else { diff --git a/src/views/layout/components/main/default/seckill.ts b/src/views/layout/components/main/default/seckill.ts index ae56990e..891c3779 100644 --- a/src/views/layout/components/main/default/seckill.ts +++ b/src/views/layout/components/main/default/seckill.ts @@ -72,7 +72,7 @@ const defaultSeckill: DefaultSeckill = { }, style: { topic_color: '#fff', - topic_size: 14, + topic_size: 18, head_button_color: '#fff', head_button_size: 12, end_text_color: '#fff',