Merge remote-tracking branch 'origin/master'

# Conflicts:
#	nnzwminiapp/pages/index/index.wxml

nnzwminiapp/pages/index/index.wxml

@@ -107,7 +107,7 @@
 			</swiper>
 		</view> -->
 		<!-- 南岸动态 -->
-		<view class="content-na" style="height:512rpx;width:100%;background-color:#F5F5F5;position:relative;overflow: hidden;margin-top: 40rpx;">
+		<view class="content-na" style="height:512rpx;width:100%;background-color:#F5F5F5;position:relative;overflow: hidden;margin-top: 5rpx;">
 			<!-- 浮动 -->
 			<!-- font-size:32rpx -->
 			<view class="content-na-tab">
@@ -116,8 +116,8 @@
 					<!-- 南岸动态 -->
 					<view class="tab-item {{naTab==0?'active':''}}" bindtap="clickNaTilteTab" data-item="0">
 						<view style="position: absolute;width: 0;height: 0;border-left: 10rpx solid transparent;border-right: 10rpx solid transparent;border-top: 10rpx solid #508FF4;bottom: -13rpx;" />
-						<view style="height:50rpx;width:56rpx;display: flex;justify-content:center;align-items:center;">
-							<image wx:if="{{ naTab==0 }}" style="width:50rpx;height:56rpx;" src="{{imgUrl}}na-title-1.png"></image>
+						<view style="height:50rpx;width:32rpx;display: flex;justify-content:center;align-items:center;">
+							<image wx:if="{{ naTab==0 }}" style="width:32rpx;height:32rpx;" src="{{imgUrl}}na-title-1.png"></image>
 						</view>
 						<view style="height:50rpx;padding-left:10rpx;">南岸动态</view>
 					</view>
@@ -219,7 +219,7 @@
 		<!-- 公示公告 -->
 
 		<!-- 视频推荐 -->
-		<view style="width: 100%;position:relative;margin-top: 40rpx;">
+		<view style="width: 100%;position:relative;margin-top: 30rpx;">
 			<view style="margin-left: 20rpx;border-radius: 20rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;">
 				<!-- 标题 -->
 				<view style="  display: flex;justify-content: left;align-items: center;height: 60rpx;" bindtap="gotoSPTJ">
@@ -251,146 +251,8 @@
 			</view>
 		</view>
 		<!-- 视频推荐 -->
-		<!-- 数据中心 -->
-		<view class="data-cneter" style="height: 1020rpx;width: 100%;background-color:#F5F5F5;position:relative;padding-top: 40rpx">
-			<!-- 数据中心 -->
-			<view class="data-center-contain">
-				<!-- 标题 -->
-				<view class="data-center-title" bindtap="gotoSjzx">
-					<view style="display:flex;align-items:center;justify-content:center;">
-						<image src="{{imgUrl}}index-data-center.png" style="height: 50rpx;width: 56rpx"></image>
-					</view>
-					<view class="data-center-title-font">数据中心</view>
-				</view>
-				<!-- 标题 -->
-				<!-- 统计分析 -->
-				<view class="center-analysis" style="height:272rpx;width:100%;position:relative;">
-					<!-- 分析header -->
-					<view style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
-						<image src="{{ imgUrl }}index-center-analysis-header.png" style="height: 129rpx;width:650rpx"></image>
-					</view>
-					<!-- 分析入口 -->
-					<view class="center-analysis-enter" style="height: 129rpx;width:100%;position: absolute;bottom:114rpx" bindtap="toDataCenter">
-						<view class="center-analysis-enter-font">政务服务数据统计分析</view>
-						<view class="center-analysis-enter-button">
-							<view class="center-analysis-enter-button-item" style="background: linear-gradient(90deg, #2FB785 0%, #2EE698 100%);">进入 ></view>
-						</view>
-					</view>
-					<!-- 本年办件数 -->
-					<view bindtap="gotoZWTJ" style="height: 172rpx;width: 100%;position:relative">
-						<!-- 办件数浮动 -->
-						<view style="height: 172rpx;width: 100%;position:absolute;bottom:22rpx">
-							<!-- 标题 -->
-							<view style="padding-left:8rpx;display:flex;align-items:center;justify-content:margin-left">
-								<view class="yellow-point"></view>
-								<view class="work-title-font">本年办件数</view>
-							</view>
-							<!-- 办件数内容 -->
-							<view style="margin-top:20rpx;display:flex;justify-content: space-between;align-items:center">
-								<view style="width: 210rpx;height: 120rpx;background-image: url({{imgUrl}}index-work-number.png);background-size: 100% 100%;">
-									<!-- 受理数 -->
-									<view style="display:flex;align-items:left;color:#FFFFFF;flex-direction:column;justify-content:center;height: 100%;padding-left:85rpx">
-										<view style="font-size:19rpx">受理数</view>
-										<view style="display:flex;flex-direction:row;align-items:center">
-											<scroll-view scroll-x style="width: 84rpx">
-												<view style="font-size:30rpx;font-weight: bold;">{{officeNumber[0]}}</view>
-											</scroll-view>
-											<view style="font-size: 19rpx;padding-left:5rpx">件</view>
-										</view>
-									</view>
-								</view>
-								<view style="width: 210rpx;height: 120rpx;background-image: url({{imgUrl}}index-finish-number.png);background-size: 100% 100%;">
-									<!-- 受理数 -->
-									<view style="display:flex;align-items:left;color:#FFFFFF;flex-direction:column;justify-content:center;height: 100%;padding-left:85rpx">
-										<view style="font-size:19rpx">办结数</view>
-										<view style="display:flex;flex-direction:row;align-items:center">
-											<scroll-view scroll-x style="width: 84rpx">
-												<view style="font-size:30rpx;font-weight: bold;">{{officeNumber[1]}}</view>
-											</scroll-view>
-											<view style="font-size: 19rpx;padding-left:5rpx">件</view>
-										</view>
-									</view>
-								</view>
-								<view style="width: 210rpx;height: 120rpx;background-image: url({{imgUrl}}index-request-number.png);background-size: 100% 100%;">
-									<!-- 受理数 -->
-									<view style="display:flex;align-items:left;color:#FFFFFF;flex-direction:column;justify-content:center;height: 100%;padding-left:85rpx">
-										<view style="font-size:19rpx">网络提交</view>
-										<view style="display:flex;flex-direction:row;align-items:center">
-											<scroll-view scroll-x style="width: 84rpx;">
-												<view style="font-size:30rpx;font-weight: bold;">{{officeNumber[2]}}</view>
-											</scroll-view>
-											<view style="font-size: 19rpx;padding-left:5rpx">件</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<!-- 办件数浮动 -->
-					</view>
-					<!-- 本年办件数 -->
-					<!-- 好差评 -->
-					<view bindtap="gotoZWTJ" style="margin-top:15rpx;height:300rpx;width:100%;">
-						<!-- 标题 -->
-						<view style="padding-left:8rpx;display:flex;align-items:center;justify-content:margin-left">
-							<view class="yellow-point"></view>
-							<view class="work-title-font">好差评</view>
-						</view>
-						<!-- 内容 -->
-						<view style="display: flex;flex-wrap: wrap;justify-content: space-between;margin-top:20rpx">
-							<view class="evaluate">评价我的办件</view>
-							<view class="evaluate">评价窗口人员</view>
-							<view class="evaluate">评价办事指南</view>
-							<view class="evaluate" style="width: 316rpx;">评价服务应用</view>
-							<view class="evaluate" style="width: 316rpx;">评价电子证照</view>
-						</view>
-						<!-- 评价量 -->
-						<view style="display: flex;flex-wrap: wrap;justify-content: space-between;height: 130rpx;width: 100%">
-							<!-- 评价总量 -->
-							<view style="height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
-								<!-- 图标 -->
-								<view style="width: 100rpx;height: 100%;display: flex;align-items:center;justify-content:center">
-									<image src="{{imgUrl}}index-evalution.png" style="height:64rpx;width:64rpx;"></image>
-								</view>
-								<!-- 数据 -->
-								<view style="width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
-									<view style="font-size: 19rpx;color: #999999;padding-bottom:8rpx">本年评价总量</view>
-									<view style="display:flex;justify-content:left;align-items:center;color: #333333;">
-										<view style="font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
-										<view style="font-size:20rpx;padding-left:5rpx">条</view>
-									</view>
-								</view>
-							</view>
-							<!-- 满意度 -->
-							<view style="height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
-								<!-- 图标 -->
-								<view style="width: 100rpx;height: 100%;display: flex;align-items:center;justify-content:center">
-									<image src="{{imgUrl}}index-good-blud.png" style="height:64rpx;width:70rpx;"></image>
-								</view>
-								<!-- 数据 -->
-								<view style="width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
-									<view style="font-size: 19rpx;color: #999999;padding-bottom:8rpx">满意度</view>
-									<view style="display:flex;justify-content:left;align-items:center;color: #333333;">
-										<view style="font-size: 28rpx;font-weight: bold;">{{evalutionRate}}</view>
-										<view style="font-size:20rpx;padding-left:5rpx">%</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<!-- 图表 -->
-						<view hidden="{{canvasImg}}" style="width: 100%;height: 300rpx;">
-							<ec-canvas id="streetlinechart3" canvas-id="streetlinechart3" ec="{{ streetlinechartec }}" />
-						</view>
-						<image hidden="{{!canvasImg}}" src="{{canvasImg}}" style="width: 100%; height: 300rpx" />
-					</view>
-					<!-- 好差评 -->
-				</view>
-				<!-- 统计分析 -->
-			</view>
-			<!-- 数据中心 -->
-		</view>
-		<!-- 数据中心 -->
 		<!-- 政民互动 -->
-		<view style="width: 100%;position:relative;margin-top: 80rpx;">
+		<view style="width: 100%;position:relative;margin-top: 22rpx;">
 			<view style="margin-left: 20rpx;border-radius: 20rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
 				<!-- 标题 -->
 				<view style="  display: flex;justify-content: left;align-items: center;height: 60rpx;">
@@ -689,9 +551,146 @@
 			</view>
 		</view>
 		<!-- 印象南岸 -->
-
+		<!-- 数据中心 -->
+		<view class="data-cneter" style="height: 1020rpx;width: 100%;background-color:#F5F5F5;position:relative;padding-top: 10rpx">
+			<!-- 数据中心 -->
+			<view class="data-center-contain">
+				<!-- 标题 -->
+				<view class="data-center-title" bindtap="gotoSjzx">
+					<view style="display:flex;align-items:center;justify-content:center;">
+						<image src="{{imgUrl}}index-data-center.png" style="height: 50rpx;width: 56rpx"></image>
+					</view>
+					<view class="data-center-title-font">数据中心</view>
+				</view>
+				<!-- 标题 -->
+				<!-- 统计分析 -->
+				<view class="center-analysis" style="height:272rpx;width:100%;position:relative;">
+					<!-- 分析header -->
+					<view style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
+						<image src="{{ imgUrl }}index-center-analysis-header.png" style="height: 129rpx;width:650rpx"></image>
+					</view>
+					<!-- 分析入口 -->
+					<view class="center-analysis-enter" style="height: 129rpx;width:100%;position: absolute;bottom:114rpx" bindtap="toDataCenter">
+						<view class="center-analysis-enter-font">政务服务数据统计分析</view>
+						<view class="center-analysis-enter-button">
+							<view class="center-analysis-enter-button-item" style="background: linear-gradient(90deg, #2FB785 0%, #2EE698 100%);">进入 ></view>
+						</view>
+					</view>
+					<!-- 本年办件数 -->
+					<view bindtap="gotoZWTJ" style="height: 172rpx;width: 100%;position:relative">
+						<!-- 办件数浮动 -->
+						<view style="height: 172rpx;width: 100%;position:absolute;bottom:22rpx">
+							<!-- 标题 -->
+							<view style="padding-left:8rpx;display:flex;align-items:center;justify-content:margin-left">
+								<view class="yellow-point"></view>
+								<view class="work-title-font">本年办件数</view>
+							</view>
+							<!-- 办件数内容 -->
+							<view style="margin-top:20rpx;display:flex;justify-content: space-between;align-items:center">
+								<view style="width: 210rpx;height: 120rpx;background-image: url({{imgUrl}}index-work-number.png);background-size: 100% 100%;">
+									<!-- 受理数 -->
+									<view style="display:flex;align-items:left;color:#FFFFFF;flex-direction:column;justify-content:center;height: 100%;padding-left:85rpx">
+										<view style="font-size:19rpx">受理数</view>
+										<view style="display:flex;flex-direction:row;align-items:center">
+											<scroll-view scroll-x style="width: 84rpx">
+												<view style="font-size:30rpx;font-weight: bold;">{{officeNumber[0]}}</view>
+											</scroll-view>
+											<view style="font-size: 19rpx;padding-left:5rpx">件</view>
+										</view>
+									</view>
+								</view>
+								<view style="width: 210rpx;height: 120rpx;background-image: url({{imgUrl}}index-finish-number.png);background-size: 100% 100%;">
+									<!-- 受理数 -->
+									<view style="display:flex;align-items:left;color:#FFFFFF;flex-direction:column;justify-content:center;height: 100%;padding-left:85rpx">
+										<view style="font-size:19rpx">办结数</view>
+										<view style="display:flex;flex-direction:row;align-items:center">
+											<scroll-view scroll-x style="width: 84rpx">
+												<view style="font-size:30rpx;font-weight: bold;">{{officeNumber[1]}}</view>
+											</scroll-view>
+											<view style="font-size: 19rpx;padding-left:5rpx">件</view>
+										</view>
+									</view>
+								</view>
+								<view style="width: 210rpx;height: 120rpx;background-image: url({{imgUrl}}index-request-number.png);background-size: 100% 100%;">
+									<!-- 受理数 -->
+									<view style="display:flex;align-items:left;color:#FFFFFF;flex-direction:column;justify-content:center;height: 100%;padding-left:85rpx">
+										<view style="font-size:19rpx">网络提交</view>
+										<view style="display:flex;flex-direction:row;align-items:center">
+											<scroll-view scroll-x style="width: 84rpx;">
+												<view style="font-size:30rpx;font-weight: bold;">{{officeNumber[2]}}</view>
+											</scroll-view>
+											<view style="font-size: 19rpx;padding-left:5rpx">件</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<!-- 办件数浮动 -->
+					</view>
+					<!-- 本年办件数 -->
+					<!-- 好差评 -->
+					<view bindtap="gotoZWTJ" style="margin-top:15rpx;height:300rpx;width:100%;">
+						<!-- 标题 -->
+						<view style="padding-left:8rpx;display:flex;align-items:center;justify-content:margin-left">
+							<view class="yellow-point"></view>
+							<view class="work-title-font">好差评</view>
+						</view>
+						<!-- 内容 -->
+						<view style="display: flex;flex-wrap: wrap;justify-content: space-between;margin-top:20rpx">
+							<view class="evaluate">评价我的办件</view>
+							<view class="evaluate">评价窗口人员</view>
+							<view class="evaluate">评价办事指南</view>
+							<view class="evaluate" style="width: 316rpx;">评价服务应用</view>
+							<view class="evaluate" style="width: 316rpx;">评价电子证照</view>
+						</view>
+						<!-- 评价量 -->
+						<view style="display: flex;flex-wrap: wrap;justify-content: space-between;height: 130rpx;width: 100%">
+							<!-- 评价总量 -->
+							<view style="height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
+								<!-- 图标 -->
+								<view style="width: 100rpx;height: 100%;display: flex;align-items:center;justify-content:center">
+									<image src="{{imgUrl}}index-evalution.png" style="height:64rpx;width:64rpx;"></image>
+								</view>
+								<!-- 数据 -->
+								<view style="width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
+									<view style="font-size: 19rpx;color: #999999;padding-bottom:8rpx">本年评价总量</view>
+									<view style="display:flex;justify-content:left;align-items:center;color: #333333;">
+										<view style="font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
+										<view style="font-size:20rpx;padding-left:5rpx">条</view>
+									</view>
+								</view>
+							</view>
+							<!-- 满意度 -->
+							<view style="height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
+								<!-- 图标 -->
+								<view style="width: 100rpx;height: 100%;display: flex;align-items:center;justify-content:center">
+									<image src="{{imgUrl}}index-good-blud.png" style="height:64rpx;width:70rpx;"></image>
+								</view>
+								<!-- 数据 -->
+								<view style="width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
+									<view style="font-size: 19rpx;color: #999999;padding-bottom:8rpx">满意度</view>
+									<view style="display:flex;justify-content:left;align-items:center;color: #333333;">
+										<view style="font-size: 28rpx;font-weight: bold;">{{evalutionRate}}</view>
+										<view style="font-size:20rpx;padding-left:5rpx">%</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<!-- 图表 -->
+						<view hidden="{{canvasImg}}" style="width: 100%;height: 300rpx;">
+							<ec-canvas id="streetlinechart3" canvas-id="streetlinechart3" ec="{{ streetlinechartec }}" />
+						</view>
+						<image hidden="{{!canvasImg}}" src="{{canvasImg}}" style="width: 100%; height: 300rpx" />
+					</view>
+					<!-- 好差评 -->
+				</view>
+				<!-- 统计分析 -->
+			</view>
+			<!-- 数据中心 -->
+		</view>
+		<!-- 数据中心 -->
 		<!-- 底部 -->
-		<view style="height: 150rpx">
+		<view style="height: 180rpx">
 		</view>
 	</scroll-view>