1

nnzwminiapp/pages/articlDetail/articlDetail.wxml

@@ -10,4 +10,5 @@
     <view class="content">
         <rich-text nodes="{{data.DOCHTMLCON}}"></rich-text>
     </view>
+	
 </view>

nnzwminiapp/pages/aticleList/aticleList.wxml

@@ -3,9 +3,9 @@
 <view style="margin-top: 0rpx;padding: 0rpx 30rpx;">
 	<ul class="list" wx:if="{{!empty}}">
 		<li style="position: relative;" wx:for-item="item" wx:for-index="index" wx:key="index" wx:for="{{aclist}}">
-      <view bindtap="next_calculator" data-item="{{ item }}" style="font-size: 20rpx;font-weight: 600;position: absolute;top: 25rpx;">·</view>
+      	<view bindtap="next_calculator" data-item="{{ item }}" style="font-size: 20rpx;font-weight: 600;position: absolute;top: 25rpx;">·</view>
 			<text bindtap="next_calculator" data-item="{{ item }}" class="title">{{item.DOCTITLE}}</text>
-			<text bindtap="next_calculator" data-item="{{ item }}" class="time">{{ item.DOCPUBTIME }}</text>
+			<text bindtap="next_calculator" data-item="{{ item }}" class="time">{{ item.DOCRELTIME }}</text>
 		</li>
 	</ul>
 	<view wx:if="{{empty && !isLoading}}" style="height: 90vh;display: flex;align-items: center;justify-content: center;">

nnzwminiapp/pages/index/index.js

@@ -1,5 +1,6 @@
 // index.js
 import {
+	baseUrl,
 	login
 } from "../api/request";
 
@@ -301,7 +302,7 @@ Page({
 				name: "南岸发布",
 				img: imgUrl + 'index-media-icon3.png',
 				ewm: "index_ewm_logo_3.jpg",
-				url: "https://mp.weixin.qq.com/s/Sm2AFbQsMgld1ey0_tiDwA"
+				url: "https://mp.weixin.qq.com/s/OzsayBZ6119Hz95PS8639w"
 			},
 			// {
 			// 	id: '4',
@@ -317,20 +318,20 @@ Page({
 			// 	ewm: "index_ewm_logo_5.png",
 			// 	url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			// },
-			// {
-			// 	id: '6',
-			// 	name: "南岸生态环境",
-			// 	img: imgUrl + 'index-media-icon6.png',
-			// 	ewm: "index_ewm_logo_6.png",
-			// 	url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
-			// },
-			// {
-			// 	id: '7',
-			// 	name: "南岸健康卫士",
-			// 	img: imgUrl + 'index-media-icon7.png',
-			// 	ewm: "index_ewm_logo_7.png",
-			// 	url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
-			// },
+			{
+				id: '6',
+				name: "南岸生态环境",
+				img: imgUrl + 'index-media-icon6.png',
+				ewm: "index_ewm_logo_6.png",
+				url: "https://mp.weixin.qq.com/s/8CwAWCtnln_cZnR_Tu86Zw"
+			},
+			{
+				id: '7',
+				name: "南岸健康卫士",
+				img: imgUrl + 'index-media-icon7.png',
+				ewm: "index_ewm_logo_7.png",
+				url: "https://mp.weixin.qq.com/s/ROeHlQixd_i1rQbNOPxEtQ"
+			},
 			// {
 			// 	id: '8',
 			// 	name: "南岸公安",
@@ -345,13 +346,13 @@ Page({
 			// 	ewm: "index_ewm_logo_9.png",
 			// 	url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			// },
-			// {
-			// 	id: '10',
-			// 	name: "书香南岸",
-			// 	img: imgUrl + 'index-media-icon10.png',
-			// 	ewm: "index_ewm_logo_10.png",
-			// 	url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
-			// },
+			{
+				id: '10',
+				name: "书香南岸",
+				img: imgUrl + 'index-media-icon10.png',
+				ewm: "index_ewm_logo_10.png",
+				url: "https://mp.weixin.qq.com/s/_NrIUpj6evRJWrBjkcMrKw"
+			},
 			// // {
 			// // 	id: '11',
 			// // 	name: "南岸卫生健康监督",
@@ -379,20 +380,20 @@ Page({
 			// 	ewm: "index_ewm_logo_15.jpg",
 			// 	url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
 			// },
-			// {
-			// 	id: '15',
-			// 	name: "南岸健康",
-			// 	img: imgUrl + 'index-media-icon18.png',
-			// 	ewm: "index_ewm_logo_18.jpg",
-			// 	url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
-			// },
-			// {
-			// 	id: '16',
-			// 	name: "重庆市南岸区天文街道",
-			// 	img: imgUrl + 'index-media-icon17.png',
-			// 	ewm: "index_ewm_logo_17.png",
-			// 	url: "https://mp.weixin.qq.com/s/yJXxRe_xcTEIVIrtQIulRQ"
-			// },
+			{
+				id: '15',
+				name: "南岸健康",
+				img: imgUrl + 'index-media-icon18.png',
+				ewm: "index_ewm_logo_18.jpg",
+				url: "https://mp.weixin.qq.com/s/w_qy31i6eIEqTgQu96hHhg"
+			},
+			{
+				id: '16',
+				name: "重庆市南岸区天文街道",
+				img: imgUrl + 'index-media-icon17.png',
+				ewm: "index_ewm_logo_17.png",
+				url: "https://mp.weixin.qq.com/s/vh9mq-nZ0llbA82-_DqaTA"
+			},
 			// {
 			// 	id: '17',
 			// 	name: "南岸智慧城管",
@@ -418,7 +419,8 @@ Page({
 		// 媒体矩阵南岸发布
 		mediaReleaseList: [],
 		// 媒体矩阵今日头条
-		mediaHeadlineList: []
+		mediaHeadlineList: [],
+		swiperList: []
 	},
 	onReady() {},
 	onShow() {
@@ -635,6 +637,7 @@ Page({
 		//     }
 		//   }
 		// })
+		this.loadyxna()
 	},
 
 	// canvas转图片
@@ -1542,15 +1545,37 @@ Page({
 	 */
 	onShareAppMessage() {
 		return {
-      title: '',
-      path:"/pages/index/index",
-      imageUrl:"./images/WechatIMG18.jpg"
+			title: ' ',
+			path: "/pages/index/index",
+			imageUrl: imgUrl + "/index_share.jpg"
 		}
 	},
-	onShareTimeline(){
+	onShareTimeline() {
 		return {
-			title: '首页'
+			title: ' ',
+			path: "/pages/index/index",
+			imageUrl: imgUrl + "/index_share.jpg"
 		}
+	},
+	loadyxna(){
+		wx.request({
+			url: 'https://data.cqna.gov.cn/mini/hlw/send?page=1&limit=4&channelId=370523',
+			method: 'GET',
+			success: res => {
+				
+				let iamges = []
+				for (let i = 0; i < res.data.data.DATA.length; i++) {
+					// 截取logo图片
+					let url = res.data.data.DATA[i].DOCPUBURL.substring(0, res.data.data.DATA[i].DOCPUBURL.lastIndexOf("/") + 1)
+					let logo = res.data.data.DATA[i].LOGOURL.substring(res.data.data.DATA[i].LOGOURL.lastIndexOf("FileName=") + "fileName=".length)
+					
+					iamges.push({url:url + logo,title:res.data.data.DATA[i].DOCTITLE,docpuburl:res.data.data.DATA[i].DOCPUBURL})
+				}
+				this.setData({
+					swiperList:iamges
+				})
+			}
+		})
 	}
 
 })

nnzwminiapp/pages/index/index.wxml

@@ -108,10 +108,10 @@
 					<view>信息公开</view>
 				</view>
 				<view class="list">
-					<view class="nav" bindtap="gotozcwj"  style="background-image: url({{imgUrl}}csyjhsbanner.png);color: #25256d;">政策文件</view>
-					<view class="nav" bindtap="gotozcjd" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp" style="background-image: url({{imgUrl}}yjsycb-gjj.png);color: #1C61CE;">政策解读</view>
-					<view class="nav" bindtap="gotojgzl" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp" style="background-image: url({{imgUrl}}yjsycb-shtt.png);color: #A6741E;">机构指南</view>
-					<view class="nav" bindtap="gotozcwdk" data-url="http://tysb.cqgxqzwzx.com:17070/appWB/#/home/500108/null/1/ykbApp" style="background-image: url({{imgUrl}}yjsycb-jjh.png);color: #DC5C0F;">政策问答库</view>
+					<view class="nav" bindtap="gotozcwj"  style="background-image: url({{imgUrl}}zcwj-bg.jpg);color: #2c6bcf;">政策文件</view>
+					<view class="nav" bindtap="gotozcjd"  style="background-image: url({{imgUrl}}zcjd-bg.jpg);color: #424293;">政策解读</view>
+					<view class="nav" bindtap="gotojgzl"  style="background-image: url({{imgUrl}}jgzn-bg.jpg);color: #b87e1b;">机构指南</view>
+					<view class="nav" bindtap="gotozcwdk" style="background-image: url({{imgUrl}}zcwdk-bg.jpg);color:#17978c;">政策问答库</view>
 				</view>
 			</view>
 		<!-- 视频推荐 -->
@@ -542,7 +542,7 @@
 		<!-- 南岸报 -->
 
 		<!-- 印象南岸 -->
-		<view style="height: 270rpx;width: 100%;position:relative;margin-top: 30rpx;">
+		<view style="height: 460rpx;width: 100%;position:relative;margin-top: 30rpx;">
 			<view style="margin-left: 20rpx;border-radius: 20rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
 				<!-- 标题 -->
 				<view style="  display: flex;justify-content: left;align-items: center;height: 60rpx;">
@@ -569,6 +569,9 @@
 						</view>
 					</view>
 					<!-- header -->
+					<view class="photolist">
+						<image wx:for="{{swiperList}}" wx:key="index" data-item ="{{item}}" class="photo" src="{{item.url}}"/>
+					</view>
 					<!-- <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;">

nnzwminiapp/pages/index/index.wxss

@@ -633,4 +633,25 @@ scroll-view ::-webkit-scrollbar {
     font-size: 30rpx;
     font-weight: 500;
     margin-right: 20rpx;
+}
+.photolist{
+    height: 89px;
+    /*段落中文本不换行*/
+    white-space: nowrap;
+    /*设置横向滚动*/
+    overflow-x: auto;
+	/* display: none; */
+}
+.photo{
+	border-radius: 10rpx;
+	width: 272rpx;
+    height: 89px;
+    display: inline-block;
+    background-size: 100% 100%;
+    /* padding: 24rpx 20rpx; */
+    box-sizing: border-box;
+    font-size: 30rpx;
+    font-weight: 500;
+    margin-right: 20rpx;
+
 }

nnzwminiapp/pages/nnzzd/nnzzd-item.wxml

@@ -1,12 +1,17 @@
-<view>
+<view style="margin-top: -40rpx">
     <scroll-view class="item-he" scroll-y>
         <view class="item-main" bindtap="tourl" data-item="{{item.linkUrl}}"   wx:for="{{eventDataList}}" wx:key="index">
             <view class="item-right">
-                <view class="item-title" style="background-image: url('{{imgUrl}}nnzzditemtitle.png');">{{item.eventTitle}}</view>
+                <view class="item-title" >
+                    <view class="item-title-line"></view>
+                    <view class="item-title-text">{{item.eventTitle}}</view>
+                    <view class="item-title-time">{{item.createTime}}</view>
+                </view>
+                <view  class="item-line"></view>
                 <view class="item-c">
                     <view class="item-context">
                         <view class="itemitme" wx:for="{{item.templateContent}}" wx:for-index="dateIndex" wx:for-item="dateItem">
-                            <view class="key">{{dateItem.label}}</view>
+                            <view class="key">{{dateItem.label}}:</view>
                             <text  class="value">{{dateItem.value}}</text>
                         </view>
                         

nnzwminiapp/pages/nnzzd/nnzzd.js

@@ -27,6 +27,7 @@ Page({
       let a = []
         res.data.forEach(element => {
           element.templateContent =  JSON.parse(element.templateContent)
+          element.createTime = element.createTime.split(' ')[0]
           a.push(element)
        }); 
       this.setData({

nnzwminiapp/pages/nnzzd/nnzzd.wxml

@@ -1,5 +1,5 @@
 <!--pages/nnzzd/nnzzd.wxml-->
-<view style="height: 1972rpx;">
+<view style="height: 1720rpx;">
     <view class="title" style="background-image: url('{{imgUrl}}nnzzditembg.png');">
         <view class="titleTitle">
         </view>
@@ -17,7 +17,7 @@
         <view class="dy" bindtap="dy"></view>
         <view class="dyrs"><view class="dysl1">已订阅人数</view><view class="dys2">{{dyrs}}↑</view></view>
     </view>
-    <view class="news" style="background-image: url('{{imgUrl}}nnzzdtitlebg.png'); margin-top: -102rpx;">
+    <view class="news" style="background-image: url('{{imgUrl}}nnzzdtitlebg.png')">
         <view class="newsbg">
 
             <include src="nnzzd-item.wxml"/>

nnzwminiapp/pages/nnzzd/nnzzd.wxss

@@ -1,17 +1,19 @@
 /* pages/nnzzd/nnzzd.wxss */
 .title{
     width: 100%;
-    height: 900rpx;
+    height: 561rpx;
     
     background-size: contain;
     background-repeat: no-repeat;
     padding-top: 60rpx;
+    position: inherit;
 }
 .news{
     width: 100%;
     height: 1120rpx;
     background-size: contain;
     background-repeat: no-repeat;
+    position: absolute;
 }
 .newsbg{
     width: 86.5%;
@@ -23,10 +25,10 @@
 .titleTitle{
     background-image: url(https://img1.imgtp.com/2023/07/12/9nTrRBU3.png);
     width: 450rpx;
-    height: 100rpx;
+    height: 90rpx;
     background-size: contain;
     background-repeat: no-repeat;
-    margin: 0 auto 0;
+    margin: 200rpx auto 0;
 }
 .tips{
     width: 60%;
@@ -71,12 +73,12 @@
     background-image: url(https://img1.imgtp.com/2023/07/12/35zNfCJb.png);
     background-size: contain;
     background-repeat: no-repeat;
-    margin: 30rpx auto 0;
+    margin: 0 auto 0;
 }
 .dyrs{
     width: 600rpx;
     height: 50rpx;
-    margin: 30rpx auto 0;
+    margin: 0 auto 0;
     font-size: 30rpx;
     text-align: center;
     color: #fff;
@@ -115,29 +117,67 @@
     /* background-color: #d1ddf8; */
 }
 .item-title{
-    width: 525rpx;
-    height: 65rpx;
-    margin: 0 auto;
+    /* width: 525rpx; */
+    
+    height: 80rpx;
+    margin: 10rpx auto 0;
     text-align: center;
-    color: #fff;
+    /* color: #fff; */
+    background: #fff;
     font-weight: bold;
     background-size: contain;
     background-repeat: no-repeat;
-    margin-bottom: 12rpx;
+    border-radius: 10rpx;
 
 }
 .item-right{
+    background: #fff;
+    border-radius: 10rpx;
     width: 90%;
     /* min-height: 334rpx; */
     margin: 0 auto 40rpx;
     
 }
+.item-line{
+    width: 100%;
+    margin: 0 auto;
+    height: 1px;
+    background: #e5e5e5;
+}
+.item-title-line{
+    width:2%;
+    height:40rpx;
+    float: left;
+    background: #2475e0;
+    border-radius: 10rpx;
+    margin: 20rpx 20rpx 0 20rpx;
+}
+.item-title-text{
+    width: 60%;
+    height: 80rpx;
+    line-height: 80rpx;
+    float: left;
+    text-align: left;
+    white-space: nowrap;  
+    text-overflow:ellipsis; 
+    overflow:hidden;
+}
+.item-title-time{
+    width: 30%;
+    height: 80rpx;
+    line-height: 80rpx;
+    font-size: 26rpx;
+    float: left;
+    color: #7f7f7f;
+    text-align: right;
+}
 .item-c{
     width: 100%;
     /* border-radius: 10rpx; */
     min-height: 334rpx;
     background: #fff;
     padding-top: 20rpx;
+    border-radius: 10rpx;
 }
 .item-context{
     width: 93%;
@@ -152,9 +192,13 @@
 .key{
     width: 30%;
     float: left;
+    color: #7f7f7f;
+    margin-left: 10rpx;
 }
 
 .value{
-    width: 70%;
+    width: 65%;
     float: left;
+    color: #383838;
+    font-weight: bold;
 }