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

# Conflicts:
#	nngkxxdp/src/main/resources/static/nnzwminiapp/app.json
#	nngkxxdp/src/main/resources/static/nnzwminiapp/pages/album/album.json
#	nngkxxdp/src/main/resources/static/nnzwminiapp/pages/album/album.wxml
#	nngkxxdp/src/main/resources/static/nnzwminiapp/pages/album/album.wxss
#	nngkxxdp/src/main/resources/static/nnzwminiapp/pages/yxnaJfh.js

nngkxxdp/src/main/resources/static/nnzwminiapp/custom-tab-bar/index.js

@@ -23,7 +23,7 @@ Component({
 				"text": "公开"
 			},
 			{
-				
+				"pagePath": "/pages/nais/nais",
 				"isSpecial": true,
 				"text": "这是南岸"
 			},

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/album/album.json

@@ -0,0 +1,4 @@
+{
+	"usingComponents": {},
+	"navigationBarTitleText": "专辑"
+}

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

@@ -0,0 +1,38 @@
+<!--pages/album/album.wxml-->
+<view style="background: #F0F0F0;">
+	<scroll-view class="scroll-wrapper" scroll-x scroll-with-animation="true" scroll-into-view="item{{currentTab < 4 ? 0 : currentTab - 3}}">
+		<view class="navigate-item" id="item{{index}}" wx:for="{{albumList}}" wx:key="index" data-index="{{index}}" bindtap="tabNav">
+			<view class="names {{currentTab === index ? 'active' : ''}}">{{item}}</view>
+			<view class="currtline {{currentTab === index ? 'active' : ''}}" wx:if="{{currentTab === index}}"></view>
+		</view>
+	</scroll-view>
+	<swiper current="{{currentTab}}" style="margin-top: 15rpx;width: 100%;height: 99vh;" bindchange="handleSwiper">
+		<swiper-item wx:for="{{albumList}}" wx:key="index">
+			<scroll-view class="swiper-album" style="height: 100%;" scroll-y="true">
+				<view style="background-image: url('{{imgUrl}}album-bg.png');height: 423rpx;width:750rpx;background-repeat: round;position: relative;">
+					<image src="{{imgUrl}}yxnaAlbum.png" style="width: 423rpx;height: 179rpx;text-align: center;position: absolute;top: 38rpx;left: 50%;transform: translateX(-50%);" />
+					<view style="display: flex;position: absolute;top: 247rpx;left: 50%;transform: translateX(-50%);">
+						<view wx:for="{{albumTitle}}" wx:key="index" style="width: 44rpx;height: 44rpx;background: #DD3706;border-radius: 50%;color: #FFFFFF;text-align: center;line-height: 44rpx;font-size: 30rpx;margin-right: 10rpx;">{{item}}</view>
+					</view>
+				</view>
+				<view bindtap="toYXNADetailInfo" style="width: 704rpx;height: 314rpx;background: #FFFFFF;box-shadow: 0 7rpx 10rpx 0 rgba(27,58,123,0.13);border-radius: 10rpx;margin: -50rpx 22rpx 30rpx 22rpx;position: relative;display: flex;justify-content: space-between;">
+					<image src="{{imgUrl}}{{albumInfo.url}}" style="width: 275rpx;height: 328rpx;border-radius: 10rpx;margin: -50rpx 23rpx 0 22rpx;" />
+					<view style="width: 366rpx;margin: 0 18rpx 37rpx 0;">
+						<view style="font-size: 40rpx;font-weight: bold;color: #333333;margin: 34rpx 0 36rpx 10rpx;">{{albumInfo.name}}</view>
+						<view style="overflow: hidden;font-size: 24rpx;font-weight: 500;line-height: 36rpx;height: 148rpx;text-overflow: ellipsis;-webkit-line-clamp:4;display: -webkit-box;-webkit-box-orient:vertical;">{{albumInfo.introduction}}</view>
+					</view>
+				</view>
+				<view bindtap="toYXNAEdit" style="display: flex;justify-content: space-between;flex-wrap: wrap;padding: 0 22rpx 20rpx 22rpx;">
+					<view style="width: 339rpx;height: 384rpx;background: #FFFFFF;box-shadow: 0 7rpx 10rpx 0 rgba(27,58,123,0.13);border-radius: 10rpx;margin: 10rpx 0" wx:for="{{albumInfo.albumList}}" wx:key="index">
+						<view>
+							<image src="{{imgUrl}}{{item.url}}" style="width: 339rpx;height: 191rpx;border-radius: 10rpx 10rpx 0 0;" />
+							<view style="padding: 0 21rpx 20rpx 21rpx;color: #333333;font-size: 30rpx;font-weight: 400;">{{item.date}}</view>
+							<view style="padding: 0 21rpx;height: 96rpx;color: #666666;font-size: 24rpx;font-weight: 400;overflow: hidden;text-overflow: ellipsis;-webkit-line-clamp:3;display: -webkit-box;-webkit-box-orient:vertical;">{{item.detail}}</view>
+						</view>
+					</view>
+				</view>
+</scroll-view>
+
+</swiper-item>
+</swiper>
+</view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/album/album.wxss

@@ -0,0 +1,46 @@
+/* pages/album/album.wxss */
+/* 滑动 */
+.scroll-wrapper {
+	white-space: nowrap;
+	-webkit-overflow-scrolling: touch;
+	background: #FFF;
+	height: 90rpx;
+	padding: 0 32rpx;
+	box-sizing: border-box;
+  }
+  
+  /* 滑动块 */
+  .navigate-item {
+	display: inline-block;
+	text-align: center;
+	height: 90rpx;
+	line-height: 90rpx;
+	margin: 0 30rpx;
+  }
+  
+  /* 滑动块 */
+  .names {
+	font-size: 30rpx;
+	color: #333333;
+	font-weight: 500;
+  }
+  
+  /* 滑动块 */
+  .names.active {
+	font-size: 30rpx;
+	color: #508FF4;
+	font-weight: 500;
+  }
+  
+  /* 滑动块 */
+  .currtline {
+	margin: -8rpx auto 0 auto;
+	height: 8rpx;
+	border-radius: 4rpx;
+  }
+  
+  /* 滑动块 */
+  .currtline.active {
+	background: #508FF4;
+	transition: all .3s;
+  }

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

@@ -0,0 +1,73 @@
+// pages/albumDetail/albumDetail.js
+import {
+	imgUrl
+} from "../api/request"
+
+Page({
+
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		// 图片前缀
+		imgUrl: imgUrl,
+		// 专辑标题
+		title: '解放前'
+	},
+
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad(options) {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload() {
+
+	},
+
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh() {
+
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom() {
+
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage() {
+
+	}
+})

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/albumDetail/albumDetail.json

@@ -0,0 +1,4 @@
+{
+	"usingComponents": {},
+	"navigationBarTitleText": "详细"
+}

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

@@ -0,0 +1,19 @@
+<!--pages/albumDetail/albumDetail.wxml-->
+<view style="background: #F0F0F0;height: 100vh;">
+	<view style="font-size: 36rpx;color: #333333;padding: 40rpx 0 5rpx 20rpx;font-weight: 400;">{{title}}</view>
+	<view style="width: 705rpx;height: 782rpx;background: #FFFFFF;margin: 22rpx;">
+		<image src="{{imgUrl}}album-bg.png" style="width: 670rpx;height: 376rpx;padding: 18rpx;" />
+		<view style="padding: 0 22rpx;font-size: 30rpx;color: #333333;">2019/10/24</view>
+		<view style="display: flex; justify-content: space-between;padding: 0 22rpx;font-size: 30rpx;color: #333333;">
+			<view>作者：XXX</view>
+			<view>《南岸的创奇事迹》</view>
+		</view>
+		<view style="border-bottom: 1px solid #D7D7D7;margin: 26rpx 22rpx 31rpx 22rpx;" />
+		<view style="padding: 0 22rpx;font-size: 26rpx;color: #47413B;">
+			想要宜居生活，去南岸；想要休憩放松，五南岸；
+			想要亲友伙伴欢聚，同样可以去南岸。
+			南岸区就是这样一处天堂般的存在，
+			它能带给人们的，是一种随时随地都能亲近自然
+			以及回归乡野的纯朴与感动。</view>
+	</view>
+</view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/albumDetail/albumDetail.wxss

@@ -0,0 +1 @@
+/* pages/albumDetail/albumDetail.wxss */

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

@@ -0,0 +1,136 @@
+// pages/albumEdit/albumEdit.js
+Page({
+
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		// 默认归属日期
+		date: '2021-01-01',
+		// 默认作品年代
+		index: 0,
+		// 作品年代
+		array: ['解放前', '解放后-80年代', '80年代-新世纪', '新世纪-千禧年'],
+		// 图片
+		img: ''
+	},
+	// 提交
+	formSubmit(e) {
+		console.log('form发生了submit事件，携带数据为：', e.detail.value)
+	},
+	// 上传图片
+	bindUpload: function (e) {
+		var that = this
+		wx.chooseMedia({
+			count: 1, // 默认3
+			sizeType: ["original", "compressed"], // 可以指定是原图还是压缩图，默认二者都有
+			sourceType: ["album", "camera"], // 可以指定来源是相册还是相机，默认二者都有
+			success: function (res) {
+				// 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
+				var tempFilePaths = res.tempFilePaths
+				for (var i = 0; i < tempFilePaths.length; i++) {
+					wx.uploadFile({
+						url: 'https://graph.baidu.com/upload',
+						filePath: tempFilePaths[i],
+						name: "file",
+						header: {
+							"content-type": "multipart/form-data"
+						},
+						success: function (res) {
+							if (res.statusCode == 200) {
+								wx.showToast({
+									title: "上传成功",
+									icon: "none",
+									duration: 1500
+								})
+								that.data.img.push(JSON.parse(res.data).data)
+								that.setData({
+									img: that.data.imgs
+								})
+							}
+						},
+						fail: function (err) {
+							wx.showToast({
+								title: "上传失败",
+								icon: "none",
+								duration: 2000
+							})
+						},
+						complete: function (result) {
+							console.log(result.errMsg)
+						}
+					})
+				}
+			}
+		})
+	},
+	// 日期切换
+	bindDateChange(e) {
+		console.log('picker发送选择改变，携带值为', e.detail.value)
+		this.setData({
+			date: e.detail.value
+		})
+	},
+	// 作品年代切换
+	bindPickerChange: function (e) {
+		console.log('picker发送选择改变，携带值为', e.detail.value)
+		this.setData({
+			index: e.detail.value
+		})
+	},
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad(options) {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload() {
+
+	},
+
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh() {
+
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom() {
+
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage() {
+
+	}
+})

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/albumEdit/albumEdit.json

@@ -0,0 +1,4 @@
+{
+	"usingComponents": {},
+	"navigationBarTitleText": "我要投稿"
+}

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

@@ -0,0 +1,72 @@
+<!--pages/albumEdit/albumEdit.wxml-->
+<view style="background: #F0F0F0;padding: 20rpx 0 40rpx 0;">
+	<form catchsubmit="formSubmit">
+		<view style="width: 700rpx;background: #FFFFFF;border-radius: 10rpx;margin: auto;">
+			<view style="display: flex;border-bottom: 1px solid #DDDDDD;margin: 20rpx 18rpx;">
+				<view style="font-size: 24rpx;display: flex;line-height: 70rpx;height: 70rpx;">
+					<view style="color: #A91919;">*</view>
+					<view style="width: 132rpx;">作者电话</view>
+				</view>
+				<input name="phone" style="font-size: 24rpx;line-height: 70rpx;height: 70rpx;width: 100%;" placeholder="请输入电话" />
+				<switch name="switchPhone" style="line-height: 60rpx;" />
+			</view>
+			<view style="display: flex;border-bottom: 1px solid #DDDDDD;margin: 20rpx 18rpx;">
+				<view style="font-size: 24rpx;display: flex;line-height: 70rpx;height: 70rpx;">
+					<view style="color: #A91919;">*</view>
+					<view style="width: 132rpx;">作品名称</view>
+				</view>
+				<input name="name" style="font-size: 24rpx;line-height: 70rpx;height: 70rpx;width: 100%;" placeholder="请输入作品名称" />
+			</view>
+			<view style="display: flex;border-bottom: 1px solid #DDDDDD;margin: 20rpx 18rpx;">
+				<view style="font-size: 24rpx;display: flex;line-height: 70rpx;height: 70rpx;">
+					<view style="color: #A91919;">*</view>
+					<view style="width: 132rpx;">作品作者</view>
+				</view>
+				<input name="author" style="font-size: 24rpx;line-height: 70rpx;height: 70rpx;width: 100%;" placeholder="请输入作品作者" />
+				<switch name="switchAuthor" style="line-height: 60rpx;" />
+			</view>
+			<view style="display: flex;border-bottom: 1px solid #DDDDDD;margin: 20rpx 18rpx;">
+				<view style="font-size: 24rpx;display: flex;line-height: 70rpx;height: 70rpx;">
+					<view style="color: #A91919;">*</view>
+					<view style="width: 132rpx;">归属如期</view>
+				</view>
+				<picker name="date" mode="date" value="{{date}}" bindchange="bindDateChange" style="line-height: 70rpx;font-size: 24rpx;">
+					<view>{{date}}</view>
+				</picker>
+			</view>
+			<view style="display: flex;border-bottom: 1px solid #DDDDDD;margin: 20rpx 18rpx;">
+				<view style="font-size: 24rpx;display: flex;line-height: 70rpx;height: 70rpx;">
+					<view style="color: #A91919;">*</view>
+					<view style="width: 132rpx;">作品年代</view>
+				</view>
+				<picker name="age" bindchange="bindPickerChange" value="{{index}}" range="{{array}}" style="line-height: 70rpx;font-size: 24rpx;">
+					{{array[index]}}
+				</picker>
+			</view>
+			<view style="display: flex;border-bottom: 1px solid #DDDDDD;margin: 20rpx 18rpx;">
+				<view style="font-size: 24rpx;display: flex;line-height: 70rpx;height: 70rpx;">
+					<view style="color: #A91919;">*</view>
+					<view style="width: 132rpx;">我的作品</view>
+				</view>
+				<view>
+					<view>
+						<button bindtap="bindUpload" style="width: 166rpx;height: 60rpx;background: #004A93;border-radius: 10rpx;color: #FFFFFF;font-size: 24rpx;line-height: 30rpx;margin: 0;">上传</button>
+					</view>
+					<view style="font-size: 24rpx;color: #D2D2D2;">支持jpg. png格式，大小在5M以下</view>
+					<view>
+						<image src="{{imgURl}}{{img}}"></image>
+						<input name="img" style="display: none;" value="{{imgURl}}{{img}}" type="text"/>
+					</view>
+				</view>
+			</view>
+			<view style="display: flex;margin: 20rpx 18rpx;height: 200rpx;">
+				<view style="font-size: 24rpx;display: flex;line-height: 70rpx;height: 70rpx;">
+					<view style="color: #A91919;">*</view>
+					<view style="width: 132rpx;">作品描述</view>
+				</view>
+				<textarea name="detail" style="font-size: 24rpx;padding-top: 20rpx;" bindblur="bindTextAreaBlur" auto-height placeholder="请输入你的作品描述" />
+			</view>
+		</view>
+		<button formType="submit" style="margin-top: 77rpx;width: 676rpx;height: 80rpx;background: #004A93;border-radius: 10rpx;color: #FFFFFF;font-size: 24rpx;line-height: 50rpx;">确认提交</button>
+	</form>
+</view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/albumEdit/albumEdit.wxss

@@ -0,0 +1 @@
+/* pages/albumEdit/albumEdit.wxss */

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

@@ -0,0 +1,18 @@
+<view style="padding-top: 20rpx">
+  <!-- 列表 -->
+  <view wx:for="{{communicateData}}" wx:for-item="item" wx:for-index="index" wx:key="index" style="height: 150rpx;width: 100%;display:flex;border-bottom: 4rpx solid #F5F5F5;margin-bottom: 20rpx">
+    <view style="height: 140rpx;width: 464rpx;padding-right: 22rpx">
+      <view style="height: 97rpx;width: 100%;font-size: 26rpx;overflow: hidden;text-overflow: ellipsis;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;">
+        重庆市南岸区经济和信息化委员会 公开征求《南岸区重庆经开区推动制造业跃升十条》,要求每个公民做好三件事,必须严格执行，动员全体人员
+      </view>
+      <view style="display:flex;align-items:center;height: 45rpx;width: 100%;font-size: 22rpx;color: #999999;padding-top: 3rpx">
+        征集时间：2022.07.04 - 2022.07.12
+      </view>
+    </view>
+    <!-- 图片 -->
+    <view style="display:flex;">
+      <image src="{{imgUrl}}index-communicate-list-img.png" style="height: 90rpx;width: 160rpx"></image>
+    </view>
+  </view>
+  <!-- 列表 -->
+</view>

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

@@ -21,6 +21,10 @@ Page({
 		// 南岸咨询
 		naTab: 0,
 		naItem: '',
+		// 政民tab
+		communicateTab: 0,
+		// 政民item
+		communicateItem: 0,
 		// 服务列表
 		serviceItems1: [{
 				img: imgUrl + 'service-1.png',
@@ -152,6 +156,53 @@ Page({
 				url: 'video1.png',
 				title: '南岸百企风采'
 			}
+		],
+		// 政民list
+		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: '交通服务'},
+		],
+		// 媒体矩阵导航
+		mediaCurrentTab: 0,
+		// 媒体矩阵导航列表
+		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'}
 		]
 	},
 	onReady() {},
@@ -421,6 +472,39 @@ Page({
 		console.log('更多')
 	},
 
+	// 政民互动
+	communicateChangeItem: function (e) {
+    this.setData({
+			communicateItem: e.currentTarget.dataset.item
+		})
+	},
+
+	communicateChangeTab: function (e) {
+		this.setData({
+			communicateTab: e.detail.current
+		})
+	},
+
+	// 媒体矩阵
+	swichNav: function( e ) {
+		var that = this;
+		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
+				})
+		}
+},
+mediaBindChange: function( e ) {
+		var that = this;
+		that.setData( {
+				mediaCurrentTab: e.detail.current,
+				navScrollLeft:e.detail.current >= 2 ? ((e.detail.current - 1) * 215) : 0
+		});
+},
+
 	getUserProfile() {
 		wx.setStorageSync('nickname', "");
 		wx.setStorageSync('avatarUrl', "");

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

@@ -21,7 +21,8 @@
 			</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>
@@ -30,7 +31,8 @@
 			</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>
@@ -45,7 +47,8 @@
 					<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>
@@ -58,7 +61,8 @@
 
 	<!-- 三会一聚 -->
 	<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>
@@ -129,7 +133,8 @@
 	<!-- 南岸咨询 -->
 
 	<!-- 数据中心 -->
-	<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">
 			<!-- 标题 -->
@@ -143,7 +148,8 @@
 			<!-- 统计分析 -->
 			<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;">
+				<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>
 				<!-- 分析入口 -->
@@ -164,9 +170,11 @@
 						</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">
@@ -176,9 +184,11 @@
 									</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">
@@ -188,9 +198,11 @@
 									</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,8 +278,9 @@
 	</view>
 	<!-- 数据中心 -->
 	<!-- 政民互动 -->
-	<view style="height: 969rpx;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="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="  display: flex;justify-content: left;align-items: center;">
 				<view style="display:flex;align-items:center;justify-content:center;">
@@ -280,21 +293,25 @@
 			<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;">
+							<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;">
 								进入 ></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">
+				<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">
 						<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>
@@ -302,14 +319,95 @@
 						<image src="{{imgUrl}}index-good-communicate.png" style="height: 100rpx;width:105rpx;"></image>
 					</view>
 				</view>
+				<!-- 常见问题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="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">
+						<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="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="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>
+				</view>
+				<!-- 交流访谈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="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>
+						</view>
+					</view>
+				</view>
+				<!-- 智能问答 -->
+				<!-- 列表 -->
+				<view style="height: 800rpx">
+					<view style="display:flex">
+						<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 style="height: 100%;display:flex;align-items:center;justify-content:center;">在线调查</view>
+						</view>
+					</view>
+					<!-- 内容 -->
+					<view style="height: 680rpx;flex: 1">
+						<swiper style="height: 100%" current="{{communicateItem}}" bindchange="communicateChangeTab">
+							<swiper-item>
+								<scroll-view scroll-y="true" style="height: 100%;padding:0;margin:0;">
+									<include src="communicateList.wxml" />
+								</scroll-view>
+							</swiper-item>
+
+							<swiper-item>
+								<scroll-view scroll-y="true" style="height: 100%;padding:0;margin:0;">
+									<include src="communicateList.wxml" />
+								</scroll-view>
+							</swiper-item>
+						</swiper>
+					</view>
+				</view>
+				<!-- 列表 -->
+
 			</view>
 			<!-- 内容 -->
 		</view>
 	</view>
 	<!-- 政民互动 -->
 	<!-- 媒体矩阵 -->
-	<view style="height: 609rpx;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="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="  display: flex;justify-content: left;align-items: center;">
 				<view style="display:flex;align-items:center;justify-content:center;">
@@ -322,27 +420,66 @@
 			<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>
 				</view>
 				<!-- header -->
+				<!-- content -->
+				<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;">
+							<block wx:for="{{provList}}" wx:key="i">
+								<view class="media-swiper-tab-list {{mediaCurrentTab==index ? 'active' : ''}}" data-current="{{index}}"
+									bindtap="swichNav">{{item.name}}</view>
+							</block>
+						</scroll-view>
+					</view>
+					<!-- 头部导航 -->
+					<!-- 选项内容 -->
+					<view style="margin-top: 25rpx">
+						<swiper current="{{mediaCurrentTab}}" class="media-swiper-box" duration="300" bindchange="mediaBindChange">
+							<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>
+												<view style="display: flex;align-items:center;justify-content:center">{{item.name}}</view>
+											</view>
+										</view>
+								  </scroll-view>
+								</swiper-item>
+							</block>
+						</swiper>
+					</view>
+					<!-- 选项内容 -->
+				</view>
+				<!-- content -->
 			</view>
 			<!-- 内容 -->
 		</view>
 	</view>
 	<!-- 媒体矩阵 -->
 	<!-- 南岸报 -->
-	<view style="height: 609rpx;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="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="  display: flex;justify-content: left;align-items: center;">
 				<view style="display:flex;align-items:center;justify-content:center;">
@@ -355,27 +492,48 @@
 			<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>
 				</view>
 				<!-- header -->
+				<!-- 报 -->
+				<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;">
+							<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>
+						<view
+							style="top: 200rpx;left:20rpx;position:absolute; display: flex;flex-direction: column;width: 30rpx;color: #FFFFFF;font-size: 28rpx;">
+							下一版</view>
+					</view>
+				</view>
 			</view>
 			<!-- 内容 -->
 		</view>
 	</view>
 	<!-- 南岸报 -->
 	<!-- 地图服务 -->
-	<view style="height: 309rpx;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="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="  display: flex;justify-content: left;align-items: center;">
 				<view style="display:flex;align-items:center;justify-content:center;">
@@ -388,19 +546,30 @@
 			<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 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>
 			</view>
 			<!-- 内容 -->
 		</view>
@@ -421,21 +590,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-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>
 				</view>
 				<!-- header -->
 				<view>
-					<swiper current="{{0}}"	display-multiple-items="3" autoplay="{{false}}" style="height: 180rpx;">
+					<swiper current="{{0}}" display-multiple-items="3" autoplay="{{false}}" style="height: 180rpx;">
 						<swiper-item wx:for="{{videoInfo}}" wx:key="index">
 							<image src="{{imgUrl}}{{item.url}}" style="height:133rpx;width:201rpx" />
 							<view style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{item.title}}</view>
@@ -449,7 +620,8 @@
 	<!-- 视频推荐 -->
 	<!-- 印象南岸 -->
 	<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;">
 				<view style="display:flex;align-items:center;justify-content:center;">
@@ -462,25 +634,37 @@
 			<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;" bindtap="toYXNADetail">
-							<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;">
+						<view style="margin-left: 20rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;"
+							bindtap="toYXNADetail">
+							<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;">
 								进入 ></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 style="width: 136rpx;height: 56rpx;background: #996749;border-radius: 10rpx;position: absolute;top: 35rpx;">解放前</view>
-					<view style="width: 232rpx;height: 56rpx;background: #A45A3A;border-radius: 10rpx;position: absolute;top: 187rpx;left: 126rpx;">解放后-80年代</view>
-					<view style="width: 226rpx;height: 56rpx;background: #D17C4B;border-radius: 10rpx;position: absolute;top: 35rpx;left: 232rpx;">80年代-新世纪</view>
-					<view style="width: 226rpx;height: 56rpx;background: #D6603A;border-radius: 10rpx;position: absolute;right: 9rpx;bottom: -5rpx;">新世纪-千禧年</view>
+					<view
+						style="width: 136rpx;height: 56rpx;background: #996749;border-radius: 10rpx;position: absolute;top: 35rpx;">
+						解放前</view>
+					<view
+						style="width: 232rpx;height: 56rpx;background: #A45A3A;border-radius: 10rpx;position: absolute;top: 187rpx;left: 126rpx;">
+						解放后-80年代</view>
+					<view
+						style="width: 226rpx;height: 56rpx;background: #D17C4B;border-radius: 10rpx;position: absolute;top: 35rpx;left: 232rpx;">
+						80年代-新世纪</view>
+					<view
+						style="width: 226rpx;height: 56rpx;background: #D6603A;border-radius: 10rpx;position: absolute;right: 9rpx;bottom: -5rpx;">
+						新世纪-千禧年</view>
 				</view>
 			</view>
 			<!-- 内容 -->

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

@@ -354,4 +354,62 @@
   background: linear-gradient(90deg, #30A2F3 0%, #69BCFA 100%);
   color: #FFFFFF;
   border-radius: 20rpx;
-}
+}
+
+.communicate-tab-item {
+  flex: 1;
+  font-size: 28rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  line-height: 28rpx;
+  height: 55rpx;
+}
+
+.communicate-tab-item.active {
+  color: #000000;
+  border-bottom: 6rpx solid #508FF4 ;
+
+}
+
+/* 媒体矩阵 */
+.media-swiper-tab{
+  width: 100%;
+  text-align: center;
+  line-height: 50rpx;
+}
+
+.media-swiper-tab-list{
+  font-size: 28rpx;
+  display: inline-block;
+  min-width: 215rpx;
+  max-width: 215rpx;
+}
+
+.media-swiper-tab-list.active {
+  color: #508FF4;
+  font-weight: bold;
+  font-size: 33rpx;
+  border-bottom: 4rpx solid #508FF4;
+}
+
+.media-swiper-box{
+  display: block;
+  height: 700px;
+  width: 100%;
+  margin-top: 10px;
+}
+
+.media-icon-1 {
+  display: flex;
+  font-size:28rpx;
+  padding-bottom:25rpx;
+  width: 60%;
+}
+
+.media-icon-2 {
+  display: flex;
+  font-size:28rpx;
+  padding-bottom:25rpx;
+  width: 40%;
+}

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

@@ -1,18 +1,27 @@
 // pages/nais/nais.js
 let app = getApp();
+import {
+	imgUrl
+} from "../api/request"
 Page({
 	/**
 	 * 页面的初始数据
 	 */
 	data: {
-
+		// 图片前缀
+		imgUrl: imgUrl,
+		// 屏幕高度
+		navHeight: '',
 	},
 
+
 	/**
 	 * 生命周期函数--监听页面初次渲染完成
 	 */
 	onReady() {
-
+		this.setData({
+			navHeight: app.globalData.navHeight
+		})
 	},
 
 	/**
@@ -30,16 +39,16 @@ Page({
 	 * 生命周期函数--监听页面隐藏
 	 */
 
-	onHide(){
+	onHide() {
 		if (typeof this.getTabBar === 'function' &&
-		this.getTabBar()) {
-		this.getTabBar().setData({
-		  selected: -1
-		})
-	  }	
+			this.getTabBar()) {
+			this.getTabBar().setData({
+				selected: -1
+			})
+		}
 	},
-	onLoad(){
-		
+	onLoad() {
+
 	},
 
 	/**

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/nais/nais.json

@@ -1,4 +1,4 @@
 {
-	"usingComponents": {
-	}
+	"usingComponents": {},
+	"navigationStyle": "custom"
 }

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

@@ -1,2 +1,65 @@
 <!--pages/nais/nais.wxml-->
-<text>pages/nais/nais.wxml</text>
+<view style="background-color: #EEEEEE;">
+	<!-- 顶部栏 -->
+	<view style="position: relative;">
+		<image src="{{imgUrl}}nais-bg.png" style="width: 100%;height:454rpx"></image>
+		<view style="position: absolute;top: {{navHeight}}rpx;font-size: 34rpx;font-weight: 500;color: #333333;left: 50%;transform: translateX(-50%);">这是南岸</view>
+	</view>
+	<view style="width:679rpx;height: 400rpx;background: #FFFFFF;box-shadow: 0 3rpx 9rpx 0 rgba(19,65,138,0.17);border-radius: 20rpx;margin-top: -57rpx;position: relative;transform: translateX(-50%);left: 50%;">
+	</view>
+	<!-- 区位条件 -->
+	<view>
+		<view style="display:flex" class="content-top">
+			<view class="content-line"></view>
+			<view class="content-title">区位条件</view>
+			<view class="content-more" bindtap="goToMore">查看更多 >></view>
+		</view>
+		<view style="width:679rpx;height: 400rpx;background: #FFFFFF;box-shadow: 0 3rpx 9rpx 0 rgba(19,65,138,0.17);border-radius: 20rpx;margin: auto;">
+		</view>
+	</view>
+	<!-- 人文底蕴 -->
+	<view>
+		<view style="display:flex" class="content-top">
+			<view class="content-line"></view>
+			<view class="content-title">人文底蕴</view>
+			<view class="content-more" bindtap="goToMore">查看更多 >></view>
+		</view>
+		<view style="width:679rpx;height: 615rpx;background: #FFFFFF;box-shadow: 0 3rpx 9rpx 0 rgba(19,65,138,0.17);border-radius: 20rpx;margin: auto;">
+		</view>
+	</view>
+	<!-- 资源优势 -->
+	<view>
+		<view style="display:flex" class="content-top">
+			<view class="content-line"></view>
+			<view class="content-title">资源优势</view>
+			<view class="content-more" bindtap="goToMore">查看更多 >></view>
+		</view>
+		<view style="width:679rpx;height: 341rpx;background: #FFFFFF;box-shadow: 0 3rpx 9rpx 0 rgba(19,65,138,0.17);border-radius: 20rpx;margin: auto;">
+		</view>
+	</view>
+	<!-- 产业特色 -->
+	<view>
+		<view style="display:flex" class="content-top">
+			<view class="content-line"></view>
+			<view class="content-title">产业特色</view>
+			<view class="content-more" bindtap="goToMore">查看更多 >></view>
+		</view>
+		<view style="width:679rpx;height: 520rpx;background: #FFFFFF;box-shadow: 0 3rpx 9rpx 0 rgba(19,65,138,0.17);border-radius: 20rpx;margin: auto;">
+		</view>
+	</view>
+	<!-- 印象南岸 -->
+	<view>
+		<view style="display:flex" class="content-top">
+			<view class="content-line"></view>
+			<view class="content-title">印象南岸</view>
+			<view class="content-more" bindtap="goToMore">查看更多 >></view>
+		</view>
+		<view style="width:679rpx;height: 1412rpx;background: #FFFFFF;box-shadow: 0 3rpx 9rpx 0 rgba(19,65,138,0.17);border-radius: 20rpx;margin: auto;">
+		</view>
+	</view>
+	<!-- 更是美食聚集地 -->
+	<view>
+		<view>更是美食聚集地</view>
+		<view style="height: 500rpx;"></view>
+	</view>
+</view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/nais/nais.wxss

@@ -1 +1,29 @@
-/* pages/nais/nais.wxss */
+/* pages/nais/nais.wxss */
+/* 标题栏 */
+.content-top {
+	padding: 30rpx 10rpx 20rpx 20rpx;
+	height: 32rpx;
+  }
+  
+  /* 标题栏 */
+  .content-title {
+	line-height: 32rpx;
+	font-size: 32rpx;
+	font-weight: bold;
+	color: #333333;
+	margin-right: auto;
+  }
+  
+  /* 标题栏 */
+  .content-line {
+	border-left: 10rpx solid #508FF4;
+	height: 32rpx;
+	margin-right: 20rpx;
+  }
+  
+  /* 标题栏 */
+  .content-more {
+	color: #999999;
+	font-size: 24rpx;
+	height: 32rpx;
+  }

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

@@ -1,18 +1,104 @@
 // pages/yxnaJfh.js
+import {
+	imgUrl
+} from "../api/request"
+
 Page({
 
 	/**
 	 * 页面的初始数据
 	 */
 	data: {
-
+		// 图片前缀
+		imgUrl: imgUrl,
+		// 专辑列表
+		albumList: ['张三专辑', '李四专辑', '李二专辑', 'XXX专辑', 'AAA专辑'],
+		// 专辑标题
+		albumTitle: [],
+		// 默认选中
+		currentTab: 0,
+		// 专辑详细
+		albumInfo: {
+			url: 'album.png',
+			name: '张三',
+			introduction: '专辑有论文专辑、音乐专辑等。论文专辑是指期刊的某一期专门对某一个大家关注的领域、问题、事件进行集中报道、讨论。',
+			albumList: [{
+					url: 'album-list.png',
+					date: '2019 10/24',
+					detail: '想要宜居生活，去南岸；想 要休憩放松，五南岸；想要 亲友伙伴欢聚，同样可以南岸南岸'
+	},
+				{
+					url: 'album-list.png',
+					date: '2019 10/24',
+					detail: '想要宜居生活，去南岸；想 要休憩放松，五南岸；想要 亲友伙伴欢聚，同样可以南岸南岸'
+				}, {
+					url: 'album-list.png',
+					date: '2019 10/24',
+					detail: '想要宜居生活，去南岸；想 要休憩放松，五南岸；想要 亲友伙伴欢聚，同样可以南岸南岸'
+				}, {
+					url: 'album-list.png',
+					date: '2019 10/24',
+					detail: '想要宜居生活，去南岸；想 要休憩放松，五南岸；想要 亲友伙伴欢聚，同样可以南岸南岸'
+				}, {
+					url: 'album-list.png',
+					date: '2019 10/24',
+					detail: '想要宜居生活，去南岸；想 要休憩放松，五南岸；想要 亲友伙伴欢聚，同样可以南岸南岸'
+				}, {
+					url: 'album-list.png',
+					date: '2019 10/24',
+					detail: '想要宜居生活，去南岸；想 要休憩放松，五南岸；想要 亲友伙伴欢聚，同样可以南岸南岸南岸'
+				}
+			]
+		}
+	},
+	getAlbumTitle() {
+		let temp = [];
+		let album = this.data.albumList[this.data.currentTab];
+		for (let index = 0; index < album.length; index++) {
+			temp.push(album.substr(index, 1));
+		}
+		this.setData({
+			albumTitle: temp
+		})
+	},
+	// 切换专辑
+	tabNav(e) {
+		let currentTab = e.currentTarget.dataset.index
+		this.setData({
+			currentTab
+		})
+		this.getAlbumTitle();
+	},
+	// 切换专辑
+	handleSwiper(e) {
+		let {
+			current,
+			source
+		} = e.detail
+		if (source === 'autoplay' || source === 'touch') {
+			const currentTab = current
+			this.setData({
+				currentTab
+			})
+		}
+		this.getAlbumTitle();
 	},
 
 	/**
 	 * 生命周期函数--监听页面加载
 	 */
 	onLoad(options) {
-
+		this.getAlbumTitle();
+	},
+	toYXNADetailInfo(){
+		wx.navigateTo({
+			url: '/pages/albumDetail/albumDetail',
+		})
+	},
+	toYXNAEdit(){
+		wx.navigateTo({
+			url: '/pages/albumEdit/albumEdit',
+		})
 	},
 
 	/**