From 899eb4bb7389fc7dddf690104fc1c64d43aa799a Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 16 Oct 2024 10:45:14 +0800
Subject: [PATCH 1/4] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/model-rich-text/index.vue | 1 -
src/views/layout/components/navbar/index.vue | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/components/model-rich-text/index.vue b/src/components/model-rich-text/index.vue
index e67db0ec..099e4d5f 100644
--- a/src/components/model-rich-text/index.vue
+++ b/src/components/model-rich-text/index.vue
@@ -26,7 +26,6 @@ watch(
content.value = new_content.html;
style_container.value = common_styles_computer(new_style.common_style);
style_img_container.value = common_img_computer(new_style.common_style);
- console.log(new_content.html);
},
{ immediate: true, deep: true }
);
diff --git a/src/views/layout/components/navbar/index.vue b/src/views/layout/components/navbar/index.vue
index 0b2d1f6a..63b929c5 100644
--- a/src/views/layout/components/navbar/index.vue
+++ b/src/views/layout/components/navbar/index.vue
@@ -32,10 +32,10 @@
-
+
-
+
From 068185498d0e198d08f93b78c51db8535aa378f2 Mon Sep 17 00:00:00 2001
From: gongfuxiang
Date: Wed, 16 Oct 2024 10:52:32 +0800
Subject: [PATCH 2/4] =?UTF-8?q?icon=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/icons/iconfont.css | 2 +-
src/assets/icons/iconfont.js | 2 +-
src/components/base/drag/index.vue | 6 +++---
src/components/common/carousel-indicator/index.vue | 2 +-
src/components/common/upload-icon/index.vue | 2 +-
src/components/model-carousel/model-carousel-content.vue | 2 +-
src/components/model-custom/components/index.vue | 2 +-
src/components/model-data-magic/components/tabs-content.vue | 2 +-
src/views/layout/components/main/index.scss | 4 ++--
src/views/layout/components/main/index.vue | 4 ++--
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/assets/icons/iconfont.css b/src/assets/icons/iconfont.css
index f604dab3..61ee0768 100644
--- a/src/assets/icons/iconfont.css
+++ b/src/assets/icons/iconfont.css
@@ -188,7 +188,7 @@
content: "\e772";
}
-.icon-close-o1:before {
+.icon-close-fillup:before {
content: "\e773";
}
diff --git a/src/assets/icons/iconfont.js b/src/assets/icons/iconfont.js
index 804e875e..831a8029 100644
--- a/src/assets/icons/iconfont.js
+++ b/src/assets/icons/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_4227145='',(h=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var c,o,i,m,v,t=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}c=function(){var a,l=document.createElement("div");l.innerHTML=h._iconfont_svg_string_4227145,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?t(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),c()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=c,m=h.document,v=!1,d(),m.onreadystatechange=function(){"complete"==m.readyState&&(m.onreadystatechange=null,z())})}function z(){v||(v=!0,i())}function d(){try{m.documentElement.doScroll("left")}catch(a){return void setTimeout(d,50)}z()}})(window);
\ No newline at end of file
+window._iconfont_svg_string_4227145='',(h=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var c,o,i,m,v,t=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}c=function(){var a,l=document.createElement("div");l.innerHTML=h._iconfont_svg_string_4227145,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?t(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),c()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=c,m=h.document,v=!1,d(),m.onreadystatechange=function(){"complete"==m.readyState&&(m.onreadystatechange=null,z())})}function z(){v||(v=!0,i())}function d(){try{m.documentElement.doScroll("left")}catch(a){return void setTimeout(d,50)}z()}})(window);
\ No newline at end of file
diff --git a/src/components/base/drag/index.vue b/src/components/base/drag/index.vue
index 7f728d45..8f5eecad 100644
--- a/src/components/base/drag/index.vue
+++ b/src/components/base/drag/index.vue
@@ -4,11 +4,11 @@
-
+
-
+
编辑
@@ -91,7 +91,7 @@ const on_sort = () => {
font-size: 1.6rem !important;
}
.icon-del-o,
-.icon-commodity-edit {
+.icon-edit-o {
cursor: pointer;
}
.cursor-move {
diff --git a/src/components/common/carousel-indicator/index.vue b/src/components/common/carousel-indicator/index.vue
index fa4ab03d..25a43aa4 100644
--- a/src/components/common/carousel-indicator/index.vue
+++ b/src/components/common/carousel-indicator/index.vue
@@ -7,7 +7,7 @@
-
+
diff --git a/src/components/common/upload-icon/index.vue b/src/components/common/upload-icon/index.vue
index 450de17b..f236daf1 100644
--- a/src/components/common/upload-icon/index.vue
+++ b/src/components/common/upload-icon/index.vue
@@ -17,7 +17,7 @@
-
+