Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/index/index.js

@@ -142,6 +142,8 @@ Page({
 		streetlinechartec: {
 			lazyLoad: true,
 		},
+		// 图表图片
+		canvasImg: '',
 		videoInfo: [{
 				url: 'video1.png',
 				title: '南岸百企风采'
@@ -158,51 +160,150 @@ Page({
 			}
 		],
 		// 政民list
-		communicateData: [
-			{},{},{},{},{}
-		],
+		communicateData: [{}, {}, {}, {}, {}],
 		// 地图服务
-		mapServiceData: [
-			{ id: 1, name: '政务公开'},
-			{ id: 2, name: '政务服务'},
-			{ id: 3, name: '党群服务'},
-			{ id: 4, name: '核算检测'},
-			{ id: 5, name: '教育资源'},
-			{ id: 6, name: '医疗卫生'},
-			{ id: 7, name: '户籍管理'},
-			{ id: 8, name: '交通服务'},
+		mapServiceData: [{
+				id: 1,
+				name: '政务公开'
+			},
+			{
+				id: 2,
+				name: '政务服务'
+			},
+			{
+				id: 3,
+				name: '党群服务'
+			},
+			{
+				id: 4,
+				name: '核算检测'
+			},
+			{
+				id: 5,
+				name: '教育资源'
+			},
+			{
+				id: 6,
+				name: '医疗卫生'
+			},
+			{
+				id: 7,
+				name: '户籍管理'
+			},
+			{
+				id: 8,
+				name: '交通服务'
+			},
 		],
 		// 媒体矩阵导航
 		mediaCurrentTab: 0,
 		// 媒体矩阵导航列表
-		provList:[
-      {"name":"南岸发布"},
-      {"name":"微信公众号"},
-      {"name":"新浪微博矩阵"},
-      {"name":"今日头条"},
-      {"name":"民政服务"},
-      {"name":"消息服务"},
-      {"name":"今日说法"},
-      {"name":"新媒体"},
+		provList: [{
+				"name": "南岸发布"
+			},
+			{
+				"name": "微信公众号"
+			},
+			{
+				"name": "新浪微博矩阵"
+			},
+			{
+				"name": "今日头条"
+			},
+			{
+				"name": "民政服务"
+			},
+			{
+				"name": "消息服务"
+			},
+			{
+				"name": "今日说法"
+			},
+			{
+				"name": "新媒体"
+			},
 		],
 		// 媒体矩阵内容选项
-		mediaSelectList: [
-			{id: '1', name: "重庆市南岸区人民政府", img: imgUrl + 'index-media-icon1.png'},
-			{id: '2', name: "南岸文旅", img: imgUrl + 'index-media-icon2.png'},
-			{id: '3', name: "南岸发布", img: imgUrl + 'index-media-icon3.png'},
-			{id: '4', name: "南岸国资", img: imgUrl + 'index-media-icon4.png'},
-			{id: '5', name: "重庆南岸消防", img: imgUrl + 'index-media-icon5.png'},
-			{id: '6', name: "南岸生态环境", img: imgUrl + 'index-media-icon6.png'},
-			{id: '7', name: "南岸健康卫士", img: imgUrl + 'index-media-icon7.png'},
-			{id: '8', name: "南岸公安", img: imgUrl + 'index-media-icon8.png'},
-			{id: '9', name: "遇见南坪", img: imgUrl + 'index-media-icon9.png'},
-			{id: '10', name: "书香南岸", img: imgUrl + 'index-media-icon10.png'},
-			{id: '11', name: "南岸卫生健康监督", img: imgUrl + 'index-media-icon11.png'},
-			{id: '12', name: "南岸司法", img: imgUrl + 'index-media-icon12.png'},
-			{id: '13', name: "广阳岛绿色发展公司", img: imgUrl + 'index-media-icon13.png'},
-			{id: '14', name: "南岸人力社保", img: imgUrl + 'index-media-icon14.png'},
-			{id: '15', name: "广阳湾智创生态城", img: imgUrl + 'index-media-icon15.png'},
-			{id: '16', name: "南岸智慧城管", img: imgUrl + 'index-media-icon16.png'}
+		mediaSelectList: [{
+				id: '1',
+				name: "重庆市南岸区人民政府",
+				img: imgUrl + 'index-media-icon1.png'
+			},
+			{
+				id: '2',
+				name: "南岸文旅",
+				img: imgUrl + 'index-media-icon2.png'
+			},
+			{
+				id: '3',
+				name: "南岸发布",
+				img: imgUrl + 'index-media-icon3.png'
+			},
+			{
+				id: '4',
+				name: "南岸国资",
+				img: imgUrl + 'index-media-icon4.png'
+			},
+			{
+				id: '5',
+				name: "重庆南岸消防",
+				img: imgUrl + 'index-media-icon5.png'
+			},
+			{
+				id: '6',
+				name: "南岸生态环境",
+				img: imgUrl + 'index-media-icon6.png'
+			},
+			{
+				id: '7',
+				name: "南岸健康卫士",
+				img: imgUrl + 'index-media-icon7.png'
+			},
+			{
+				id: '8',
+				name: "南岸公安",
+				img: imgUrl + 'index-media-icon8.png'
+			},
+			{
+				id: '9',
+				name: "遇见南坪",
+				img: imgUrl + 'index-media-icon9.png'
+			},
+			{
+				id: '10',
+				name: "书香南岸",
+				img: imgUrl + 'index-media-icon10.png'
+			},
+			{
+				id: '11',
+				name: "南岸卫生健康监督",
+				img: imgUrl + 'index-media-icon11.png'
+			},
+			{
+				id: '12',
+				name: "南岸司法",
+				img: imgUrl + 'index-media-icon12.png'
+			},
+			{
+				id: '13',
+				name: "广阳岛绿色发展公司",
+				img: imgUrl + 'index-media-icon13.png'
+			},
+			{
+				id: '14',
+				name: "南岸人力社保",
+				img: imgUrl + 'index-media-icon14.png'
+			},
+			{
+				id: '15',
+				name: "广阳湾智创生态城",
+				img: imgUrl + 'index-media-icon15.png'
+			},
+			{
+				id: '16',
+				name: "南岸智慧城管",
+				img: imgUrl + 'index-media-icon16.png'
+			}
 		]
 	},
 	onReady() {},
@@ -264,8 +365,21 @@ Page({
 		// })
 	},
 
+	// canvas转图片
+	canvasToTempImage() {
+		wx.canvasToTempFilePath({
+			canvas: this.barComponent3.canvasNode,
+			success: (res) => {
+				this.setData({
+					canvasImg: res.tempFilePath
+				});
+			}
+		}, this);
+	},
+
 	// 加载评价图表
 	init_bar3() {
+		let that = this;
 		this.barComponent3.init((canvas, width, height, dpr) => {
 			// 初始化图表
 			const barChart = echarts.init(canvas, null, {
@@ -274,6 +388,9 @@ Page({
 				devicePixelRatio: dpr
 			});
 			barChart.setOption(this.getScaOption2());
+			barChart.on("finished", function () {
+				that.canvasToTempImage();
+			});
 			// 注意这里一定要返回 chart 实例，否则会影响事件处理等
 			return barChart;
 		});
@@ -482,12 +599,12 @@ Page({
 	naMore: function (e) {
 		wx.navigateTo({
 			url: '/pages/aticleList/aticleList',
-		  })
+		})
 	},
 
 	// 政民互动
 	communicateChangeItem: function (e) {
-    this.setData({
+		this.setData({
 			communicateItem: e.currentTarget.dataset.item
 		})
 	},
@@ -497,36 +614,36 @@ Page({
 			communicateTab: e.detail.current
 		})
 	},
-	toList:function(){
+	toList: function () {
 		wx.navigateTo({
 			url: '/pages/programList/programList',
-		  })
+		})
 	},
-	toLeaveMessage:function(){
+	toLeaveMessage: function () {
 		wx.navigateTo({
 			url: '/pages/leaveMessage/leaveMessage',
-		  })
+		})
 	},
 
 	// 媒体矩阵
-	swichNav: function( e ) {
+	swichNav: function (e) {
 		var that = this;
-		if( this.data.mediaCurrentTab === e.target.dataset.current ) {
-				return false;
+		if (this.data.mediaCurrentTab === e.target.dataset.current) {
+			return false;
 		} else {
-				that.setData( {
-						mediaCurrentTab: e.target.dataset.current,
-						navScrollLeft:e.target.dataset.current >= 2 ? ((e.target.dataset.current - 1) * 215) : 0
-				})
+			that.setData({
+				mediaCurrentTab: e.target.dataset.current,
+				navScrollLeft: e.target.dataset.current >= 2 ? ((e.target.dataset.current - 1) * 215) : 0
+			})
 		}
-},
-mediaBindChange: function( e ) {
+	},
+	mediaBindChange: function (e) {
 		var that = this;
-		that.setData( {
-				mediaCurrentTab: e.detail.current,
-				navScrollLeft:e.detail.current >= 2 ? ((e.detail.current - 1) * 215) : 0
+		that.setData({
+			mediaCurrentTab: e.detail.current,
+			navScrollLeft: e.detail.current >= 2 ? ((e.detail.current - 1) * 215) : 0
 		});
-},
+	},
 
 	getUserProfile() {
 		wx.setStorageSync('nickname', "");
@@ -559,39 +676,39 @@ mediaBindChange: function( e ) {
 		})
 	},
 	//印象南岸进入
-	toYxna(){
+	toYxna() {
 		wx.navigateTo({
 			url: "/pages/yxnaJfq/yxnaJfq",
-		  })
+		})
 	},
-	toJfq:function(){
+	toJfq: function () {
 		wx.navigateTo({
 			url: '/pages/yxnaJfq/yxnaJfq',
-		  })
+		})
 	},
-	toJfh:function(){
+	toJfh: function () {
 		wx.navigateTo({
 			url: '/pages/yxnaJfh/yxnaJfh',
-		  })
+		})
 	},
-	toXsj:function(){
+	toXsj: function () {
 		wx.navigateTo({
 			url: '/pages/yxna/yxna',
-		  })
+		})
 	},
-	toQxn:function(){
+	toQxn: function () {
 		wx.navigateTo({
 			url: '/pages/yxnaQxn/yxnaQxn',
-		  })
+		})
 	},
-	gotoSjzx(){
+	gotoSjzx() {
 		wx.navigateTo({
-		  url: '/pages/dataCenter/dataCenter',
+			url: '/pages/dataCenter/dataCenter',
 		})
 	},
-	gotoZWTJ(){
+	gotoZWTJ() {
 		wx.navigateTo({
-		  url: '/pages/dataCenterZWTJ/dataCenterZWTJ',
+			url: '/pages/dataCenterZWTJ/dataCenterZWTJ',
 		})
 	}
 

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/index/index.wxml

@@ -21,8 +21,7 @@
 			</view>
 			<!-- 服务内容1 -->
 			<view class="content-service" style="margin-top: 15rpx">
-				<view wx:for="{{ serviceItems1 }}" wx:for-item="item" wx:for-index="index" wx:key="index"
-					class="content-service-item">
+				<view wx:for="{{ serviceItems1 }}" wx:for-item="item" wx:for-index="index" wx:key="index" class="content-service-item">
 					<view bindtap="toDataCenter">
 						<image src="{{ item.img }}" style="height:88rpx;width:88rpx"></image>
 					</view>
@@ -31,8 +30,7 @@
 			</view>
 			<!-- 服务内容2 -->
 			<view class="content-service">
-				<view wx:for="{{ serviceItems2 }}" wx:for-item="item" wx:for-index="index" wx:key="index"
-					class="content-service-item">
+				<view wx:for="{{ serviceItems2 }}" wx:for-item="item" wx:for-index="index" wx:key="index" class="content-service-item">
 					<view>
 						<image src="{{ item.img }}" style="height:88rpx;width:88rpx"></image>
 					</view>
@@ -47,8 +45,7 @@
 					<view class="people-font2">每日更新</view>
 				</view>
 				<view class="people-content">
-					<view wx:for="{{ peopleService }}" wx:for-item="item" wx:for-index="index" wx:key="index"
-						class="people-content-item {{ item.top?'top':'' }}">
+					<view wx:for="{{ peopleService }}" wx:for-item="item" wx:for-index="index" wx:key="index" class="people-content-item {{ item.top?'top':'' }}">
 						<image wx:if="{{ item.top }}" src="{{imgUrl}}index-top-fire.png" style="height: 24rpx;width: 20rpx"></image>
 						<view>{{ item.name }}</view>
 					</view>
@@ -61,8 +58,7 @@
 
 	<!-- 三会一聚 -->
 	<view class="three" style="height:200rpx;width:100%;padding-left:15rpx;background-color: #F5F5F5;">
-		<swiper current="{{lun}}" autoplay="{{true}}" interval="3000" indicator-dots="{{true}}"
-			style="height: 100%;width: 720rpx">
+		<swiper current="{{lun}}" autoplay="{{true}}" interval="3000" indicator-dots="{{true}}" style="height: 100%;width: 720rpx">
 			<swiper-item>
 				<image src="{{imgUrl}}three.png" style="height:163rpx;width:100%"></image>
 			</swiper-item>
@@ -133,8 +129,7 @@
 	<!-- 南岸咨询 -->
 
 	<!-- 数据中心 -->
-	<view class="data-cneter"
-		style="height: 1029rpx;width: 100%;background-color:#F5F5F5;position:relative;padding-top: 30rpx">
+	<view class="data-cneter" style="height: 1029rpx;width: 100%;background-color:#F5F5F5;position:relative;padding-top: 30rpx">
 		<!-- 数据中心 -->
 		<view class="data-center-contain">
 			<!-- 标题 -->
@@ -148,8 +143,7 @@
 			<!-- 统计分析 -->
 			<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;" bindtap="gotoZWTJ">
+				<view style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;" bindtap="gotoZWTJ">
 					<image src="{{ imgUrl }}index-center-analysis-header.png" style="height: 129rpx;width:650rpx"></image>
 				</view>
 				<!-- 分析入口 -->
@@ -170,11 +164,9 @@
 						</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="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="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">
@@ -184,11 +176,9 @@
 									</view>
 								</view>
 							</view>
-							<view
-								style="width: 210rpx;height: 120rpx;background-image: url({{imgUrl}}index-finish-number.png);background-size: 100% 100%;">
+							<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="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">
@@ -198,11 +188,9 @@
 									</view>
 								</view>
 							</view>
-							<view
-								style="width: 210rpx;height: 120rpx;background-image: url({{imgUrl}}index-request-number.png);background-size: 100% 100%;">
+							<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="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;">
@@ -266,9 +254,10 @@
 						</view>
 					</view>
 					<!-- 图表 -->
-					<view style="width: 100%;height: 300rpx;">
+					<view hidden="{{canvasImg}}" style="width: 100%;height: 600rpx;">
 						<ec-canvas id="streetlinechart3" canvas-id="streetlinechart3" ec="{{ streetlinechartec }}" />
 					</view>
+					<image hidden="{{!canvasImg}}" src="{{canvasImg}}" style="width: 100%; height: 300rpx" />
 				</view>
 				<!-- 好差评 -->
 			</view>
@@ -279,8 +268,7 @@
 	<!-- 数据中心 -->
 	<!-- 政民互动 -->
 	<view style="height: 1710rpx;width: 100%;position:relative;margin-top: 80rpx;">
-		<view
-			style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
+		<view style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
 			<!-- 标题 -->
 			<view style="  display: flex;justify-content: left;align-items: center;height: 60rpx;">
 				<view style="display:flex;align-items:center;justify-content:center;">
@@ -293,25 +281,21 @@
 			<view>
 				<!-- header -->
 				<view style="position:relative;height: 129rpx">
-					<view
-						style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
+					<view style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
 						<image src="{{ imgUrl }}index-communicate-header.png" style="height: 129rpx;width:650rpx"></image>
 					</view>
 					<!-- 入口 -->
 					<view style="height: 129rpx;width:100%;position: absolute;bottom:-30rpx;display: flex;align-items: top;">
 						<view class="center-analysis-enter-font">与南岸政府对话</view>
 						<view style="margin-left: 20rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;">
-							<view
-								style="font-size: 22rpx;height: 30rpx;padding: 5rpx 23rpx;display: flex;align-items: center;justify-content: center;background: linear-gradient(90deg, #30A2F3 0%, #69BCFA 100%);color: #FFFFFF;border-radius: 20rpx;" bindtap="toList">
+							<view style="font-size: 22rpx;height: 30rpx;padding: 5rpx 23rpx;display: flex;align-items: center;justify-content: center;background: linear-gradient(90deg, #30A2F3 0%, #69BCFA 100%);color: #FFFFFF;border-radius: 20rpx;" bindtap="toList">
 								进入 ></view>
 						</view>
 					</view>
 				</view>
 				<!-- header -->
-				<view
-					style="width: 100%;margin-top:10rpx;height: 150rpx;background: #E5F3FF;border-radius: 10rpx;display:flex;">
-					<view
-						style="width: 429rpx;height: 100%;padding-left:30rpx;display:flex;flex-direction:column;justify-content:center" bindtap="toList">
+				<view style="width: 100%;margin-top:10rpx;height: 150rpx;background: #E5F3FF;border-radius: 10rpx;display:flex;">
+					<view style="width: 429rpx;height: 100%;padding-left:30rpx;display:flex;flex-direction:column;justify-content:center" bindtap="toList">
 						<view style="color: #333333;font-weight: 500;font-size: 28rpx;">常见问题咨询</view>
 						<view style="padding-top:10rpx;color: #999999;font-weight: 500;font-size: 22rpx;">基本问题 都在这里</view>
 					</view>
@@ -322,32 +306,28 @@
 				<!-- 常见问题over -->
 				<view style="height: 340rpx;padding: 20rpx 0rpx;display:flex;justify-content:space-between;flex-wrap: wrap">
 					<!-- 1 -->
-					<view
-						style="height: 150rpx;width:315rpx;background-color:#FEEEEC;border-radius:10rpx;display:flex;align-items:center">
+					<view style="height: 150rpx;width:315rpx;background-color:#FEEEEC;border-radius:10rpx;display:flex;align-items:center">
 						<view style="padding-left:30rpx;display:flex;flex-direction:column">
 							<view style="color: #333333;font-size:28rpx">在线访谈</view>
 							<view style="color: #999999;font-size:22rpx;padding-top:5rpx">在民众在线交流</view>
 						</view>
 					</view>
 					<!-- 2 -->
-					<view
-						style="height: 150rpx;width:315rpx;background-color:#ECF2FE;border-radius:10rpx;display:flex;align-items:center" bindtap="toLeaveMessage">
+					<view style="height: 150rpx;width:315rpx;background-color:#ECF2FE;border-radius:10rpx;display:flex;align-items:center" bindtap="toLeaveMessage">
 						<view style="padding-left:30rpx;display:flex;flex-direction:column">
 							<view style="color: #333333;font-size:28rpx">我要留言</view>
 							<view style="color: #999999;font-size:22rpx;padding-top:5rpx">有什么想说的？畅所欲言</view>
 						</view>
 					</view>
 					<!-- 3 -->
-					<view
-						style="height: 150rpx;width:315rpx;background-color:#E5FFF9;border-radius:10rpx;display:flex;align-items:center">
+					<view style="height: 150rpx;width:315rpx;background-color:#E5FFF9;border-radius:10rpx;display:flex;align-items:center">
 						<view style="padding-left:30rpx;display:flex;flex-direction:column">
 							<view style="color: #333333;font-size:28rpx">12345热线</view>
 							<view style="color: #999999;font-size:22rpx;padding-top:5rpx">政务服务便民热线</view>
 						</view>
 					</view>
 					<!-- 4 -->
-					<view
-						style="height: 150rpx;width:315rpx;background-color:#FCF6E2;border-radius:10rpx;display:flex;align-items:center">
+					<view style="height: 150rpx;width:315rpx;background-color:#FCF6E2;border-radius:10rpx;display:flex;align-items:center">
 						<view style="padding-left:30rpx;display:flex;flex-direction:column">
 							<view style="color: #333333;font-size:28rpx">投诉建议</view>
 							<view style="color: #999999;font-size:22rpx;padding-top:5rpx">欢迎您反映问题</view>
@@ -357,12 +337,10 @@
 				<!-- 交流访谈over -->
 				<!-- 智能问答 -->
 				<view style="height: 200rpx;width:100%">
-					<view
-						style="height: 183rpx;width:100%;background-image: url({{imgUrl}}index-smart-question.png);;background-size: 100% 100%;">
+					<view style="height: 183rpx;width:100%;background-image: url({{imgUrl}}index-smart-question.png);;background-size: 100% 100%;">
 						<view style="padding-left:35rpx;height:100%;display:flex;flex-direction:column;justify-content:center">
 							<view style="color: #FFFFFF;font-size:32rpx;padding-bottom:15rpx;letter-spacing:4rpx">智能问答</view>
-							<view
-								style="font-size: 24rpx;width:80rpx;height: 30rpx;padding: 5rpx 23rpx;display: flex;align-items: center;justify-content: center;background-color:#7FC5F8;color: #FFFFFF;border-radius: 20rpx;">
+							<view style="font-size: 24rpx;width:80rpx;height: 30rpx;padding: 5rpx 23rpx;display: flex;align-items: center;justify-content: center;background-color:#7FC5F8;color: #FFFFFF;border-radius: 20rpx;">
 								进入 ></view>
 						</view>
 					</view>
@@ -371,12 +349,10 @@
 				<!-- 列表 -->
 				<view style="height: 800rpx">
 					<view style="display:flex">
-						<view class="communicate-tab-item {{communicateTab==0?'active':''}}" bindtap="communicateChangeItem"
-							data-item="0">
+						<view class="communicate-tab-item {{communicateTab==0?'active':''}}" bindtap="communicateChangeItem" data-item="0">
 							<view style="height: 100%;display:flex;align-items:center;justify-content:center;">法规意见征集</view>
 						</view>
-						<view class="communicate-tab-item {{communicateTab==1?'active':''}}" bindtap="communicateChangeItem"
-							data-item="1">
+						<view class="communicate-tab-item {{communicateTab==1?'active':''}}" bindtap="communicateChangeItem" data-item="1">
 							<view style="height: 100%;display:flex;align-items:center;justify-content:center;">在线调查</view>
 						</view>
 					</view>
@@ -406,8 +382,7 @@
 	<!-- 政民互动 -->
 	<!-- 媒体矩阵 -->
 	<view style="height: 809rpx;width: 100%;position:relative;margin-top: 80rpx;">
-		<view
-			style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
+		<view style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
 			<!-- 标题 -->
 			<view style="  display: flex;justify-content: left;align-items: center;height: 60rpx;">
 				<view style="display:flex;align-items:center;justify-content:center;">
@@ -420,16 +395,14 @@
 			<view>
 				<!-- header -->
 				<view style="position:relative;height: 129rpx">
-					<view
-						style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
+					<view style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
 						<image src="{{ imgUrl }}index-media-header.png" style="height: 129rpx;width:650rpx"></image>
 					</view>
 					<!-- 入口 -->
 					<view style="height: 129rpx;width:100%;position: absolute;bottom:-30rpx;display: flex;align-items: top;">
 						<view class="center-analysis-enter-font">政务新媒体矩阵</view>
 						<view style="margin-left: 20rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;">
-							<view
-								style="font-size: 22rpx;height: 30rpx;padding: 5rpx 23rpx;display: flex;align-items: center;justify-content: center;background: linear-gradient(90deg, #AF66DC 0%, #D6AAF3 100%);color: #FFFFFF;border-radius: 20rpx;">
+							<view style="font-size: 22rpx;height: 30rpx;padding: 5rpx 23rpx;display: flex;align-items: center;justify-content: center;background: linear-gradient(90deg, #AF66DC 0%, #D6AAF3 100%);color: #FFFFFF;border-radius: 20rpx;">
 								进入 ></view>
 						</view>
 					</view>
@@ -439,11 +412,9 @@
 				<view style="height: 700rpx;width: 100%;">
 					<!-- 头部导航 -->
 					<view class="media-swiper-tab">
-						<scroll-view scroll-x="true" show-scrollbar="false" scroll-with-animation="true"
-							scroll-left="{{navScrollLeft}}rpx" style="width: 100%;white-space: nowrap;">
+						<scroll-view scroll-x="true" show-scrollbar="false" scroll-with-animation="true" scroll-left="{{navScrollLeft}}rpx" style="width: 100%;white-space: nowrap;">
 							<block wx:for="{{provList}}" wx:key="i">
-								<view class="media-swiper-tab-list {{mediaCurrentTab==index ? 'active' : ''}}" data-current="{{index}}"
-									bindtap="swichNav">{{item.name}}</view>
+								<view class="media-swiper-tab-list {{mediaCurrentTab==index ? 'active' : ''}}" data-current="{{index}}" bindtap="swichNav">{{item.name}}</view>
 							</block>
 						</scroll-view>
 					</view>
@@ -454,16 +425,16 @@
 							<block wx:for="{{provList}}" wx:for-item="city" wx:key="n">
 								<swiper-item>
 									<scroll-view scroll-y="true" style="height: 100%;padding:0;margin:0;">
-									  <view style="display: flex;justify-content: flex-start;flex-wrap: wrap">
-										  <!-- 选项 -->
-										  <view wx:for="{{mediaSelectList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="{{index % 2 === 0?'media-icon-1':'media-icon-2'}}">
-											  <view style="display: flex;align-items:center;justify-content:center;margin-right: 4rpx">
-												  <image src="{{item.img}}" style="height:44rpx;width:44rpx;"></image>
+										<view style="display: flex;justify-content: flex-start;flex-wrap: wrap">
+											<!-- 选项 -->
+											<view wx:for="{{mediaSelectList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="{{index % 2 === 0?'media-icon-1':'media-icon-2'}}">
+												<view style="display: flex;align-items:center;justify-content:center;margin-right: 4rpx">
+													<image src="{{item.img}}" style="height:44rpx;width:44rpx;"></image>
 												</view>
 												<view style="display: flex;align-items:center;justify-content:center">{{item.name}}</view>
 											</view>
 										</view>
-								  </scroll-view>
+									</scroll-view>
 								</swiper-item>
 							</block>
 						</swiper>
@@ -478,8 +449,7 @@
 	<!-- 媒体矩阵 -->
 	<!-- 南岸报 -->
 	<view style="height: 990rpx;width: 100%;position:relative;margin-top: 80rpx;">
-		<view
-			style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
+		<view style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
 			<!-- 标题 -->
 			<view style="  display: flex;justify-content: left;align-items: center;height: 60rpx;">
 				<view style="display:flex;align-items:center;justify-content:center;">
@@ -492,16 +462,14 @@
 			<view>
 				<!-- header -->
 				<view style="position:relative;height: 129rpx">
-					<view
-						style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
+					<view style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
 						<image src="{{ imgUrl }}index-paper-header.png" style="height: 129rpx;width:650rpx"></image>
 					</view>
 					<!-- 入口 -->
 					<view style="height: 129rpx;width:100%;position: absolute;bottom:-30rpx;display: flex;align-items: top;">
 						<view class="center-analysis-enter-font">南岸报</view>
 						<view style="margin-left: 20rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;">
-							<view
-								style="font-size: 22rpx;height: 30rpx;padding: 5rpx 23rpx;display: flex;align-items: center;justify-content: center;background: linear-gradient(90deg, #F58661 0%, #FCAF96 100%);color: #FFFFFF;border-radius: 20rpx;">
+							<view style="font-size: 22rpx;height: 30rpx;padding: 5rpx 23rpx;display: flex;align-items: center;justify-content: center;background: linear-gradient(90deg, #F58661 0%, #FCAF96 100%);color: #FFFFFF;border-radius: 20rpx;">
 								进入 ></view>
 						</view>
 					</view>
@@ -510,18 +478,14 @@
 				<!-- 报 -->
 				<view style="height: 790rpx;width: 100%;display: flex">
 					<view style="height: 761rpx;width: 550rpx;position:relative;">
-						<view
-							style="padding: 20rpx;border: 3rpx solid #FFFFFF;box-shadow: 8rpx -5rpx 25rpx 0rpx rgba(29,29,29,0.18);top: -22rpx;position:absolute;height: 761rpx;width: 505rpx;">
+						<view style="padding: 20rpx;border: 3rpx solid #FFFFFF;box-shadow: 8rpx -5rpx 25rpx 0rpx rgba(29,29,29,0.18);top: -22rpx;position:absolute;height: 761rpx;width: 505rpx;">
 							<image src="{{imgUrl}}index-paper-content-paper.png" style="height: 761rpx;width: 505rpx;"></image>
 						</view>
 					</view>
-					<view
-						style="height: 771rpx;width: 100rpx;position:relative;background-image: url({{imgUrl}}index-paper-page.png);background-size: 100% 100%;">
-						<view
-							style="top: 20rpx;left:20rpx;position:absolute; display: flex;flex-direction: column;width: 30rpx;color: #FFFFFF;font-size: 28rpx;">
+					<view style="height: 771rpx;width: 100rpx;position:relative;background-image: url({{imgUrl}}index-paper-page.png);background-size: 100% 100%;">
+						<view style="top: 20rpx;left:20rpx;position:absolute; display: flex;flex-direction: column;width: 30rpx;color: #FFFFFF;font-size: 28rpx;">
 							上一版</view>
-						<view
-							style="top: 200rpx;left:20rpx;position:absolute; display: flex;flex-direction: column;width: 30rpx;color: #FFFFFF;font-size: 28rpx;">
+						<view style="top: 200rpx;left:20rpx;position:absolute; display: flex;flex-direction: column;width: 30rpx;color: #FFFFFF;font-size: 28rpx;">
 							下一版</view>
 					</view>
 				</view>
@@ -532,8 +496,7 @@
 	<!-- 南岸报 -->
 	<!-- 地图服务 -->
 	<view style="height: 329rpx;width: 100%;position:relative;margin-top: 80rpx;">
-		<view
-			style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
+		<view style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
 			<!-- 标题 -->
 			<view style="  display: flex;justify-content: left;align-items: center;height: 60rpx;">
 				<view style="display:flex;align-items:center;justify-content:center;">
@@ -546,27 +509,23 @@
 			<view>
 				<!-- header -->
 				<view style="position:relative;height: 129rpx">
-					<view
-						style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
+					<view style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
 						<image src="{{ imgUrl }}index-map-header.png" style="height: 129rpx;width:650rpx"></image>
 					</view>
 					<!-- 入口 -->
 					<view style="height: 129rpx;width:100%;position: absolute;bottom:-30rpx;display: flex;align-items: top;">
 						<view class="center-analysis-enter-font">地图搜索</view>
 						<view style="margin-left: 20rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;">
-							<view
-								style="font-size: 22rpx;height: 30rpx;padding: 5rpx 23rpx;display: flex;align-items: center;justify-content: center;background: linear-gradient(90deg, #0163EA 0%, #00BEFA 100%);color: #FFFFFF;border-radius: 20rpx;">
+							<view style="font-size: 22rpx;height: 30rpx;padding: 5rpx 23rpx;display: flex;align-items: center;justify-content: center;background: linear-gradient(90deg, #0163EA 0%, #00BEFA 100%);color: #FFFFFF;border-radius: 20rpx;">
 								进入 ></view>
 						</view>
 					</view>
 				</view>
 				<!-- header -->
 				<!-- content -->
-				<view
-					style="margin-top:10rpx;width: 100%;height: 136rpx;display:flex;flex-wrap: wrap;justify-content: space-between;">
+				<view style="margin-top:10rpx;width: 100%;height: 136rpx;display:flex;flex-wrap: wrap;justify-content: space-between;">
 					<!-- 按钮 -->
-					<view wx:for="{{ mapServiceData }}" wx:for-item="item" wx:for-index="index" wx:key="index"
-						style="height: 50rpx;width: 139rpx;background-color: #EEF5FF;display:flex;align-items:center;justify-content:center;font-size:23rpx;color: #333333;font-weight: 500;">
+					<view wx:for="{{ mapServiceData }}" wx:for-item="item" wx:for-index="index" wx:key="index" style="height: 50rpx;width: 139rpx;background-color: #EEF5FF;display:flex;align-items:center;justify-content:center;font-size:23rpx;color: #333333;font-weight: 500;">
 						{{item.name}}
 					</view>
 				</view>
@@ -590,16 +549,14 @@
 			<view>
 				<!-- header -->
 				<view style="position:relative;height: 129rpx">
-					<view
-						style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
+					<view style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
 						<image src="{{ imgUrl }}index-video-header.png" style="height: 129rpx;width:650rpx"></image>
 					</view>
 					<!-- 入口 -->
 					<view style="height: 129rpx;width:100%;position: absolute;bottom:-30rpx;display: flex;align-items: top;">
 						<view class="center-analysis-enter-font">视频推荐</view>
 						<view style="margin-left: 20rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;">
-							<view
-								style="font-size: 22rpx;height: 30rpx;padding: 5rpx 23rpx;display: flex;align-items: center;justify-content: center;background: linear-gradient(90deg, #FFAF03 0%, #F9BF41 100%);color: #FFFFFF;border-radius: 20rpx;">
+							<view style="font-size: 22rpx;height: 30rpx;padding: 5rpx 23rpx;display: flex;align-items: center;justify-content: center;background: linear-gradient(90deg, #FFAF03 0%, #F9BF41 100%);color: #FFFFFF;border-radius: 20rpx;">
 								进入 ></view>
 						</view>
 					</view>
@@ -620,8 +577,7 @@
 	<!-- 视频推荐 -->
 	<!-- 印象南岸 -->
 	<view style="height: 470rpx;width: 100%;position:relative;margin-top: 30rpx;margin-bottom: 60rpx;">
-		<view
-			style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
+		<view style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
 			<!-- 标题 -->
 			<view style="  display: flex;justify-content: left;align-items: center;height: 60rpx;">
 				<view style="display:flex;align-items:center;justify-content:center;">
@@ -634,35 +590,28 @@
 			<view>
 				<!-- header -->
 				<view style="position:relative;height: 129rpx">
-					<view
-						style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
+					<view style="margin-top:15rpx;height: 129rpx;width:100%;display:flex;align-items:center;justify-content:center;">
 						<image src="{{ imgUrl }}index-na-header.png" style="height: 129rpx;width:650rpx"></image>
 					</view>
 					<!-- 入口 -->
 					<view style="height: 129rpx;width:100%;position: absolute;bottom:-30rpx;display: flex;align-items: top;">
 						<view class="center-analysis-enter-font">印象南岸</view>
 						<view style="margin-left: 20rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;">
-							<view
-								style="font-size: 22rpx;height: 30rpx;padding: 5rpx 23rpx;display: flex;align-items: center;justify-content: center;background: linear-gradient(90deg, #A28164 0%, #CBB197 100%);color: #FFFFFF;border-radius: 20rpx;" bindtap="toYxna">
+							<view style="font-size: 22rpx;height: 30rpx;padding: 5rpx 23rpx;display: flex;align-items: center;justify-content: center;background: linear-gradient(90deg, #A28164 0%, #CBB197 100%);color: #FFFFFF;border-radius: 20rpx;" bindtap="toYxna">
 								进入 ></view>
 						</view>
 					</view>
 				</view>
 				<!-- header -->
-				<view
-					style="font-size: 30rpx;font-weight: 400;color: #FFFFFF;line-height: 56rpx;text-align: center;position: relative;">
+				<view style="font-size: 30rpx;font-weight: 400;color: #FFFFFF;line-height: 56rpx;text-align: center;position: relative;">
 					<image src="{{imgUrl}}yxnaLine.png" style="width:653rpx;height:174rpx" />
-					<view bindtap="toJfq"
-						style="width: 136rpx;height: 56rpx;background: #996749;border-radius: 10rpx;position: absolute;top: 35rpx;">
+					<view bindtap="toJfq" style="width: 136rpx;height: 56rpx;background: #996749;border-radius: 10rpx;position: absolute;top: 35rpx;">
 						解放前</view>
-					<view bindtap="toJfh"
-						style="width: 232rpx;height: 56rpx;background: #A45A3A;border-radius: 10rpx;position: absolute;top: 187rpx;left: 126rpx;">
+					<view bindtap="toJfh" style="width: 232rpx;height: 56rpx;background: #A45A3A;border-radius: 10rpx;position: absolute;top: 187rpx;left: 126rpx;">
 						解放后-80年代</view>
-					<view bindtap="toXsj"
-						style="width: 226rpx;height: 56rpx;background: #D17C4B;border-radius: 10rpx;position: absolute;top: 35rpx;left: 232rpx;">
+					<view bindtap="toXsj" style="width: 226rpx;height: 56rpx;background: #D17C4B;border-radius: 10rpx;position: absolute;top: 35rpx;left: 232rpx;">
 						80年代-新世纪</view>
-					<view bindtap="toQxn"
-						style="width: 226rpx;height: 56rpx;background: #D6603A;border-radius: 10rpx;position: absolute;right: 9rpx;bottom: -5rpx;">
+					<view bindtap="toQxn" style="width: 226rpx;height: 56rpx;background: #D6603A;border-radius: 10rpx;position: absolute;right: 9rpx;bottom: -5rpx;">
 						新世纪-千禧年</view>
 				</view>
 			</view>