From ce1aa74b90bae409961e0b735a9ea996d128543f Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 28 Mar 2024 20:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=88=97=E8=A1=A8=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/resiAndHouse/resiAndHouse.js                   | 6 ++++--
 pages/resiAndHouse/resiAndHouse.wxml                 | 2 +-
 subpages/searchResult/pages/punchCard/punchCard.wxml | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js
index 03a2cc9..b7dbb0b 100644
--- a/pages/resiAndHouse/resiAndHouse.js
+++ b/pages/resiAndHouse/resiAndHouse.js
@@ -185,9 +185,11 @@ Page({
             console.log(err);
         })
     },
-    toResiDetail(){
+    toResiDetail(e){
+        // '1765976717767618562'
+        console.log(e);
         wx.navigateTo({
-            url: `/subpages/searchResult/pages/punchCard/punchCard?resiId=${'1765976717767618562'}`,
+            url: `/subpages/searchResult/pages/punchCard/punchCard?resiId=${e.currentTarget.dataset.resiid}`,
           })
     },
     onFinish(e){
diff --git a/pages/resiAndHouse/resiAndHouse.wxml b/pages/resiAndHouse/resiAndHouse.wxml
index 3ce646f..576c412 100644
--- a/pages/resiAndHouse/resiAndHouse.wxml
+++ b/pages/resiAndHouse/resiAndHouse.wxml
@@ -46,7 +46,7 @@
             </view>
 
         </view>
-        <view class="form_item" wx:for="{{resiList}}" :wx:key="{{index}}" bind:tap="toResiDetail">
+        <view class="form_item" wx:for="{{resiList}}" :wx:key="{{index}}" bind:tap="toResiDetail" data-resiId="{{item.resiId}}">
             <view class="box_18">
                 <text lines="1" class="text_16">{{item.name}}</text>
                 <view class="resi_tag">
diff --git a/subpages/searchResult/pages/punchCard/punchCard.wxml b/subpages/searchResult/pages/punchCard/punchCard.wxml
index 05b908b..8ed2b59 100644
--- a/subpages/searchResult/pages/punchCard/punchCard.wxml
+++ b/subpages/searchResult/pages/punchCard/punchCard.wxml
@@ -30,7 +30,7 @@
         <view class="form_value">{{form.baseInfoDto.updatedTime}}</view>
     </view>
     <view class="tabs">
-        <view class="tab_item {{activeType === index ? 'border_bto' : ''}}" wx:for="{{tabList}}" bind:tap="handelClickTab" data-item="{{item}}" data-index="{{index}}" wx:key="index">
+        <view class="tab_item {{activeType === index ? 'border_bto' : ''}}" wx:for="{{tabList}}" bind:tap="handelClickTab" data-item="{{item}}" data-index="{{index}}" wx:key="index" wx:if="{{item.filledQty!=0}}">
      {{item.name}} <text style="color:{{item.filledQty!==item.totalQty?'#f27225':'#1ebfb5'}}">（{{ item.filledQty }}/{{ item.totalQty }}）</text>
         </view>
     </view>