diff --git a/src/assets/icon/iconfont.css b/src/assets/icon/iconfont.css
index cc77a193..ec401c6b 100644
--- a/src/assets/icon/iconfont.css
+++ b/src/assets/icon/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4236293 */
- src: url('iconfont.woff2?t=1699953801277') format('woff2'),
- url('iconfont.woff?t=1699953801277') format('woff'),
- url('iconfont.ttf?t=1699953801277') format('truetype');
+ src: url('iconfont.woff2?t=1700117916443') format('woff2'),
+ url('iconfont.woff?t=1700117916443') format('woff'),
+ url('iconfont.ttf?t=1700117916443') format('truetype');
}
.iconfont {
@@ -13,6 +13,18 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-settings:before {
+ content: "\e699";
+}
+
+.icon-link:before {
+ content: "\e632";
+}
+
+.icon-rukou:before {
+ content: "\e624";
+}
+
.icon-Searchbar_Search_icon:before {
content: "\e64a";
}
diff --git a/src/assets/icon/iconfont.js b/src/assets/icon/iconfont.js
index 3e38def0..c0c884fb 100644
--- a/src/assets/icon/iconfont.js
+++ b/src/assets/icon/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_4236293='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,t,i,o,e,v=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_4236293,(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?v(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),h()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(i=h,o=c.document,e=!1,n(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,s())})}function s(){e||(e=!0,i())}function n(){try{o.documentElement.doScroll("left")}catch(a){return void setTimeout(n,50)}s()}}(window);
+window._iconfont_svg_string_4236293='',function(l){var a=(a=document.getElementsByTagName("script"))[a.length-1],c=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,t,o,v,e=function(a,c){c.parentNode.insertBefore(a,c)};if(c&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_4236293,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(a=document.body).firstChild?e(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(t=h,o=l.document,v=!1,n(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,s())})}function s(){v||(v=!0,t())}function n(){try{o.documentElement.doScroll("left")}catch(a){return void setTimeout(n,50)}s()}}(window);
diff --git a/src/assets/icon/iconfont.json b/src/assets/icon/iconfont.json
index 60de867e..12f3424c 100644
--- a/src/assets/icon/iconfont.json
+++ b/src/assets/icon/iconfont.json
@@ -5,6 +5,27 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
+ {
+ "icon_id": "8106221",
+ "name": "settings",
+ "font_class": "settings",
+ "unicode": "e699",
+ "unicode_decimal": 59033
+ },
+ {
+ "icon_id": "747955",
+ "name": "链接",
+ "font_class": "link",
+ "unicode": "e632",
+ "unicode_decimal": 58930
+ },
+ {
+ "icon_id": "23713925",
+ "name": "入口",
+ "font_class": "rukou",
+ "unicode": "e624",
+ "unicode_decimal": 58916
+ },
{
"icon_id": "12150232",
"name": "Search bar_Search_icon",
diff --git a/src/assets/icon/iconfont.ttf b/src/assets/icon/iconfont.ttf
index 98ee83bf..2a4d576a 100644
Binary files a/src/assets/icon/iconfont.ttf and b/src/assets/icon/iconfont.ttf differ
diff --git a/src/assets/icon/iconfont.woff b/src/assets/icon/iconfont.woff
index 12b7a1fa..9dd40ef7 100644
Binary files a/src/assets/icon/iconfont.woff and b/src/assets/icon/iconfont.woff differ
diff --git a/src/assets/icon/iconfont.woff2 b/src/assets/icon/iconfont.woff2
index c53f84d4..5d681706 100644
Binary files a/src/assets/icon/iconfont.woff2 and b/src/assets/icon/iconfont.woff2 differ
diff --git a/src/assets/image/dashboardLinkBack.png b/src/assets/image/dashboardLinkBack.png
new file mode 100644
index 00000000..e9c53bf3
Binary files /dev/null and b/src/assets/image/dashboardLinkBack.png differ
diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue
index 99d53433..a1d7ceac 100644
--- a/src/views/dashboard/search/GeneralSearch.vue
+++ b/src/views/dashboard/search/GeneralSearch.vue
@@ -167,7 +167,7 @@ export default {
if (res.success) {
// 设置对象key为搜索时需要传给后端的字段名，以及设置选项和字段label
for (const item in res.result) {
- if (res.result) {
+ if (res.result[item]) {
let label = ''
if (item === 'applicableVehicle') {
// 适用车辆类型
@@ -200,9 +200,14 @@ export default {
label: label,
current: 'all'
}
+ } else {
+ // 该字段为null，删除原本有的该字段
+ if (Object.keys(this.selectOptions).includes(item)) {
+ delete this.selectOptions[item]
+ }
}
}
- this.selectOptions = Object.assign({}, this.selectOptions)
+ console.log(this.selectOptions)
} else {
this.$message.warning(res.message)
this.selectOptions = {}