From 891ac2d5e1cce2e442812b1b0af291ab71d99e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Tue, 3 Sep 2024 16:52:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=92=E6=9D=80=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/model-seckill/theme-2.png | Bin 13386 -> 19587 bytes .../images/components/model-seckill/time.png | Bin 0 -> 691 bytes .../common/mult-color-picker/index.vue | 2 +- src/components/model-seckill/index.vue | 38 +++- .../model-seckill/model-seckill-content.vue | 23 ++- .../model-seckill/model-seckill-setting.vue | 179 ++++++++++++------ .../model-seckill/model-seckill-styles.vue | 2 +- src/utils/index.ts | 2 +- .../layout/components/main/default/seckill.ts | 2 +- 9 files changed, 172 insertions(+), 76 deletions(-) create mode 100644 src/assets/images/components/model-seckill/time.png diff --git a/src/assets/images/components/model-seckill/theme-2.png b/src/assets/images/components/model-seckill/theme-2.png index 70ff43ce10381c453725da4ef280f47361071300..8a776794ea1348f9cb06b70bfbb7214664205791 100644 GIT binary patch literal 19587 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 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 0000000000000000000000000000000000000000..d0cacb8e85fcb46c90182229e83857ef62c13ad2 GIT binary patch literal 691 zcmV;k0!;mhP)Px%ZAnByR9HvFmraOHVHC%Ir+h4km55>GqZB)3qgatdHWZc=v$Pe9k*%GP%#yVt zHL;kX-B$nyfTO@p zU}Jh@VLm-CfcwCVnf>fy+S-KNeFJa>I1Q|6lTYuz0C#~2Gy5=1rxC#2R|1!Si@>S| zBcId%Ya8BwE1<6f*UaokolGr2I`utZ?-2T5z?Ss>ZSj%iLu8)<$LqYY1i;;Q0}p|* z7I%L%Gld6tmz&qO$iD{;o7r4dt`8uc{8@*O%SIGHI)d0!^~4{56!X~@w^!kF0Hm*Q z>@Rbo3NQg&?wIAd9w^OUH8WKfJ%Hr;H$$?$jw{y#vZd|C9^ zyWf^)0=B;90Ng6-_k06@M)0Wsz(P(4H2HRz+4sQ@x%(4fUjU#Nf}A9L1RNWLaCdD< zvez}IdP$gDhH74qfn~rZ;DnjY2O)Z8nA?a3J*^7Rl#4+08j+UGoK{>H>IlSQD^8s( zXBai*S{335@Ss6(aTtv-j)x_?AhgV$Z0L^t<2XS?7m`4=EfMWsND_e7@W@J*3sAq3 zRYK8qDa`?BUP?=Afwepe(7u*eAhhqdT}&bX-7h8;h%Q&NHi*2dS=H))yPVccx_@## Z{|yxmBjs|9Wyk;k002ovPDHLkV1kP;I+g$c literal 0 HcmV?d00001 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',