Merge remote-tracking branch 'origin/master'

nnzwminiapp/pages/dataCenterZWTJ/dataCenterZWTJ.js

@@ -134,7 +134,8 @@ Page({
 			method: 'GET'
 		}).then(res => {
 			this.setData({
-				matters: res.data.conutNumbers,
+				// matters: res.data.conutNumbers,
+				matters: [0,0,0,1,3,5,5],
 				mattersZero: 7 - res.data.listTotal.conutNumber.toString().length,
 				departmentSort: res.data.listRank,
 				matterSort: res.data.listMatterRank,

nnzwminiapp/pages/dataCenterZWTJ/dataCenterZWTJ.wxml

@@ -232,7 +232,7 @@
 <view class="box">
 	<view class="box2Title">
 		<image class="box2TitleIcon" src="{{imgUrl}}zwtjZWFW.png"></image>
-		<text>南岸区政务服务事项总数</text>
+		<text style="font-size:26rpx">南岸区依申请+公共服务办理类事项总数</text>
 	</view>
 	<view class="box2Crossline">
 	</view>

nnzwminiapp/pages/index/index.js

@@ -172,7 +172,7 @@ Page({
 			{
 				id: 5,
 				top: false,
-				name: '南岸一颗树'
+				name: '南山一颗树'
 			},
 			{
 				id: 6,
@@ -296,13 +296,13 @@ Page({
 			// 	ewm: "index_ewm_logo_2.png",
 			// 	url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			// },
-			// {
-			// 	id: '3',
-			// 	name: "南岸发布",
-			// 	img: imgUrl + 'index-media-icon3.png',
-			// 	ewm: "index_ewm_logo_3.jpg",
-			// 	url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
-			// },
+			{
+				id: '3',
+				name: "南岸发布",
+				img: imgUrl + 'index-media-icon3.png',
+				ewm: "index_ewm_logo_3.jpg",
+				url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
+			},
 			// {
 			// 	id: '4',
 			// 	name: "南岸国资",

nnzwminiapp/pages/nais/nais.json

@@ -3,7 +3,8 @@
 		"t-swiper": "tdesign-miniprogram/swiper/swiper",
 		"custom-banner-swiper": "../../components/customBannerSwiper/customBannerSwiper"
   },
-	"navigationBarTitleText": "这是南岸",
+	"navigationBarTitleText": "",
 	"navigationBarBackgroundColor": "#FFFFFF",
 	"navigationBarTextStyle": "black"
+	
 }