From f35bbddc12eb7a64ed813b7e6cb722f60a4886ba Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 5 Jul 2022 13:33:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-resident-mp-yushan/pages/toRegister/toRegister.js      | 2 +-
 .../subpages/family/pages/index/index.wxml                  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
index 89cb6d1..9d593e2 100644
--- a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
+++ b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
       }
     })
     let that = this
-    const versionNum = '1.2.34'
+    const versionNum = '1.2.35'
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data ? res.data.scanFlag : '1'
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 ede767b..feb27ad 100644
--- a/epdc-resident-mp-yushan/subpages/family/pages/index/index.wxml
+++ b/epdc-resident-mp-yushan/subpages/family/pages/index/index.wxml
@@ -1,12 +1,12 @@
 <view class="f-container">
-  <block wx:if="{{familyInfo.roomCode}}">
+  <block wx:if="{{familyInfo.roomCodeShow}}">
     <view class="f-top">
       <view class="f-card">
         <view class="flex-view">
           <view class="card-left">
             <view class="card-title">{{ familyInfo.plotName }} - {{familyInfo.buildingName}} - {{familyInfo.unit}} - {{familyInfo.roomNo}}</view>
-            <view wx:if="{{familyInfo.roomCode.length <= 24}}" class="card-num">
-              <text>No.{{ familyInfo.roomCode }}</text>
+            <view wx:if="{{familyInfo.roomCodeShow.length <= 24}}" class="card-num">
+              <text>No.{{ familyInfo.roomCodeShow }}</text>
               <!-- <text >No.6666666666666666666666</text> -->
               <image />
             </view>