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 0000000..77ac1a2 Binary files /dev/null and b/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/wailian-bg.jpg differ 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)