diff --git a/src/assets/iconfont/iconfont.json b/src/assets/iconfont/iconfont.json index 98c91ed..18b8c76 100644 --- a/src/assets/iconfont/iconfont.json +++ b/src/assets/iconfont/iconfont.json @@ -427,7 +427,7 @@ }, { "icon_id": "13455314", - "name": "进入店铺", + "name": "单元格", "font_class": "jinrudianpu", "unicode": "e642", "unicode_decimal": 58946 diff --git a/src/components/componentscom/entertheshop/index.vue b/src/components/componentscom/entertheshop/index.vue index 2160acc..1a6abdb 100644 --- a/src/components/componentscom/entertheshop/index.vue +++ b/src/components/componentscom/entertheshop/index.vue @@ -2,10 +2,12 @@
diff --git a/src/components/rightslider/entertheshopstyle/index.vue b/src/components/rightslider/entertheshopstyle/index.vue index 6f60640..4b0686f 100644 --- a/src/components/rightslider/entertheshopstyle/index.vue +++ b/src/components/rightslider/entertheshopstyle/index.vue @@ -12,13 +12,13 @@ size="small" > @@ -26,18 +26,31 @@ + + + + + 点击{{datas.icon?'更换':'添加'}}图片 + + +
@@ -67,10 +80,15 @@
+ + +
@@ -132,5 +159,17 @@ export default { width: 40%; } } + /* 上传图片按钮 */ + .uploadImg { + width: 345px; + height: 40px; + margin-top:20px ; + } + img{ + display: block; + margin: 0 auto; + width: 56px; + height: 56px; + } } diff --git a/src/components/sliderassembly/index.vue b/src/components/sliderassembly/index.vue index 3eade16..90f73e6 100644 --- a/src/components/sliderassembly/index.vue +++ b/src/components/sliderassembly/index.vue @@ -108,7 +108,7 @@ export default { name: 'storeinformation', }, { - text: '进入店铺', + text: '单元格', type: '1-13', icon: 'icon-jinrudianpu', name: 'entertheshop', diff --git a/src/utils/componentProperties.js b/src/utils/componentProperties.js index eedbf5c..bc36d83 100644 --- a/src/utils/componentProperties.js +++ b/src/utils/componentProperties.js @@ -217,14 +217,15 @@ componentProperties.set('storeinformation', { }) componentProperties.set('entertheshop', { component: 'entertheshop', - text: '进入店铺', + text: '单元格', type: '1-13', active: true, style: 'entertheshopstyle', setStyle: { - text: '进入店铺', - shopName: '店铺名称', - copywriting: '进入店铺', + text: '单元格', + icon: '', // 左侧图标 + shopName: '左侧标题', + copywriting: '右侧内容', type: '10', http: {}, },