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/package-lock.json
#	nngkxxdp/src/main/resources/static/nnzwminiapp/package.json

.gitignore

@@ -43,3 +43,6 @@ nbdist/
 !*/build/*.html
 !*/build/*.xml
 nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/node_modules
+nngkxxdp/src/main/resources/static/nnzwminiapp/miniprogram_npm
+nngkxxdp/src/main/resources/static/nnzwminiapp/node_modules
+nngkxxdp/src/main/resources/static/nnzwminiapp/project.config.json

nngkxxdp/src/main/resources/static/nnzwminiapp/app.json

@@ -2,6 +2,7 @@
 	"pages": [
 		"pages/index/index",
 		"pages/customerServe/customerServe",
+    	"pages/ZCWDK/add/add",
 		"pages/nais/nais",
 		"pages/dataCenterZWTJ/dataCenterZWTJ",
 		"pages/login/login",
@@ -16,7 +17,6 @@
 		"pages/publics/publics",
 		"pages/dataCenter/dataCenter",
 		"pages/dataCenterXXTJ/dataCenterXXTJ",
-		"pages/ZCWDK/index/index",
 		"pages/ZCWDK/info/info",
 		"pages/yxnaJfq/yxnaJfq",
 		"pages/yxnaJfh/yxnaJfh",
@@ -24,7 +24,10 @@
 		"pages/yxna/yxna",
 		"pages/articlDetail/articlDetail",
 		"pages/programList/programList",
-		"pages/leaveMessage/leaveMessage"
+		"pages/leaveMessage/leaveMessage",
+		"pages/album/album",
+		"pages/albumDetail/albumDetail",
+		"pages/albumEdit/albumEdit"
 	],
 	"window": {
 		"backgroundTextStyle": "light",

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/add/add.js

@@ -0,0 +1,66 @@
+// pages/ZCWDK/add/add.js
+Page({
+
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad(options) {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload() {
+
+	},
+
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh() {
+
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom() {
+
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage() {
+
+	}
+})

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/add/add.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "我要提问",
+  "navigationBarBackgroundColor": "#508ff4",
+  "navigationBarTextStyle": "white"
+}

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/add/add.wxml

@@ -0,0 +1,19 @@
+<!--pages/ZCWDK/add/add.wxml-->
+<view>
+  <view class="inputss">
+    <view style="float: left; margin-right: 20rpx; font-size: 24rpx;font-family: PingFang SC;font-weight: 400;color: #333333;">手机号: </view>
+    <input class="weui-input" style=" border-bottom: 1rpx #B8B8B8 solid;" auto-focus placeholder="请输入手机号"/>
+  </view>
+  <view class="inputss">
+    <view style="float: left; margin-right: 20rpx; font-size: 24rpx;font-family: PingFang SC;font-weight: 400;color: #333333;">部门: </view>
+    <input class="weui-input" style=" border-bottom: 1rpx #B8B8B8 solid;" auto-focus placeholder="请输入部门"/>
+  </view>
+  <view class="inputss">
+    <view style="float: left; margin-right: 20rpx; font-size: 24rpx;font-family: PingFang SC;font-weight: 400;color: #333333;">问题: </view>
+    <input class="weui-input" style=" border-bottom: 1rpx #B8B8B8 solid;" auto-focus placeholder="请输入内容"/>
+  </view>
+  <view class="btns">
+	<view class="box qx">取消</view>
+	<view class="box qr">确认</view>
+  </view>
+</view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/add/add.wxss

@@ -0,0 +1,26 @@
+/* pages/ZCWDK/add/add.wxss */
+
+.inputss{
+  width: 90%;
+  margin: 60rpx auto;
+}
+.btns{
+	width: 90%;
+	margin: 0 auto;
+}
+.box{
+	width: 300rpx;
+	height: 90rpx;
+	float: left;
+	line-height: 90rpx;
+	text-align: center;
+	border-radius: 10rpx;
+}
+.qx{
+	border: 1rpx solid #C5C5C5 ;
+}
+.qr{
+	background: #508FF4;
+	color: #fff;
+	margin-left: 40rpx;
+}

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

@@ -9,13 +9,13 @@ Page({
 	 * 页面的初始数据
 	 */
 	data: {
-    imgUrl: imgUrl,
-    defaultSearch:{
-      name:"全部",
-      id:""
-    },
-    searchItems:[{name:"全部",id:""},{name:"区教委",id:""},{name:"区科技局",id:""},{name:"区经济信息委",id:""},{name:"区民政局",id:""}],
-    showModal: false,
+		imgUrl: imgUrl,
+		defaultSearch:{
+		name:"全部",
+		id:""
+		},
+		searchItems:[{name:"全部",id:""},{name:"区教委",id:""},{name:"区科技局",id:""},{name:"区经济信息委",id:""},{name:"区民政局",id:""}],
+		showModal: false,
 	},
 
 	/**
@@ -88,5 +88,15 @@ Page({
     wx.navigateTo({
       url: "/pages/ZCWDK/info/info",
     })
-  }
+  },
+  back(){
+	wx.navigateBack({
+		delta: 1
+	  });
+	},
+	askQuestion(){
+		wx.navigateTo({
+		  url: '/pages/ZCWDK/add/add',
+		})
+	}
 })

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/index/index.json

@@ -1,6 +1,6 @@
 {
   "navigationStyle": "custom",
 	"usingComponents": {
-    
-  }
+		"t-icon": "tdesign-miniprogram/icon/icon"
+	}
 }

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

@@ -1,9 +1,18 @@
 <!--pages/ZCWDK/index/index.wxml-->
 <view>
   <!-- <image src="{{imgUrl}}/wdkbg.png"></image> -->
-  
+
   <view class="head" style="background-image: url({{imgUrl}}/wdkbg.png);">
-    <view  class="navTitle"></view>
+	<view class="navTitle">
+		<t-icon name="chevron-left" size="68rpx" data-name="chevron-left"  bind:click="back" />
+		<view class="title" style="float: left;">政策问答库</view>
+	</view>
+	<view class="ttp">
+		<view class="tw" bindtap="askQuestion">
+			<text>我要</text>
+			<text>提问</text>
+		</view>
+	</view>
     <view class="logo">
       <image src="{{imgUrl}}/wdklogo.png"></image>
       <text>共计问答数：6526</text>
@@ -13,6 +22,7 @@
       <input class="inputText"/>
       <image src="{{imgUrl}}/wdksearchIcon.png" class="serachIcon"></image>
     </view>
+	
   </view>
   <view class="body">
     <view class="title">

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

@@ -8,7 +8,27 @@ page{
 .navTitle{
   width: 100%;
   height: 130rpx;
-  margin-bottom: 70rpx;
+  margin-bottom: 20rpx;
+}
+.navTitle t-icon{
+	width: 48rpx; 
+	float: left;
+	margin-top: 50rpx;
+	margin-left: 20rpx;
+	height: 130rpx;
+	line-height: 130rpx;
+	text-align: center;
+	color: #fff;
+}
+.navTitle .title{
+	width: 600rpx;
+	height: 130rpx;
+	line-height: 130rpx;
+	text-align: center;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 400;
+	color: #FFFFFF;
 }
 
 .head{
@@ -20,13 +40,13 @@ page{
 
 .logo{
   margin: 0 auto;
-  width: 80%;
-  height: 70rpx;
+  width: 60%;
+  height: 50rpx;
 }
 
 .logo image{
   width: 100%;
-  height: 70rpx;
+  height: 50rpx;
 }
 .logo text{
   font-size: 30rpx;
@@ -81,10 +101,12 @@ page{
 .serachItems{
   width: 100%;
   height: 700rpx;
-  margin-top: -60rpx;
+  margin-top: 460rpx;
   background: #fff;
   padding-top: 20rpx;
   position: fixed;
+  top: 0;
+  left: 0;
   z-index: 9999;
 }
 
@@ -194,5 +216,26 @@ page{
   background: #fff;
   transform: translateX(3rpx);
 }
-
+.ttp{
+	width: 100%;
+	height: 80rpx;
+}
+.tw{
+	width: 138rpx;
+	height: 80rpx;
+	background: #CCA65E;
+	color: #fff;
+	border-radius: 80rpx 0 0 80rpx;
+	padding-top: 10rpx;
+	float: right;
+}
+.tw text{
+	width: 100%;
+	display: block;
+	margin-left: 40rpx;
+	font-size: 24rpx;
+	font-family: PingFang SC;
+	font-weight: 400;
+	color: #FFFFFF;
+}
 

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/info/info.js

@@ -7,7 +7,15 @@ Page({
 	 * 页面的初始数据
 	 */
 	data: {
-    imgUrl: imgUrl,
+		imgUrl: imgUrl,
+		defaultSearch:{
+			name:"全部",
+			id:""
+			},
+		searchItems:[
+			{name:"全部",id:""},
+			{name:"区教委",id:""},{name:"区科技局",id:""},{name:"区经济信息委",id:""},{name:"区民政局",id:""}],
+		showModal: false,
 	},
 
 	/**
@@ -64,5 +72,26 @@ Page({
 	 */
 	onShareAppMessage() {
 
+	},
+  
+	selectType(){
+	  this.setData({
+		showModal: !this.data.showModal
+	  })
+	},
+	closedlg(){
+	  this.setData({
+		showModal: false
+	  })
+	},
+	back(){
+		wx.navigateBack({
+			delta: 1
+		  });
+	},
+	askQuestion(){
+		wx.navigateTo({
+		  url: '/pages/ZCWDK/add/add',
+		})
 	}
 })

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/info/info.json

@@ -2,6 +2,7 @@
   "navigationStyle": "custom",
 	"usingComponents": {
     "t-tabs": "tdesign-miniprogram/tabs/tabs",
-    "t-tab-panel": "tdesign-miniprogram/tabs/tab-panel"
+	"t-tab-panel": "tdesign-miniprogram/tabs/tab-panel",
+	"t-icon": "tdesign-miniprogram/icon/icon"
   }
-}
+}

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/info/info.wxml

@@ -1,7 +1,16 @@
 <!--pages/ZCWDK/info/info.wxml-->
 <view>
   <view class="head" style="background-image: url({{imgUrl}}/wdkbg.png);">
-      <view  class="navTitle"></view>
+		<view class="navTitle">
+			<t-icon name="chevron-left" size="68rpx" data-name="chevron-left" bind:click="back" />
+			<view class="title" style="float: left;">政策问答库</view>
+		</view>
+		<view class="ttp">
+		<view class="tw" bindtap="askQuestion">
+			<text>我要</text>
+			<text>提问</text>
+		</view>
+	</view>
       <view class="logo">
         <image src="{{imgUrl}}/wdklogo.png"></image>
         <text>共计问答数：6526</text>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ZCWDK/info/info.wxss

@@ -4,10 +4,30 @@ page{
   background: #F5F5F5 ;
 }
 .navTitle{
-  width: 100%;
-  height: 130rpx;
-  margin-bottom: 70rpx;
-}
+	width: 100%;
+	height: 130rpx;
+	margin-bottom: 20rpx;
+  }
+  .navTitle t-icon{
+	  width: 48rpx; 
+	  float: left;
+	  margin-top: 50rpx;
+	  margin-left: 20rpx;
+	  height: 130rpx;
+	  line-height: 130rpx;
+	  text-align: center;
+	  color: #fff;
+  }
+  .navTitle .title{
+	  width: 600rpx;
+	  height: 130rpx;
+	  line-height: 130rpx;
+	  text-align: center;
+	  font-size: 36rpx;
+	  font-family: PingFang SC;
+	  font-weight: 400;
+	  color: #FFFFFF;
+  }
 
 .head{
   width: 100%;
@@ -15,27 +35,32 @@ page{
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
-
+.title{
+	width: 100%;
+	height: 73rpx;
+	margin-top: 20rpx;
+	margin-bottom: 12rpx;
+  }
 .logo{
-  margin: 0 auto;
-  width: 80%;
-  height: 70rpx;
-}
-
-.logo image{
-  width: 100%;
-  height: 70rpx;
-}
-.logo text{
-  font-size: 30rpx;
-  font-family: PingFang SC;
-  font-weight: 400;
-  color: #FFFFFF;
-  opacity: 0.6;
-  display: block;
-  width: 100%;
-  text-align: center;
-}
+	margin: 0 auto;
+	width: 60%;
+	height: 50rpx;
+  }
+  
+  .logo image{
+	width: 100%;
+	height: 50rpx;
+  }
+  .logo text{
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: 400;
+	color: #FFFFFF;
+	opacity: 0.6;
+	display: block;
+	width: 100%;
+	text-align: center;
+  }
 .searchBox{
   width: 90%;
   height: 80rpx;
@@ -66,25 +91,27 @@ page{
 }
 /* 遮罩层 */
 .mask {
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  top: 0;
-  left: 0;
-  background: #000;
-  z-index: 9000;
-  opacity: 0.5;
-}
-
-.serachItems{
-  width: 100%;
-  height: 700rpx;
-  margin-top: -60rpx;
-  background: #fff;
-  padding-top: 20rpx;
-  position: fixed;
-  z-index: 9999;
-}
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	background: #000;
+	z-index: 9000;
+	opacity: 0.5;
+  }
+  
+  .serachItems{
+	width: 100%;
+	height: 700rpx;
+	margin-top: 460rpx;
+	background: #fff;
+	padding-top: 20rpx;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 9999;
+  }
 
 .serachItems scroll-view{
   height: 700rpx;
@@ -254,4 +281,27 @@ page{
   margin-top: 70rpx;
   margin-left: 30rpx;
   
+}
+
+.ttp{
+	width: 100%;
+	height: 80rpx;
+}
+.tw{
+	width: 138rpx;
+	height: 80rpx;
+	background: #CCA65E;
+	color: #fff;
+	border-radius: 80rpx 0 0 80rpx;
+	padding-top: 10rpx;
+	float: right;
+}
+.tw text{
+	width: 100%;
+	display: block;
+	margin-left: 40rpx;
+	font-size: 24rpx;
+	font-family: PingFang SC;
+	font-weight: 400;
+	color: #FFFFFF;
 }

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

@@ -1,18 +1,104 @@
 // pages/album/album.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',
+		})
 	},
 
 	/**

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

@@ -50,7 +50,7 @@
 				</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>
+						<button bindtap="bindUpload" style="width: 166rpx;height: 60rpx;background: #004A93;border-radius: 10rpx;color: #FFFFFF;font-size: 24rpx;line-height: 60rpx;margin: 0;">上传</button>
 					</view>
 					<view style="font-size: 24rpx;color: #D2D2D2;">支持jpg. png格式，大小在5M以下</view>
 					<view>
@@ -67,6 +67,6 @@
 				<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>
+		<button formType="submit" style="margin-top: 77rpx;width: 676rpx;height: 80rpx;background: #004A93;border-radius: 10rpx;color: #FFFFFF;font-size: 24rpx;line-height: 80rpx;">确认提交</button>
 	</form>
 </view>

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

@@ -46,6 +46,19 @@ Page({
 			currentTab
 		})
 	},
+	// 切换国民经济统计数据
+	handleSwiper(e) {
+		let {
+			current,
+			source
+		} = e.detail
+		if (source === 'autoplay' || source === 'touch') {
+			const currentTab = current
+			this.setData({
+				currentTab
+			})
+		}
+	},
 
 	/**
 	 * 生命周期函数--监听页面加载
@@ -495,5 +508,15 @@ Page({
 	 */
 	onShareAppMessage() {
 
+	},
+	gotoZWTJ(){
+		wx.navigateTo({
+		  url: '/pages/dataCenterZWTJ/dataCenterZWTJ',
+		})
+	},
+	gotoXXTJ(){
+		wx.navigateTo({
+		  url: '/pages/dataCenterXXTJ/dataCenterXXTJ',
+		})
 	}
 })

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

@@ -16,7 +16,7 @@
           <view class="currtline {{currentTab === index ? 'active' : ''}}" wx:if="{{currentTab === index}}"></view>
         </view>
       </scroll-view>
-      <swiper current="{{currentTab}}" style="padding: 0 10px;margin-top: 15rpx;height: 500rpx;width: 100%;" duration="1">
+      <swiper current="{{currentTab}}" style="padding: 0 10px;margin-top: 15rpx;height: 500rpx;width: 100%;" duration="1" bindchange="handleSwiper">
         <swiper-item wx:for="{{statistics}}" wx:key="index">
           <ec-canvas id="{{item.name}}" canvas-id="{{item.name}}" ec="{{ streetlinechartec }}" />
         </swiper-item>
@@ -27,7 +27,7 @@
     </view>
   </view>
   <!-- 政务服务数据统计分析 -->
-  <view style="background-color: #FFFFFF;margin-top: 30rpx;">
+  <view style="background-color: #FFFFFF;margin-top: 30rpx;" bindtap="gotoZWTJ">
     <view style="border-bottom: 1px solid #C5C5C5;">
       <view class="title">
         <image src="{{imgUrl}}riseData.png"></image>
@@ -196,7 +196,7 @@
     </view>
   </view>
   <!-- 本年度公开信息办理情况 -->
-  <view style="background-color: #FFFFFF;margin-top: 30rpx;">
+  <view style="background-color: #FFFFFF;margin-top: 30rpx;" bindtap="gotoXXTJ">
     <view style="border-bottom: 1px solid #C5C5C5;">
       <view class="title">
         <image src="{{imgUrl}}processing.png"></image>

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

@@ -2,7 +2,7 @@
   <!-- 列表 -->
   <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 style="height: 99rpx;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">

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

@@ -48,7 +48,7 @@ Page({
 			}
 		],
 		serviceItems2: [{
-				img: '../images/service-6.png',
+				img: imgUrl + 'service-6.png',
 				name: '税务服务'
 			},
 			{
@@ -584,5 +584,15 @@ mediaBindChange: function( e ) {
 			url: '/pages/yxnaQxn/yxnaQxn',
 		  })
 	},
+	gotoSjzx(){
+		wx.navigateTo({
+		  url: '/pages/dataCenter/dataCenter',
+		})
+	},
+	gotoZWTJ(){
+		wx.navigateTo({
+		  url: '/pages/dataCenterZWTJ/dataCenterZWTJ',
+		})
+	}
 
 })

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

@@ -138,7 +138,7 @@
 		<!-- 数据中心 -->
 		<view class="data-center-contain">
 			<!-- 标题 -->
-			<view class="data-center-title">
+			<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>
@@ -149,7 +149,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;">
+					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>
 				<!-- 分析入口 -->
@@ -641,8 +641,7 @@
 					<!-- 入口 -->
 					<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="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>

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

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

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

@@ -69,7 +69,7 @@
 	</view>
 	<view class="list cont-width">
 		<view class="list-nav">
-			<view class="list-item" bindtap="navto">
+			<view class="list-item" bindtap="toCanteen">
 				<view class="left">
 					<image src="../images/l-grzl.png" alt=""></image>
 					<text>我们的食堂</text>

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

@@ -9,7 +9,7 @@
 
 .head-bg {
 	width: 100%;
-	height: 300rpx;
+	height: 400rpx;
 	background-image:url(https://s1.ax1x.com/2022/10/13/xaoji9.png);
 	background-size: 100% 100%;
 	display: flex;

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

@@ -127,13 +127,13 @@
 					“两江四岸”核心区，历史母城重要组成部分;</view>
 			</view>
 			<view style="width: 612rpx;border-bottom: 1px solid #E8E8E8;margin: 20rpx 36rpx 30rpx 49rpx;" />
-			<view style="display: flex;height: 70rpx;padding-left: 18rpx;">
+			<view style="display: flex;height: 65rpx;padding-left: 18rpx;">
 				<image src="{{imgUrl}}nais-star.png" style="width: 26rpx;height:26rpx;" />
 				<view style="font-size: 24rpx;font-family: PingFang SC;font-weight: 500;color: #333333;padding-bottom: 40rpx;width: 590rpx;padding-right: -17rpx;overflow: hidden;text-overflow: ellipsis;-webkit-line-clamp:2;display: -webkit-box;-webkit-box-orient:vertical;">
 					“长江风景眼”广阳岛、“城市会客厅”长嘉汇、“山城花冠”南山，绘就出“江、山、岛、湾、峡、湖、城”的大；</view>
 			</view>
 			<view style="width: 612rpx;border-bottom: 1px solid #E8E8E8;margin: 20rpx 36rpx 30rpx 49rpx;" />
-			<view style="display: flex;height: 70rpx;padding-left: 18rpx;">
+			<view style="display: flex;height: 65rpx;padding-left: 18rpx;">
 				<image src="{{imgUrl}}nais-star.png" style="width: 26rpx;height:26rpx;" />
 				<view style="font-size: 24rpx;font-family: PingFang SC;font-weight: 500;color: #333333;padding-bottom: 40rpx;width: 590rpx;overflow: hidden;text-overflow: ellipsis;-webkit-line-clamp:2;display: -webkit-box;-webkit-box-orient:vertical;">
 					国家公共文化服务体系示范区、南滨路国家级文化产业示范园区、第二批国家文化和旅游消费试点城市、国家版</view>

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

@@ -136,5 +136,10 @@ Page({
    */
   onShareAppMessage() {
 
+  },
+  gotoZXWDK(){
+	  wx.navigateTo({
+		url: '/pages/ZCWDK/index/index',
+	  })
   }
 })

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

@@ -98,7 +98,7 @@
     <swiper display-multiple-items="2" autoplay="{{false}}" style="padding: 0 10px;height: 400rpx;;">
       <block wx:for="{{topics}}" wx:key="*this">
         <swiper-item>
-          <image src="{{imgUrl}}{{item}}" style="width: 327rpx;height: 227rpx;"></image>
+          <image src="{{imgUrl}}{{item}}" bindtap="gotoZXWDK" style="width: 327rpx;height: 227rpx;"></image>
         </swiper-item>
       </block>
     </swiper>

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

@@ -4,9 +4,19 @@ Page({
 	/**
 	 * 页面的初始数据
 	 */
-	data: {
+	data: {},
+	// 前往专辑界面
+	toAlbum() {
+		wx.navigateTo({
+			url: '/pages/album/album',
+		})
+	},
+	// 前往编辑专辑界面
+	toEditAlbum() {
+		wx.navigateTo({
+			url: '/pages/albumEdit/albumEdit',
+		})
 	},
-
 	/**
 	 * 生命周期函数--监听页面加载
 	 */
@@ -20,25 +30,25 @@ Page({
 	onReady() {
 
 	},
-	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',
-		  })
+		})
 	},
 
 	/**

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

@@ -3,8 +3,8 @@
 	<view class="header">
 		<image src="/images/logo-xsj.png"></image>
 		<view class="button">
-			<button style="background: #E2F0FA;color: #1B3A7B;">投稿</button>
-			<button style="background: #F5EAD1;color: #844A0C;">专辑</button>
+			<button style="background: #E2F0FA;color: #1B3A7B;" bindtap="toEditAlbum">投稿</button>
+			<button style="background: #F5EAD1;color: #844A0C;" bindtap="toAlbum">专辑</button>
 		</view>
 	</view>
 	<view class="lineNav">

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

@@ -7,7 +7,18 @@ Page({
 	data: {
 
 	},
-
+	// 前往专辑界面
+	toAlbum() {
+		wx.navigateTo({
+			url: '/pages/album/album',
+		})
+	},
+	// 前往编辑专辑界面
+	toEditAlbum() {
+		wx.navigateTo({
+			url: '/pages/albumEdit/albumEdit',
+		})
+	},
 	/**
 	 * 生命周期函数--监听页面加载
 	 */
@@ -21,25 +32,25 @@ Page({
 	onReady() {
 
 	},
-	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',
-		  })
+		})
 	},
 
 	/**

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

@@ -3,8 +3,8 @@
 	<view class="header">
 		<image src="/images/logo-jfh.png"></image>
 		<view class="button">
-			<button style="background: #E2F0FA;color: #1B3A7B;">投稿</button>
-			<button style="background: #F5EAD1;color: #844A0C;">专辑</button>
+			<button style="background: #E2F0FA;color: #1B3A7B;" bindtap="toEditAlbum">投稿</button>
+			<button style="background: #F5EAD1;color: #844A0C;" bindtap="toAlbum">专辑</button>
 		</view>
 	</view>
 	<view class="lineNav">

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

@@ -6,7 +6,18 @@ Page({
 	 */
 	data: {
 	},
-
+	// 前往专辑界面
+	toAlbum() {
+		wx.navigateTo({
+			url: '/pages/album/album',
+		})
+	},
+	// 前往编辑专辑界面
+	toEditAlbum() {
+		wx.navigateTo({
+			url: '/pages/albumEdit/albumEdit',
+		})
+	},
 	/**
 	 * 生命周期函数--监听页面加载
 	 */
@@ -20,25 +31,25 @@ Page({
 	onReady() {
 
 	},
-	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',
-		  })
+		})
 	},
 
 	/**

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

@@ -3,8 +3,8 @@
 	<view class="header">
 		<image src="/images/logo-jfq.png"></image>
 		<view class="button">
-			<button style="background: #E2F0FA;color: #1B3A7B;">投稿</button>
-			<button style="background: #F5EAD1;color: #844A0C;">专辑</button>
+			<button style="background: #E2F0FA;color: #1B3A7B;" bindtap="toEditAlbum">投稿</button>
+			<button style="background: #F5EAD1;color: #844A0C;" bindtap="toAlbum">专辑</button>
 		</view>
 	</view>
 	<view class="lineNav">

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

@@ -7,7 +7,18 @@ Page({
 	data: {
 
 	},
-
+	// 前往专辑界面
+	toAlbum() {
+		wx.navigateTo({
+			url: '/pages/album/album',
+		})
+	},
+	// 前往编辑专辑界面
+	toEditAlbum() {
+		wx.navigateTo({
+			url: '/pages/albumEdit/albumEdit',
+		})
+	},
 	/**
 	 * 生命周期函数--监听页面加载
 	 */
@@ -21,25 +32,25 @@ Page({
 	onReady() {
 
 	},
-	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',
-		  })
+		})
 	},
 
 	/**

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

@@ -3,8 +3,8 @@
 	<view class="header">
 		<image src="/images/logo-qxn.png"></image>
 		<view class="button">
-			<button style="background: #E2F0FA;color: #1B3A7B;">投稿</button>
-			<button style="background: #F5EAD1;color: #844A0C;">专辑</button>
+			<button style="background: #E2F0FA;color: #1B3A7B;" bindtap="toEditAlbum">投稿</button>
+			<button style="background: #F5EAD1;color: #844A0C;" bindtap="toAlbum">专辑</button>
 		</view>
 	</view>
 	<view class="lineNav">

nngkxxdp/src/main/resources/static/nnzwminiapp/project.config.json

@@ -1,51 +0,0 @@
-{
-	"description": "项目配置文件",
-	"packOptions": {
-		"ignore": [],
-		"include": []
-	},
-	"setting": {
-		"bundle": false,
-		"userConfirmedBundleSwitch": false,
-		"urlCheck": true,
-		"scopeDataCheck": false,
-		"coverView": true,
-		"es6": true,
-		"postcss": true,
-		"compileHotReLoad": false,
-		"lazyloadPlaceholderEnable": false,
-		"preloadBackgroundData": false,
-		"minified": true,
-		"autoAudits": false,
-		"newFeature": false,
-		"uglifyFileName": false,
-		"uploadWithSourceMap": true,
-		"useIsolateContext": true,
-		"nodeModules": false,
-		"enhance": true,
-		"useMultiFrameRuntime": true,
-		"useApiHook": true,
-		"useApiHostProcess": true,
-		"showShadowRootInWxmlPanel": true,
-		"packNpmManually": false,
-		"enableEngineNative": false,
-		"packNpmRelationList": [],
-		"minifyWXSS": true,
-		"showES6CompileOption": false,
-		"minifyWXML": true,
-		"babelSetting": {
-			"ignore": [],
-			"disablePlugins": [],
-			"outputPath": ""
-		}
-	},
-	"compileType": "miniprogram",
-	"libVersion": "2.19.4",
-	"appid": "wx967815720b8115a4",
-	"projectname": "miniprogram-92",
-	"condition": {},
-	"editorSetting": {
-		"tabIndent": "tab",
-		"tabSize": 4
-	}
-}