diff --git a/src/assets/icons/iconfont.css b/src/assets/icons/iconfont.css
index c1e7cc85..64f2555b 100644
--- a/src/assets/icons/iconfont.css
+++ b/src/assets/icons/iconfont.css
@@ -1,9 +1,9 @@
@font-face {
font-family: "iconfont"; /* Project id 4607934 */
- src: url('iconfont.woff2?t=1725414216013') format('woff2'),
- url('iconfont.woff?t=1725414216013') format('woff'),
- url('iconfont.ttf?t=1725414216013') format('truetype'),
- url('iconfont.svg?t=1725414216013#iconfont') format('svg');
+ src: url('iconfont.woff2?t=1726043407380') format('woff2'),
+ url('iconfont.woff?t=1726043407380') format('woff'),
+ url('iconfont.ttf?t=1726043407380') format('truetype'),
+ url('iconfont.svg?t=1726043407380#iconfont') format('svg');
}
.iconfont {
@@ -14,6 +14,10 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-bofang:before {
+ content: "\e798";
+}
+
.icon-a-miaosha:before {
content: "\e797";
}
diff --git a/src/assets/icons/iconfont.js b/src/assets/icons/iconfont.js
index 14b37eea..b4a7f7d2 100644
--- a/src/assets/icons/iconfont.js
+++ b/src/assets/icons/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_4607934='',(l=>{var h=(a=(a=document.getElementsByTagName("script"))[a.length-1]).getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var o,v,m,t,c,i=function(h,a){a.parentNode.insertBefore(h,a)};if(h&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}o=function(){var h,a=document.createElement("div");a.innerHTML=l._iconfont_svg_string_4607934,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(h=document.body).firstChild?i(a,h.firstChild):h.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(o,0):(v=function(){document.removeEventListener("DOMContentLoaded",v,!1),o()},document.addEventListener("DOMContentLoaded",v,!1)):document.attachEvent&&(m=o,t=l.document,c=!1,d(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,z())})}function z(){c||(c=!0,m())}function d(){try{t.documentElement.doScroll("left")}catch(h){return void setTimeout(d,50)}z()}})(window);
\ No newline at end of file
+window._iconfont_svg_string_4607934='',(l=>{var h=(a=(a=document.getElementsByTagName("script"))[a.length-1]).getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var o,v,m,t,c,i=function(h,a){a.parentNode.insertBefore(h,a)};if(h&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}o=function(){var h,a=document.createElement("div");a.innerHTML=l._iconfont_svg_string_4607934,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(h=document.body).firstChild?i(a,h.firstChild):h.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(o,0):(v=function(){document.removeEventListener("DOMContentLoaded",v,!1),o()},document.addEventListener("DOMContentLoaded",v,!1)):document.attachEvent&&(m=o,t=l.document,c=!1,d(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,z())})}function z(){c||(c=!0,m())}function d(){try{t.documentElement.doScroll("left")}catch(h){return void setTimeout(d,50)}z()}})(window);
\ No newline at end of file
diff --git a/src/assets/icons/iconfont.json b/src/assets/icons/iconfont.json
index 0c021b17..5b319137 100644
--- a/src/assets/icons/iconfont.json
+++ b/src/assets/icons/iconfont.json
@@ -5,6 +5,13 @@
"css_prefix_text": "icon-",
"description": "web端",
"glyphs": [
+ {
+ "icon_id": "41814968",
+ "name": "播放 (2)",
+ "font_class": "bofang",
+ "unicode": "e798",
+ "unicode_decimal": 59288
+ },
{
"icon_id": "41708758",
"name": "秒杀",
diff --git a/src/assets/icons/iconfont.svg b/src/assets/icons/iconfont.svg
index 79f7ed66..0a11a889 100644
--- a/src/assets/icons/iconfont.svg
+++ b/src/assets/icons/iconfont.svg
@@ -14,6 +14,8 @@
/>
+
+
diff --git a/src/assets/icons/iconfont.ttf b/src/assets/icons/iconfont.ttf
index 22e8e5a4..bb4a4717 100644
Binary files a/src/assets/icons/iconfont.ttf and b/src/assets/icons/iconfont.ttf differ
diff --git a/src/assets/icons/iconfont.woff b/src/assets/icons/iconfont.woff
index 4c156f0f..0b7888c8 100644
Binary files a/src/assets/icons/iconfont.woff and b/src/assets/icons/iconfont.woff differ
diff --git a/src/assets/icons/iconfont.woff2 b/src/assets/icons/iconfont.woff2
index ee7784b2..6fe90784 100644
Binary files a/src/assets/icons/iconfont.woff2 and b/src/assets/icons/iconfont.woff2 differ
diff --git a/src/components/common/carousel-indicator/index.vue b/src/components/common/carousel-indicator/index.vue
index 7887ce65..fa4ab03d 100644
--- a/src/components/common/carousel-indicator/index.vue
+++ b/src/components/common/carousel-indicator/index.vue
@@ -1,10 +1,10 @@
指示器设置
-
+
-
+
@@ -17,7 +17,7 @@
-
+
@@ -30,16 +30,19 @@
-
+
-
+
+
+
+
-
+
@@ -63,6 +66,10 @@ const props = defineProps({
value: {
type: Object,
default: () => {}
+ },
+ isIndicatorBottom: {
+ type: Boolean,
+ default: true
}
})
diff --git a/src/components/common/common-styles/index.vue b/src/components/common/common-styles/index.vue
index 5e3bc385..cabcd020 100644
--- a/src/components/common/common-styles/index.vue
+++ b/src/components/common/common-styles/index.vue
@@ -28,6 +28,9 @@
+
+
+
@@ -70,6 +73,7 @@ const props = defineProps({
background_img: [] as uploadList[],
color_list: [{ color: '', color_percentage: undefined }] as color_list[],
background_img_style: 2,
+ floating_up: 0,
padding: 0,
padding_top: 0,
padding_bottom: 0,
@@ -108,6 +112,10 @@ const props = defineProps({
type: Boolean,
default: true,
},
+ isFloatingUp: {
+ type: Boolean,
+ default: true,
+ }
});
// value 和初始化数据合并数据
let form = ref(props.value);
@@ -139,4 +147,9 @@ const padding_change = (padding: any) => {
.common-styles {
width: 100%;
}
+:deep(.el-input-number.is-controls-right .el-input__wrapper) {
+ .el-input__inner {
+ text-align: left;
+ }
+}
diff --git a/src/components/common/upload/index.vue b/src/components/common/upload/index.vue
index ffb58157..64386cb2 100644
--- a/src/components/common/upload/index.vue
+++ b/src/components/common/upload/index.vue
@@ -209,7 +209,10 @@
-
+
+
+
+
{{ tipsText }}
diff --git a/src/components/model-carousel/index.vue b/src/components/model-carousel/index.vue
index 931c66f6..4fe56553 100644
--- a/src/components/model-carousel/index.vue
+++ b/src/components/model-carousel/index.vue
@@ -25,16 +25,34 @@
@slide-change="slideChange"
>
-
+
+
+
+
+
+
+
+
+ {{ item.video_title }}
+
-
+
+
+
+
+
+
+
+
+ {{ item.video_title }}
+
-
+
{{ actived_index + 1 }}/{{ form.carousel_list.length }}
@@ -48,7 +66,7 @@
diff --git a/src/components/model-carousel/model-carousel-content.vue b/src/components/model-carousel/model-carousel-content.vue
index 80e637ec..a97d4487 100644
--- a/src/components/model-carousel/model-carousel-content.vue
+++ b/src/components/model-carousel/model-carousel-content.vue
@@ -31,11 +31,21 @@
-
+
+ 上传图片
+
-
+
+
+
+ 上传视频
+
+
+
+
+
@@ -60,7 +70,9 @@ const { form } = toRefs(state);
const add = () => {
form.value.carousel_list.push({
carousel_img: [],
+ carousel_video: [],
carousel_link: {},
+ video_title: "视频名称"
});
};
const remove = (index: number) => {
@@ -73,6 +85,10 @@ const remove = (index: number) => {
padding-left: 1.6rem;
padding-right: 2rem;
padding-top: 4.6rem;
+ padding-bottom: 1.6rem;
+ :deep(.el-form-item) {
+ margin-bottom: 0;
+ }
}
.upload_style {
width: 100%;
@@ -81,4 +97,10 @@ const remove = (index: number) => {
.tips {
color: $cr-info-dark;
}
+.upload-text {
+ font-size: 1.4rem;
+ color: #999999;
+ text-align: left;
+ font-style: normal;
+}
diff --git a/src/components/model-carousel/model-carousel-styles.vue b/src/components/model-carousel/model-carousel-styles.vue
index a091df05..19f0849b 100644
--- a/src/components/model-carousel/model-carousel-styles.vue
+++ b/src/components/model-carousel/model-carousel-styles.vue
@@ -1,6 +1,6 @@
-
+
图片设置
@@ -18,6 +18,60 @@
+
+
+
+ 视频按钮
+
+
+
+
+
+
+
+ 图片
+ 图标
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -31,20 +85,29 @@ const props = defineProps({
type: Object,
default: () => {},
},
+ content: {
+ type: Object,
+ default: () => {},
+ }
});
const state = reactive({
form: props.value,
+ new_content: props.content,
});
// 如果需要解构,确保使用toRefs
-const { form } = toRefs(state);
+const { form, new_content } = toRefs(state);
+
+const is_video = computed(() => new_content.value.carousel_list.length > 0 && (new_content.value.carousel_list.findIndex((item: any) => item.carousel_video.length > 0)) != -1);
-// 监听整个form对象,发生变化的时候触发emit
-const emit = defineEmits(['update:value']);
// 图片圆角
const radius_change = (radius: any) => {
form.value = Object.assign(form.value, pick(radius, ['radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right']));
- emit('update:value', form.value);
+};
+
+const mult_color_picker_event = (arry: color_list[], type: number) => {
+ form.value.video_color_list = arry;
+ form.value.video_direction = type.toString();
};
// 通用样式处理
const common_styles_update = (val: Object) => {
diff --git a/src/components/model-data-magic/index.vue b/src/components/model-data-magic/index.vue
index c6dc79ae..4e1e395c 100644
--- a/src/components/model-data-magic/index.vue
+++ b/src/components/model-data-magic/index.vue
@@ -19,7 +19,7 @@
-
+
{{ item.actived_index + 1 }}/{{ item.data_content.list.length }}
@@ -48,7 +48,7 @@
-
+
{{ item.actived_index + 1 }}/{{ item.data_content.list.length }}
@@ -355,7 +355,6 @@ const style_container = computed(() => common_styles_computer(new_style.value.co
}
.dot {
z-index: 3;
- bottom: 6px;
.dot-item {
margin: 0 0.3rem;
}
diff --git a/src/components/model-data-magic/model-data-magic-content.vue b/src/components/model-data-magic/model-data-magic-content.vue
index 51d7d53c..b4f38020 100644
--- a/src/components/model-data-magic/model-data-magic-content.vue
+++ b/src/components/model-data-magic/model-data-magic-content.vue
@@ -81,12 +81,13 @@ const data_style = {
indicator_style: 'dot',
indicator_location: 'center',
indicator_size: 5,
+ indicator_bottom: 6,
indicator_radius: {
- radius: 0,
- radius_top_left: 0,
- radius_top_right: 0,
- radius_bottom_left: 0,
- radius_bottom_right: 0,
+ radius: 4,
+ radius_top_left: 4,
+ radius_top_right: 4,
+ radius_bottom_left: 4,
+ radius_bottom_right: 4,
},
actived_color: '#2A94FF',
color: '#DDDDDD',
diff --git a/src/components/model-goods-list/index.vue b/src/components/model-goods-list/index.vue
index b66169bf..9f0f4d6c 100644
--- a/src/components/model-goods-list/index.vue
+++ b/src/components/model-goods-list/index.vue
@@ -469,10 +469,7 @@ watchEffect(() => {
notice_length: notice_length,
};
// 更新轮播图的key,确保更换时能重新更新轮播图
- // 添加节流处理,一秒只执行一次
- throttle(() => {
- carouselKey.value = get_math();
- }, 1000);
+ carouselKey.value = get_math();
}
});
//#endregion
diff --git a/src/components/model-nav-group/index.vue b/src/components/model-nav-group/index.vue
index f0427223..4652b6e3 100644
--- a/src/components/model-nav-group/index.vue
+++ b/src/components/model-nav-group/index.vue
@@ -141,10 +141,7 @@ watch(props.value, (val) => {
is_roll: display_is_roll,
};
// 更新轮播图的key,确保更换时能重新更新轮播图
- // 添加节流处理,一秒只执行一次
- throttle(() => {
- carouselKey.value = get_math();
- }, 1000);
+ carouselKey.value = get_math();
}
nextTick(() => {
if (!isEmpty(bannerImg.value)) {
diff --git a/src/components/model-nav-group/model-nav-group-styles.vue b/src/components/model-nav-group/model-nav-group-styles.vue
index c2230a6f..79d00a8d 100644
--- a/src/components/model-nav-group/model-nav-group-styles.vue
+++ b/src/components/model-nav-group/model-nav-group-styles.vue
@@ -20,7 +20,7 @@
-
+
diff --git a/src/components/model-notice/index.vue b/src/components/model-notice/index.vue
index 3938cbfe..221a84db 100644
--- a/src/components/model-notice/index.vue
+++ b/src/components/model-notice/index.vue
@@ -76,7 +76,7 @@ const container_background_style = computed(() => {
return gradient_computer(styles) + radius_computer(new_style.value.container_radius) + background_computer(styles) + `overflow:hidden;`;
});
// 图片设置
-const img_style = ref('');
+const img_style = computed(() => `height: ${ new_style.value.title_height }px; width: ${ new_style.value.title_width }px`);
// 标题的设置
const topic_style = computed(() => {
// 标题渐变色处理
@@ -108,14 +108,6 @@ const notice_list = computed(() => {
// 内容参数的集合
watchEffect(() => {
- //#region 标题设置
- if (form.value.notice_style == 'card') {
- img_style.value = `height: ${ new_style.value.title_height }px; width: ${ new_style.value.title_width }px`;
- } else if (!isEmpty(form.value.img)) {
- img_style.value = `height: ${ new_style.value.title_height }px; width: ${ new_style.value.title_width }px`;
- }
- //#endregion
-
//#region 轮播图设置
const time = (new_style.value?.interval_time || 2) * 1000;
const direction = form.value.direction;
@@ -134,10 +126,7 @@ watchEffect(() => {
notice_length: notice_length
};
// 更新轮播图的key,确保更换时能重新更新轮播图
- // 添加节流处理,一秒只执行一次
- throttle(() => {
- carouselKey.value = get_math();
- }, 1000);
+ carouselKey.value = get_math();
}
//#endregion
});
diff --git a/src/components/model-seckill/index.vue b/src/components/model-seckill/index.vue
index c94303d1..81c13cd6 100644
--- a/src/components/model-seckill/index.vue
+++ b/src/components/model-seckill/index.vue
@@ -434,10 +434,7 @@ watchEffect(() => {
// 判断是平移还是整屏滚动
slides_per_group.value = new_style.value.rolling_fashion == 'translation' ? 1 : form.value.carousel_col;
// 更新轮播图的key,确保更换时能重新更新轮播图
- // 添加节流处理,一秒只执行一次
- throttle(() => {
- carouselKey.value = get_math();
- }, 1000);
+ carouselKey.value = get_math();
});
//容器高度
diff --git a/src/components/page-settings/page-styles.vue b/src/components/page-settings/page-styles.vue
index 2372205c..4c89db2a 100644
--- a/src/components/page-settings/page-styles.vue
+++ b/src/components/page-settings/page-styles.vue
@@ -57,7 +57,7 @@
-
+