From f0e0aebead49fa18f21c5487c812fc168867e71c Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 29 Mar 2021 09:19:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=85=8D=E7=BD=AE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/wx-mini/index-set/wailian-bg.jpg | Bin 0 -> 11479 bytes .../scss/modules/wx-mini/index-set.scss | 64 ++++ .../src/components/wx-index/cpt-item.vue | 279 ++++++++++-------- epmet-oper-web/src/router/index.js | 100 +++---- .../modules/customer/customize/ConfigEdit.vue | 5 +- .../modules/customer/customize/MiniHome.vue | 16 +- 6 files changed, 281 insertions(+), 183 deletions(-) create mode 100644 epmet-oper-web/src/assets/img/modules/wx-mini/index-set/wailian-bg.jpg diff --git a/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/wailian-bg.jpg b/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/wailian-bg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..77ac1a2590b7099338f5dccb47e12f3b00de9be2 GIT binary patch literal 11479 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 F{T~k+hGPH# literal 0 HcmV?d00001 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 5bc0da3..3917aef 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 @@ -637,7 +637,10 @@ } } } + + } + } } @@ -841,9 +844,70 @@ 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; + background-color: white; + + .link { + width: 100%; + position: relative; + + > img { + width: 308px; + margin: 13px; + height: 160px; + border-radius: 10px; + } + span { + position: absolute; + top: 30px; + left: 20px; + color: #fff; + font-size: 22px; + font-family: PingFang SC; + font-weight: bold; + color: #ffffff; + } + } + .dots { + position: absolute; + bottom: 12px; + left: 0; + right: 0; + width: 100%; + display: flex; + justify-content: center; + + > i { + float: right; + position: relative; + top: 11px; + margin: 0 2px; + width: 5px; + height: 5px; + border-radius: 50%; + background: rgba(0, 0, 0, 0.26); + &.z-on { + background: rgba(255, 255, 255, 1); + } + } + } + + } + } // 积分银行积分排行 .mw-cpt-score_rank { 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 504b2cd..6b433a1 100644 --- a/epmet-oper-web/src/components/wx-index/cpt-item.vue +++ b/epmet-oper-web/src/components/wx-index/cpt-item.vue @@ -144,7 +144,7 @@ - +
@@ -167,7 +167,34 @@
+ +
+
+ + +
+ + + + + +
+
+
@@ -344,130 +371,135 @@
- -
-
-
党员积分排行榜
-
-
-

身边党员

-
-

社区党员

-
-
-
-
- - -
- 2 - 1 - 3 - -
- -
-
-
-
-
-
- - - -
- -
- {{subitem.title1}} - {{subitem.title2}} - {{subitem.title3}} -
- -
- - - {{subitem.info1}} - {{subitem.info2}} - {{subitem.info3}} - -
-
-
-
- -
-
    -
  • 排名
  • -
  • 头像
  • -
  • 姓名
  • -
  • 当月积分
  • - -
-
- - -
-
-
-
- {{subitem.rank}} -
-
- - - - -
-
- {{subitem.name}} -
-
- {{subitem.score}} -
-
-
- - - -
- -
- 查看更多 - -
-
-
+ +
+
+
党员积分排行榜
+
+
+

身边党员

+
+

社区党员

+
+
+
+ +
+ + +
+ 2 + 1 + 3 + +
+ +
+
+
+
+
+
+ + + +
+ +
+ {{subitem.title1}} + {{subitem.title2}} + {{subitem.title3}} +
+ +
+ + {{subitem.info1}} + {{subitem.info2}} + {{subitem.info3}} + +
+
+
+
+ +
+
    +
  • 排名
  • +
  • 头像
  • +
  • 姓名
  • +
  • 当月积分
  • + +
+
+ + +
+
+
+
+ {{subitem.rank}} +
+
+ + + + +
+
+ {{subitem.name}} +
+
+ {{subitem.score}} +
+
+
+
+ +
+ 查看更多 +
+
+
diff --git a/epmet-oper-web/src/router/index.js b/epmet-oper-web/src/router/index.js index 696a7dd..9b8246c 100644 --- a/epmet-oper-web/src/router/index.js +++ b/epmet-oper-web/src/router/index.js @@ -124,56 +124,56 @@ router.beforeEach((to, from, next) => { if (userType === 'work') { const customerId=localStorage.getItem('customerId') console.log('customerId:' ,customerId) - if(customerId==='1e68188b8f7e9ab15658c164bd5b3676'){ - // if(customerId==='45687aa479955f9d06204d415238f7cc'){ - const menuList=[ - { - children: [], - createdBy: "a76fc711807ac9827d7611b0f94ec220", - createdTime: "2020-08-26 16:38", - delFlag: null, - icon: "icon-database", - id: "abe812eb350f6b5eda575e268e50ac1c", - name: "定制功能配置", - parentName: null, - permissions: "", - pid: "0", - resourceList: null, - revision: 0, - showFlag: 1, - sort: 2, - type: 0, - updatedBy: "a76fc711807ac9827d7611b0f94ec220", - updatedTime: "2020-09-02 14:49", - url: "customer/customize/ConfigItem", - }, - { - children: [], - createdBy: "a76fc711807ac9827d7611b0f94ec220", - createdTime: "2020-08-26 16:38", - delFlag: null, - icon: "icon-file-text", - id: "8e55eba74c920c00c44c125e3bc73ddc", - name: "居民端首页配置", - parentName: null, - permissions: "", - pid: "0", - resourceList: null, - revision: 0, - showFlag: 1, - sort: 3, - type: 0, - updatedBy: "a76fc711807ac9827d7611b0f94ec220", - updatedTime: "2020-09-02 14:49", - url: "customer/customize/MiniHome", - } - ] + // if(customerId==='1e68188b8f7e9ab15658c164bd5b3676'){ + // // if(customerId==='45687aa479955f9d06204d415238f7cc'){ + // const menuList=[ + // { + // children: [], + // createdBy: "a76fc711807ac9827d7611b0f94ec220", + // createdTime: "2020-08-26 16:38", + // delFlag: null, + // icon: "icon-database", + // id: "abe812eb350f6b5eda575e268e50ac1c", + // name: "定制功能配置", + // parentName: null, + // permissions: "", + // pid: "0", + // resourceList: null, + // revision: 0, + // showFlag: 1, + // sort: 2, + // type: 0, + // updatedBy: "a76fc711807ac9827d7611b0f94ec220", + // updatedTime: "2020-09-02 14:49", + // url: "customer/customize/ConfigItem", + // }, + // { + // children: [], + // createdBy: "a76fc711807ac9827d7611b0f94ec220", + // createdTime: "2020-08-26 16:38", + // delFlag: null, + // icon: "icon-file-text", + // id: "8e55eba74c920c00c44c125e3bc73ddc", + // name: "居民端首页配置", + // parentName: null, + // permissions: "", + // pid: "0", + // resourceList: null, + // revision: 0, + // showFlag: 1, + // sort: 3, + // type: 0, + // updatedBy: "a76fc711807ac9827d7611b0f94ec220", + // updatedTime: "2020-09-02 14:49", + // url: "customer/customize/MiniHome", + // } + // ] - window.SITE_CONFIG['menuList'] = menuList - fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList']) - // next({ ...to, replace: true }) - next({ ...to, replace: true }) - }else{ + // window.SITE_CONFIG['menuList'] = menuList + // fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList']) + // // next({ ...to, replace: true }) + // next({ ...to, replace: true }) + // }else{ http .get('/gov/access/menu/nav') .then(({ data: res }) => { @@ -189,7 +189,7 @@ router.beforeEach((to, from, next) => { .catch(() => { next({ name: 'loginWork' }) }) - } + // } // localStorage.getItem('customerId') // 1e68188b8f7e9ab15658c164bd5b3676 diff --git a/epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue b/epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue index 8b54193..5239bf7 100644 --- a/epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue +++ b/epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue @@ -35,8 +35,9 @@
- @@ -51,7 +52,7 @@
- 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 1056a64..571d8c4 100644 --- a/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue +++ b/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue @@ -180,15 +180,14 @@ {{ focusedCpt.configurationDescription }}
-
+
Banner图 - +
@@ -810,6 +809,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)