diff --git a/src/components/componentscom/tabBar/index.vue b/src/components/componentscom/tabBar/index.vue index 9dd8bfe..39feb1c 100644 --- a/src/components/componentscom/tabBar/index.vue +++ b/src/components/componentscom/tabBar/index.vue @@ -80,7 +80,7 @@ export default { width: 100%; position: relative; position: absolute; - bottom: 0px; + bottom: -54px; left: 0px; z-index: 2; } diff --git a/src/components/phoneBottom/index.vue b/src/components/phoneBottom/index.vue index b10388b..08a3b3a 100644 --- a/src/components/phoneBottom/index.vue +++ b/src/components/phoneBottom/index.vue @@ -6,19 +6,6 @@

- - diff --git a/src/layout/home/index.vue b/src/layout/home/index.vue index 9a0b2ce..b301b3f 100644 --- a/src/layout/home/index.vue +++ b/src/layout/home/index.vue @@ -27,13 +27,13 @@ 重置 - 保存 + > --> 查看JSON - 上架 + > --> @@ -144,7 +144,7 @@ 组件设置 @@ -283,7 +283,6 @@ export default { /* 取消加载 */ loading.close() - let datas = res.data.shopTemplate //如果为模板,则需要将id设置为null,否则模板会被修改 @@ -294,8 +293,6 @@ export default { this.pageComponents = JSON.parse(datas.component) console.log(this.pageComponents, '--------------------pageComponents') - // TODO: 旧店铺组件模板数据是否需要同步? - // this.mergeComponents() if (datas.templateJson) { console.log('----------home datas1') @@ -322,24 +319,6 @@ export default { }, methods: { - // 合并组件数据 - mergeComponents() { - // item 店铺绑定的组件数据 需要吧 item 合并到 componentsData 数据中 - this.pageComponents.forEach((item, index) => { - if (componentProperties.get(item.component)) { - // 更改单个组件数据 - this.$set( - this.pageComponents, - index, - this.$common.assiginObj( - componentProperties.get(item.component), - item - ) - ) - } - }) - }, - dropDownButton(res) { // 设为系统模板 if (res === '1') { @@ -392,9 +371,6 @@ export default { message: '上架成功', type: 'success', }) - /* this.$alert('请返回上一页进行刷新操作对您创建的页面进行操作', '上架成功', { - confirmButtonText: '确定', - }); */ this.$router.push({ path: 'establishShop' }) this.id = null }) @@ -409,9 +385,9 @@ export default {
"name": "${this.pageSetup.name}",
- "templateJson": ${JSON.stringify(this.pageSetup)}, + "templateJson": '${JSON.stringify(this.pageSetup)}',
- "component": ${JSON.stringify(this.pageComponents)}, + "component": '${JSON.stringify(this.pageComponents)}',
}`, '查看JSON', @@ -467,8 +443,6 @@ export default { /* 取消加载 */ loadings.close() - - this.$message({ message: '上传成功', type: 'success', @@ -518,7 +492,6 @@ export default { type: 'success', }) - /* 获取图片链接 */ callBack(res.data.src) }) @@ -1170,5 +1143,4 @@ export default { transform: translate(8px, 8px); opacity: 0; } -