diff --git a/epdc-resident-mp-yushan/app.json b/epdc-resident-mp-yushan/app.json index 5995141..ad6aa10 100644 --- a/epdc-resident-mp-yushan/app.json +++ b/epdc-resident-mp-yushan/app.json @@ -125,21 +125,21 @@ }, { "pagePath": "pages/discussion/discussion", - "text": "党群议事", + "text": "有么说么", "iconPath": "images/discuss.png", "selectedIconPath": "images/discussSelected.png" }, { "pagePath": "pages/association/association", - "text": "邻里党群", + "text": "左邻右舍", "iconPath": "images/association.png", "selectedIconPath": "images/association-select.png" }, { - "pagePath": "pages/heart/heart", - "text": "初心互助", - "iconPath": "images/mutual.png", - "selectedIconPath": "images/mutualSelected.png" + "pagePath": "pages/accept/accept", + "text": "物业服务", + "iconPath": "images/property.png", + "selectedIconPath": "images/propertySelected.png" }, { "pagePath": "pages/mine/mine", diff --git a/epdc-resident-mp-yushan/images/association.png b/epdc-resident-mp-yushan/images/association.png index e1f84aa..b45719a 100644 Binary files a/epdc-resident-mp-yushan/images/association.png and b/epdc-resident-mp-yushan/images/association.png differ diff --git a/epdc-resident-mp-yushan/images/discuss.png b/epdc-resident-mp-yushan/images/discuss.png index 41893ef..a6f064a 100644 Binary files a/epdc-resident-mp-yushan/images/discuss.png and b/epdc-resident-mp-yushan/images/discuss.png differ diff --git a/epdc-resident-mp-yushan/images/home/add-issue.png b/epdc-resident-mp-yushan/images/home/add-issue.png deleted file mode 100644 index 1fc7f52..0000000 Binary files a/epdc-resident-mp-yushan/images/home/add-issue.png and /dev/null differ diff --git a/epdc-resident-mp-yushan/images/home/appramise.png b/epdc-resident-mp-yushan/images/home/appramise.png deleted file mode 100644 index 00bb168..0000000 Binary files a/epdc-resident-mp-yushan/images/home/appramise.png and /dev/null differ diff --git a/epdc-resident-mp-yushan/images/home/association.png b/epdc-resident-mp-yushan/images/home/association.png new file mode 100644 index 0000000..df97201 Binary files /dev/null and b/epdc-resident-mp-yushan/images/home/association.png differ diff --git a/epdc-resident-mp-yushan/images/home/consult.png b/epdc-resident-mp-yushan/images/home/consult.png deleted file mode 100644 index 71c5d47..0000000 Binary files a/epdc-resident-mp-yushan/images/home/consult.png and /dev/null differ diff --git a/epdc-resident-mp-yushan/images/home/dang_logo.png b/epdc-resident-mp-yushan/images/home/dang_logo.png index 2c30d7f..811eb02 100644 Binary files a/epdc-resident-mp-yushan/images/home/dang_logo.png and b/epdc-resident-mp-yushan/images/home/dang_logo.png differ diff --git a/epdc-resident-mp-yushan/images/home/discussion.png b/epdc-resident-mp-yushan/images/home/discussion.png new file mode 100644 index 0000000..6d90e74 Binary files /dev/null and b/epdc-resident-mp-yushan/images/home/discussion.png differ diff --git a/epdc-resident-mp-yushan/images/home/edu-grey.png b/epdc-resident-mp-yushan/images/home/edu-grey.png new file mode 100644 index 0000000..ace7b83 Binary files /dev/null and b/epdc-resident-mp-yushan/images/home/edu-grey.png differ diff --git a/epdc-resident-mp-yushan/images/home/edu.png b/epdc-resident-mp-yushan/images/home/edu.png new file mode 100644 index 0000000..2bcc45a Binary files /dev/null and b/epdc-resident-mp-yushan/images/home/edu.png differ diff --git a/epdc-resident-mp-yushan/images/home/heart.png b/epdc-resident-mp-yushan/images/home/heart.png new file mode 100644 index 0000000..242775f Binary files /dev/null and b/epdc-resident-mp-yushan/images/home/heart.png differ diff --git a/epdc-resident-mp-yushan/images/home/info-note.png b/epdc-resident-mp-yushan/images/home/info-note.png index cd83bc4..a748a2c 100644 Binary files a/epdc-resident-mp-yushan/images/home/info-note.png and b/epdc-resident-mp-yushan/images/home/info-note.png differ diff --git a/epdc-resident-mp-yushan/images/home/notice-logo.png b/epdc-resident-mp-yushan/images/home/notice-logo.png index 3a6b920..62dfdc8 100644 Binary files a/epdc-resident-mp-yushan/images/home/notice-logo.png and b/epdc-resident-mp-yushan/images/home/notice-logo.png differ diff --git a/epdc-resident-mp-yushan/images/home/notice.png b/epdc-resident-mp-yushan/images/home/notice.png deleted file mode 100644 index 05899e8..0000000 Binary files a/epdc-resident-mp-yushan/images/home/notice.png and /dev/null differ diff --git a/epdc-resident-mp-yushan/images/home/policy-grey.png b/epdc-resident-mp-yushan/images/home/policy-grey.png new file mode 100644 index 0000000..ae49a8b Binary files /dev/null and b/epdc-resident-mp-yushan/images/home/policy-grey.png differ diff --git a/epdc-resident-mp-yushan/images/home/policy.png b/epdc-resident-mp-yushan/images/home/policy.png new file mode 100644 index 0000000..b46d320 Binary files /dev/null and b/epdc-resident-mp-yushan/images/home/policy.png differ diff --git a/epdc-resident-mp-yushan/images/home/property.png b/epdc-resident-mp-yushan/images/home/property.png new file mode 100644 index 0000000..55821df Binary files /dev/null and b/epdc-resident-mp-yushan/images/home/property.png differ diff --git a/epdc-resident-mp-yushan/images/home/right-sword.png b/epdc-resident-mp-yushan/images/home/right-sword.png index 98a50a8..fc63b52 100644 Binary files a/epdc-resident-mp-yushan/images/home/right-sword.png and b/epdc-resident-mp-yushan/images/home/right-sword.png differ diff --git a/epdc-resident-mp-yushan/images/home/safe-grey.png b/epdc-resident-mp-yushan/images/home/safe-grey.png new file mode 100644 index 0000000..fe5d868 Binary files /dev/null and b/epdc-resident-mp-yushan/images/home/safe-grey.png differ diff --git a/epdc-resident-mp-yushan/images/home/safe.png b/epdc-resident-mp-yushan/images/home/safe.png new file mode 100644 index 0000000..3c16880 Binary files /dev/null and b/epdc-resident-mp-yushan/images/home/safe.png differ diff --git a/epdc-resident-mp-yushan/images/home/synthetical-service-grey.png b/epdc-resident-mp-yushan/images/home/synthetical-service-grey.png new file mode 100644 index 0000000..f5b4c19 Binary files /dev/null and b/epdc-resident-mp-yushan/images/home/synthetical-service-grey.png differ diff --git a/epdc-resident-mp-yushan/images/home/synthetical-service.png b/epdc-resident-mp-yushan/images/home/synthetical-service.png new file mode 100644 index 0000000..48c0138 Binary files /dev/null and b/epdc-resident-mp-yushan/images/home/synthetical-service.png differ diff --git a/epdc-resident-mp-yushan/images/mine.png b/epdc-resident-mp-yushan/images/mine.png index 8ccf004..b1a40c7 100644 Binary files a/epdc-resident-mp-yushan/images/mine.png and b/epdc-resident-mp-yushan/images/mine.png differ diff --git a/epdc-resident-mp-yushan/images/property.png b/epdc-resident-mp-yushan/images/property.png new file mode 100644 index 0000000..6888dac Binary files /dev/null and b/epdc-resident-mp-yushan/images/property.png differ diff --git a/epdc-resident-mp-yushan/images/propertySelected.png b/epdc-resident-mp-yushan/images/propertySelected.png new file mode 100644 index 0000000..7556848 Binary files /dev/null and b/epdc-resident-mp-yushan/images/propertySelected.png differ diff --git a/epdc-resident-mp-yushan/pages/index/components/banner/banner.js b/epdc-resident-mp-yushan/pages/index/components/banner/banner.js index 92a1d70..b10b6bf 100644 --- a/epdc-resident-mp-yushan/pages/index/components/banner/banner.js +++ b/epdc-resident-mp-yushan/pages/index/components/banner/banner.js @@ -1,6 +1,7 @@ Component({ data: { - currentIndex: 0 + currentIndex: 0, + autoplay:true }, properties: { bannerList: { @@ -12,15 +13,22 @@ Component({ }, pageLifetimes: { - + show:function(){ + this.setData({ + autoPlay:true + }) + }, + hide:function(){ + this.setData({ + autoPlay:false + }) + } }, methods: { swiperChange (e) { - if (e.detail.source === 'touch') { this.setData({ currentIndex: e.detail.current }) - } }, navigatetoBannerDetail (e) { const { id, url, newsflag } = e.currentTarget.dataset diff --git a/epdc-resident-mp-yushan/pages/index/components/banner/banner.wxml b/epdc-resident-mp-yushan/pages/index/components/banner/banner.wxml index 3408225..7a605f9 100644 --- a/epdc-resident-mp-yushan/pages/index/components/banner/banner.wxml +++ b/epdc-resident-mp-yushan/pages/index/components/banner/banner.wxml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/epdc-resident-mp-yushan/pages/index/components/newsList/newsList.wxss b/epdc-resident-mp-yushan/pages/index/components/newsList/newsList.wxss index 4b48380..db50b9b 100644 --- a/epdc-resident-mp-yushan/pages/index/components/newsList/newsList.wxss +++ b/epdc-resident-mp-yushan/pages/index/components/newsList/newsList.wxss @@ -3,7 +3,7 @@ background: #fff; box-sizing: border-box; padding: 0 35rpx; - margin-top: 10rpx; + margin-top: 20rpx; } .news-list .list-item { width: 100%; @@ -14,11 +14,11 @@ align-items: center; justify-content: space-between; } -.news-list .list-item .left { +.news-list .list-item .right { width: calc(100% - 50rpx - 220rpx); height: 146rpx; } -.news-list .list-item .left .title { +.news-list .list-item .right .title { color: #3f3f3f; font-size: 30rpx; line-height: 45rpx; @@ -30,12 +30,13 @@ -webkit-line-clamp: 2; -webkit-box-orient: vertical; } -.news-list .list-item .left .bottom { +.news-list .list-item .right .bottom { display: flex; align-items: center; justify-content: space-between; + padding-top: 20rpx; } -.news-list .list-item .left .bottom .category { +.news-list .list-item .right .bottom .category { color: #aaa; font-size: 22rpx; line-height: 48rpx; @@ -44,20 +45,20 @@ overflow: hidden; text-overflow: ellipsis; } -.news-list .list-item .left .bottom .time { +.news-list .list-item .right .bottom .time { color: #aaa; font-size: 22rpx; line-height: 48rpx; width: 150rpx; text-align: right; } -.news-list .list-item .right { - width: 220rpx; +.news-list .list-item .left { + width: 250rpx; height: 146rpx; border-radius: 12rpx; overflow: hidden; } -.news-list .list-item .right image { +.news-list .list-item .left image { width: 100%; height:100%; } diff --git a/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxml b/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxml index 0870f25..c43d4ad 100644 --- a/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxml +++ b/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxml @@ -11,6 +11,6 @@ {{item.title}} - {{unreadnum}} + \ No newline at end of file diff --git a/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxss b/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxss index c4a12c0..a3f0b93 100644 --- a/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxss +++ b/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxss @@ -17,11 +17,12 @@ .notice .notice-logo { width: 32rpx; height: 32rpx; + margin-left: -80rpx; } .notice .info-note { - width: 94rpx; - height: 24rpx; - margin: 0 20rpx 0 10rpx; + width: 58rpx; + height: 30rpx; + margin: 5rpx 20rpx 0 10rpx; } .notice swiper { height: 76rpx; diff --git a/epdc-resident-mp-yushan/pages/index/components/project/project.wxml b/epdc-resident-mp-yushan/pages/index/components/project/project.wxml index a1e5275..bfeb3ee 100644 --- a/epdc-resident-mp-yushan/pages/index/components/project/project.wxml +++ b/epdc-resident-mp-yushan/pages/index/components/project/project.wxml @@ -1,6 +1,38 @@ - + 项目进度 + + @@ -32,10 +64,10 @@ - + \ No newline at end of file diff --git a/epdc-resident-mp-yushan/pages/index/components/project/project.wxss b/epdc-resident-mp-yushan/pages/index/components/project/project.wxss index 79f5e72..b71b5a5 100644 --- a/epdc-resident-mp-yushan/pages/index/components/project/project.wxss +++ b/epdc-resident-mp-yushan/pages/index/components/project/project.wxss @@ -1,25 +1,34 @@ .project { width: 100%; - height: 450rpx; box-sizing: border-box; padding-top: 20rpx; + background: #FFF; + margin-top: 20rpx; } -.project swiper { +.project .text{ + font-weight: bold; + padding: 30rpx; +} +.project .swiper { width: 100%; height: 380rpx; + display: inline-block; + white-space: nowrap; + overflow-x: scroll; } -.project swiper swiper-item { +.project .swiper .swiper-item { + display: inline-block; box-sizing: border-box; - padding: 0 40rpx; - width:100%; + padding: 0 30rpx; + width:60%; height: 380rpx; } .project .content { width: 100%; height: 380rpx; background: #fff; - border-radius: 0 16rpx 16rpx 16rpx; overflow: hidden; + padding: 0 30rpx; } .project .content .top { width:100%; @@ -49,7 +58,7 @@ } .project .content .top .top-content .progress { height: 36rpx; - width: 36%; + width: 60%; margin-left: 20rpx; background: rgba(0,0,0, 0.4); border-radius: 17rpx; @@ -114,6 +123,7 @@ .project .content .bottom .info .right { color: #aaa; font-size: 20rpx; + padding-right: 15rpx; } /* 自定义轮播指示点样式 */ diff --git a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.js b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.js index 2cd0725..343002d 100644 --- a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.js +++ b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.js @@ -9,21 +9,48 @@ Component({ } }, methods: { - // 跳转到我要报事 - navigateToAddIssue () { - this.triggerEvent('navigateToAddIssue') + // 跳转到左邻右舍 + navigateToAssociation () { + this.triggerEvent('navigateToAssociation') }, - // 跳转到网格专员 - navigatetoConsultion() { - this.triggerEvent('navigatetoConsultion') + // 跳转到有么说么 + navigateToDiscussion() { + this.triggerEvent('navigateToDiscussion') }, - // 跳转到通知公告 - navigateToNotice () { - this.triggerEvent('navigateToNotice') + // 跳转到物业服务 + navigateToProperty () { + this.triggerEvent('navigateToProperty') }, - // 跳转到请您监督 - navigatetoAppraise () { - this.triggerEvent('navigatetoAppraise') + // 跳转到互帮互助 + navigateToHeart () { + this.triggerEvent('navigateToHeart') + }, + // 跳转到社区教育 + navigateToEducation () { + this.showNotAvailable(); + // this.triggerEvent('navigateToEducation') + }, + // 跳转到平安榆山 + navigateToSafe () { + this.showNotAvailable(); + // this.triggerEvent('navigateToSafe') + }, + // 跳转到政策法规 + navigateToPolicy () { + this.showNotAvailable(); + // this.triggerEvent('navigateToPolicy') + }, + // 跳转到综合服务 + navigateToSyntheticalService () { + this.showNotAvailable(); + // this.triggerEvent('navigateToSynthetical') + }, + // 暂未开放 + showNotAvailable () { + wx.showToast({ + icon:'none', + title: '暂未开放', + }) }, } }) \ No newline at end of file diff --git a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml index 9d81dfd..2b4f2cf 100644 --- a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml +++ b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml @@ -1,20 +1,36 @@ - - - 我要报事 + + + 左邻右舍 - - - 网格专员 + + + 有么说么 - - - 通知公告 + + + 物业服务 - - - 请您监督 + + + 互帮互助 + + + + 社区教育 + + + + 平安榆山 + + + + 政策法规 + + + + 综合服务 \ No newline at end of file diff --git a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxss b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxss index e93511e..6b455cd 100644 --- a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxss +++ b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxss @@ -1,14 +1,15 @@ .sudoku { background:#fff; padding: 0 20rpx; + margin-top: 20rpx; } .content { width: 100%; - height: 215rpx; display: grid; grid-template-columns: 1fr 1fr 1fr 1fr; grid-template-rows: 215rpx; box-sizing: border-box; + padding-bottom: 20rpx; } .item { display: flex; @@ -23,7 +24,6 @@ .item .name { font-size: 28rpx; color: #3f3f3f; - font-weight: bold; } .sudoku .hover-sudoku { background: rgba(0,0,0,0.1); diff --git a/epdc-resident-mp-yushan/pages/index/index.js b/epdc-resident-mp-yushan/pages/index/index.js index ef403a1..d1370ec 100644 --- a/epdc-resident-mp-yushan/pages/index/index.js +++ b/epdc-resident-mp-yushan/pages/index/index.js @@ -218,8 +218,8 @@ Page({ }) }) }, - // 跳转到我要报事 - navigateToAddIssue () { + // 跳转到互帮互助 + navigateToHeart () { if (app.globalData.infoCompleted == 0) { this.setData({ completeInfoDialogVisible: !this.data.completeInfoDialogVisible @@ -227,38 +227,37 @@ Page({ return false } wx.navigateTo({ - url: '/subpages/discussion/pages/addIssue/addIssue' + url: '/pages/heart/heart' }) }, - // 跳转到网格专员 - navigatetoConsultion() { + // 跳转到左邻右舍 + navigateToAssociation() { if (app.globalData.infoCompleted == 0) { this.setData({ completeInfoDialogVisible: !this.data.completeInfoDialogVisible }) return false } - wx.navigateTo({ - url: '/subpages/home/pages/consultation/consultation' + wx.switchTab({ + url: '/pages/association/association', }) }, - // 跳转到通知公告 - navigateToNotice () { - wx.navigateTo({ - url: '/subpages/home/pages/notice/notice' + // 跳转到有么说么 + navigateToDiscussion () { + wx.switchTab({ + url: '/pages/discussion/discussion' }) }, - // 跳转到请您监督 - navigatetoAppraise () { + // 跳转到物业服务 + navigateToProperty () { if (app.globalData.infoCompleted == 0) { this.setData({ completeInfoDialogVisible: !this.data.completeInfoDialogVisible }) return false } - const token = wx.getStorageSync('token') - wx.navigateTo({ - url: `/subpages/home/pages/webview/webview?url=${global.WEBROOT()}&token=${token}` + wx.switchTab({ + url: '/pages/association/association' }) }, // 初始化加载 diff --git a/epdc-resident-mp-yushan/pages/index/index.wxml b/epdc-resident-mp-yushan/pages/index/index.wxml index 73dbd20..2aee973 100644 --- a/epdc-resident-mp-yushan/pages/index/index.wxml +++ b/epdc-resident-mp-yushan/pages/index/index.wxml @@ -1,13 +1,13 @@ - 党群e家 + 微笑榆山 - + {{departmentName}} @@ -21,15 +21,6 @@ bannerList="{{bannerList}}"> - - - - + + + +