diff --git a/images/scan.png b/images/scan.png new file mode 100644 index 0000000..33f0f31 Binary files /dev/null and b/images/scan.png differ 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 @@ + 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