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

nngkxxdp/src/main/resources/mapper/SmsMessageDao.xml

@@ -218,7 +218,7 @@
 					FROM save_hlw_interface_data
 					GROUP BY CHNLID,chnlidname
 		) d ON d.CHNLID = a.chnlid
-		where 
+		where
 			TIMESTAMPDIFF(
 				DAY,
 				DATE_FORMAT(d.DOCRELTIME, '%Y-%m-%d'),
@@ -240,7 +240,8 @@
         title,
         url,
         sort,
-        create_time
+        create_time,
+        cover
         FROM
         sort_article
         WHERE 1=1

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

@@ -26,6 +26,7 @@
 		"pages/articlDetail/articlDetail",
 		"pages/programList/programList",
 		"pages/leaveMessage/leaveMessage",
+		"pages/leaveMessage2/leaveMessage2",
 		"pages/album/album",
 		"pages/albumDetail/albumDetail",
 		"pages/albumEdit/albumEdit"

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/api/request.js

@@ -1,5 +1,6 @@
 const baseUrl = "http://localhost:7777/mini"
-const imgUrl = "http://192.168.1.253:7777/applet/"
+// const imgUrl = "http://192.168.1.253:7777/applet/"
+const imgUrl = "http://117.50.172.145/"
 
 let token = wx.getStorageSync('token')
 

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

@@ -1,11 +1,14 @@
 // pages/articlDetail/articlDetail.js
+import {
+	imgUrl
+  } from "../api/request"
 Page({
 
 	/**
 	 * 页面的初始数据
 	 */
 	data: {
-
+		imgUrl: imgUrl,
 	},
 
 	/**

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

@@ -2,7 +2,7 @@
 <view class="body">
 <view class="title">遏制“天价”月饼区市场监管局开展月饼包装专项检查</view>
     <view class="source"><span>2022-09-01</span><span>来源:南岸区融媒体中心</span></view>
-    <image src="/images/1.png" alt=""></image>
+    <image src="{{imgUrl}}1.png" alt=""></image>
     <view class="content">
         <text>中秋降至，区市场监管局对辖区的麦德龙、永辉、盒马、新世纪等超市销售的月饼包装情况进行专项检查，并抽取样品，送权威机构进行计量检测。 </text>
         <text>在麦德龙超市，场地中央及货架上摆满了各式各样的月饼，价格大多在100元至300元之间。区市场监管局执法人员对这些月饼逐一进行查看，重点检查月饼包装是否符合《限制商品过度包装要求食品和化妆品》国家标准第1号修改单的要求，包装层数是否超过了3层，包装材料是否使用了贵金属、红木等贵重材质，月饼是否与其他产品混装销售等。

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: 99rpx;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;line-height:33rpx;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

@@ -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;
 		});
@@ -281,41 +398,35 @@ Page({
 	getScaOption2() {
 		//请求数据 
 		var xAxis = {
-				type: 'value',
-				min: 0,
-				max: 150000,
-				axisLabel: {
-					fontSize: 18
-				}
-			},
-			yAxis = {
-				type: 'category',
-				data: [
-					'非常不满意', '不满意', '基本满意', '满意', '非常满意'
-				],
-				axisLabel: {
-					fontSize: 18
-				}
-			},
-			grid = {
-				left: '20%',
-				top: '10%',
-				bottom: '10%'
-			},
-			series = [{
-				data: [123, 200, 15220, 80333, 1073671],
-				type: 'bar',
-				barWidth: 25,
-				itemStyle: {
-					color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-							offset: 0,
-							color: '#3977E6'
-						},
-						{
-							offset: 1,
-							color: '#37BBF8'
-						}
-					]),
+			type: 'value',
+			min: 0,
+			max: 150000,
+		},
+		yAxis = {
+			type: 'category',
+			data: [
+				'非常不满意', '不满意', '基本满意', '满意', '非常满意'
+			]
+		},
+		grid = {
+			left: '22%',
+			top: '10%',
+			bottom: '10%'
+		},
+		series = [{
+			data: [123, 200, 15220, 80333, 1073671],
+			type: 'bar',
+			barWidth: 14,
+			itemStyle: {
+				color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
+						offset: 0,
+						color: '#3977E6'
+					},
+					{
+						offset: 1,
+						color: '#37BBF8'
+					}
+				]),
 					// emphasis: {
 					//   barBorderRadius: 7
 					// },
@@ -482,12 +593,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 +608,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 +670,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: 1129rpx;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: 400rpx" />
 				</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>

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

@@ -1,5 +1,12 @@
 /**index.wxss**/
 /* pages/publics/publics.wxss */
+scroll-view ::-webkit-scrollbar {
+	display:none;
+	width:0;
+	height:0;
+	color:transparent;
+}
+
 /* 头部 */
 .top {
   height: 409rpx;
@@ -13,8 +20,8 @@
   position: absolute;
   left: 50%;
   transform: translate(-50%);
-  width: 500rpx;
-  height: 176rpx;
+  width: 426rpx;
+  height: 150rpx;
 }
 
 /* 第一个内容，浮动上移 */
@@ -66,7 +73,7 @@
 
 /* 服务的内容单个 */
 .content-service-item {
-  font-size: 20rpx;
+  font-size: 22rpx;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -86,21 +93,18 @@
 /* 百姓聚焦字体 */
 .people-font1 {
   height: 59rpx;
-  /* font-size: 36rpx; */
   font-size: 40rpx;
   font-family: DOUYU;
   font-weight: normal;
   color: #333333;
   padding-right: 18rpx;
-  display: flex;
-  flex-direction: row;
-  align-items: flex-end;
+  margin-bottom: -24rpx;
 }
 
 /* 每日更新字体 */
 .people-font2 {
   height: 59rpx;
-  font-size: 18px;
+  font-size: 9px;
   font-family: PingFang SC;
   font-weight: 500;
   color: #999999;
@@ -167,6 +171,7 @@
   font-size: 28rpx;
   text-align: center;
   line-height: 50rpx;
+  color: #333;
   height: 50rpx;
   width: 200rpx;
   display: flex;

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

@@ -1,17 +1,41 @@
 // pages/leaveMessage/leaveMessage.js
+import {
+	imgUrl
+  } from "../api/request"
 Page({
 
 	/**
 	 * 页面的初始数据
 	 */
 	data: {
-
+		imgUrl: imgUrl,
+		choose:false,
+    	DqOpenid: '',
+    	grade_name1:'建议投诉',
+    	grades1: ['咨询','其他'],
 	},
 	next_leaveMessage:function () {
 	  wx.navigateTo({
 		url: '/pages/leaveMessage2/leaveMessage2',
 	  })
 	},
+	// 点击下拉框 
+	bindShowMsg1() {
+	this.setData({
+	   choose: !this.data.choose
+	 })
+   },
+	
+   // 已选下拉框 
+   mySelect1(e) {
+	 console.log(e)
+	 var name = e.currentTarget.dataset.name 
+	 this.setData({
+	   grade_name1: name,
+	   choose: false
+	 })
+	
+   },
 
 	/**
 	 * 生命周期函数--监听页面加载

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

@@ -1,38 +1,68 @@
 <!--pages/leaveMessage/leaveMessage.wxml-->
 <view class="body">
-<form action="">
-        <ul class="list">
-            <li>
-                <view class="name"><span class="star">*</span><span>姓名：</span></view>
-                <view class="cont"><input type="text" placeholder="请输入姓名" bindinput="bindKeyInput"/></view>
-            </li>
-            <li>
-                <view class="name"><span class="star">*</span><span>联系电话：</span></view>
-                <view class="cont"><input type="text" placeholder="请输入联系电话" bindinput="bindKeyInput"/></view>
-            </li>
-            <li>
-                <view class="name"><span class="star">*</span><span>公开意愿：</span></view>
-                <view class="cont">
-                    <view class="open">
-                        <view class="text">公开</view>
-                        <view class="dot"></view>
-                    </view>
-                </view>
-            </li>
-            <li>
-                <view class="name"><span>地址：</span></view>
-                <view class="cont">
-                    <input type="text" placeholder="请输入详细地址" bindinput="bindKeyInput"/>
-                    <view class="map">
-                        <image src="/images/map.png" alt=""></image>
-                        <span>地图</span>
-                    </view>
-                </view>
-            </li>
-        </ul>
-        <view class="btn">
-            <button style="background: #508FF4;" bindtap="next_leaveMessage">提交</button>
-            <button style="background: #F49C12;">重置</button>
-        </view>
-    </form>
+	<form action="">
+		<ul class="list">
+			<li>
+				<view class="name"><span class="star">*</span><span>姓名：</span></view>
+				<view class="cont"><input type="text" placeholder="请输入姓名" bindinput="bindKeyInput" /></view>
+			</li>
+			<li>
+				<view class="name"><span class="star">*</span><span>联系电话：</span></view>
+				<view class="cont"><input type="text" placeholder="请输入联系电话" bindinput="bindKeyInput" /></view>
+			</li>
+			<li>
+				<view class="name"><span class="star">*</span><span>公开意愿：</span></view>
+				<view class="cont">
+					<view class="open">
+						<view class="text">公开</view>
+						<view class="dot"></view>
+					</view>
+				</view>
+			</li>
+			<li>
+				<view class="name"><span class="star">*</span><span>留言类型：</span></view>
+				<view class="cont">
+					<view class="classify-kuangjia">
+						<!-- 下拉框 -->
+						<view class='classify' bindtap='bindShowMsg1'>
+							<text class="b">{{grade_name1}}</text>
+			<li class="tra"></li>
+			<!-- 下拉需要显示的列表 -->
+			<view class="select_box" wx:if="{{choose}}">
+				<view wx:for="{{grades1}}" wx:key="unique">
+					<view class="select_one" catchtap="mySelect1" data-name="{{item}}">{{item}}</view>
+				</view>
+			</view>
+</view>
+</view>
+</view>
+</li>
+<li>
+	<view class="name"><span>地址：</span></view>
+	<view class="cont">
+		<input type="text" placeholder="请输入详细地址" bindinput="bindKeyInput" />
+		<view class="map">
+			<image src="{{imgUrl}}map.png" alt=""></image>
+			<span>地图</span>
+		</view>
+	</view>
+</li>
+<li>
+	<view class="name"><span>标题：</span></view>
+	<view class="cont">
+		<input type="text" placeholder="请输入标题（不超过50个字）" bindinput="bindKeyInput" maxlength="50" />
+	</view>
+</li>
+<li>
+	<view class="name"><span>内容：</span></view>
+	<view class="cont" style="height: 152rpx;">
+		<textarea type="text" placeholder="请输入内容（不超过700个字）" bindinput="bindKeyInput" maxlength="50" style="height: 100%;margin-top: 120rpx;width: 100%;"/>
+	</view>
+</li>
+</ul>
+<view class="btn">
+	<button style="background: #508FF4;" bindtap="next_leaveMessage">提交</button>
+	<button style="background: #F49C12;">重置</button>
+</view>
+</form>
 </view>

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

@@ -41,9 +41,7 @@ a{
 }
 
 .list li .cont {
-	width: calc(100% - 71px);
-	width: -moz-calc(100% - 71px);
-	width: -webkit-calc(100% - 71px);
+	width: calc(100% - 142rpx);
 	border-bottom: 1px solid rgb(102 102 102 / 12%);
 	height: 50px;
 	display: flex;
@@ -84,6 +82,54 @@ a{
 	border-radius: 50%;
 }
 
+
+.classify-kuangjia{
+	height: 34rpx;
+	width: 98%;
+	display: flex;
+	border-left: none;
+	border-right: none;
+   	justify-content: start;
+  }
+  .classify{
+	align-items: center;
+	width: 100%;
+	position:relative;
+	text-align: left;
+	height: 34rpx;
+  }
+  .select_box{
+	width: 100%;
+  	position: absolute;
+	background-color: #666666;
+	right: 0rpx;
+	top:34rpx;
+	overflow: hidden;
+  }
+  .select_one {
+	width: 100%;
+	height: 60rpx;
+	line-height: 60rpx;
+	border-bottom: 1px solid #ccc;
+  }
+  /* 下拉过度效果 */
+  @keyframes myclassify {
+	from {
+	  height: 0rpx;
+	}to {
+	  height: 210rpx;
+	}
+  }
+   
+.classify .tra{
+		border-width: 10rpx;    
+		border-style: solid;
+		border-color:black transparent transparent transparent;
+		position: absolute;
+		right: 30rpx;
+		top: 0rpx;
+	}
+
 .list .map {
 	width: 170rpx;
 	font-size: 13px;

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

@@ -1,4 +1,7 @@
 // pages/leaveMessage2/leaveMessage2.js
+import {
+	imgUrl
+  } from "../api/request"
 Page({
 
 	/**
@@ -6,6 +9,7 @@ Page({
 	 */
 	data: {
 		nullHouse:true,
+		imgUrl: imgUrl
 	},
 	
 	/**

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

@@ -1,6 +1,6 @@
 <!--pages/leaveMessage2/leaveMessage2.wxml-->
 <view class="body">
-<view class="logo" style="background-image: url(/images/bg-leaveM.png);">网上12345</view>
+<view class="logo" style="background-image: url({{imgUrl}}bg-leaveM.png);">网上12345</view>
     <view class="content">
         <text>中秋降至，区市场监管局对辖区的麦德龙、永辉、盒马、新世纪等超市销售的月饼包装情况进行专项检查，并抽取样品，送权威机构进行计量检测。 </text>
         <text>在麦德龙超市，场地中央及货架上摆满了各式各样的月饼，价格大多在100元至300元之间。区市场监管局执法人员对这些月饼逐一进行查看，重点检查月饼包装是否符合《限制商品过度包装要求食品和化妆品》国家标准第1号修改单的要求，包装层数是否超过了3层，包装材料是否使用了贵金属、红木等贵重材质，月饼是否与其他产品混装销售等。

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

@@ -3,6 +3,10 @@ import{
   baseUrl
 }from '../../utils/util'
 
+import {
+	imgUrl
+} from "../api/request"
+
 
 Page({
 
@@ -10,6 +14,9 @@ Page({
    * 页面的初始数据
    */
   data: {
+    imgUrl: imgUrl,
+    agreementImg: '',
+    agree: false,
     canIUse: wx.canIUse('button.open-type.getUserInfo')
   },
 
@@ -31,7 +38,12 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    this.setData({
+      agree: false
+    })
+    this.setData({
+      agreementImg: imgUrl + 'login-allow.png'
+    })
   },
 
   /**
@@ -41,7 +53,33 @@ Page({
 
   },
 
+  agreementSuccess(e) {
+    if (this.data.agree === true) {
+      this.setData({
+        agree: false
+      })
+      this.setData({
+        agreementImg: imgUrl + 'login-allow.png'
+      })
+    } else {
+      this.setData({
+        agree: true
+      })
+      this.setData({
+        agreementImg: imgUrl + 'login-select-allow.png'
+      })
+    }
+  },
+
   getUserProfile() {
+    if (this.data.agree === false) {
+      wx.showToast({
+        title: '请同意服务协议',
+        icon: 'error',
+        duration: 1500//持续的时间
+      })
+      return
+    }
     wx.setStorageSync('nickname', "");
     wx.setStorageSync('avatarUrl', "");
     wx.getUserProfile({

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

@@ -1,14 +1,29 @@
 <!--pages/login/login.wxml-->
-<view style="height: 100vh; background-image: url('https://hui.yrslm.com:8089/file/bg1.jpg');background-size: 100% 100%;">
-  <view class="head">
-    <view class="logo">
-      <image class="bg" style="width: 90px; height: 90px; border-radius: 90px;" src="https://wx.qlogo.cn/mmhead/Q3auHgzwzM6oEStzJXU5EgPwXloSC6qSD1xIJUbrpSr3pakmodv23A/0"></image>
+<view style="height: 100vh;background-color: #F5F6F8">
+
+  <view style="height: 280rpx;width: 100%;display:flex;align-items:center;justify-content:center;padding-top:130rpx">
+    <view>
+      <image src="{{imgUrl}}login-top-icon.png" style="height: 175rpx;width: 370rpx"></image>
     </view>
   </view>
-  <view class="btn">
-    <button type="primary" bindtap="getUserProfile" style="width: 80%;">
-      <image style="width: 30rpx; height: 30rpx; margin-left: 45rpx;float: left;margin-top: 7rpx;" src="wx.png"></image>
-      <text style="float: left; margin-left: 50rpx;">微信用户一键登陆</text>
+
+  <view style="margin-top:50rpx;height: 100rpx;width: 100%;display:flex;align-items:center;justify-content:center">
+    <view style="width: 80%;display:flex;align-items:center;justify-content:center">
+      <view style="height: 66rpx">
+        <image src="{{agreementImg}}" bindtap="agreementSuccess" style="height: 40rpx;width: 40rpx"></image>
+      </view>
+      <view style="height: 66rpx;font-size:24rpx;color: #333333;display:flex;align-items:center;justify-content:center">
+        阅读并同意《服务协议及个人信息处理规则》和《xxx 个人信息处理规则》
+      </view>
+    </view>
+  </view>
+
+  <view style="margin-top: 10rpx">
+    <button type="primary" bindtap="getUserProfile"
+      style="width: 80%;display: flex;align-items:center;justify-content: center">
+      <image style="height: 33rpx;width: 41rpx" src="{{imgUrl}}wx-login.png"></image>
+      <text style="padding-left: 15rpx;font-size:27rpx">微信用户一键登陆</text>
     </button>
   </view>
+
 </view>

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

@@ -1,27 +1 @@
 /* pages/login/login.wxss */
-page {
-  box-sizing: border-box;
-  /* padding-bottom: calc(env(safe-area-inset-bottom) + 96rpx); */
-}
-
-
-.head {
-  width: 100%;
-  margin-top: 120rpx;
-  height: 200rpx;
-  line-height: 400rpx;
-  margin-bottom: 60rpx;
-  float: left;
-}
-
-.logo {
-  /* margin-top: 100px; */
-  width: 180rpx;
-  height: 180rpx;
-  border-radius: 180rpx;
-  margin: auto;
-}
-
-.btn {
-  width: 100%;
-}

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

@@ -1,10 +1,15 @@
 // pages/yxna/yxna.js
+import {
+	imgUrl
+  } from "../api/request"
 Page({
 
 	/**
 	 * 页面的初始数据
 	 */
-	data: {},
+	data: {
+		imgUrl: imgUrl
+	},
 	// 前往专辑界面
 	toAlbum() {
 		wx.navigateTo({
@@ -31,25 +36,30 @@ Page({
 
 	},
 	toJfq: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxnaJfq/yxnaJfq',
 		})
 	},
 	toJfh: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxnaJfh/yxnaJfh',
 		})
 	},
 	toXsj: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxna/yxna',
 		})
 	},
 	toQxn: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxnaQxn/yxnaQxn',
 		})
 	},
+	back(){
+	  wx.navigateBack({
+		  delta: 1
+		});
+	  },
 
 	/**
 	 * 生命周期函数--监听页面显示

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

@@ -1,5 +1,8 @@
 {
 	"usingComponents": {},
 	"navigationBarTitleText": "印象南岸",
-	"navigationStyle":"custom"
+	"navigationStyle":"custom",
+	"usingComponents": {
+		"t-icon": "tdesign-miniprogram/icon/icon"
+	}
 }

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

@@ -1,14 +1,18 @@
 <!--pages/yxna/yxna.wxml-->
-<view class="page" style="background-image: url(/images/yxna-xsj.png);width: 100%;">
+<view class="page" style="background-image: url({{imgUrl}}yxna-xsj.png);width: 100%;">
+	<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="header">
-		<image src="/images/logo-xsj.png"></image>
+		<image src="{{imgUrl}}logo-xsj.png"></image>
 		<view class="button">
 			<button style="background: #E2F0FA;color: #1B3A7B;" bindtap="toEditAlbum">投稿</button>
 			<button style="background: #F5EAD1;color: #844A0C;" bindtap="toAlbum">专辑</button>
 		</view>
 	</view>
 	<view class="lineNav">
-		<view class="line" style="background-image: url(/images/line-xsj.png);">
+		<view class="line" style="background-image: url({{imgUrl}}line-xsj.png);">
 			<view class="title" style="width: 63px;left: 10px;top: 46px;" bindtap="toJfq">解放前</view>
 			<view style="width: 30rpx;height: 30rpx;background: #BEC0CA;border-radius: 50%;position: absolute;top: 146rpx;left: 64rpx;"></view>
 			<view class="title" style="width: 116px;left: 61px;top: 18px;" bindtap="toJfh">解放后-80年代</view>

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

@@ -5,11 +5,29 @@ button{
 .page{
 	background-size: 100% 100%;
 }
+.navTitle{
+	width: 100%;
+	height: 160rpx;
+	display: flex;
+	align-items: center;
+  }
+  .navTitle t-icon{
+	  width: 48rpx; 
+	  color: #fff;
+  }
+  .navTitle .title{
+	  width: 600rpx;
+	  font-size: 34rpx;
+	  font-family: PingFang SC;
+	  color: #FFFFFF;
+	  font-weight: bold;
+	  margin-left: 260rpx;
+  }
 .header{
-	height: 480rpx;
+	height: 220rpx;
 	display: flex;
 	justify-content: center;
-	align-items: center;
+	align-items: flex-start;
 	position: relative;
 }
 .header image{

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

@@ -1,11 +1,14 @@
 // pages/yxnaJfh/yxnaJfh.js
+import {
+	imgUrl
+  } from "../api/request"
 Page({
 
 	/**
 	 * 页面的初始数据
 	 */
 	data: {
-
+		imgUrl: imgUrl
 	},
 	// 前往专辑界面
 	toAlbum() {
@@ -33,25 +36,30 @@ Page({
 
 	},
 	toJfq: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxnaJfq/yxnaJfq',
 		})
 	},
 	toJfh: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxnaJfh/yxnaJfh',
 		})
 	},
 	toXsj: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxna/yxna',
 		})
 	},
 	toQxn: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxnaQxn/yxnaQxn',
 		})
 	},
+	back(){
+	  wx.navigateBack({
+		  delta: 1
+		});
+	  },
 
 	/**
 	 * 生命周期函数--监听页面显示

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

@@ -1,5 +1,8 @@
 {
 	"usingComponents": {},
 	"navigationBarTitleText": "印象南岸",
-	"navigationStyle":"custom"
+	"navigationStyle":"custom",
+	"usingComponents": {
+		"t-icon": "tdesign-miniprogram/icon/icon"
+	}
 }

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

@@ -1,14 +1,18 @@
 <!--pages/yxnaJfh/yxnaJfh.wxml-->
-<view class="page" style="background-image: url(/images/yxna-jfh.png);width: 100%;">
+<view class="page" style="background-image: url({{imgUrl}}yxna-jfh.png);width: 100%;">
+	<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="header">
-		<image src="/images/logo-jfh.png"></image>
+		<image src="{{imgUrl}}logo-jfh.png"></image>
 		<view class="button">
 			<button style="background: #E2F0FA;color: #1B3A7B;" bindtap="toEditAlbum">投稿</button>
 			<button style="background: #F5EAD1;color: #844A0C;" bindtap="toAlbum">专辑</button>
 		</view>
 	</view>
 	<view class="lineNav">
-		<view class="line" style="background-image: url(/images/line-jfh.png);">
+		<view class="line" style="background-image: url({{imgUrl}}line-jfh.png);">
 			<view class="title" style="width: 63px;left: 10px;top: 46px;" bindtap="toJfq">解放前</view>
 			<view style="width: 30rpx;height: 30rpx;background: #9CE7DB;border-radius: 50%;position: absolute;top: 146rpx;left: 64rpx;"></view>
 			<view class="title" style="width: 116px;left: 61px;top: 18px;opacity:1;" bindtap="toJfh">解放后-80年代</view>

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

@@ -5,8 +5,26 @@ button{
 .page{
 	background-size: 100% 100%;
 }
+.navTitle{
+	width: 100%;
+	height: 160rpx;
+	display: flex;
+	align-items: center;
+  }
+  .navTitle t-icon{
+	  width: 48rpx; 
+	  color: #fff;
+  }
+  .navTitle .title{
+	  width: 600rpx;
+	  font-size: 34rpx;
+	  font-family: PingFang SC;
+	  color: #FFFFFF;
+	  font-weight: bold;
+	  margin-left: 260rpx;
+  }
 .header{
-	height: 480rpx;
+	height: 220rpx;
 	display: flex;
 	justify-content: center;
 	align-items: center;

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

@@ -1,10 +1,14 @@
 // pages/yxnaJfq/yxnaJfq.js
+import {
+	imgUrl
+  } from "../api/request"
 Page({
 
 	/**
 	 * 页面的初始数据
 	 */
 	data: {
+		imgUrl: imgUrl
 	},
 	// 前往专辑界面
 	toAlbum() {
@@ -32,25 +36,30 @@ Page({
 
 	},
 	toJfq: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxnaJfq/yxnaJfq',
 		})
 	},
 	toJfh: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxnaJfh/yxnaJfh',
 		})
 	},
 	toXsj: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxna/yxna',
 		})
 	},
 	toQxn: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxnaQxn/yxnaQxn',
 		})
 	},
+	back(){
+	  wx.navigateBack({
+		  delta: 1
+		});
+	  },
 
 	/**
 	 * 生命周期函数--监听页面显示

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

@@ -1,5 +1,8 @@
 {
 	"usingComponents": {},
 	"navigationBarTitleText": "印象南岸",
-	"navigationStyle":"custom"
+	"navigationStyle":"custom",
+	"usingComponents": {
+		"t-icon": "tdesign-miniprogram/icon/icon"
+	}
 }

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

@@ -1,14 +1,18 @@
 <!--pages/yxnaJfq/yxnaJfq.wxml-->
-<view class="page" style="background-image: url(/images/yxna-jfq.png);width: 100%;">
+<view class="page" style="background-image: url({{imgUrl}}yxna-jfq.png);width: 100%;">
+	<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="header">
-		<image src="/images/logo-jfq.png"></image>
+		<image src="{{imgUrl}}logo-jfq.png"></image>
 		<view class="button">
 			<button style="background: #E2F0FA;color: #1B3A7B;" bindtap="toEditAlbum">投稿</button>
 			<button style="background: #F5EAD1;color: #844A0C;" bindtap="toAlbum">专辑</button>
 		</view>
 	</view>
 	<view class="lineNav">
-		<view class="line" style="background-image: url(/images/line-jfq.png);">
+		<view class="line" style="background-image: url({{imgUrl}}line-jfq.png);">
 			<view class="title" style="width: 63px;left: 10px;top: 46px;opacity:1;" bindtap="toJfq">解放前</view>
 			<view style="width: 42rpx;height: 42rpx;background: #47413B;border-radius: 50%;position: absolute;top: 144rpx;left: 64rpx;"></view>
 			<view class="title" style="width: 116px;left: 61px;top: 18px;" bindtap="toJfh">解放后-80年代</view>

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

@@ -5,8 +5,26 @@ button{
 .page{
 	background-size: 100% 100%;
 }
+.navTitle{
+	width: 100%;
+	height: 160rpx;
+	display: flex;
+	align-items: center;
+  }
+  .navTitle t-icon{
+	  width: 48rpx; 
+	  color: #333333;
+  }
+  .navTitle .title{
+	  width: 600rpx;
+	  font-size: 34rpx;
+	  font-family: PingFang SC;
+	  color: #333333;
+	  font-weight: bold;
+	  margin-left: 260rpx;
+  }
 .header{
-	height: 480rpx;
+	height: 220rpx;
 	display: flex;
 	justify-content: center;
 	align-items: center;

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

@@ -1,11 +1,14 @@
 // pages/yxnaQxn/yxnaQxn.js
+import {
+	imgUrl
+  } from "../api/request"
 Page({
 
 	/**
 	 * 页面的初始数据
 	 */
 	data: {
-
+		imgUrl: imgUrl
 	},
 	// 前往专辑界面
 	toAlbum() {
@@ -33,25 +36,30 @@ Page({
 
 	},
 	toJfq: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxnaJfq/yxnaJfq',
 		})
 	},
 	toJfh: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxnaJfh/yxnaJfh',
 		})
 	},
 	toXsj: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxna/yxna',
 		})
 	},
 	toQxn: function () {
-		wx.navigateTo({
+		wx.redirectTo({
 			url: '/pages/yxnaQxn/yxnaQxn',
 		})
 	},
+	back(){
+	  wx.navigateBack({
+		  delta: 1
+		});
+	  },
 
 	/**
 	 * 生命周期函数--监听页面显示

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

@@ -1,5 +1,8 @@
 {
 	"usingComponents": {},
 	"navigationBarTitleText": "印象南岸",
-	"navigationStyle":"custom"
+	"navigationStyle":"custom",
+	"usingComponents": {
+		"t-icon": "tdesign-miniprogram/icon/icon"
+	}
 }

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

@@ -1,14 +1,18 @@
 <!--pages/yxnaQxn/yxnaQxn.wxml-->
-<view class="page" style="background-image: url(/images/yxna-qxn.png);width: 100%;">
+<view class="page" style="background-image: url({{imgUrl}}yxna-qxn.png);width: 100%;">
+	<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="header">
-		<image src="/images/logo-qxn.png"></image>
+		<image src="{{imgUrl}}logo-qxn.png"></image>
 		<view class="button">
 			<button style="background: #E2F0FA;color: #1B3A7B;" bindtap="toEditAlbum">投稿</button>
 			<button style="background: #F5EAD1;color: #844A0C;" bindtap="toAlbum">专辑</button>
 		</view>
 	</view>
 	<view class="lineNav">
-		<view class="line" style="background-image: url(/images/line-qxn.png);">
+		<view class="line" style="background-image: url({{imgUrl}}line-qxn.png);">
 			<view class="title" style="width: 63px;left: 10px;top: 46px;" bindtap="toJfq">解放前</view>
 			<view style="width: 30rpx;height: 30rpx;background: #F4EBDB;border-radius: 50%;position: absolute;top: 146rpx;left: 64rpx;"></view>
 			<view class="title" style="width: 116px;left: 61px;top: 18px;" bindtap="toJfh">解放后-80年代</view>

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

@@ -5,8 +5,26 @@ button{
 .page{
 	background-size: 100% 100%;
 }
+.navTitle{
+	width: 100%;
+	height: 160rpx;
+	display: flex;
+	align-items: center;
+  }
+  .navTitle t-icon{
+	  width: 48rpx; 
+	  color: #fff;
+  }
+  .navTitle .title{
+	  width: 600rpx;
+	  font-size: 34rpx;
+	  font-family: PingFang SC;
+	  color: #FFFFFF;
+	  font-weight: bold;
+	  margin-left: 260rpx;
+  }
 .header{
-	height: 480rpx;
+	height: 220rpx;
 	display: flex;
 	justify-content: center;
 	align-items: center;