From 5e38b2df4954a96b34779bc14c38ebb9ac038d99 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Fri, 17 Jun 2022 15:12:28 +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

---
 images/scan.png                                 | Bin 0 -> 16073 bytes
 pages/index/index.js                            |   5 -----
 pages/index/index.wxml                          |   1 +
 pages/index/index.wxss                          |   7 ++++++-
 .../pages/editHouseInfo/editHouseInfo.json      |   1 +
 .../family/pages/familyInfo/familyInfo.json     |   1 +
 subpages/family/pages/index/index.json          |   1 +
 7 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 images/scan.png

diff --git a/images/scan.png b/images/scan.png
new file mode 100644
index 0000000000000000000000000000000000000000..33f0f318a3c9fa78c53b7736e5ea0781f8436cd4
GIT binary patch
literal 16073
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

literal 0
HcmV?d00001

diff --git a/pages/index/index.js b/pages/index/index.js
index dd7fcef..a626603 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -238,11 +238,6 @@ Page({
           this.toPointList()
         }
         break
-      case 'tmp-9':
-        if (navCode == '10091') {
-          this.toFamily()
-        }
-        break
       default:
         let c_childNav = [];
         for (let i = 0; i < this.data.panel.length; i++) {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index b0fa555..1de2660 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -43,6 +43,7 @@
         <image src="/images/down.png"></image>
       </view>
       <view class="grid-set">
+        <image bindtap="toFamily" class="scan" src="/images/scan.png"></image>
         <image wx:if="{{notice == 0}}" bindtap="toNotice" class="notice" src="/images/notice.png"></image>
         <image bindtap="toNotice" wx:else class="notice" src="/images/notice-xz.png"></image>
         <image bindtap="logout" class="logout" src="/images/logout.png"></image>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 357bccc..174f9a9 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -323,7 +323,12 @@ page {
 .title-new .grid-any .grid-set .notice{
   width: 40rpx;
   height: 40rpx;
-  margin-right: 80rpx;
+  margin-right: 40rpx;
+}
+.title-new .grid-any .grid-set .scan{
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 50rpx;
 }
 .list-all{
   margin-top: -60rpx;
diff --git a/subpages/family/pages/editHouseInfo/editHouseInfo.json b/subpages/family/pages/editHouseInfo/editHouseInfo.json
index 8835af0..955e391 100644
--- a/subpages/family/pages/editHouseInfo/editHouseInfo.json
+++ b/subpages/family/pages/editHouseInfo/editHouseInfo.json
@@ -1,3 +1,4 @@
 {
+  "navigationBarTitleText": "编辑",
   "usingComponents": {}
 }
\ No newline at end of file
diff --git a/subpages/family/pages/familyInfo/familyInfo.json b/subpages/family/pages/familyInfo/familyInfo.json
index 8835af0..349aacc 100644
--- a/subpages/family/pages/familyInfo/familyInfo.json
+++ b/subpages/family/pages/familyInfo/familyInfo.json
@@ -1,3 +1,4 @@
 {
+  "navigationBarTitleText": "基本信息",
   "usingComponents": {}
 }
\ No newline at end of file
diff --git a/subpages/family/pages/index/index.json b/subpages/family/pages/index/index.json
index 8835af0..94b31bc 100644
--- a/subpages/family/pages/index/index.json
+++ b/subpages/family/pages/index/index.json
@@ -1,3 +1,4 @@
 {
+  "navigationBarTitleText": "我的家庭",
   "usingComponents": {}
 }
\ No newline at end of file