diff --git a/components/custom-tab-bar/index.js b/components/custom-tab-bar/index.js index 006de2b..e90db0f 100644 --- a/components/custom-tab-bar/index.js +++ b/components/custom-tab-bar/index.js @@ -32,15 +32,6 @@ Component({ show: true }, - { - "pagePath": "/pages/statistics/statistics", - "text": "数据", - "iconPath": "/images/home/information.png", - "selectedIconPath": "/images/home/informationSelected.png", - show: true - - }, - { "pagePath": "/pages/mine/mine", "text": "我的", @@ -53,26 +44,7 @@ Component({ attached() { }, ready: function () { - this.setData({ - selected: app.globalData.selected - }) - // secretary 书记 admin 管理员 - console.log( app.globalData.roleList.filter(item => item.roleKey === 'secretary')) - if(app.globalData.roleList.length <= 0) { - - getStaffbasicinfo().then(res=>{ - getOwnedRolesOfStaffId(res.data.id).then(res2 => { - app.globalData.user = res.data - this.setData({ - "list[3].show": res2.data.filter(item => item.roleKey === 'secretary' || item.roleKey === 'administrator' || item.roleKey === 'street_secretary').length > 0 - }) - }) - }) - } else { - // this.setData({ - // "list[3].show": app.globalData.roleList.filter(item => item.roleKey === 'secretary' || item.roleKey === 'administrator' || item.roleKey === 'street_secretary').length > 0 - // }) - } + }, methods: { switchTab(e) { diff --git a/pages/index/index.wxml b/pages/index/index.wxml index b948bf1..67f5551 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -5,15 +5,11 @@ - - - - {{resiAndhouseTotal}} - {{tabValue === 1?'居民总数':'房屋总数'}} - - - - + + 数字化社区平台 + 打造社区工作新模式
用数据提升基层治理与服务水平
+ + @@ -154,5 +150,4 @@ - \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 87953c2..babf462 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -20,12 +20,12 @@ page { } .back { - width: 30rpx; - height: 30rpx; - margin-left: 20rpx; - margin-top: 20rpx; - border-radius: 0rpx; - z-index: 101; + width: 30rpx; + height: 30rpx; + margin-left: 20rpx; + margin-top: 20rpx; + border-radius: 0rpx; + z-index: 101; } .header .navigation { width: 100%; @@ -42,7 +42,7 @@ page { } .header_text_1 { margin-left: 20rpx; - margin-top: 12rpx; + margin-top: 12rpx; /* width: 157rpx; height: 30rpx; */ overflow-wrap: break-word; @@ -60,14 +60,11 @@ page { left: 30rpx; top: -120rpx; width: 690rpx; + height: 300rpx; background-size: 100% 100%; display: flex; flex-direction: column; z-index: 1000; - background-color: #ffffff; - padding: 10rpx; - border-radius: 10rpx; - } .bg-image{ position: absolute; @@ -859,7 +856,9 @@ line-height: 40rpx; /* align-items: center; */ } +.right{ +} .bg_new_box{ background: #F9FBFE; height: 230rpx; @@ -1031,21 +1030,25 @@ line-height: 52rpx; margin-left: 20rpx; font-size: 32rpx; } -ec-canvas { +.movable-area{ + pointer-events:none; + z-index: 100; width: 100%; height: 100%; + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; } -.total{ - width: 30%; - height: 318rpx; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; +.movable-view{ + pointer-events:auto; + height: 50px; + width: 50px; + } -.communityOverview { - width: 100%; - height: 318rpx; - display: flex; - box-sizing: border-box; +.image-wrapper{ + width: 190rpx; + height: 190rpx; + } \ No newline at end of file diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js index c4b60e0..29baac1 100644 --- a/pages/resiAndHouse/resiAndHouse.js +++ b/pages/resiAndHouse/resiAndHouse.js @@ -261,7 +261,6 @@ Page({ angencyFwList: [{ ...res.data, children: arr }], angencyJmList:[{ ...res.data, children: arr }] }) - console.log(this.data.angencyFwList); }) }, getTreeFun(id, arr, data) { @@ -417,9 +416,13 @@ Page({ this.setData({ showAngenCascader: true }) + this.onChangeJm({detail:{ + value:this.data.angencyJmList[0].id, + selectedOptions:this.data.angencyJmList + }}) }, handelClickShowTreeFw() { - this.setData({ + this.setData({ showFw: true }) },