Kaynağa Gözat

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

sunjuan 2 yıl önce
ebeveyn
işleme
73aeced9de
14 değiştirilmiş dosya ile 97 ekleme ve 144 silme
  1. 1 1
      nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/baseAffairs/baseAffairs.js
  2. 1 1
      nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/baseAffairs/baseAffairs.wxml
  3. 1 1
      nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/fileList/file.wxml
  4. 10 2
      nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/fileList/util.wxs
  5. 0 1
      nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/governmentArticles/governmentArticles.js
  6. 13 3
      nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/governmentArticlesDetail/governmentArticlesDetail.js
  7. 1 1
      nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/governmentArticlesDetail/governmentArticlesDetail.wxml
  8. 49 45
      nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/index/index.js
  9. 10 8
      nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/index/index.wxml
  10. 1 0
      nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/index/index.wxss
  11. 5 0
      nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/interpretation/interpretation.js
  12. 4 4
      nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/interpretation/interpretation.wxml
  13. 1 74
      nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/publicLeaderDetail/publicLeaderDetail.js
  14. 0 3
      nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/publicLeaderDetail/publicLeaderDetail.wxml

+ 1 - 1
nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/baseAffairs/baseAffairs.js

@@ -15,7 +15,7 @@ Page({
     docId: '',
     url: '',
     info: '',
-    content: '各镇人民政府,各街道办事处,区级各部门,重庆经开区各部门,有关单位:   为贯彻落实《国务院办公厅关于全面推进基层政务公开标准化规范化工作的指导意见》(国办发〔2019〕54号)精神,按照《重庆市人民政府办公厅关于全面推进基层政务公开标准化规范化工作的实施意见》(渝府办发〔2020〕58号)要求,结合我区行政权力配置情况和政务公开工作实际,编制了《南岸区试点领域政务公开标准目录》,经区政府第167次常务会议审议通过,现印发给你们,请按照工作要求抓好工作,落实工作',
+    content: '',
     zdlyList: [{'icon': 'publics-base-zdly-icon-1.png', 'name': '重大建设项目', 'url': 'https://www.cqna.gov.cn/bm/qfzggw/zwgk_59968/zfxxgkml1/jczwgk/zdxm/bzml/'},{'icon': 'publics-base-zdly-icon-2.png', 'name': '公共资源交易', 'url': 'https://www.cqna.gov.cn/bm/qfzggw/zwgk_59968/zfxxgkml1/jczwgk/ggzyjy/bzml/'},
     {'icon': 'publics-base-zdly-icon-3.png', 'name': '义务教育', 'url': 'https://www.cqna.gov.cn/bm/qjw/zwgk_59968/zfxxgkml1/jczwgk4/ywjy_141404/bzml/'},{'icon': 'publics-base-zdly-icon-4.png', 'name': '户籍管理', 'url': 'https://www.cqna.gov.cn/bm/qgafj/zwgk_59968/zfxxgkml1/jczwgk4/hjgl_141408/hjgllyjczwgkbzzyml/'},
     {'icon': 'publics-base-zdly-icon-5.png', 'name': '社会救助', 'url': 'https://www.cqna.gov.cn/bm/qmzj/zwgk_59968/zfxxgkml/jczwgk/shjz_141412/bzml/'},{'icon': 'publics-base-zdly-icon-6.png', 'name': '养老服务', 'url': 'https://www.cqna.gov.cn/bm/qmzj/zwgk_59968/zfxxgkml/jczwgk/ylfw_179024/bzml_282898/'},

+ 1 - 1
nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/baseAffairs/baseAffairs.wxml

@@ -30,7 +30,7 @@
       <!-- 内容 -->
       <view style="margin-top: 22rpx;border-top: 3rpx solid #508FF4;background-color: #F4F8FF;padding: 50rpx 30rpx 52rpx 33rpx;">
         <view style="font-size: 31rpx;color: #333333;line-height: 58rpx;">
-          {{ content }}<span bindtap="goToDetail" style="margin-left: 20rpx;color: #508FF4;">详情>></span>
+          {{ content }}<span wx:if="{{content && content.length > 0}}" bindtap="goToDetail" style="margin-left: 20rpx;color: #508FF4;">详情>></span>
         </view>
       </view>
     </view>

+ 1 - 1
nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/fileList/file.wxml

@@ -9,7 +9,7 @@
 		<li style="position: relative;" wx:for-item="item" wx:for-index="index" wx:key="index" wx:for="{{fileList}}">
       <view bindtap="goTOFileDetail" data-url="{{item.DOCPUBURL}}" data-item="{{item.DOCID}}" style="font-size: 20rpx;font-weight: 600;position: absolute;top: 25rpx;">·</view>
 			<text bindtap="goTOFileDetail" data-url="{{item.DOCPUBURL}}" data-item="{{item.DOCID}}" class="title">{{item.DOCTITLE}}</text>
-			<text bindtap="goTOFileDetail" data-url="{{item.DOCPUBURL}}" data-item="{{item.DOCID}}" class="time">{{item.DOCRELTIME}}</text>
+			<text bindtap="goTOFileDetail" data-url="{{item.DOCPUBURL}}" data-item="{{item.DOCID}}" class="time">{{filter.formatTime(item.DOCRELTIME)}}</text>
 		</li>
 	</ul>
 </view>

+ 10 - 2
nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/fileList/util.wxs

@@ -6,9 +6,17 @@ var filter = {
 		} else {
 			return ''
 		}
-	}
+  },
+  formatTime: function(time) {
+    if (time && time != '') {
+			return time.slice(0,-3)
+		} else {
+			return ''
+		}
+  }
 }
 // 导出对外暴露的属性
 module.exports = {
-	formateDate: filter.formateDate
+  formateDate: filter.formateDate,
+  formatTime: filter.formatTime
 }

+ 0 - 1
nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/governmentArticles/governmentArticles.js

@@ -9,7 +9,6 @@ Page({
 	},
 	gotoDetail(e) {
 		let url = e.currentTarget.dataset.url.substring(0, e.currentTarget.dataset.url.lastIndexOf("/") + 1);
-		console.log(url);
 		wx.navigateTo({
 			url: '/pages/publics/governmentArticlesDetail/governmentArticlesDetail?channelId=' + e.currentTarget.dataset.channelid + '&docId=' + e.currentTarget.dataset.docid + '&url=' + url,
 		})

+ 13 - 3
nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/governmentArticlesDetail/governmentArticlesDetail.js

@@ -12,7 +12,8 @@ Page({
 		imgUrl: imgUrl,
 		articles: '',
 		fontSize: '中',
-		isPlay: false
+		isPlay: false,
+		isFile: true
 	},
 
 	chooseFontSize(e) {
@@ -49,6 +50,11 @@ Page({
 	 * 生命周期函数--监听页面加载
 	 */
 	onLoad(options) {
+		if (options.isFile == 'false') {
+			this.setData({
+				isFile: false
+			})
+		}
 		if (options.docId == undefined) {
 			wx.request({
 				url: 'https://data.cqna.gov.cn/mini/hlw/send?page=1&limit=1&channelId=' + options.channelId,
@@ -122,14 +128,18 @@ Page({
 	 * 生命周期函数--监听页面隐藏
 	 */
 	onHide() {
-		this.end(); //暂停音频
+		if (this.innerAudioContext) {
+			this.innerAudioContext.stop(); //暂停音频
+		}
 	},
 
 	/**
 	 * 生命周期函数--监听页面卸载
 	 */
 	onUnload() {
-		this.end(); //暂停音频
+		if (this.innerAudioContext) {
+			this.innerAudioContext.stop(); //暂停音频
+		}
 	},
 
 	/**

+ 1 - 1
nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/governmentArticlesDetail/governmentArticlesDetail.wxml

@@ -32,7 +32,7 @@
 	<view style="background: #F4F8FF;border-top: 1px solid #508FF4;margin-top: 50rpx;padding: 20rpx 20rpx;">
 		<rich-text style="font-size: 30px!important;" nodes="{{articles.DOCHTMLCON}}" />
 	</view>
-	<view>
+	<view wx:if="{{isFile}}">
 		<view style="font-size: 38rpx;font-family: PingFang SC;font-weight: bold;color: #333333;border-bottom: 1px solid #C5C5C5;padding: 70rpx 0 20rpx 0;">附件下载</view>
 		<view style="display: flex;justify-content: space-between;color: #333333;height: 150rpx;align-items: center;font-size: 30rpx;">
 			<view>1.政府信息公开申请表 .docx</view>

+ 49 - 45
nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/index/index.js

@@ -15,27 +15,7 @@ Page({
 		// 屏幕高度
 		navHeight: '',
 		// 区政府领导列表
-		leaderList: [{
-			id: '145044',
-			name: '王茂春',
-			pic: '图层 1298.png',
-			description: '区委副书记,区政府党组书记、区政府区长,重庆经开区党工委副书记(兼)'
-		}, {
-			id: '341997',
-			name: '唐昕',
-			pic: '图层 1298.png',
-			description: '区委常委,区政府党组副书记、常务副区长'
-		}, {
-			id: '341998',
-			name: '张进',
-			pic: '图层 1298.png',
-			description: '区委常委,区政府党组成员、副区长'
-		}, {
-			id: '341999',
-			name: '蒋文新',
-			pic: '图层 1298.png',
-			description: '民盟重庆市南岸区委主委,区政府副区长'
-		}],
+		leaderList: [],
 		// 政府信息公开
 		governmentInfoList: [{
 				title: '政府信息公开指南',
@@ -57,48 +37,48 @@ Page({
 		// 基层政务公开
 		baseList: [{
 				pic: 'publics-base-1.png',
-        name: '重项目建设',
-        url: 'https://www.cqna.gov.cn/bm/qfzggw/zwgk_59968/zfxxgkml1/jczwgk/zdxm/bzml/'
+				name: '重项目建设',
+				url: 'https://www.cqna.gov.cn/bm/qfzggw/zwgk_59968/zfxxgkml1/jczwgk/zdxm/bzml/'
 			},
 			{
 				pic: 'publics-base-2.png',
-        name: '公共资源交易',
-        url: 'https://www.cqna.gov.cn/bm/qfzggw/zwgk_59968/zfxxgkml1/jczwgk/ggzyjy/bzml/'
+				name: '公共资源交易',
+				url: 'https://www.cqna.gov.cn/bm/qfzggw/zwgk_59968/zfxxgkml1/jczwgk/ggzyjy/bzml/'
 			},
 			{
 				pic: 'publics-base-3.png',
-        name: '义务教育',
-        url: 'https://www.cqna.gov.cn/bm/qjw/zwgk_59968/zfxxgkml1/jczwgk4/ywjy_141404/bzml/'
+				name: '义务教育',
+				url: 'https://www.cqna.gov.cn/bm/qjw/zwgk_59968/zfxxgkml1/jczwgk4/ywjy_141404/bzml/'
 			},
 			{
 				pic: 'publics-base-4.png',
-        name: '社会救助',
-        url: 'https://www.cqna.gov.cn/bm/qmzj/zwgk_59968/zfxxgkml/jczwgk/shjz_141412/bzml/'
+				name: '社会救助',
+				url: 'https://www.cqna.gov.cn/bm/qmzj/zwgk_59968/zfxxgkml/jczwgk/shjz_141412/bzml/'
 			},
 			{
 				pic: 'publics-base-5.png',
-        name: '养老服务',
-        url: 'https://www.cqna.gov.cn/bm/qmzj/zwgk_59968/zfxxgkml/jczwgk/ylfw_179024/bzml_282898/'
+				name: '养老服务',
+				url: 'https://www.cqna.gov.cn/bm/qmzj/zwgk_59968/zfxxgkml/jczwgk/ylfw_179024/bzml_282898/'
 			},
 			{
 				pic: 'publics-base-6.png',
-        name: '公共法律服务',
-        url: 'https://www.cqna.gov.cn/bm/qsfj/zwgk_59968/zfxxgkml1/jczwgk/ggflvfwly/bzml/'
+				name: '公共法律服务',
+				url: 'https://www.cqna.gov.cn/bm/qsfj/zwgk_59968/zfxxgkml1/jczwgk/ggflvfwly/bzml/'
 			},
 			{
 				pic: 'publics-base-7.png',
-        name: '就业创业领域',
-        url: 'https://www.cqna.gov.cn/bm/qrlsbj/zwgk_59968/zfxxgkml/jczwgk/jycyly/bzml/'
+				name: '就业创业领域',
+				url: 'https://www.cqna.gov.cn/bm/qrlsbj/zwgk_59968/zfxxgkml/jczwgk/jycyly/bzml/'
 			},
 			{
 				pic: 'publics-base-8.png',
-        name: '社会保险领域',
-        url: 'https://www.cqna.gov.cn/bm/qrlsbj/zwgk_59968/zfxxgkml/jczwgk/shbxly/bzml/'
+				name: '社会保险领域',
+				url: 'https://www.cqna.gov.cn/bm/qrlsbj/zwgk_59968/zfxxgkml/jczwgk/shbxly/bzml/'
 			},
 			{
 				pic: 'publics-base-9.png',
-        name: '国土空间规划',
-        url: 'http://ghzrzyj.cq.gov.cn/zz/naq/zwgk/gtkjghlyjczwgk/'
+				name: '国土空间规划',
+				url: 'http://ghzrzyj.cq.gov.cn/zz/naq/zwgk/gtkjghlyjczwgk/'
 			}
 		],
 		// 政策文件tab
@@ -128,7 +108,26 @@ Page({
 		// 政策解读默认项
 		currentTab: 0,
 		// 政务专题
-		topics: ['图层 3269.png', '图层 3270.png', '图层 3269.png']
+		topics: [{
+				pic: 'https://www.cqna.gov.cn/zwgk_254/zwzt/348196/images/P020220520416638485836.png',
+				title: '重大行政决策公开'
+			}, {
+				pic: 'https://www.cqna.gov.cn/zwgk_254/zwzt/348190/images/P020220520422504152985.png',
+				title: '政策问答库'
+			},
+			{
+				pic: 'https://www.cqna.gov.cn/zwgk_254/zwzt/362900/images/P020220802602397615813.png',
+				title: '疫情防控'
+			},
+			{
+				pic: 'https://www.cqna.gov.cn/zwgk_254/zwzt/348203/images/P020220520419381023376.png',
+				title: '政策文件与政策解读'
+			},
+			{
+				pic: 'https://www.cqna.gov.cn/zwgk_254/zwzt/348195/images/P020220520416540661874.png',
+				title: '基层政务公开'
+			}
+		]
 	},
 
 
@@ -345,6 +344,11 @@ Page({
 	onShareAppMessage() {
 
 	},
+	gotoZCJDDetail(e) {
+		wx.navigateTo({
+			url: '/pages/publics/governmentArticlesDetail/governmentArticlesDetail?channelId=' + e.currentTarget.dataset.channelid + '&isFile=false'
+		})
+	},
 	gotoZXWDK() {
 		wx.navigateTo({
 			url: '/pages/ZCWDK/index/index',
@@ -359,13 +363,13 @@ Page({
 		wx.navigateTo({
 			url: '/pages/publics/baseAffairs/baseAffairs',
 		})
-  },
-  goToBaseAffairsDetail(e) {
-    const index = e.currentTarget.dataset.item
-    wx.navigateTo({
+	},
+	goToBaseAffairsDetail(e) {
+		const index = e.currentTarget.dataset.item
+		wx.navigateTo({
 			url: `/pages/web/web?url=${this.data.baseList[index].url}`
 		})
-  },
+	},
 	goToFileList() {
 		wx.navigateTo({
 			url: '/pages/publics/fileList/fileList',

+ 10 - 8
nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/index/index.wxml

@@ -60,7 +60,9 @@
 					<view data-item="{{index}}" style="position: absolute;top: -40rpx;width: 65rpx;height: 65rpx;">
 						<image data-item="{{index}}" style="width: 65rpx;height: 65rpx;" src="{{imgUrl + item.pic}}" mode="" />
 					</view>
-					{{item.name}}
+					<view style="padding-top: 4rpx;">
+            {{item.name}}
+          </view>
 				</view>
 			</view>
 		</view>
@@ -123,13 +125,13 @@
 					<view class="navigate-item" id="item{{index}}" wx:for="{{policyInterpretation}}" wx:key="index" data-index="{{index}}" bindtap="tabNav">
 						<view class="names">{{item.name}}</view>
 						<view class="currtline {{currentTab === index ? 'active' : ''}}" wx:if="{{currentTab === index}}"></view>
-						<view wx:if="{{ currentTab === index }}" style="position: absolute;width: 0;height: 0;border-left: 10rpx solid transparent;border-right: 10rpx solid transparent;border-top: 10rpx solid #508FF4;bottom: -5rpx;left: 40rpx;" />
+						<view wx:if="{{ currentTab === index }}" style="position: absolute;width: 0;height: 0;border-left: 10rpx solid transparent;border-right: 10rpx solid transparent;border-top: 10rpx solid #508FF4;bottom: -5rpx;left: 45rpx;" />
 					</view>
 				</scroll-view>
-				<swiper current="{{currentTab}}" bindchange="handleSwiper" autoplay="{{false}}" style="padding: 0 10px;margin-top: 15rpx;height: 320rpx;">
+				<swiper current="{{currentTab}}" bindchange="handleSwiper" autoplay="{{false}}" style="padding: 0 10px;margin-top: 0rpx;height: 320rpx;">
 					<!-- 文字解读 -->
 					<swiper-item>
-						<view wx:key="index" wx:for="{{textInterpretationList}}" style="display: flex;align-items: center;justify-content: space-between;flex-wrap: wrap;height: 107rpx;font-size: 28rpx;color: #666666;width: 639rpx;margin-left: 23rpx;border-bottom: 2rpx solid #CCCCCC;">
+						<view bindtap="gotoZCJDDetail" data-channelid="{{item.CHNLID}}" wx:key="index" wx:for="{{textInterpretationList}}" style="display: flex;align-items: center;justify-content: space-between;flex-wrap: wrap;height: 107rpx;font-size: 28rpx;color: #666666;width: 639rpx;margin-left: 23rpx;border-bottom: 2rpx solid #CCCCCC;">
 							<view class="limit-text-1" style="width: 500rpx">{{item.DOCTITLE}}</view>
 							<view>{{filter.formateDate(item.DOCPUBTIME)}}</view>
 						</view>
@@ -137,7 +139,7 @@
 					<!-- 图片解读 -->
 					<swiper-item>
 						<view style="display: flex;justify-content: space-between;">
-							<view style="width: 327rpx;" wx:for="{{pictureInterpretationList}}" wx:key="index">
+							<view style="width: 327rpx;" bindtap="gotoZCJDDetail" data-channelid="{{item.CHNLID}}" wx:for="{{pictureInterpretationList}}" wx:key="index">
 								<image src="{{imgUrl}}图层 3261.png" style="width: 327rpx;height: 227rpx;"></image>
 								<view style="font-size: 20rpx;font-family: PingFang SC;color: #666666;">{{item.DOCTITLE}}</view>
 							</view>
@@ -146,7 +148,7 @@
 					<!-- 视频解读 -->
 					<swiper-item>
 						<view style="display: flex;justify-content: space-between;">
-							<view style="width: 327rpx;" wx:for="{{videoInterpretationList}}" wx:key="index">
+							<view style="width: 327rpx;" bindtap="gotoZCJDDetail" data-channelid="{{item.CHNLID}}" wx:for="{{videoInterpretationList}}" wx:key="index">
 								<image src="{{imgUrl}}图层 3261.png" style="width: 327rpx;height: 227rpx;"></image>
 								<view style="font-size: 20rpx;font-family: PingFang SC;color: #666666;">{{item.DOCTITLE}}</view>
 							</view>
@@ -154,7 +156,7 @@
 					</swiper-item>
 					<!-- 媒体解读 -->
 					<swiper-item>
-						<view wx:key="index" wx:for="{{mediaInterpretationList}}" style="display: flex;align-items: center;justify-content: space-between;flex-wrap: wrap;height: 107rpx;font-size: 28rpx;color: #666666;width: 639rpx;margin-left: 23rpx;border-bottom: 2rpx solid #CCCCCC;">
+						<view bindtap="gotoZCJDDetail" data-channelid="{{item.CHNLID}}" wx:key="index" wx:for="{{mediaInterpretationList}}" style="display: flex;align-items: center;justify-content: space-between;flex-wrap: wrap;height: 107rpx;font-size: 28rpx;color: #666666;width: 639rpx;margin-left: 23rpx;border-bottom: 2rpx solid #CCCCCC;">
 							<view class="limit-text-1" style="width: 500rpx">{{item.DOCTITLE}}</view>
 							<view>{{filter.formateDate(item.DOCPUBTIME)}}</view>
 						</view>
@@ -172,7 +174,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}}" bindtap="gotoZXWDK" style="width: 327rpx;height: 227rpx;"></image>
+						<image src="{{item.pic}}" bindtap="gotoZXWDK" style="width: 327rpx;height: 227rpx;border-radius: 12rpx;"></image>
 					</swiper-item>
 				</block>
 			</swiper>

+ 1 - 0
nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/index/index.wxss

@@ -186,5 +186,6 @@
 /* 滑动块 */
 .currtline.active {
   background: #508FF4;
+  height: 7rpx;
   transition: all .3s;
 }

+ 5 - 0
nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/interpretation/interpretation.js

@@ -85,6 +85,11 @@ Page({
 			}
 		})
 	},
+	gotoDetail(e) {
+		wx.navigateTo({
+			url: '/pages/publics/governmentArticlesDetail/governmentArticlesDetail?channelId=' + e.currentTarget.dataset.channelid + '&isFile=false'
+		})
+	},
 	// 触底
 	scrollBottom(e) {
 		this.setData({

+ 4 - 4
nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/interpretation/interpretation.wxml

@@ -11,7 +11,7 @@
 		<!-- 文字解读 -->
 		<swiper-item>
 			<scroll-view scroll-y="true" style="height: 100%;padding:0;margin:0;" bindscrolltolower="scrollBottom">
-				<view wx:for-item="item" wx:for-index="index" wx:key="index" wx:for="{{interpretationListInfo}}" style="display: flex;align-items: center;justify-content: space-between;flex-wrap: wrap;height: 120rpx;font-size: 28rpx;color: #666666;width: 700rpx;margin-left: 23rpx;border-bottom: 2rpx solid #CCCCCC;">
+				<view bindtap="gotoDetail" data-channelid="{{item.CHNLID}}" wx:for-item="item" wx:for-index="index" wx:key="index" wx:for="{{interpretationListInfo}}" style="display: flex;align-items: center;justify-content: space-between;flex-wrap: wrap;height: 120rpx;font-size: 28rpx;color: #666666;width: 700rpx;margin-left: 23rpx;border-bottom: 2rpx solid #CCCCCC;">
 					<view class="limit-text-1" style="width: 600rpx;-webkit-line-clamp:2;overflow:hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-box-orient:vertical;">{{item.DOCTITLE}}</view>
 					<view>{{filter.formateDate(item.DOCPUBTIME)}}</view>
 				</view>
@@ -21,7 +21,7 @@
 		<swiper-item>
 			<scroll-view scroll-y="true" style="height: 100%;padding:0;margin:0;" bindscrolltolower="scrollBottom">
 				<view style="display: flex;justify-content: space-around;flex-wrap: wrap;">
-					<view style="width: 327rpx;" wx:for="{{interpretationListInfo}}" wx:key="index">
+					<view bindtap="gotoDetail" data-channelid="{{item.CHNLID}}" style="width: 327rpx;" wx:for="{{interpretationListInfo}}" wx:key="index">
 						<image src="{{imgUrl}}图层 3261.png" style="width: 327rpx;height: 227rpx;"></image>
 						<view style="font-size: 25rpx;font-family: PingFang SC;color: #666666;-webkit-line-clamp:2;overflow:hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-box-orient:vertical;">{{item.DOCTITLE}}</view>
 					</view>
@@ -32,7 +32,7 @@
 		<swiper-item>
 			<scroll-view scroll-y="true" style="height: 100%;padding:0;margin:0;" bindscrolltolower="scrollBottom">
 				<view style="display: flex;justify-content: space-around;flex-wrap: wrap;">
-					<view style="width: 327rpx;" wx:for="{{interpretationListInfo}}" wx:key="index">
+					<view bindtap="gotoDetail" data-channelid="{{item.CHNLID}}" style="width: 327rpx;" wx:for="{{interpretationListInfo}}" wx:key="index">
 						<image src="{{imgUrl}}图层 3261.png" style="width: 327rpx;height: 227rpx;"></image>
 						<view style="font-size: 25rpx;font-family: PingFang SC;color: #666666;-webkit-line-clamp:2;overflow:hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-box-orient:vertical;">{{item.DOCTITLE}}</view>
 					</view>
@@ -42,7 +42,7 @@
 		<!-- 媒体解读 -->
 		<swiper-item>
 			<scroll-view scroll-y="true" style="height: 100%;padding:0;margin:0;" bindscrolltolower="scrollBottom">
-				<view wx:for-item="item" wx:for-index="index" wx:key="index" wx:for="{{interpretationListInfo}}" style="display: flex;align-items: center;justify-content: space-between;flex-wrap: wrap;height: 120rpx;font-size: 28rpx;color: #666666;width: 700rpx;margin-left: 23rpx;border-bottom: 2rpx solid #CCCCCC;">
+				<view bindtap="gotoDetail" data-channelid="{{item.CHNLID}}" wx:for-item="item" wx:for-index="index" wx:key="index" wx:for="{{interpretationListInfo}}" style="display: flex;align-items: center;justify-content: space-between;flex-wrap: wrap;height: 120rpx;font-size: 28rpx;color: #666666;width: 700rpx;margin-left: 23rpx;border-bottom: 2rpx solid #CCCCCC;">
 					<view class="limit-text-1" style="width: 600rpx;-webkit-line-clamp:2;overflow:hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-box-orient:vertical;">{{item.DOCTITLE}}</view>
 					<view>{{filter.formateDate(item.DOCPUBTIME)}}</view>
 				</view>

+ 1 - 74
nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/publicLeaderDetail/publicLeaderDetail.js

@@ -10,80 +10,7 @@ Page({
 	 */
 	data: {
 		imgUrl: imgUrl,
-		leaderList: [{
-			channelId: '145044',
-			docId: '8852125',
-			name: '王茂春',
-			pic: '图层 1298.png',
-			description: '区委副书记,区政府党组书记、区政府区长,重庆经开区党工委副书记(兼)'
-		}, {
-			channelId: '341997',
-			docId: '10298243',
-			name: '唐昕',
-			pic: '图层 1298.png',
-			description: '区委常委,区政府党组副书记、常务副区长'
-		}, {
-			channelId: '341998',
-			docId: '10298370',
-			name: '张进',
-			pic: '图层 1298.png',
-			description: '区委常委,区政府党组成员、副区长'
-		}, {
-			channelId: '341999',
-			docId: '10298390',
-			name: '蒋文新',
-			pic: '图层 1298.png',
-			description: '民盟重庆市南岸区委主委,区政府副区长'
-		}, {
-			channelId: '342000',
-			docId: '10298402',
-			name: '游泳',
-			docId: '10298402',
-			pic: '图层 1298.png',
-			description: '区政府党组成员、副区长'
-		}, {
-			channelId: '342002',
-			docId: '10298423',
-			name: '刘露',
-			pic: '图层 1298.png',
-			description: '区政府党组成员、副区长'
-		}, {
-			channelId: '342003',
-			docId: '10298429',
-			name: '张超林',
-			pic: '图层 1298.png',
-			description: '区政府党组成员、副区长'
-		}, {
-			channelId: '342004',
-			docId: '10298447',
-			name: '杨建',
-			pic: '图层 1298.png',
-			description: '区政府党组成员、副区长,区公安分局党委书记、局长、督察长(兼)'
-		}, {
-			channelId: '342005',
-			docId: '10298487',
-			name: '石少林',
-			pic: '图层 1298.png',
-			description: '区政府党组成员、副区长'
-		}, {
-			channelId: '344559',
-			docId: '10381074',
-			name: '张炎',
-			pic: '图层 1298.png',
-			description: '区政府党组成员,中国信息通信研究院西部分院(重庆信息通信研究院)院长'
-		}, {
-			channelId: '145052',
-			docId: '10298498',
-			name: '陈炯',
-			pic: '图层 1298.png',
-			description: '区政府一级巡视员'
-		}, {
-			channelId: '145046',
-			docId: '10298513',
-			name: '莫裕全',
-			pic: '图层 1298.png',
-			description: '民进重庆市委副主委,区政府一级巡视员'
-		}],
+		leaderList: [],
 	},
 
 	onLoad(options) {

+ 0 - 3
nngkxxdp/src/main/resources/static/nnzwminiapp/pages/publics/publicLeaderDetail/publicLeaderDetail.wxml

@@ -2,13 +2,10 @@
     <!-- item -->
     <view bindtap="gotoInfo" data-item="{{item}}" wx:for="{{ leaderList }}" wx:for-item="item" wx:for-index="index" wx:key="index" style="margin-left: 32rpx;margin-top: 31rpx;height: 225rpx;width: 688rpx;display: flex;background-color: #ffffff;">
       <view style="width: 187rpx;height: 100%;display: flex;align-items: center;justify-content: center;">
-        <!-- <image style="width: 147rpx;height: 184rpx" src="{{imgUrl}}{{item.pic}}" mode="" /> -->
         <image style="width: 147rpx;height: 184rpx" src="{{item.DOCPUBURL}}{{item.LDTX[0].APPFILE}}" mode="" />
       </view>
       <view>
         <view style="padding-left: 10rpx;display: flex;flex-direction: column;justify-content: center;">
-          <!-- <view style="font-size: 33rpx;font-weight: 600;padding: 19rpx 0;">{{item.name}}</view>
-          <view class="limit-text-2" style="width: 461rpx;font-size: 27rpx;color: #999999;line-height: 29rpx;">{{item.description}}</view> -->
           <view style="font-size: 33rpx;font-weight: 600;padding: 19rpx 0;">{{item.CHNLIDNAME}}</view>
           <view class="limit-text-2" style="width: 461rpx;font-size: 27rpx;color: #999999;line-height: 29rpx;">{{item.DRZW}}</view>
         </view>