From 5fa56e32650125a91adc438d4d6906dbd533481b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=A5=E6=96=AF?= <9068149@qq.com> Date: Tue, 28 Sep 2021 18:26:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 5 +- src/assets/iconfont/demo_index.html | 6 +- src/assets/iconfont/iconfont.json | 2 +- .../rightslider/custommodulestyle/index.vue | 2 +- .../rightslider/investigatestyle/index.vue | 2 +- src/components/sliderassembly/index.vue | 216 +++++------------- src/layout/home/index.vue | 55 ++++- src/utils/componentProperties.js | 100 ++++---- src/views/establishShop/index.vue | 12 +- 9 files changed, 179 insertions(+), 221 deletions(-) diff --git a/src/App.vue b/src/App.vue index 8a49b36..1681c97 100644 --- a/src/App.vue +++ b/src/App.vue @@ -69,7 +69,7 @@ export default { } - diff --git a/src/assets/iconfont/demo_index.html b/src/assets/iconfont/demo_index.html index 9f71da2..77633c7 100644 --- a/src/assets/iconfont/demo_index.html +++ b/src/assets/iconfont/demo_index.html @@ -362,7 +362,7 @@
  • -
    店铺笔记卡片
    +
    文章模块
    &#xe610;
    • @@ -1046,7 +1046,7 @@
  • - 店铺笔记卡片 + 文章模块
    .icon-dianpubijikapian
    @@ -1723,7 +1723,7 @@ -
    店铺笔记卡片
    +
    文章模块
    #icon-dianpubijikapian
    • diff --git a/src/assets/iconfont/iconfont.json b/src/assets/iconfont/iconfont.json index 615de58..98c91ed 100644 --- a/src/assets/iconfont/iconfont.json +++ b/src/assets/iconfont/iconfont.json @@ -392,7 +392,7 @@ }, { "icon_id": "13319817", - "name": "店铺笔记卡片", + "name": "文章模块", "font_class": "dianpubijikapian", "unicode": "e610", "unicode_decimal": 58896 diff --git a/src/components/rightslider/custommodulestyle/index.vue b/src/components/rightslider/custommodulestyle/index.vue index 9af16d6..5c6213e 100644 --- a/src/components/rightslider/custommodulestyle/index.vue +++ b/src/components/rightslider/custommodulestyle/index.vue @@ -4,7 +4,7 @@

    {{ datas.text }}

    - {{ 'aaa'+ data-type}} + {{ 'aaa'+ datas.type}} diff --git a/src/components/rightslider/investigatestyle/index.vue b/src/components/rightslider/investigatestyle/index.vue index 500c19f..fe3be25 100644 --- a/src/components/rightslider/investigatestyle/index.vue +++ b/src/components/rightslider/investigatestyle/index.vue @@ -25,7 +25,7 @@ - + +

    {{ item.text }}

    @@ -38,17 +39,18 @@ export default { title: '基础组件', comList: [ { - text: '标题文本', + text: '商品搜索', type: '1-1', + icon: 'icon-shangpinsousuo', + name: 'commoditysearch', + }, + { + text: '标题文本', + type: '1-3', icon: 'icon-Component-biaotiwenzi', name: 'captiontext', }, - { - text: '商品', - type: '1-2', - icon: 'icon-goods', - name: 'listswitching', - }, + { text: '图片广告', type: '1-3', @@ -62,10 +64,10 @@ export default { name: 'graphicnavigation', }, { - text: '富文本', + text: '底部导航', type: '1-5', - icon: 'icon-fuwenben', - name: 'richtext', + icon: 'icon-daohang', + name: 'tabBar', }, { text: '魔方', @@ -73,211 +75,118 @@ export default { icon: 'icon-mofang', name: 'magiccube', }, - { - text: '辅助分割', - type: '1-7', - icon: 'icon-Component-fuzhufenge', - name: 'auxiliarysegmentation', - }, - { - text: '商品搜索', - type: '1-8', - icon: 'icon-shangpinsousuo', - name: 'commoditysearch', - }, - { - text: '店铺信息', - type: '1-9', - icon: 'icon-dianpuxinxi', - name: 'storeinformation', - }, - { - text: '进入店铺', - type: '1-10', - icon: 'icon-jinrudianpu', - name: 'entertheshop', - }, { text: '公告', - type: '1-11', + type: '1-7', icon: 'icon-gonggao', name: 'notice', }, + { text: '视频', - type: '1-12', + type: '1-8', icon: 'icon-shipin', name: 'videoss', }, { text: '音频', - type: '1-13', + type: '1-9', icon: 'icon-yuyin', name: 'voicer', }, - + { + text: '富文本', + type: '1-10', + icon: 'icon-fuwenben', + name: 'richtext', + }, + { + text: '辅助分割', + type: '1-11', + icon: 'icon-Component-fuzhufenge', + name: 'auxiliarysegmentation', + }, + + { + text: '店铺信息', + type: '1-12', + icon: 'icon-dianpuxinxi', + name: 'storeinformation', + }, + { + text: '进入店铺', + type: '1-13', + icon: 'icon-jinrudianpu', + name: 'entertheshop', + }, { text: '社群涨粉', - type: '1-15', + type: '1-14', icon: 'icon-kuaisuzhangfen', name: 'communitypowder', }, - { - text: '店铺笔记卡片', - type: '1-16', - icon: 'icon-dianpubijikapian', - name: 'storenotecard', - }, /* { - text: '人群运营', + text: 'xxx', type: '1-17', icon: 'icon-yunying', name: '' }, */ /* { - text: '在线客服', + text: 'xxx', type: '1-19', icon: 'icon-weibiaoti-_huaban', name: '' }, */ /* { - text: '个性化推荐', + text: 'xxxx', type: '1-18', icon: 'icon-gexinghuatuijian', name: '' }, */ - { - text: '调研', - type: '1-20', - icon: 'icon-dianpubijikapian', - name: 'investigate', - }, - { - text: '导航', - type: '1-21', - icon: 'icon-daohang', - name: 'tabBar', - }, { text: '关注公众号', - type: '1-22', + type: '1-15', icon: 'icon-gongzhonghao', name: 'follow', }, { text: '悬浮', - type: '1-23', + type: '1-16', icon: 'icon-wangye', name: 'suspension', }, { text: '自定义模块', - type: '1-13', + type: 'demo', icon: 'icon-zidingyimokuai', name: 'custommodule' }, ], }, - /* { - title: '营销组件', + { + title: '业务组件', comList: [ { - text: '优惠券', + text: '商品', type: '2-1', - icon: 'icon-youhuiquan', - name: '' + icon: 'icon-goods', + name: 'listswitching', }, { - text: '限时折扣', + text: '文章模块', type: '2-2', - icon: 'icon-xianshizhekou', - name: '' + icon: 'icon-dianpubijikapian', + name: 'storenotecard', }, { - text: '秒杀', + text: '表单模块', type: '2-3', - icon: 'icon-miaosha', - name: '' - }, - { - text: '拼团', - type: '2-4', - icon: 'icon-pintuan-copy', - name: '' - }, - { - text: '砍价', - type: '2-5', - icon: 'icon-kanjia', - name: '' - }, - { - text: '周期购', - type: '2-6', - icon: 'icon-zhouqi', - name: '' - }, - { - text: '积分商城', - type: '2-7', - icon: 'icon-jifenzhang', - name: '' + vanIcon: 'orders-o', + name: 'investigate', } ] }, - { - title: '教育组件', - comList: [ - { - text: '课程', - type: '3-1', - icon: 'icon-kecheng', - name: '' - }, - { - text: '老师', - type: '3-2', - icon: 'icon-laoshi', - name: '' - }, - { - text: '知识专栏', - type: '3-3', - icon: 'icon-zhishizhuanlan1', - name: '' - }, - { - text: '知识内容', - type: '3-4', - icon: 'icon-zhishizhuanlan', - name: '' - }, - { - text: '知识直播', - type: '3-5', - icon: 'icon-zhibobofangshexiangjitianxianxianxing', - name: '' - }, - { - text: '知识付费会员', - type: '3-6', - icon: 'icon-zhishifufeihuiyuan', - name: '' - }, - { - text: '群打卡', - type: '3-7', - icon: 'icon-daka', - name: '' - }, - { - text: '报名表单', - type: '3-8', - icon: 'icon-baomingbiaodan', - name: '' - } - ] - } */ + ], } }, @@ -310,12 +219,13 @@ export default { diff --git a/src/utils/componentProperties.js b/src/utils/componentProperties.js index ae7e508..29ee658 100644 --- a/src/utils/componentProperties.js +++ b/src/utils/componentProperties.js @@ -6,30 +6,30 @@ const componentsData = new Map() componentsData.set('captiontext', { component: 'captiontext', text: '标题文字', - type: '1-1', + type: '1-3', active: true, style: 'captiontextsstyle', setStyle: { text: '标题文字', - name: '标题文字', - description: '', - wordSize: 16, - descriptionSize: 12, - wordWeight: 400, - positions: 'left', - descriptionWeight: 200, - wordColor: 'rgba(50, 50, 51, 10)', - descriptionColor: 'rgba(150, 151, 153, 10)', - backColor: 'rgba(255, 255, 255, 10)', - borderBott: false, - wordHeight: 24, - more: { - show: false, - type: 1, - text: '查看更多', - httpType: 1, - http: '', - select: {}, + name: '标题文字',//标题内容 + description: '',//描述内容 + wordSize: 16,//标题大小 + descriptionSize: 12,//描述大小 + wordWeight: 400,//标题粗细 + positions: 'left', //显示位置 可选left/center + descriptionWeight: 200,//描述粗细 + wordColor: 'rgba(50, 50, 51, 10)',//标题颜色 + descriptionColor: 'rgba(150, 151, 153, 10)',//描述颜色 + backColor: 'rgba(255, 255, 255, 10)', //背景颜色 + borderBott: false, //底部分割线 + wordHeight: 24,//框体高度 + more: { //查看更多 + show: false,//是否显示查看更多 + type: 1, // 样式选择 + text: '查看更多', //自定义文字 + httpType: 1,//链接类型 + http: '',//外部链接 + select: {},//内部跳转链接 }, }, }) @@ -37,7 +37,7 @@ componentsData.set('captiontext', { componentsData.set('listswitching', { component: 'listswitching', text: '商品', - type: '1-2', + type: '2-1', active: true, style: 'listswitchingstyle', setStyle: { @@ -84,13 +84,13 @@ componentsData.set('pictureads', { style: 'pictureadsstyle', setStyle: { text: '图片广告', - swiperType: 0, - borderRadius: 0, - pageMargin: 0, - imageMargin: 0, - pagingType: 0, - rowindividual: 2, - imageList: [], + swiperType: 0, // 选择模板 + borderRadius: 0,// 图片倒角 + pageMargin: 0, // 页面边距 + imageMargin: 0, // 图片边距 + pagingType: 0, // 分页类型: 0/"bullets"/"fraction"/"progressbar" + rowindividual: 2,// 一行个数 + imageList: [], // 添加图片 }, }) @@ -118,7 +118,7 @@ componentsData.set('graphicnavigation', { componentsData.set('richtext', { component: 'richtext', text: '富文本', - type: '1-5', + type: '1-10', active: true, style: 'richtextstyle', setStyle: { @@ -170,7 +170,7 @@ componentsData.set('magiccube', { componentsData.set('auxiliarysegmentation', { component: 'auxiliarysegmentation', text: '辅助分割', - type: '1-7', + type: '1-11', active: true, style: 'auxiliarysegmentationstyle', setStyle: { @@ -185,7 +185,7 @@ componentsData.set('auxiliarysegmentation', { componentsData.set('commoditysearch', { component: 'commoditysearch', text: '商品搜索', - type: '1-8', + type: '1-1', active: true, style: 'commoditysearchstyle', setStyle: { @@ -204,7 +204,7 @@ componentsData.set('commoditysearch', { componentsData.set('storeinformation', { component: 'storeinformation', text: '店铺信息', - type: '1-9', + type: '1-12', active: true, style: 'storeinformationstyle', setStyle: { @@ -219,7 +219,7 @@ componentsData.set('storeinformation', { componentsData.set('entertheshop', { component: 'entertheshop', text: '进入店铺', - type: '1-10', + type: '1-13', active: true, style: 'entertheshopstyle', setStyle: { @@ -233,7 +233,7 @@ componentsData.set('entertheshop', { componentsData.set('notice', { component: 'notice', text: '公告', - type: '1-11', + type: '1-7', active: true, style: 'noticestyle', setStyle: { @@ -246,7 +246,7 @@ componentsData.set('notice', { componentsData.set('videoss', { component: 'videoss', text: '视频', - type: '1-12', + type: '1-8', active: true, style: 'videostyle', setStyle: { @@ -258,7 +258,7 @@ componentsData.set('videoss', { componentsData.set('voicer', { component: 'voicer', text: '音频', - type: '1-13', + type: '1-9', active: true, style: 'voicerstyle', setStyle: { @@ -269,7 +269,7 @@ componentsData.set('voicer', { componentsData.set('custommodule', { component: 'custommodule', text: '自定义模块', - type: '1-14', + type: 'demo', active: true, style: 'custommodulestyle', setStyle: { @@ -281,7 +281,7 @@ componentsData.set('custommodule', { componentsData.set('communitypowder', { component: 'communitypowder', text: '社群涨粉', - type: '1-15', + type: '1-14', active: true, style: 'communitypowderstyle', setStyle: { @@ -296,12 +296,12 @@ componentsData.set('communitypowder', { }) componentsData.set('storenotecard', { component: 'storenotecard', - text: '店铺笔记卡片', - type: '1-16', + text: '文章模块', + type: '2-2', active: true, style: 'storenotecardstyle', setStyle: { - text: '店铺笔记卡片', + text: '文章模块', name: '这里显示专题名称', //专题名称 commodityType: 0, // 选择模板 moditystyle: 0, // 卡片样式选择 @@ -353,24 +353,24 @@ componentsData.set('onlineservice', { }) componentsData.set('investigate', { component: 'investigate', - text: '调研', - type: '1-20', + text: '表单模块', + type: '2-3', active: true, style: 'investigatestyle', setStyle: { - text: '调研', - title: '调研', + text: '表单模块', + title: '表单模块', jsonData: [], //value1为sass显示内容，value2为前端显示内容 }, }) componentsData.set('tabBar', { component: 'tabBar', - text: '导航', - type: '1-21', + text: '底部导航', + type: '1-5', active: true, style: 'tabBarStyle', setStyle: { - text: '导航', + text: '底部导航', activeColor: '#1989fa', inactiveColor: '#7d7e80', isShowBorder: true, @@ -384,7 +384,7 @@ componentsData.set('tabBar', { componentsData.set('follow', { component: 'follow', text: '关注公众号', - type: '1-22', + type: '1-15', active: true, style: 'followStyle', setStyle: { @@ -397,7 +397,7 @@ componentsData.set('follow', { componentsData.set('suspension', { component: 'suspension', text: '悬浮按钮', - type: '1-23', + type: '1-16', active: true, style: 'suspensionstyle', setStyle: { diff --git a/src/views/establishShop/index.vue b/src/views/establishShop/index.vue index 4fd42f8..bd0fb83 100644 --- a/src/views/establishShop/index.vue +++ b/src/views/establishShop/index.vue @@ -337,8 +337,10 @@ - + + 配置管理 + + @@ -733,9 +735,9 @@ export default { box-sizing: border-box; /* tab */ - /deep/.el-tabs__nav-wrap .is-top { - padding: 0 20px; - } + // /deep/.el-tabs__nav-wrap .is-top { + // padding: 0 20px; + // } .el-dropdown-link { cursor: pointer;