Merge branch 'znz_dev' into 'master'

znz-04-30-1

See merge request !2

src/wx/pages/index/index.wxml

@@ -26,35 +26,35 @@
 			<image src='/img/zyhd.png'></image>
 			<view>志愿活动</view>
 		</view>
-		<view wx:if="{{showSocial}}" bindtap="socialEvent">
+		<!-- <view wx:if="{{showSocial}}" bindtap="socialEvent">
 			<image src='../../img/2.png'></image>
 			<view>社会实践</view>
 		</view>
 		<view wx:if="{{showFamily}}" bindtap="familyEvent">
 			<image src='../../img/2.png'></image>
 			<view>亲子活动</view>
-		</view>
-		<!-- <view bindtap="mediaCourse">
+		</view> -->
+		<view bindtap="familyEvent">
 			<image src='/img/zxdy.png'></image>
 			<view>在线答疑</view>
-		</view> -->
+		</view>
 		<view bindtap="mediaCourse">
 			<image src='/img/gykt.png'></image>
 			<view>公益课堂</view>
 		</view>
-		<view wx:if="{{showNews}}" bindtap="news">
+		<!-- <view wx:if="{{showNews}}" bindtap="news">
 			<text class="messageCount" wx:if="{{unreadMessageCount>0}}">{{unreadMessageCount}}</text>
 			<image src='../../img/4.png'></image>
 			<view>消息通知</view>
-		</view>
-		<!-- <view bindtap="mediaCourse">
+		</view> -->
+		<view bindtap="">
 			<image src='/img/zyyw.png'></image>
 			<view>志愿要闻</view>
-		</view> -->
-		<view bindtap="area" wx:if="{{role==4}}">
+		</view>
+		<!-- <view bindtap="area" wx:if="{{role==4}}">
 			<image src='../../img/4.png'></image>
 			<view>区域管理</view>
-		</view>
+		</view> -->
 	</view>
 
 	<view class='volunteers'>