From efd646a82bcd02754c67cb507e02134328f2551e Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Tue, 29 Sep 2020 10:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E9=A1=B5=E9=9D=A2=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=A6=96=E9=A1=B5=E8=8E=B7=E5=BE=97=E7=9A=84?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=8A=A8=E6=80=81=E8=AE=BE=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.ts                         | 14 +++++++-------
 src/pages/index/index.wxml                       |  2 +-
 src/subpages/basicReality/pages/index/index.scss |  1 -
 src/subpages/basicReality/pages/index/index.wxml |  8 ++------
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/pages/index/index.ts b/src/pages/index/index.ts
index 9063bb5..c82683d 100644
--- a/src/pages/index/index.ts
+++ b/src/pages/index/index.ts
@@ -252,18 +252,18 @@ Page({
   //跳转到子页
   navigateToPage (e:{ currentTarget: { dataset: { code: any}}}) {
     console.log(e.currentTarget.dataset.code)
-
+    let label = e.currentTarget.dataset.label
     if (e.currentTarget.dataset.code == 'A1001') { //党员信息
       wx.navigateTo({ 
-        url: "/subpages/basicReality/pages/index/index?tab=basic-situation&title=党员信息" 
+        url: "/subpages/basicReality/pages/index/index?tab=basic-situation&title="+label 
       });
     } else if (e.currentTarget.dataset.code == 'A1002') { //参与情况
       wx.navigateTo({
-        url: "/subpages/basicReality/pages/index/index?tab=enter-situation&title=参与情况"
+        url: "/subpages/basicReality/pages/index/index?tab=enter-situation&title="+label 
       });
     } else if (e.currentTarget.dataset.code == 'A1003') { //发挥作用
       wx.navigateTo({
-        url: "/subpages/basicReality/pages/index/index?tab=bring-into-play-situation&title=发挥作用"
+        url: "/subpages/basicReality/pages/index/index?tab=bring-into-play-situation&title="+label 
       });
     } else if (e.currentTarget.dataset.code == 'A2001') { //热议事件
       wx.navigateTo({ 
@@ -287,15 +287,15 @@ Page({
       });
     } else if (e.currentTarget.dataset.code == 'A3001') { //社区报道
       wx.navigateTo({
-        url: "/subpages/governRanking/pages/governRanking/governRanking?tab=second&title=社区报到"
+        url: "/subpages/governRanking/pages/governRanking/governRanking?tab=second&title="+label
       });
     } else if (e.currentTarget.dataset.code == 'A3002') { //网格自治
       wx.navigateTo({
-        url: "/subpages/governRanking/pages/governRanking/governRanking?tab=third&title=网格自治"
+        url: "/subpages/governRanking/pages/governRanking/governRanking?tab=third&title="+label
       });
     } else if (e.currentTarget.dataset.code == 'A3003') { //网格满意度
       wx.navigateTo({
-        url: "/subpages/governRanking/pages/governRanking/governRanking?tab=fourth&title=网格满意度"
+        url: "/subpages/governRanking/pages/governRanking/governRanking?tab=fourth&title="+label
       });
     }
   },
diff --git a/src/pages/index/index.wxml b/src/pages/index/index.wxml
index b4284e1..de7f765 100644
--- a/src/pages/index/index.wxml
+++ b/src/pages/index/index.wxml
@@ -62,7 +62,7 @@
     <view class="content-title">{{rowItem.mainLabel}}</view>
     <view class="content">
       <block wx:for="{{rowItem.childNav}}" wx:for-index="index" wx:key="index">
-        <view class="item" data-code="{{item.navCode}}" bindtap="navigateToPage" hover-stay-time="150" hover-class="grid-hover">
+        <view class="item" data-code="{{item.navCode}}" data-label="{{item.label}}" bindtap="navigateToPage" hover-stay-time="150" hover-class="grid-hover">
           <image src="{{item.icon}}" />
           <view class="name">{{item.label}}</view>
         </view>
diff --git a/src/subpages/basicReality/pages/index/index.scss b/src/subpages/basicReality/pages/index/index.scss
index 3b432a4..289b46a 100644
--- a/src/subpages/basicReality/pages/index/index.scss
+++ b/src/subpages/basicReality/pages/index/index.scss
@@ -8,7 +8,6 @@ page {
 .basic-reality {
   background: #f8f8fa;
   width: 100%;
-  padding-top: 90rpx;
 }
 
 .tab-bar {
diff --git a/src/subpages/basicReality/pages/index/index.wxml b/src/subpages/basicReality/pages/index/index.wxml
index 6e952fe..1211942 100644
--- a/src/subpages/basicReality/pages/index/index.wxml
+++ b/src/subpages/basicReality/pages/index/index.wxml
@@ -1,14 +1,10 @@
 <view class="basic-reality">
   
-  <cover-view class="tab-bar">
+  <!-- <cover-view class="tab-bar">
     <cover-view class="party-van tab-item" bindtap="onChangeTab" data-tab="party-van">党员先锋</cover-view>
     <cover-view class="no-data" ></cover-view>
-    <!-- 孔村版-去掉支部建设,联建共建 -->
-    <!--<cover-view class="branch-construct tab-item" bindtap="onChangeTab" data-tab="branch-construct">支部建设</cover-view>
-   <cover-view class="union-construct tab-item" bindtap="onChangeTab" data-tab="union-construct">联建共建</cover-view>-->
-    <!--<cover-view class="select-tab {{selectTab === 'party-van' ? 'party-van' : selectTab === 'branch-construct' ? 'branch-construct' : 'union-construct'}}"></cover-view> -->
     <cover-image class="select-tab {{selectTab === 'party-van' ? 'party-van' : selectTab === 'branch-construct' ? 'branch-construct' : 'union-construct'}}" src="https://epdc-shibei.elinkservice.cn/epdcFile/M00/02/BA/rBAAM16X7bqAH_AaAAAB2R4v1Do645.png"></cover-image>
-  </cover-view>
+  </cover-view> -->
 
   <party-van wx:if="{{selectTab === 'party-van'}}" tab="{{subTab}}"></party-van>