diff --git a/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/icon1.png b/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/icon1.png new file mode 100644 index 0000000..d86d88c Binary files /dev/null and b/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/icon1.png differ diff --git a/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/icon2.png b/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/icon2.png new file mode 100644 index 0000000..ad3d2cc Binary files /dev/null and b/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/icon2.png differ diff --git a/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/icon3.png b/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/icon3.png new file mode 100644 index 0000000..f5eea18 Binary files /dev/null and b/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/icon3.png differ diff --git a/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/icon4.png b/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/icon4.png new file mode 100644 index 0000000..f5eea18 Binary files /dev/null and b/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/icon4.png differ diff --git a/epmet-oper-web/src/assets/scss/modules/wx-mini/more.scss b/epmet-oper-web/src/assets/scss/modules/wx-mini/extended.scss similarity index 66% rename from epmet-oper-web/src/assets/scss/modules/wx-mini/more.scss rename to epmet-oper-web/src/assets/scss/modules/wx-mini/extended.scss index efdaf5e..c0dca7b 100644 --- a/epmet-oper-web/src/assets/scss/modules/wx-mini/more.scss +++ b/epmet-oper-web/src/assets/scss/modules/wx-mini/extended.scss @@ -3,46 +3,36 @@ @import "@/assets/scss/c/anime.scss"; // 更多功能1 -.mw-cpt-cnt_menus { - position: relative; +.extended_more1 { margin-top: 10px; + background: rgba(255, 255, 255, 1); - .d-cpt-wrap { - width: 355px; - margin: 0 auto; - border-radius: 5px; - overflow: hidden; - background: rgba(255, 255, 255, 1); + .more_list { + padding:0 20px; + display: flex; + justify-content: space-between; - .list { - padding: 15px 0 5px; - overflow: hidden; - .item { - position: relative; - float: left; - margin: 0 24px; - width: 40px; - - > img { - display: block; - width: 40px; - height: 40px; - margin-bottom: 1px; - } + .more_item { + display: flex; + flex-direction: column; + text-align: center; - p { - width: 100px; - margin-left: -30px; - line-height: 15px; - font-size: 13px; - text-align: center; - font-family: PingFang SC; - font-weight: 500; - color: rgba(51, 51, 51, 1); - } + img { + width: 40px; + height: 40px; + margin-bottom: 1px; } + p { + line-height: 15px; + font-size: 13px; + text-align: center; + font-family: PingFang SC; + font-weight: 500; + color: rgba(51, 51, 51, 1); + } } + } } diff --git a/epmet-oper-web/src/assets/scss/modules/wx-mini/group.scss b/epmet-oper-web/src/assets/scss/modules/wx-mini/group.scss index 85f617d..8afe27d 100644 --- a/epmet-oper-web/src/assets/scss/modules/wx-mini/group.scss +++ b/epmet-oper-web/src/assets/scss/modules/wx-mini/group.scss @@ -13,7 +13,10 @@ .list { width: 1000px; overflow: hidden; - + padding:10px 10px; + .item_margin{ + margin-left:10px; + } .item { width: 205px; height:122px; @@ -21,10 +24,9 @@ float: left; border-radius: 10px; background-color: #ffffff; - margin-left: 10px; - box-shadow: 0px 3px 24px 0px rgba(211, 211, 211, 0.26); + // margin-left: 10px; + box-shadow: 3px 3px 24px 3px rgba(211, 211, 211, 0.26); - .row1{ display:flex; margin:10px; diff --git a/epmet-oper-web/src/assets/scss/modules/wx-mini/more copy.scss b/epmet-oper-web/src/assets/scss/modules/wx-mini/more copy.scss deleted file mode 100644 index 7c6791f..0000000 --- a/epmet-oper-web/src/assets/scss/modules/wx-mini/more copy.scss +++ /dev/null @@ -1,270 +0,0 @@ -@import "@/assets/scss/c/config.scss"; -@import "@/assets/scss/c/function.scss"; -@import "@/assets/scss/c/anime.scss"; - - -// 我的消息 -.mw-cpt-new_msg { - position: relative; - - .d-cpt-wrap { - width: 136px; - height: 50px; - background: rgba(255, 255, 255, 1); - box-shadow: 0px 2px 12px 0px rgba(211, 211, 211, 0.26); - border-radius: 50px 0 0 50px; - line-height: 50px; - img { - position: relative; - width: 40px; - margin: 5px; - vertical-align: top; - } - span { - font-size: 16px; - font-family: PingFang SC; - font-weight: 500; - color: rgba(255, 76, 82, 1); - } - } -} - -// 更多功能1 -.mw-cpt-cnt_menus { - position: relative; - margin-top: 10px; - - .d-cpt-wrap { - width: 355px; - margin: 0 auto; - border-radius: 5px; - overflow: hidden; - background: rgba(255, 255, 255, 1); - - .list { - padding: 15px 0 5px; - overflow: hidden; - .item { - position: relative; - float: left; - margin: 0 24px; - width: 40px; - - > img { - display: block; - width: 40px; - height: 40px; - margin-bottom: 1px; - } - - p { - width: 100px; - margin-left: -30px; - line-height: 15px; - font-size: 13px; - text-align: center; - font-family: PingFang SC; - font-weight: 500; - color: rgba(51, 51, 51, 1); - } - } - - } - } -} - -// 更多功能2 -.mw-cpt-cnt_function2 { - position: relative; - margin-top: 10px; - - .d-cpt-wrap { - border-radius: 10px; - // overflow-x: scroll; - overflow: hidden; - margin: 0 13px; - padding:0 0 13px 0; - background-color: white; - - .link { - width: 100%; - position: relative; - - .link-item{ - display: inline; - position: relative; - - > img { - width:45%; - // width: 308px; - margin: 8px; - // height: 160px; - border-radius: 10px; - } - span { - position: absolute; - top: -10px; - left: 20px; - color: #fff; - font-size: 15px; - font-family: PingFang SC; - font-weight: bold; - color: #ffffff; - } - } - - - } - - .dots { - position: absolute; - bottom: 10px; - left: 0; - right: 0; - width: 100%; - display: flex; - justify-content: center; - - .dot { - margin: 0 5px; - width: 20px; - height: 4px; - border-radius: 6px; - background-color: #ddd; - transition: all ease $ad1; - - &.z-on { - background-color: $c1; - } - } - } - - } -} - - // 积分银行积分排行 -.mw-cpt-score_rank { - position: relative; - margin-top: 10px; - - .d-cpt-wrap { - width: 100%; - // overflow-x: scroll; - overflow: hidden; - .d-cpt-title { - position: relative; - margin: 10px 10px 0 10px; - padding: 7px 10px 13px; - font-size: 17px; - line-height: 15px; - font-family: PingFang SC; - font-weight: bold; - color: rgba(51, 51, 51, 1); - border-bottom: 1px solid #e7eeee; - - &::before { - content: ""; - position: absolute; - top: 7px; - left: 0; - width: 3px; - height: 15px; - background: rgba(230, 0, 0, 1); - border-radius: 3px; - } - } - - .rank_title{ - margin:10px 20px; - display: flex; - .rank_title_total{ - margin-right:20px; - width:33%; - font-size: 15px; - text-align: center; - font-family: PingFang SC; - padding:3px 10px; - font-weight: 500; - background-color: rgba(239, 60, 61, 1); - color: rgb(255, 255, 255); - border-radius: 90px; - } - .rank_title_week{ - width:33%; - margin-right:20px; - font-size: 15px; - text-align: center; - font-family: PingFang SC; - padding:3px 10px; - font-weight: 500; - background-color: rgb(255, 255, 255); - color: rgb(0, 0, 0); - border-radius: 90px; - border-color: rgb(139, 139, 139); - border-width: 1px; - border-style: solid; - } - .rank_title_month{ - width:33%; - font-size: 15px; - text-align: center; - font-family: PingFang SC; - padding:3px 10px; - font-weight: 500; - background-color: rgb(255, 255, 255); - color: rgb(0, 0, 0); - border-radius: 90px; - border-color: rgb(139, 139, 139); - border-width: 1px; - border-style: solid; - } - } - - .list { - margin:10px 15px; - .item { - margin:8px 0; - padding:8px 0; - background-color: #ffffff; - width: 100%; - display:flex; - height: 40px ; - align-items:center; - .logo { - width:10%; - height: 21px; - line-height: 21px; - text-align: center; - >img{ - width: 25px; - } - >span{ - font-size: 14px; - text-align: center; - } - - } - .name { - width:70%; - z-index: 10; - vertical-align: bottom; - } - .score { - width:20%; - z-index: 20; - font-size: 14px; - font-family: PingFang SC; - font-weight: bold; - font-style: italic; - } - - - } - } - } -} - - - - - diff --git a/epmet-oper-web/src/assets/scss/modules/wx-mini/score.scss b/epmet-oper-web/src/assets/scss/modules/wx-mini/score.scss index af69605..f504114 100644 --- a/epmet-oper-web/src/assets/scss/modules/wx-mini/score.scss +++ b/epmet-oper-web/src/assets/scss/modules/wx-mini/score.scss @@ -31,7 +31,7 @@ background: rgba(230, 0, 0, 1); border-radius: 3px; } - .more{ + .score_more{ position: absolute; top:13px; right:10px; diff --git a/epmet-oper-web/src/assets/scss/modules/wx-mini/voice.scss b/epmet-oper-web/src/assets/scss/modules/wx-mini/voice.scss index 2934d86..5eb39e3 100644 --- a/epmet-oper-web/src/assets/scss/modules/wx-mini/voice.scss +++ b/epmet-oper-web/src/assets/scss/modules/wx-mini/voice.scss @@ -147,7 +147,7 @@ } .rank_tabs{ - margin:0px 15px 0px; + margin:10px 15px 0px; display: flex; padding:0px 0px; justify-content: space-between; diff --git a/epmet-oper-web/src/components/wx-index/cpt-item.vue b/epmet-oper-web/src/components/wx-index/cpt-item.vue index ea305ec..e7f8dea 100644 --- a/epmet-oper-web/src/components/wx-index/cpt-item.vue +++ b/epmet-oper-web/src/components/wx-index/cpt-item.vue @@ -53,8 +53,8 @@
- +
@@ -104,7 +104,7 @@ import pageHeader from './pageHeader.vue' import heart from './heart' import voice from './voice' import issue from './issue' -import more from './more' +import extended from './extended' import score from './score' import group from './group' @@ -118,7 +118,7 @@ export default { heart, voice, issue, - more, + extended, score, group, }, diff --git a/epmet-oper-web/src/components/wx-index/more.vue b/epmet-oper-web/src/components/wx-index/extended.vue similarity index 77% rename from epmet-oper-web/src/components/wx-index/more.vue rename to epmet-oper-web/src/components/wx-index/extended.vue index 3b07d22..54e24da 100644 --- a/epmet-oper-web/src/components/wx-index/more.vue +++ b/epmet-oper-web/src/components/wx-index/extended.vue @@ -5,28 +5,30 @@ @click="focusCpt"> -
-
-
-
- + +
+
+ +
- - + src="@/assets/img/modules/wx-mini/index-set/page/icon1.png"> + + -

{{ subitem.text }}

+ src="@/assets/img/modules/wx-mini/index-set/page/icon4.png">
+

{{ subitem.text }}

+
+
@@ -86,4 +88,4 @@ export default { } } - + diff --git a/epmet-oper-web/src/components/wx-index/group.vue b/epmet-oper-web/src/components/wx-index/group.vue index 658cbc1..7f3f57b 100644 --- a/epmet-oper-web/src/components/wx-index/group.vue +++ b/epmet-oper-web/src/components/wx-index/group.vue @@ -8,12 +8,9 @@
- -
+ v-for="(subitem, subindex) in item.demoData.list">
diff --git a/epmet-oper-web/src/components/wx-index/score.vue b/epmet-oper-web/src/components/wx-index/score.vue index 0589815..817b7ea 100644 --- a/epmet-oper-web/src/components/wx-index/score.vue +++ b/epmet-oper-web/src/components/wx-index/score.vue @@ -9,7 +9,7 @@ v-if="item.componentFrontId==='resi-functionList-score-rank'">
积分排名 -
查看更多
+
查看更多
@@ -74,7 +74,7 @@ v-if="item.componentFrontId==='resi-functionList-score-rank-2'">
积分排名 -
查看更多
+
查看更多
diff --git a/epmet-oper-web/src/components/wx-index/voice.vue b/epmet-oper-web/src/components/wx-index/voice.vue index 4e40cac..c0d6720 100644 --- a/epmet-oper-web/src/components/wx-index/voice.vue +++ b/epmet-oper-web/src/components/wx-index/voice.vue @@ -135,4 +135,4 @@ export default { } } - + diff --git a/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue b/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue index cf11600..d0f8a37 100644 --- a/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue +++ b/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue @@ -810,7 +810,7 @@ export default { addCpt (item, tempOnlyId, displayOrder = 0) { console.log('添加组件到实例') let trueItem = cloneDeep(item) - debugger + trueItem.tempOnlyId = tempOnlyId trueItem.displayOrder = displayOrder this.cptList.push(trueItem) 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 8529da3..a0255c0 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 @@ -767,7 +767,7 @@ export default { }, // 添加组件到实例-前验证 beforeAddCpt (item) { - debugger + console.log('添加组件到实例-前验证') const regionType = this.checkCptRegion(item) const tempOnlyId = getRandomString(20)