From 9e01d2456cd1ad404e09f05a131f0ba38db54d1d Mon Sep 17 00:00:00 2001 From: dai_siki <851733175@qq.com> Date: Sat, 21 Mar 2020 11:15:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E8=81=94=E8=B0=83?= =?UTF-8?q?=E5=BC=80=E5=A7=8B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/modules/wx-mini/index-set.vue | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue index 213e405..083f822 100644 --- a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue +++ b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue @@ -710,15 +710,27 @@ export default { }, // 判断组件所属区域类别 checkCptRegion (item) { - const { componentFrontId } = item - const fun = name => name === componentFrontId - if (['resi-titleList-home-gridNameTitle'].findIndex(fun) !== -1) { + const { region } = item + // const { componentFrontId } = item + // const fun = name => name === componentFrontId + // if (['resi-titleList-home-gridNameTitle'].findIndex(fun) !== -1) { + // return 'top' + // } else if (['resi-topList-voice-hotNewsSwiper'].findIndex(fun) !== -1) { + // return 'ban' + // } else if (['resi-functionList-extend-moreFunctionIcons', 'resi-functionList-group-recommendGroupSlider', 'resi-functionList-hall-hotSubjectList'].findIndex(fun) !== -1) { + // return 'cnt' + // } else if (['resi-floatingList-mine-newMessageButton'].findIndex(fun) !== -1) { + // return 'fixed' + // } else { + // return 'none' + // } + if (region === 'titleList') { return 'top' - } else if (['resi-topList-voice-hotNewsSwiper'].findIndex(fun) !== -1) { + } else if (region === 'topList') { return 'ban' - } else if (['resi-functionList-extend-moreFunctionIcons', 'resi-functionList-group-recommendGroupSlider', 'resi-functionList-hall-hotSubjectList'].findIndex(fun) !== -1) { + } else if (region === 'functionList') { return 'cnt' - } else if (['resi-floatingList-mine-newMessageButton'].findIndex(fun) !== -1) { + } else if (region === 'floatingList') { return 'fixed' } else { return 'none' @@ -727,8 +739,10 @@ export default { // 判断组件是否可用复用 checkCptReuse (item) { const { componentFrontId } = item + const reuseList = this.cptTypeList[0].componentList.map(v => v.componentFrontId) const fun = name => name === componentFrontId - return ['resi-functionList-hall-hotSubjectList'].findIndex(fun) !== -1 + // return ['resi-functionList-hall-hotSubjectList'].findIndex(fun) !== -1 + return reuseList.findIndex(fun) !== -1 }, // 根据所属区域简称得到名字 getCptRegionName (id) { @@ -781,7 +795,7 @@ export default { console.log('添加组件到实例') let trueItem = cloneDeep(item) trueItem.tempOnlyId = tempOnlyId - trueItem.region = region + trueItem.localRegion = region trueItem.displayOrder = displayOrder this.cptList.push(trueItem) }, From e22375e973056c52a112502ef67117b44a6110f5 Mon Sep 17 00:00:00 2001 From: dai_siki <851733175@qq.com> Date: Sat, 21 Mar 2020 11:40:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E8=81=94=E8=B0=83?= =?UTF-8?q?=E5=BC=80=E5=A7=8B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/modules/wx-mini/index-set.vue | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue index 083f822..78b3a21 100644 --- a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue +++ b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue @@ -37,10 +37,10 @@
- - - - + + + + {{ item.functionName }} @@ -568,6 +568,7 @@ export default { await this.getCptTypeList() await this.getCptList() this.toStep(2) + this.cleanFocusCpt() loadingInstance.close() }, processBackendCptData (item) { @@ -761,19 +762,19 @@ export default { const tempOnlyId = getRandomString(20) if (regionType === 'top') { if (this.topCptList.length > 0) { - + this.$message('标题区已有组件，请删除后再添加') } else { this.addCpt(item, tempOnlyId, 1) } } else if (regionType === 'ban') { if (this.banCptList.length > 0) { - + this.$message('置顶区已有组件，请删除后再添加') } else { this.addCpt(item, tempOnlyId, 2) } } else if (regionType === 'fixed') { if (this.fixedCptList.length > 0) { - + this.$message('浮窗区已有组件，请删除后再添加') } else { this.addCpt(item, tempOnlyId, 3) } @@ -821,12 +822,16 @@ export default { checkExistCpt (item) { return this.cptList.some(cptItem => item.componentFrontId === cptItem.componentFrontId) }, + // 清空聚焦实例组件 + cleanFocusCpt () { + this.focusedCpt = { tempOnlyId: '' } + }, // 聚焦实例组件 focusCpt (item) { console.log('聚焦实例组件') if (this.isInPreview) return if (this.focusedCpt.tempOnlyId === item.tempOnlyId) { - this.focusedCpt = { tempOnlyId: '' } + this.cleanFocusCpt() } else { this.focusedCpt = { ...cloneDeep(item), demoData: JSON.stringify(item.demoData), configuration: JSON.stringify(item.configuration), demoIsUnfold: true, confIsUnfold: false } } From ec4ace3e86e915e4b909182ef171bcb44cc851ea Mon Sep 17 00:00:00 2001 From: dai_siki <851733175@qq.com> Date: Sat, 21 Mar 2020 12:29:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E8=81=94=E8=B0=83?= =?UTF-8?q?=E5=BC=80=E5=A7=8B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/wx-mini/index-set.scss | 15 +- .../src/views/modules/wx-mini/index-set.vue | 157 ++++++++++-------- 2 files changed, 103 insertions(+), 69 deletions(-) diff --git a/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss b/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss index e4319b9..c4aa5d7 100644 --- a/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss +++ b/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss @@ -45,6 +45,7 @@ .d-item { margin: 5px 0; line-height: 24px; + overflow: hidden; .d-item-region { margin-right: 4px; font-size: 10px; @@ -128,7 +129,7 @@ background-color: #f7f6f9; box-shadow: 0 5px 15px 1px rgba(0, 0, 0, 0.2); - .mw-phone-topbar{ + .mw-phone-topbar { display: block; width: 100%; } @@ -182,7 +183,7 @@ cursor: pointer; &.z-focused { - box-shadow: 0 0 12px 3px rgba(#67C23A, 0.5); + box-shadow: 0 0 12px 3px rgba(#67c23a, 0.5); } .d-cpt-operate { @@ -224,6 +225,16 @@ } } + .mw-cpt-placeholder { + position: relative; + line-height: 40px; + text-align: center; + font-size: 17px; + font-family: PingFang SC; + font-weight: 500; + color: rgba(255, 76, 82, 1); + } + .mw-cpt-top_title { position: relative; diff --git a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue index 78b3a21..ea9d8a5 100644 --- a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue +++ b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue @@ -85,14 +85,18 @@
- -
-
- -

删除

-
+
+
+
+ {{ item.componentName }} +
+
+
+
+ +

删除

@@ -117,14 +121,18 @@
- -
-
- -

删除

-
+
+
+
+ {{ item.componentName }} +
+
+
+
+ +

删除

@@ -141,14 +149,18 @@ {{ item.demoData.text }} - -
-
- -

删除

-
+
+
+
+ {{ item.componentName }} +
+
+
+
+ +

删除

@@ -177,7 +189,7 @@
+ v-else-if="item.componentFrontId==='resi-functionList-extend-moreFunctionIcons'">
@@ -192,7 +204,7 @@
+ v-else-if="item.componentFrontId==='resi-functionList-group-recommendGroupSlider'">
@@ -219,6 +231,11 @@
+
+
+ {{ item.componentName }} +
+
@@ -316,6 +333,47 @@ export default { functionName: '通用组件', functionType: 1, // 1通用 2功能 isUnfold: true, + componentList: [ + { + componentId: '7', + componentName: '新闻列表', + componentFrontId: 'resi-functionList-hall-hotSubjectList', + region: 'functionList', + configuration: { + // bgc: '#fff' + }, + demoData: { + list: [ + { + pic: '', + title: '我是新闻标题，我是新闻标题，我是新闻标题，我是新闻标题，我是新闻标题', + author: '大港路党支部', + date: '2020-01-02' + }, + { + pic: '', + title: '我是新闻标题', + author: '大港路党支部', + date: '2020-01-02' + }, + { + pic: '', + title: '我是新闻标题', + author: '大港路党支部', + date: '2020-01-02' + } + ] + }, + configurationDescription: '' + } + ] + }, + // 功能组件 + { + functionId: '1', + functionName: '议事厅', + functionType: 2, // 1通用 2功能 + isUnfold: false, componentList: [ { componentId: '1', @@ -329,6 +387,7 @@ export default { avatar: '', title: '青岛市市北区大港路第二网格' }, + region: 'titleList', configurationDescription: '请配置具体内容' }, { @@ -342,6 +401,7 @@ export default { pic: '', title: '轮播图新闻标题' }, + region: 'topList', configurationDescription: '请配置具体内容' }, { @@ -355,21 +415,14 @@ export default { ico: '', text: '有新消息！' }, + region: 'floatingList', configurationDescription: '' - } - ] - }, - // 功能组件 - { - functionId: '1', - functionName: '议事厅', - functionType: 2, // 1通用 2功能 - isUnfold: false, - componentList: [ + }, { componentId: '5', componentName: '功能菜单', componentFrontId: 'resi-functionList-extend-moreFunctionIcons', + region: 'functionList', configuration: { // bgc: '#eee' }, @@ -399,6 +452,7 @@ export default { componentId: '6', componentName: '热门群', componentFrontId: 'resi-functionList-group-recommendGroupSlider', + region: 'functionList', configuration: { // bgc: '#fff' }, @@ -434,37 +488,6 @@ export default { ] }, configurationDescription: '' - }, - { - componentId: '7', - componentName: '新闻列表', - componentFrontId: 'resi-functionList-hall-hotSubjectList', - configuration: { - // bgc: '#fff' - }, - demoData: { - list: [ - { - pic: '', - title: '我是新闻标题，我是新闻标题，我是新闻标题，我是新闻标题，我是新闻标题', - author: '大港路党支部', - date: '2020-01-02' - }, - { - pic: '', - title: '我是新闻标题', - author: '大港路党支部', - date: '2020-01-02' - }, - { - pic: '', - title: '我是新闻标题', - author: '大港路党支部', - date: '2020-01-02' - } - ] - }, - configurationDescription: '' } ] } From 2c796511943f81c43f11fb3396f750a5893784b9 Mon Sep 17 00:00:00 2001 From: dai_siki <851733175@qq.com> Date: Sat, 21 Mar 2020 13:02:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E8=81=94=E8=B0=83?= =?UTF-8?q?=E5=BC=80=E5=A7=8B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/src/views/modules/wx-mini/index-set.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue index ea9d8a5..7319a9c 100644 --- a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue +++ b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue @@ -12,9 +12,9 @@ @@ -29,7 +29,7 @@ @click="save">保存 发布 - ({{ wxIndex.customerName }} - {{ wxIndex.clientType===0 ? '政府端' : '居民端' }}) + ({{ wxIndex.customerName }} - {{ wxIndex.clientType===1 ? '政府端' : '居民端' }})