diff --git a/src/components/model-seckill/index.vue b/src/components/model-seckill/index.vue
index eeecb8eb..87aa4260 100644
--- a/src/components/model-seckill/index.vue
+++ b/src/components/model-seckill/index.vue
@@ -4,14 +4,14 @@
-
- {{ form.topic_text }}
+
+ {{ form.title_text }}
|
{{ seckill_time.time_first_text }}
-
![]()
+
{{ item.value }}
@@ -162,7 +162,6 @@
import { background_computer, common_styles_computer, get_math, gradient_computer, gradient_handle, padding_computer, radius_computer } from '@/utils';
import { isEmpty, throttle } from 'lodash';
import SeckillAPI from '@/api/seckill';
-import { online_url } from '@/utils';
import { Swiper, SwiperSlide } from 'swiper/vue';
import { Autoplay } from 'swiper/modules';
import 'swiper/css';
@@ -176,11 +175,7 @@ const props = defineProps({
},
},
});
-const new_url = ref('');
-onBeforeMount(async () => {
- const url = await online_url('/static/plugins/seckill/images/diy/').then((res) => res);
- new_url.value = url + 'time.png';
-});
+
const form = computed(() => props.value?.content || {});
const new_style = computed(() => props.value?.style || {});
const time_bg = computed(() => {
diff --git a/src/components/model-seckill/model-seckill-content.vue b/src/components/model-seckill/model-seckill-content.vue
index 4152bc54..3724838e 100644
--- a/src/components/model-seckill/model-seckill-content.vue
+++ b/src/components/model-seckill/model-seckill-content.vue
@@ -11,19 +11,19 @@
-
+
文字
图片
-
+
-
+
-
+
diff --git a/src/components/model-seckill/model-seckill-setting.vue b/src/components/model-seckill/model-seckill-setting.vue
index 1df24574..29e11e3a 100644
--- a/src/components/model-seckill/model-seckill-setting.vue
+++ b/src/components/model-seckill/model-seckill-setting.vue
@@ -39,9 +39,9 @@ onBeforeMount(async () => {
// 全部的默认数据
default_data = {
content: {
- topic_type: 'image',
- topic_src: [{ id: 1, url: new_url.value + 'header-title.png', original: '标题', title: '标题', ext: '.png', type: 'img' }],
- topic_text: '限时秒杀',
+ title_type: 'image',
+ title_src: [{ id: 1, url: new_url.value + 'header-title.png', original: '标题', title: '标题', ext: '.png', type: 'img' }],
+ title_text: '限时秒杀',
},
style: {
title_color: '#fff',
@@ -122,8 +122,8 @@ onBeforeMount(async () => {
theme_1: {},
theme_2: {
content: {
- topic_type: 'image',
- topic_src: [{ id: 1, url: new_url.value + 'header-title-2.png', original: '标题2', title: '标题2', ext: '.png', type: 'img' }],
+ title_type: 'image',
+ title_src: [{ id: 1, url: new_url.value + 'header-title-2.png', original: '标题2', title: '标题2', ext: '.png', type: 'img' }],
button_status: '0',
},
style: {
@@ -138,8 +138,8 @@ onBeforeMount(async () => {
},
theme_3: {
content: {
- topic_type: 'text',
- topic_src: [],
+ title_type: 'text',
+ title_src: [],
button_status: '1',
},
style: {
@@ -155,8 +155,8 @@ onBeforeMount(async () => {
},
theme_4: {
content: {
- topic_type: 'text',
- topic_src: [],
+ title_type: 'text',
+ title_src: [],
button_status: '1',
},
style: {
diff --git a/src/views/layout/components/main/default/seckill.ts b/src/views/layout/components/main/default/seckill.ts
index d7890e16..26f89f8c 100644
--- a/src/views/layout/components/main/default/seckill.ts
+++ b/src/views/layout/components/main/default/seckill.ts
@@ -5,9 +5,10 @@ interface DefaultSeckill {
content: {
head_state: string;
theme: string;
- topic_type: string;
- topic_src: uploadList[];
- topic_text: string;
+ title_type: string;
+ title_src: uploadList[];
+ title_text: string;
+ theme_4_static_img: uploadList[];
button_status: string;
button_text: string;
shop_style_type: string;
@@ -72,9 +73,10 @@ const defaultSeckill: DefaultSeckill = {
content: {
head_state: '1',
theme: '1',
- topic_type: 'image',
- topic_src: [{ id: 1, url: new_url + 'header-title.png', original: '标题', title: '标题', ext: '.png', type: 'img' }],
- topic_text: '限时秒杀',
+ title_type: 'image',
+ title_src: [{ id: 1, url: new_url + 'header-title.png', original: '标题', title: '标题', ext: '.png', type: 'img' }],
+ theme_4_static_img: [{ id: 2, url: new_url + 'time.png', original: '时钟', title: '时钟', ext: '.png', type: 'img' }],
+ title_text: '限时秒杀',
button_status: '1',
button_text: '更多',
shop_style_type: '1',