-
+
@@ -141,7 +137,7 @@ const calculateWidth = () => {
:class="[
{
'w-full': property.layoutType !== 'oneColSmallImg',
- 'w-[calc(100%-140px-16px)]':
+ 'w-[calc(100vw-36px-16px)]':
property.layoutType === 'oneColSmallImg',
},
]"
@@ -149,7 +145,7 @@ const calculateWidth = () => {
{{ spu.introduction }}
@@ -173,7 +169,7 @@ const calculateWidth = () => {
¥{{ fenToYuan(spu.price || Infinity) }}
@@ -181,13 +177,13 @@ const calculateWidth = () => {
¥{{ fenToYuan(spu.marketPrice) }}
-
-
+
{
@@ -227,5 +223,3 @@ const calculateWidth = () => {
-
-
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-combination/property.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-combination/property.vue
index a46029f10..0efe4e4d7 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-combination/property.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-combination/property.vue
@@ -60,17 +60,26 @@ onMounted(async () => {
-
+
-
+
-
+
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-point/property.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-point/property.vue
index 5aafd3732..dd01a66b0 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-point/property.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-point/property.vue
@@ -42,17 +42,26 @@ const formData = useVModel(props, 'modelValue', emit);
-
+
-
+
-
+
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-seckill/index.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-seckill/index.vue
index 236cd4563..2ce09e22f 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-seckill/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-seckill/index.vue
@@ -116,19 +116,15 @@ const calculateWidth = () => {
v-if="property.badge.show"
class="absolute left-0 top-0 z-[1] items-center justify-center"
>
-
+
@@ -139,7 +135,7 @@ const calculateWidth = () => {
:class="[
{
'w-full': property.layoutType !== 'oneColSmallImg',
- 'w-[calc(100%-140px-16px)]':
+ 'w-[calc(100vw-140px-16px)]':
property.layoutType === 'oneColSmallImg',
},
]"
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-seckill/property.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-seckill/property.vue
index 0657667e5..989581dbf 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-seckill/property.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-seckill/property.vue
@@ -45,17 +45,26 @@ const formData = useVModel(props, 'modelValue', emit);
-
+
-
+
-
+
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/title-bar/property.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/title-bar/property.vue
index 996283654..63a28ae6f 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/title-bar/property.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/title-bar/property.vue
@@ -54,12 +54,18 @@ const rules = {}; // 表单校验
-
+
-
+
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-card/index.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-card/index.vue
index 55c02b7e1..baa5ca21e 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-card/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-card/index.vue
@@ -21,7 +21,7 @@ defineProps<{ property: UserCardProperty }>();
-
+
点击绑定手机号
去绑定
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-card/property.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-card/property.vue
index 79a7eb080..bad6c2e53 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-card/property.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-card/property.vue
@@ -16,5 +16,3 @@ const formData = useVModel(props, 'modelValue', emit);
-
-
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-coupon/index.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-coupon/index.vue
index 58750f9c1..6fbe90bd9 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-coupon/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-coupon/index.vue
@@ -13,5 +13,3 @@ defineProps<{ property: UserCouponProperty }>();
src="https://shopro.sheepjs.com/admin/static/images/shop/decorate/couponCardStyle.png"
/>
-
-
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-coupon/property.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-coupon/property.vue
index 488bf3168..9a5633b36 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-coupon/property.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-coupon/property.vue
@@ -16,5 +16,3 @@ const formData = useVModel(props, 'modelValue', emit);
-
-
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-order/index.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-order/index.vue
index e2e0a0f74..1451ac12d 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-order/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-order/index.vue
@@ -13,5 +13,3 @@ defineProps<{ property: UserOrderProperty }>();
src="https://shopro.sheepjs.com/admin/static/images/shop/decorate/orderCardStyle.png"
/>
-
-
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-order/property.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-order/property.vue
index 48f0c0a41..66c6cfdd1 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-order/property.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/user-order/property.vue
@@ -16,5 +16,3 @@ const formData = useVModel(props, 'modelValue', emit);
-
-
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/video-player/property.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/video-player/property.vue
index 453b23a63..aa3445b8e 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/video-player/property.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/video-player/property.vue
@@ -56,5 +56,3 @@ const formData = useVModel(props, 'modelValue', emit);
-
-
diff --git a/apps/web-antd/src/views/mall/promotion/components/vertical-button-group/index.vue b/apps/web-antd/src/views/mall/promotion/components/vertical-button-group/index.vue
index 2b081b5b5..78ac6e306 100644
--- a/apps/web-antd/src/views/mall/promotion/components/vertical-button-group/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/vertical-button-group/index.vue
@@ -18,12 +18,12 @@ defineOptions({ name: 'VerticalButtonGroup' });
// TODO @AI:圆角的样式不太对!
.ant-btn-group > :deep(.ant-btn:first-child) {
border-bottom-color: transparent;
- border-radius: var(--ant-border-radius) var(--ant-border-radius) 0 0;
+ border-radius: hsl(var(--radius)) hsl(var(--radius)) 0 0;
}
.ant-btn-group > :deep(.ant-btn:last-child) {
border-top-color: transparent;
- border-radius: 0 0 var(--ant-border-radius) var(--ant-border-radius);
+ border-radius: 0 0 hsl(var(--radius)) hsl(var(--radius));
}
.ant-btn-group :deep(.ant-btn:not(:first-child):not(:last-child)) {
diff --git a/apps/web-antd/src/views/mall/promotion/kefu/modules/tools/emoji-select-popover.vue b/apps/web-antd/src/views/mall/promotion/kefu/modules/tools/emoji-select-popover.vue
index 40a56d8a5..2f690bff4 100644
--- a/apps/web-antd/src/views/mall/promotion/kefu/modules/tools/emoji-select-popover.vue
+++ b/apps/web-antd/src/views/mall/promotion/kefu/modules/tools/emoji-select-popover.vue
@@ -32,8 +32,8 @@ function handleSelect(item: Emoji) {
v-for="(item, index) in emojiList"
:key="index"
:style="{
- borderColor: 'var(--primary)',
- color: 'var(--primary)',
+ borderColor: 'hsl(var(--primary))',
+ color: 'hsl(var(--primary))',
}"
:title="item.name"
class="icon-item w-1/10 mr-2 mt-1 flex cursor-pointer items-center justify-center border border-solid p-2"