elis преди 1 година
родител
ревизия
3181ce1436

+ 14 - 4
nnzwminiapp/pages/publics/governmentArticlesDetail/governmentArticlesDetail.js

@@ -23,7 +23,8 @@ Page({
 		// 文件路径前缀
 		fileUrlPrefix: '',
 		// 文件列表
-		fileList: []
+		fileList: [],
+		zcyw: [],
 	},
 
 	chooseFontSize(e) {
@@ -86,10 +87,12 @@ Page({
 					res.data.data.DOCHTMLCON = res.data.data.DOCHTMLCON.replace(/src="[^"]+"/gi, 'style="width:' + this.data.windowsWidth + '" src="' + options.url + res.data.data.THUMBFILES + '"');
 					// 替换特定图片宽度样式
 					res.data.data.DOCHTMLCON = res.data.data.DOCHTMLCON.replace('style="width:600px;"', 'style="width:' + this.data.windowsWidth + '"')
+					console.log(res.data.data);
 					this.setData({
 						fileUrlPrefix: options.url,
 						articles: res.data.data,
-						fileList: res.data.data.DOCATTACHFILEFIELD
+						fileList: res.data.data.DOCATTACHFILEFIELD,
+						zcyw:res.data.data.ZCYW
 					})
 				}
 			})
@@ -132,9 +135,11 @@ Page({
 							} else {
 								this.getAhrefs(res1.data.data.DOCHTMLCON);
 							}
+							console.log(res1.data.data);
 							this.setData({
 								fileUrlPrefix: url,
-								articles: res1.data.data
+								articles: res1.data.data,
+								zcyw:res1.data.data.ZCYW
 							})
 						}
 					})
@@ -169,9 +174,11 @@ Page({
 					} else {
 						this.getAhrefs(res.data.data.DOCHTMLCON);
 					}
+					console.log(res.data.data);
 					this.setData({
 						fileUrlPrefix: options.url,
-						articles: res.data.data
+						articles: res.data.data,
+						zcyw:res.data.data.ZCYW
 					})
 				}
 			})
@@ -282,5 +289,8 @@ Page({
 		return {
 			title: this.data.articles.DOCTITLE
 		};
+	},
+	goDetail(){
+
 	}
 })

+ 9 - 0
nnzwminiapp/pages/publics/governmentArticlesDetail/governmentArticlesDetail.wxml

@@ -41,4 +41,13 @@
 			<view bindtap="downloadFile" data-url="{{item.APPFILE}}" style="width: 151rpx;height: 50rpx;border: 1px solid #C5C5C5;border-radius: 4px;background: #FFFFFF;text-align: center;line-height: 50rpx;">下载</view>
 		</view>
 	</view>
+	<view wx:if="{{zcyw.length>0}}" class="zcyw">
+		<view class="zcyw-title">政策原文:</view>
+		<view class="zcyw-content">
+			<view wx:for="{{zcyw}}" wx:key="index" class="zcyw-item" bindtap="goDetail" data-id="{{item.DOCID}}">
+				<view class="zcyw-item-title">{{index+1}}.{{item.DOCTITLE}}</view>
+			</view>
+		</view>
+	</view>
+	<view style="height:50rpx"></view>
 </view>

+ 21 - 0
nnzwminiapp/pages/publics/governmentArticlesDetail/governmentArticlesDetail.wxss

@@ -16,4 +16,25 @@
 .fontSizeSmall {
 	font-size: 12px!important;
 	line-height: normal;
+}
+.zcyw{
+	width: 90%;
+	min-height: 250rpx;
+	margin: 0 auto;
+	margin-top: 30rpx;
+	margin-bottom: 40rpx;
+}
+.zcyw-title{
+	border: 1rpx red solid;
+	width: 100%;
+	height: 80rpx;
+	line-height: 80rpx;
+
+	color: red;
+	font-weight: bold;
+}
+.zcyw-content{
+	border: 1rpx red solid;
+	width: 100%;
+	min-height: 200rpx;
 }

+ 6 - 0
nnzwminiapp/pages/publics/index/index.js

@@ -374,6 +374,12 @@ Page({
 			currentTab
 		})
 	},
+	gotospjd(e) {
+		// console.log(e);
+			wx.navigateTo({
+				url: '/pages/web/web?url=' + e.currentTarget.dataset.url
+			})
+		},
 	// 滑动政策解读
 	handleSwiper(e) {
 		let {

+ 6 - 5
nnzwminiapp/pages/publics/index/index.wxml

@@ -59,7 +59,7 @@
 				<view class="content-more" bindtap="goToBaseAffairs">查看更多 >></view>
 			</view>
 			<view style="padding: 0 8rpx 20rpx 8rpx;background-color: #ffffff;width: 690rpx;margin-left: 30rpx;display: flex;flex-wrap:wrap;justify-content: space-between;">
-				<view data-item="{{index}}" bindtap="goToBaseAffairsDetail" wx:for="{{baseList}}" wx:for-index="index" wx:for-item="item" wx:key="index" style="position: relative;margin-top: 60rpx;color: #ffffff;font-size: 32rpx;width: 207rpx;height: 94rpx;background-color: #889FFF;border-radius: 8rpx;border: 1rpx solid #4547FF;display: flex;align-items: center;justify-content: center;">
+				<view data-item="{{index}}" bindtap="goToBaseAffairsDetail" wx:for="{{baseList}}" wx:for-index="index" wx:for-item="item" wx:key="index" style="position: relative;margin-top: 60rpx;color: #ffffff;font-size: 32rpx;width: 207rpx;height: 94rpx;background-color: #96c3f5;border-radius: 8rpx;display: flex;align-items: center;justify-content: center;">
 					<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>
@@ -146,7 +146,8 @@
 						<view wx:if="{{isZCJDLoading}}" style="display: flex;justify-content: center;align-items: center;height: 100%;">
 							<t-loading theme="spinner" size="64rpx" text="加载中..." inheritColor></t-loading>
 						</view>
-						<view wx:if="{{!isZCJDLoading}}" bindtap="gotoZCJDDetail" data-docid="{{item.DOCID}}" 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 wx:if="{{!isZCJDLoading}}" bindtap="gotospjd" data-url="{{item.DOCPUBURL}}"  data-docid="{{item.DOCID}}" 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;">
+							<!-- bindtap="gotoZCJDDetail" -->
 							<view class="limit-text-1" style="width: 500rpx">{{item.DOCTITLE}}</view>
 							<view>{{filter.formateDate(item.DOCRELTIME)}}</view>
 						</view>
@@ -157,8 +158,8 @@
 							<t-loading theme="spinner" size="64rpx" text="加载中..." inheritColor></t-loading>
 						</view>
 						<view wx:if="{{!isZCJDLoading}}" style="display: flex;justify-content: space-between;">
-							<view style="width: 327rpx;" bindtap="gotoZCJDDetailByDocId" data-url="{{item.DOCPUBURL}}" data-docid="{{item.DOCID}}" data-channelid="{{item.CHNLID}}" wx:for="{{pictureInterpretationList}}" wx:key="index">
-								<!-- <image src="{{item.logoImg}}" style="width: 327rpx;height: 185rpx;"></image> -->
+							<view style="width: 327rpx;" bindtap="gotospjd" data-url="{{item.DOCPUBURL}}"  data-url="{{item.DOCPUBURL}}" data-docid="{{item.DOCID}}" data-channelid="{{item.CHNLID}}" wx:for="{{pictureInterpretationList}}" wx:key="index">
+								<!-- bindtap="gotoZCJDDetailByDocId" <image src="{{item.logoImg}}" style="width: 327rpx;height: 185rpx;"></image> -->
 								<view style="width: 327rpx;height: 185rpx;background-image: url({{item.logoImg}});background-size:cover;"></view>
 								<view class="limit-text-3" style="font-size: 20rpx;font-family: PingFang SC;color: #666666;">{{item.DOCTITLE}}</view>
 							</view>
@@ -175,7 +176,7 @@
               <t-loading theme="spinner" size="64rpx" text="加载中..." inheritColor></t-loading>
             </view>
             <view wx:if="{{!isZCJDLoading}}" style="display: flex;justify-content: space-between;">
-              <view style="width: 327rpx;" bindtap="gotoZCJDDetail" data-docid = "{{item.DOCID}}" data-channelid="{{item.CHNLID}}" wx:for="{{videoInterpretationList}}" wx:key="index">
+              <view style="width: 327rpx;" bindtap="gotospjd" data-url="{{item.DOCPUBURL}}" data-docid = "{{item.DOCID}}" data-channelid="{{item.CHNLID}}" wx:for="{{videoInterpretationList}}" wx:key="index">
                 <view style="width: 327rpx;height: 185rpx;background-image: url({{item.logoImg}});background-size:cover;"></view>
                 <view style="font-size: 20rpx;font-family: PingFang SC;color: #666666;">{{item.DOCTITLE}}</view>
               </view>

+ 5 - 4
nnzwminiapp/pages/publics/interpretation/interpretation.wxml

@@ -11,7 +11,8 @@
 		<!-- 文字解读 -->
 		<swiper-item>
 			<scroll-view scroll-y="true" style="height: 100%;padding:0;margin:0;" bindscrolltolower="scrollBottom">
-				<view bindtap="gotoDetailByDocId" data-url="{{item.DOCPUBURL}}" data-channelid="{{item.CHNLID}}" data-docid="{{item.DOCID}}" 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="gotoWeb"  data-url="{{item.DOCPUBURL}}" data-url="{{item.DOCPUBURL}}" data-channelid="{{item.CHNLID}}" data-docid="{{item.DOCID}}" 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;">
+					<!-- bindtap="gotoDetailByDocId" -->
 					<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.DOCRELTIME)}}</view>
 				</view>
@@ -21,9 +22,9 @@
 		<swiper-item>
 			<scroll-view scroll-y="true" style="height: 100%;padding:0;margin:0;" bindscrolltolower="scrollBottom">
 				<view style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
-					<view bindtap="gotoDetailByDocId" data-url="{{item.DOCPUBURL}}" data-docid="{{item.DOCID}}" data-channelid="{{item.CHNLID}}" style="margin-top: 20rpx;margin-left: 33rpx;width: 327rpx;" wx:for="{{interpretationListInfo}}" wx:key="index">
+					<view bindtap="gotoWeb"  data-url="{{item.DOCPUBURL}}"  data-url="{{item.DOCPUBURL}}" data-docid="{{item.DOCID}}" data-channelid="{{item.CHNLID}}" style="margin-top: 20rpx;margin-left: 33rpx;width: 327rpx;" wx:for="{{interpretationListInfo}}" wx:key="index">
 						<view style="width: 327rpx;height: 185rpx;background-image: url({{item.logoImg}});background-size:cover;"></view>
-						<!-- <image src="{{item.logoImg}}" mode="aspectFill" style="width: 327rpx;height: 185rpx;"></image> -->
+						<!-- bindtap="gotoDetailByDocId" <image src="{{item.logoImg}}" mode="aspectFill" style="width: 327rpx;height: 185rpx;"></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>
 				</view>
@@ -36,7 +37,7 @@
 					<t-empty icon="info-circle-filled" description="暂无数据" />
 				</view> -->
 				<view style="display: flex;justify-content: space-around;flex-wrap: wrap;">
-          <view bindtap="gotoWeb" data-url="{{item.DOCPUBURL}}" data-docid="{{item.DOCID}}" data-channelid="{{item.CHNLID}}" style="margin-top: 20rpx;margin-left: 33rpx;width: 327rpx;" wx:for="{{interpretationListInfo}}" wx:key="index">
+          <view bindtap="gotoWeb"  data-url="{{item.DOCPUBURL}}" data-docid="{{item.DOCID}}" data-channelid="{{item.CHNLID}}" style="margin-top: 20rpx;margin-left: 33rpx;width: 327rpx;" wx:for="{{interpretationListInfo}}" wx:key="index">
 						<view style="width: 327rpx;height: 185rpx;background-image: url({{item.logoImg}});background-size:cover;"></view>
 						<!-- <image src="{{item.logoImg}}" mode="aspectFill" style="width: 327rpx;height: 185rpx;"></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>