3.31修改

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: '积分排名',
+    //     module: 'pointRank',
+    //   },
          {
-        icon:
+        icon:'../../images/my-home.png',
-          'https://epdc-yushan.elinkservice.cn/files-pro/20211009/db9d4408de344c419bb22be21ba163b9.png',
+        tip: '一户一码',
-        tip: '积分排名',
         module: 'pointRank',
+        imgHeightFlag:true
       },
       {
         icon:
@@ -437,25 +443,6 @@ Page({
       }
     })
   },
-  // 获取最新社区资讯
-  contentList() {
-    const params = {
-      pageIndex: 1,
-      pageSize: 5,
-      typeId: '',
-    }
-    homeApi
-      .contentList(params)
-      .then((res) => {
-        console.log('社区最新资讯', res)
-        this.setData({
-          communityNewsList: res.data,
-        })
-      })
-      .catch((err) => {
-        console.error(err)
-      })
-  },
     // 模块列表跳转
     navigateToModule(e) {
         const { module } = e.currentTarget.dataset
@@ -464,9 +451,34 @@ Page({
             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/integralCentre/pages/index/index',
+                    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',
@@ -485,6 +497,26 @@ Page({
           })
         }
       },
+  // 获取最新社区资讯
+  contentList() {
+    const params = {
+      pageIndex: 1,
+      pageSize: 5,
+      typeId: '',
+    }
+    homeApi
+      .contentList(params)
+      .then((res) => {
+        console.log('社区最新资讯', res)
+        this.setData({
+          communityNewsList: res.data,
+        })
+      })
+      .catch((err) => {
+        console.error(err)
+      })
+  },
+
   // 我有事要说跳转
   navigateToDiscussion() {
     if (app.globalData.infoCompleted == 0) {

epdc-resident-mp-yushan/pages/index/index.wxml

@@ -117,7 +117,7 @@
     <view class="module-list">
       <view hover-class="hover-module-item" hover-stay-time="150" class="module-item" wx:for="{{moduleList}}" wx:key="index" wx:for-item="item" data-module="{{item.module}}" bindtap="navigateToModule">
         <view class="icon">
-          <image src="{{item.icon}}" />
+          <image class="{{item.imgHeightFlag?'house_img':''}}" src="{{item.icon}}" />
         </view>
         <view class="tip">{{item.tip}}</view>
       </view>
@@ -159,10 +159,10 @@
     <complete-info-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></complete-info-dialog>
   </view>
   <!-- 悬浮按钮 -->
-  <move-btn wx:if="{{vaccinationSwitch}}" button-width="142" button-height="164" button-left="620" area-top="120" area-height="85%" img-url="../../images/vaccines.png" bindmovebtnCallBack="toVaccines"></move-btn>
+  <!-- <move-btn wx:if="{{vaccinationSwitch}}" button-width="142" button-height="164" button-left="620" area-top="120" area-height="85%" img-url="../../images/vaccines.png" bindmovebtnCallBack="toVaccines"></move-btn> -->
   
   <!-- = -->
-  <move-btn  button-width="140" button-height="140" button-left="620" area-top="120" area-height="60%" img-url="../../images/my-home.png" bindmovebtnCallBack="toFamily"></move-btn>
+  <!-- <move-btn  button-width="140" button-height="140" button-left="620" area-top="120" area-height="60%" img-url="../../images/my-home.png" bindmovebtnCallBack="toFamily"></move-btn> -->
 
 
   <!-- 拨打电话 -->

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 {

epdc-resident-mp-yushan/subpages/family/pages/index/index.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "我的家庭",
+  "navigationBarTitleText": "我的e家",
   "usingComponents": {}
 }

epdc-resident-mp-yushan/subpages/family/pages/index/index.wxml

@@ -6,7 +6,7 @@
           <view class="card-left">
             <view class="card-title">{{ familyInfo.plotName }} - {{familyInfo.buildingName}} - {{familyInfo.unit}} - {{familyInfo.roomNo}}</view>
             <view wx:if="{{familyInfo.roomCodeShow.length <= 24}}" class="card-num">
-              <text>No.{{ familyInfo.roomCodeShow }}</text>
+              <!-- <text>No.{{ familyInfo.roomCodeShow }}</text> -->
               <!-- <text >No.6666666666666666666666</text> -->
               <image />
             </view>
@@ -28,7 +28,9 @@
     </view>
     <view class="f-wr">
       <view class="title-wr">
-        <view class="title-label">家庭成员</view>
+        <view class="title-label">成员新了</view>
+        <view class="title-label">房价涨了</view>
+        <view class="title-label">快递来了</view>
         <view class="title-right">
           <!-- <view class="title-right-label">明细</view> -->
           <image class="right-icon" src="../../images/arrow-right.png" />