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 @@
{{ 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 }} +
-
+
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 @@