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

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: '税务服务'
 			},
 			{

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

@@ -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/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

@@ -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/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">