diff --git a/src/assets/icons/iconfont.css b/src/assets/icons/iconfont.css index 64f2555b..d23aa9fd 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=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'); + src: url('iconfont.woff2?t=1726304182208') format('woff2'), + url('iconfont.woff?t=1726304182208') format('woff'), + url('iconfont.ttf?t=1726304182208') format('truetype'), + url('iconfont.svg?t=1726304182208#iconfont') format('svg'); } .iconfont { @@ -14,6 +14,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-fenlei-more:before { + content: "\e6b7"; +} + +.icon-jinzhi:before { + content: "\e799"; +} + .icon-bofang:before { content: "\e798"; } diff --git a/src/assets/icons/iconfont.js b/src/assets/icons/iconfont.js index b4a7f7d2..a5aa5085 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,i,c=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?c(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,i=!1,d(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,z())})}function z(){i||(i=!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 5b319137..750fa89a 100644 --- a/src/assets/icons/iconfont.json +++ b/src/assets/icons/iconfont.json @@ -5,6 +5,20 @@ "css_prefix_text": "icon-", "description": "web端", "glyphs": [ + { + "icon_id": "37217394", + "name": "icon-fenlei-more", + "font_class": "fenlei-more", + "unicode": "e6b7", + "unicode_decimal": 59063 + }, + { + "icon_id": "41868113", + "name": "禁止", + "font_class": "jinzhi", + "unicode": "e799", + "unicode_decimal": 59289 + }, { "icon_id": "41814968", "name": "播放 (2)", diff --git a/src/assets/icons/iconfont.svg b/src/assets/icons/iconfont.svg index 0a11a889..6a562c53 100644 --- a/src/assets/icons/iconfont.svg +++ b/src/assets/icons/iconfont.svg @@ -14,6 +14,10 @@ /> + + + + diff --git a/src/assets/icons/iconfont.ttf b/src/assets/icons/iconfont.ttf index bb4a4717..0ad2c1ac 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 0b7888c8..3ddc2139 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 6fe90784..bd09bebd 100644 Binary files a/src/assets/icons/iconfont.woff2 and b/src/assets/icons/iconfont.woff2 differ diff --git a/src/components/base/drag/index.vue b/src/components/base/drag/index.vue index fd1fdd79..c44114f8 100644 --- a/src/components/base/drag/index.vue +++ b/src/components/base/drag/index.vue @@ -2,18 +2,11 @@
  • - - + - + +
    • @@ -29,13 +22,11 @@ interface Props { spaceCol?: number; // 上下间距 iconPosition?: string; // top/bottom/center isShowEdit?: boolean; - isNotCloseIndex?: number[]; } const props = withDefaults(defineProps(), { type: () => 'line', isShowEdit: false, spaceCol: () => 5, - isNotCloseIndex: () => [], iconPosition: 'center', }); const className = ref(''); diff --git a/src/components/model-article-list/index.vue b/src/components/model-article-list/index.vue index 69c04307..3352c8ab 100644 --- a/src/components/model-article-list/index.vue +++ b/src/components/model-article-list/index.vue @@ -121,12 +121,12 @@ const interval_time = ref(2000); // 轮播图是否滚动 const is_roll = ref(1); const get_auto_data_list = async () => { - const { category, number, sort, sort_rules, is_cover } = new_content.value; + const { category_ids, number, order_by_type, order_by_rule, is_cover } = new_content.value; const new_data = { article_keywords: '', - article_category_ids: category.join(','), - article_order_by_type: sort, - article_order_by_rule: sort_rules, + article_category_ids: category_ids.join(','), + article_order_by_type: order_by_type, + article_order_by_rule: order_by_rule, article_number: number, article_is_cover: is_cover, }; @@ -165,8 +165,8 @@ onMounted(() => { } }); const data_list_computer = computed(() => { - const { data_type, category, number, sort, sort_rules, is_cover, data_list } = new_content.value; - return { data_type, category, number, sort, sort_rules, is_cover, data_list }; + const { data_type, category_ids, number, order_by_type, order_by_rule, is_cover, data_list } = new_content.value; + return { data_type, category_ids, number, order_by_type, order_by_rule, is_cover, data_list }; }); watch( () => data_list_computer.value, diff --git a/src/components/model-article-list/model-article-list-content.vue b/src/components/model-article-list/model-article-list-content.vue index b3bbc9bc..ca31b92b 100644 --- a/src/components/model-article-list/model-article-list-content.vue +++ b/src/components/model-article-list/model-article-list-content.vue @@ -30,7 +30,7 @@ @@ -117,7 +117,7 @@ const base_list = reactive({ { name: '价格', value: '3' }, { name: '最新', value: '4' }, ], - sort_rules_list: [ + order_by_rule_list: [ { name: '降序(desc)', value: '0' }, { name: '升序(asc)', value: '1' }, ], diff --git a/src/components/model-goods-tabs/index.vue b/src/components/model-goods-tabs/index.vue index 1adfcadb..f3fd1a4e 100644 --- a/src/components/model-goods-tabs/index.vue +++ b/src/components/model-goods-tabs/index.vue @@ -26,11 +26,11 @@ watch(tabs_list.value, (val) => { let new_data = val; // 产品的值 new_data.content.data_type = new_data.content.tabs_list[0].data_type; - new_data.content.category = new_data.content.tabs_list[0].category; - new_data.content.brand = new_data.content.tabs_list[0].brand; + new_data.content.category_ids = new_data.content.tabs_list[0].category_ids; + new_data.content.brand_ids = new_data.content.tabs_list[0].brand_ids; new_data.content.number = new_data.content.tabs_list[0].number; - new_data.content.sort = new_data.content.tabs_list[0].sort; - new_data.content.sort_rules = new_data.content.tabs_list[0].sort_rules; + new_data.content.order_by_type = new_data.content.tabs_list[0].order_by_type; + new_data.content.order_by_rule = new_data.content.tabs_list[0].order_by_rule; new_data.content.data_list = new_data.content.tabs_list[0].data_list; tabs_list.value = new_data; diff --git a/src/components/model-goods-tabs/model-goods-tabs-content.vue b/src/components/model-goods-tabs/model-goods-tabs-content.vue index bfcc24cb..9007d07d 100644 --- a/src/components/model-goods-tabs/model-goods-tabs-content.vue +++ b/src/components/model-goods-tabs/model-goods-tabs-content.vue @@ -55,12 +55,12 @@ @@ -152,7 +152,7 @@ const base_list = reactive({ { name: '价格', value: '3' }, { name: '最新', value: '4' }, ], - sort_rules_list: [ + order_by_rule_list: [ { name: '降序（desc）', value: '0' }, { name: '升序（asc）', value: '1' }, ], @@ -200,8 +200,8 @@ const tabs_add = () => { category: [], data_ids: [], number: 4, - sort: '0', - sort_rules: '0', + order_by_type: '0', + order_by_rule: '0', data_list: [], }); }; diff --git a/src/components/model-tabs/index.vue b/src/components/model-tabs/index.vue index 0283f941..e2b3701d 100644 --- a/src/components/model-tabs/index.vue +++ b/src/components/model-tabs/index.vue @@ -1,11 +1,11 @@ - + diff --git a/src/components/model-tabs/model-tabs-content.vue b/src/components/model-tabs/model-tabs-content.vue index 80e67f8d..070a7ead 100644 --- a/src/components/model-tabs/model-tabs-content.vue +++ b/src/components/model-tabs/model-tabs-content.vue @@ -17,13 +17,19 @@
    选项卡设置
    - - - - +添加 + + + + +添加 +     @@ -99,4 +105,13 @@ const tabs_theme_change = (val: string | number | boolean | undefined): void => margin-bottom: 0; } } +.cursor-move { + color: #ddd; + cursor: move; +} +.card-background { + background: #fff; + padding-left: 1.6rem; + padding-right: 2rem; +} diff --git a/src/views/layout/components/main/default/article-list.ts b/src/views/layout/components/main/default/article-list.ts index 36790265..5a8c9ea9 100644 --- a/src/views/layout/components/main/default/article-list.ts +++ b/src/views/layout/components/main/default/article-list.ts @@ -12,12 +12,12 @@ interface DefaultArticleList { theme: string; carousel_col: string; data_type: string; - category: string[]; + category_ids: string[]; data_list: ArticleList[]; data_ids: string; data_auto_list: ArticleList[]; number: number; - sort: string; + order_by_type: string; sort_rules: string; field_show: string[]; is_cover: string; @@ -48,12 +48,12 @@ const defaultArticleList: DefaultArticleList = { theme: '0', carousel_col: '2', data_type: '0', - category: [], + category_ids: [], data_list: [], data_ids: '', data_auto_list: [], number: 4, - sort: '0', + order_by_type: '0', sort_rules: '0', field_show: ['0', '1'], is_cover: '1', diff --git a/src/views/layout/components/main/default/article-tabs.ts b/src/views/layout/components/main/default/article-tabs.ts index cb50ef17..a97998ab 100644 --- a/src/views/layout/components/main/default/article-tabs.ts +++ b/src/views/layout/components/main/default/article-tabs.ts @@ -10,9 +10,9 @@ interface articleTabsList { title: string; desc: string; data_type: string; - category: string[]; + category_ids: string[]; number: number; - sort: string; + order_by_type: string; sort_rules: string; is_cover: string; data_list: ArticleList[]; @@ -64,12 +64,12 @@ const defaultArticleTabs: DefaultArticleTabs = { article_theme: '0', article_carousel_col: '2', tabs_list: [ - { id: '1', title: '热门推荐', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, - { id: '2', title: '测试一', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, - { id: '3', title: '测试二', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, - { id: '4', title: '测试三', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, - { id: '5', title: '测试四', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, - { id: '6', title: '测试五', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, + { id: '1', title: '热门推荐', desc: '简介', data_type: '0', category_ids: [], number: 4, order_by_type: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, + { id: '2', title: '测试一', desc: '简介', data_type: '0', category_ids: [], number: 4, order_by_type: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, + { id: '3', title: '测试二', desc: '简介', data_type: '0', category_ids: [], number: 4, order_by_type: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, + { id: '4', title: '测试三', desc: '简介', data_type: '0', category_ids: [], number: 4, order_by_type: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, + { id: '5', title: '测试四', desc: '简介', data_type: '0', category_ids: [], number: 4, order_by_type: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, + { id: '6', title: '测试五', desc: '简介', data_type: '0', category_ids: [], number: 4, order_by_type: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, ], field_show: ['0', '1'], }, diff --git a/src/views/layout/components/main/default/goods-list.ts b/src/views/layout/components/main/default/goods-list.ts index 0fe65ca3..4eab084d 100644 --- a/src/views/layout/components/main/default/goods-list.ts +++ b/src/views/layout/components/main/default/goods-list.ts @@ -4,15 +4,15 @@ interface DefaultProductList { theme: string; data_type: string; carousel_col: number; - category: string[]; - brand: string[]; + category_ids: string[]; + brand_ids: string[]; data_ids: string[]; product_show_list: string[]; data_list: string[]; data_auto_list: string[]; is_price_solo: string; number: number; - sort: string; + order_by_type: string; sort_rules: string; is_show: string[]; is_shop_show: string; @@ -60,12 +60,12 @@ const defaultProductList: DefaultProductList = { product_show_list: [], data_list: [], data_auto_list: [], - category: [], - brand: [], + category_ids: [], + brand_ids: [], data_ids: [], is_price_solo: '1', number: 4, - sort: '0', + order_by_type: '0', sort_rules: '0', is_show: ['title', 'plugins_view_icon', 'price', 'sales_count', 'original_price'], is_shop_show: '1', diff --git a/src/views/layout/components/main/default/goods-tabs.ts b/src/views/layout/components/main/default/goods-tabs.ts index 474e5834..95e3f30d 100644 --- a/src/views/layout/components/main/default/goods-tabs.ts +++ b/src/views/layout/components/main/default/goods-tabs.ts @@ -5,11 +5,11 @@ interface articleTabsList { img: uploadList[]; desc: string; data_type: string; - category: string[]; - brand: string[]; + category_ids: string[]; + brand_ids: string[]; data_ids: string[]; number: number; - sort: string; + order_by_type: string; sort_rules: string; data_list: []; } @@ -75,10 +75,10 @@ const defaultProductList: DefaultProductList = { theme: '0', carousel_col: 3, tabs_list: [ - { id: '1', title: '热门推荐', img: [], desc: '简介', data_type: '0', category: [], brand: [], data_ids: [], number: 4, sort: '0', sort_rules: '0', data_list: [] }, - { id: '2', title: '测试一', img: [], desc: '简介', data_type: '0', category: [], brand: [], data_ids: [], number: 4, sort: '0', sort_rules: '0', data_list: [] }, - { id: '3', title: '测试二', img: [], desc: '简介', data_type: '0', category: [], brand: [], data_ids: [], number: 4, sort: '0', sort_rules: '0', data_list: [] }, - { id: '4', title: '测试三', img: [], desc: '简介', data_type: '0', category: [], brand: [], data_ids: [], number: 4, sort: '0', sort_rules: '0', data_list: [] }, + { id: '1', title: '热门推荐', img: [], desc: '简介', data_type: '0', category_ids: [], brand_ids: [], data_ids: [], number: 4, order_by_type: '0', sort_rules: '0', data_list: [] }, + { id: '2', title: '测试一', img: [], desc: '简介', data_type: '0', category_ids: [], brand_ids: [], data_ids: [], number: 4, order_by_type: '0', sort_rules: '0', data_list: [] }, + { id: '3', title: '测试二', img: [], desc: '简介', data_type: '0', category_ids: [], brand_ids: [], data_ids: [], number: 4, order_by_type: '0', sort_rules: '0', data_list: [] }, + { id: '4', title: '测试三', img: [], desc: '简介', data_type: '0', category_ids: [], brand_ids: [], data_ids: [], number: 4, order_by_type: '0', sort_rules: '0', data_list: [] }, ], is_show: ['title', 'plugins_view_icon', 'price', 'sales_count', 'original_price'], is_shop_show: '1', diff --git a/src/views/layout/components/main/default/tabs.ts b/src/views/layout/components/main/default/tabs.ts index 6eb25476..4a3e2364 100644 --- a/src/views/layout/components/main/default/tabs.ts +++ b/src/views/layout/components/main/default/tabs.ts @@ -14,6 +14,7 @@ interface defaultTabs { content: { tabs_theme: string; tabs_top_up: string; + home_data: tabs_page; tabs_list: tabs_page[]; }; style: { @@ -33,8 +34,9 @@ const defaultTabs: defaultTabs = { content: { tabs_theme: '0', tabs_top_up: '1', + home_data: { id: get_math(), title: '首页', desc: '简介', data_type: '0', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} }, tabs_list: [ - { id: get_math(), title: '首页', desc: '简介', data_type: '0', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} }, + { id: get_math(), title: '热门推荐', desc: '简介', data_type: '0', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} }, { id: get_math(), title: '测试一', desc: '简介', data_type: '0', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} }, { id: get_math(), title: '测试二', desc: '简介', data_type: '0', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} }, ], diff --git a/src/views/layout/components/main/index.vue b/src/views/layout/components/main/index.vue index c23500ae..dcbf1d4b 100644 --- a/src/views/layout/components/main/index.vue +++ b/src/views/layout/components/main/index.vue @@ -25,11 +25,11 @@
    已选组件({{ diy_data.length }})
    -
  • - +
    + {{ item.name }} -
    • +
  • @@ -40,7 +40,7 @@
    • - + 34