From 13dfdbf6cc9f9c5ddffebaee7a67f70c22d2608e Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 3 Apr 2023 10:50:22 +0800
Subject: [PATCH] =?UTF-8?q?3.31=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
epdc-resident-mp-yushan/pages/index/index.js | 98 ++++++++++++-------
.../pages/index/index.wxml | 6 +-
.../pages/index/index.wxss | 8 +-
.../subpages/family/pages/index/index.json | 2 +-
.../subpages/family/pages/index/index.wxml | 6 +-
5 files changed, 80 insertions(+), 40 deletions(-)
diff --git a/epdc-resident-mp-yushan/pages/index/index.js b/epdc-resident-mp-yushan/pages/index/index.js
index bd73fa0..dcd0481 100644
--- a/epdc-resident-mp-yushan/pages/index/index.js
+++ b/epdc-resident-mp-yushan/pages/index/index.js
@@ -29,11 +29,17 @@ Page({
communityNewsList: [],
currentIndex: 0,
moduleList: [
- {
- icon:
- 'https://epdc-yushan.elinkservice.cn/files-pro/20211009/db9d4408de344c419bb22be21ba163b9.png',
- tip: '积分排名',
+ // {
+ // icon:
+ // 'https://epdc-yushan.elinkservice.cn/files-pro/20211009/db9d4408de344c419bb22be21ba163b9.png',
+ // tip: '积分排名',
+ // module: 'pointRank',
+ // },
+ {
+ icon:'../../images/my-home.png',
+ tip: '一户一码',
module: 'pointRank',
+ imgHeightFlag:true
},
{
icon:
@@ -437,6 +443,60 @@ Page({
}
})
},
+ // 模块列表跳转
+ navigateToModule(e) {
+ const { module } = e.currentTarget.dataset
+ if (module === 'gridArmy') {
+ wx.navigateTo({
+ url: '/subpages/gridArmy/pages/communityList/communityList',
+ })
+ } else if (module === 'pointRank') {
+ if (!this.data.identityNo) {
+ wx.showToast({
+ title: '请先扫描房屋码，绑定家庭',
+ icon: 'none',
+ duration: 2500
+ })
+ return
+ }
+ const params = {
+ idCard: this.data.identityNo
+ }
+ api.getRoomCodeByIdCard(params).then(res => {
+ if (res.data && res.data.roomCode) {
+ wx.navigateTo({
+ url: `/subpages/family/pages/index/index?roomCode=${res.data.roomCode}`,
+ })
+ } else {
+ wx.showToast({
+ title: '请扫房屋码绑定房屋',
+ icon: 'none',
+ duration: 2500
+ })
+ }
+ })
+ // wx.navigateTo({
+ // // /subpages/integralCentre/pages/index/index
+ // url: '/subpages/family/pages/index/index',
+ // })
+ } else if (module === 'volunteerService') {
+ wx.navigateTo({
+ url: '/pages/heart/heart',
+ })
+ } else if (module === 'societyOrg') {
+ wx.navigateTo({
+ url: '/subpages/societyOrg/pages/orgList/orgList',
+ })
+ } else if (module === 'fingerYushan') {
+ wx.navigateTo({
+ url: '/subpages/fingertipYushan/pages/index/index',
+ })
+ } else if (module === 'personalCenter') {
+ wx.navigateTo({
+ url: '/pages/mine/mine'
+ })
+ }
+ },
// 获取最新社区资讯
contentList() {
const params = {
@@ -456,35 +516,7 @@ Page({
console.error(err)
})
},
- // 模块列表跳转
- navigateToModule(e) {
- const { module } = e.currentTarget.dataset
- if (module === 'gridArmy') {
- wx.navigateTo({
- url: '/subpages/gridArmy/pages/communityList/communityList',
- })
- } else if (module === 'pointRank') {
- wx.navigateTo({
- url: '/subpages/integralCentre/pages/index/index',
- })
- } else if (module === 'volunteerService') {
- wx.navigateTo({
- url: '/pages/heart/heart',
- })
- } else if (module === 'societyOrg') {
- wx.navigateTo({
- url: '/subpages/societyOrg/pages/orgList/orgList',
- })
- } else if (module === 'fingerYushan') {
- wx.navigateTo({
- url: '/subpages/fingertipYushan/pages/index/index',
- })
- } else if (module === 'personalCenter') {
- wx.navigateTo({
- url: '/pages/mine/mine'
- })
- }
- },
+
// 我有事要说跳转
navigateToDiscussion() {
if (app.globalData.infoCompleted == 0) {
diff --git a/epdc-resident-mp-yushan/pages/index/index.wxml b/epdc-resident-mp-yushan/pages/index/index.wxml
index 149d444..d150551 100644
--- a/epdc-resident-mp-yushan/pages/index/index.wxml
+++ b/epdc-resident-mp-yushan/pages/index/index.wxml
@@ -117,7 +117,7 @@
-
+
{{item.tip}}
@@ -159,10 +159,10 @@
-
+
-
+
diff --git a/epdc-resident-mp-yushan/pages/index/index.wxss b/epdc-resident-mp-yushan/pages/index/index.wxss
index 6710781..3449e4f 100644
--- a/epdc-resident-mp-yushan/pages/index/index.wxss
+++ b/epdc-resident-mp-yushan/pages/index/index.wxss
@@ -489,7 +489,13 @@ image {
height: 150rpx;
border-radius: 8rpx;
overflow: hidden;
- margin-right: 20rpx;
+ margin-right: 50rpx;
+}
+.module-list .module-item .icon .house_img {
+ width: 100% !important;
+ height: 90% !important;
+ position: relative;
+ top: 8rpx;
}
.news-list .list-item .detail {
diff --git a/epdc-resident-mp-yushan/subpages/family/pages/index/index.json b/epdc-resident-mp-yushan/subpages/family/pages/index/index.json
index 94b31bc..3c99b53 100644
--- a/epdc-resident-mp-yushan/subpages/family/pages/index/index.json
+++ b/epdc-resident-mp-yushan/subpages/family/pages/index/index.json
@@ -1,4 +1,4 @@
{
- "navigationBarTitleText": "我的家庭",
+ "navigationBarTitleText": "我的e家",
"usingComponents": {}
}
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/family/pages/index/index.wxml b/epdc-resident-mp-yushan/subpages/family/pages/index/index.wxml
index feb27ad..db6934c 100644
--- a/epdc-resident-mp-yushan/subpages/family/pages/index/index.wxml
+++ b/epdc-resident-mp-yushan/subpages/family/pages/index/index.wxml
@@ -6,7 +6,7 @@
{{ familyInfo.plotName }} - {{familyInfo.buildingName}} - {{familyInfo.unit}} - {{familyInfo.roomNo}}
- No.{{ familyInfo.roomCodeShow }}
+
@@ -28,7 +28,9 @@
- 家庭成员
+ 成员新了
+ 房价涨了
+ 快递来了