diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index 184d95c4f..171b87215 100644 --- a/src/components/Descriptions/src/Descriptions.vue +++ b/src/components/Descriptions/src/Descriptions.vue @@ -116,7 +116,7 @@ const toggleClick = () => { :row="{ label: item.label }" - >{{ item.label }} + >{{ item.label }} @@ -131,7 +131,7 @@ const toggleClick = () => { {{ - item.mappedField ? data[item.mappedField] : data[item.field] + item.mappedField ? data[item.mappedField] : data[item.field] }} diff --git a/src/components/DiyEditor/components/ComponentContainer.vue b/src/components/DiyEditor/components/ComponentContainer.vue index 485672244..6f2d87c30 100644 --- a/src/components/DiyEditor/components/ComponentContainer.vue +++ b/src/components/DiyEditor/components/ComponentContainer.vue @@ -165,8 +165,8 @@ $toolbar-position: -55px; width: 80px; height: 25px; font-size: 12px; - color: #6a6a6a; line-height: 25px; + color: #6a6a6a; text-align: center; background: #fff; box-shadow: diff --git a/src/components/DiyEditor/components/ComponentLibrary.vue b/src/components/DiyEditor/components/ComponentLibrary.vue index 06f231285..8fb924cd8 100644 --- a/src/components/DiyEditor/components/ComponentLibrary.vue +++ b/src/components/DiyEditor/components/ComponentLibrary.vue @@ -94,9 +94,9 @@ const handleCloneComponent = (component: DiyComponent) => { diff --git a/src/components/DiyEditor/components/mobile/HotZone/property.vue b/src/components/DiyEditor/components/mobile/HotZone/property.vue index 65892f857..7c4d49bfa 100644 --- a/src/components/DiyEditor/components/mobile/HotZone/property.vue +++ b/src/components/DiyEditor/components/mobile/HotZone/property.vue @@ -42,22 +42,22 @@ const handleOpenEditDialog = () => { diff --git a/src/components/DiyEditor/components/mobile/MenuSwiper/index.vue b/src/components/DiyEditor/components/mobile/MenuSwiper/index.vue index fc6d71820..d0f36a5b7 100644 --- a/src/components/DiyEditor/components/mobile/MenuSwiper/index.vue +++ b/src/components/DiyEditor/components/mobile/MenuSwiper/index.vue @@ -103,13 +103,16 @@ watch( .el-carousel__indicator { padding-top: 0; padding-bottom: 0; + .el-carousel__button { --el-carousel-indicator-height: 6px; --el-carousel-indicator-width: 6px; --el-carousel-indicator-out-color: #ff6000; + border-radius: 6px; } } + .el-carousel__indicator.is-active { .el-carousel__button { --el-carousel-indicator-width: 12px; diff --git a/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue b/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue index 6c671d3f2..7d632df86 100644 --- a/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue +++ b/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue @@ -93,8 +93,8 @@ defineOptions({ name: 'NavigationBarCellProperty' }) const props = withDefaults( defineProps<{ - modelValue: NavigationBarCellProperty[] - isMp: boolean + modelValue?: NavigationBarCellProperty[] + isMp?: boolean }>(), { modelValue: () => [], diff --git a/src/components/DiyEditor/components/mobile/NavigationBar/index.vue b/src/components/DiyEditor/components/mobile/NavigationBar/index.vue index 104c6002a..905b68fee 100644 --- a/src/components/DiyEditor/components/mobile/NavigationBar/index.vue +++ b/src/components/DiyEditor/components/mobile/NavigationBar/index.vue @@ -67,10 +67,10 @@ const getSearchProp = computed(() => (cell: NavigationBarCellProperty) => { .navigation-bar { display: flex; height: 50px; + padding: 0 6px; background: #fff; justify-content: space-between; align-items: center; - padding: 0 6px; /* 左边 */ .left { diff --git a/src/components/DiyEditor/components/mobile/ProductCard/index.vue b/src/components/DiyEditor/components/mobile/ProductCard/index.vue index 93f6e0745..25335558c 100644 --- a/src/components/DiyEditor/components/mobile/ProductCard/index.vue +++ b/src/components/DiyEditor/components/mobile/ProductCard/index.vue @@ -77,7 +77,7 @@ v-if="property.fields.marketPrice.show && spu.marketPrice" class="ml-4px text-10px line-through" :style="{ color: property.fields.marketPrice.color }" - >¥{{ fenToYuan(spu.marketPrice) }} + >¥{{ fenToYuan(spu.marketPrice) }}
diff --git a/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue b/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue index d41bf1c1e..47ebb5ad7 100644 --- a/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue +++ b/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue @@ -74,7 +74,7 @@ v-if="property.fields.marketPrice.show && spu.marketPrice" class="ml-4px text-10px line-through" :style="{ color: property.fields.marketPrice.color }" - >¥{{ fenToYuan(spu.marketPrice) }}¥{{ fenToYuan(spu.marketPrice) }}
diff --git a/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue b/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue index 3d34a3d4c..7b1b243d6 100644 --- a/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue +++ b/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue @@ -74,7 +74,7 @@ v-if="property.fields.marketPrice.show && spu.marketPrice" class="ml-4px text-10px line-through" :style="{ color: property.fields.marketPrice.color }" - >¥{{ fenToYuan(spu.marketPrice) }}¥{{ fenToYuan(spu.marketPrice) }}
diff --git a/src/components/DiyEditor/index.vue b/src/components/DiyEditor/index.vue index fa23a4d0f..48052061c 100644 --- a/src/components/DiyEditor/index.vue +++ b/src/components/DiyEditor/index.vue @@ -583,12 +583,12 @@ $toolbar-height: 42px; gap: 8px; :deep(.el-tag) { - box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.1); border: none; + box-shadow: 0 2px 8px 0 rgb(0 0 0 / 10%); .el-tag__content { - width: 100%; display: flex; + width: 100%; align-items: center; justify-content: flex-start; diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index 3acc10ab0..fa38caef6 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -27,7 +27,7 @@ const { getPrefixCls } = useDesign() const prefixCls = getPrefixCls('form') export default defineComponent({ - // eslint-disable-next-line vue/no-reserved-component-names + name: 'Form', props: { // 生成Form的布局结构数组 diff --git a/src/components/FormCreate/src/components/IframeComponent.vue b/src/components/FormCreate/src/components/IframeComponent.vue index 3fd74c4dd..1a438f940 100644 --- a/src/components/FormCreate/src/components/IframeComponent.vue +++ b/src/components/FormCreate/src/components/IframeComponent.vue @@ -64,9 +64,9 @@ const showPreview = computed(() => { } .iframe-preview { + overflow: hidden; border: 1px solid #dcdfe6; border-radius: 4px; - overflow: hidden; } .iframe-content { @@ -76,11 +76,11 @@ const showPreview = computed(() => { .iframe-placeholder { display: flex; - align-items: center; - justify-content: center; min-height: 200px; + background-color: #fafafa; border: 1px dashed #dcdfe6; border-radius: 4px; - background-color: #fafafa; + align-items: center; + justify-content: center; } diff --git a/src/components/Infotip/src/Infotip.vue b/src/components/Infotip/src/Infotip.vue index 0afd69287..c93bb6d52 100644 --- a/src/components/Infotip/src/Infotip.vue +++ b/src/components/Infotip/src/Infotip.vue @@ -14,7 +14,6 @@ defineProps({ title: propTypes.string.def(''), schema: { type: Array as PropType>, - required: true, default: () => [] }, showIndex: propTypes.bool.def(true), diff --git a/src/components/InputWithColor/index.vue b/src/components/InputWithColor/index.vue index 1311a5594..96afa1a3a 100644 --- a/src/components/InputWithColor/index.vue +++ b/src/components/InputWithColor/index.vue @@ -26,6 +26,7 @@ const { modelValue, color } = useVModels(props, emit)