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

nnzwminiapp/pages/index/index.wxml

@@ -182,6 +182,41 @@
 			</view>
 			<!-- 浮动 -->
 		</view>
+
+        <!-- 公示公告 -->
+		<!-- gotoNewsPaper -->
+		<view style="width: 100%;position:relative;margin-top: 40rpx;" bindtap="gotoGSGG">
+			<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;">
+					<view style="display:flex;align-items:center;justify-content:center;">
+						<image src="{{imgUrl}}notice-icon.png" style="height: 50rpx;width: 56rpx"></image>
+					</view>
+					<view class="data-center-title-font">公示公告</view>
+				</view>
+				<!-- 标题 -->
+				<!-- 内容 -->
+				<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;">
+							<image src="{{ imgUrl }}notice-bg.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 class="center-analysis-enter-button">
+								<view style="background: linear-gradient(90deg, #F58661 0%, #FCAF96 100%);" class="center-analysis-enter-button-item">
+									进入 ></view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 内容 -->
+			</view>
+		</view>
+		<!-- 公示公告 -->
+
 		<!-- 视频推荐 -->
 		<view style="width: 100%;position:relative;margin-top: 30rpx;">
 			<view style="margin-left: 20rpx;border-radius: 20rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;">
@@ -568,40 +603,6 @@
 		</view>
 		<!-- 南岸报 -->
 
-        <!-- 公示公告 -->
-		<!-- gotoNewsPaper -->
-		<view style="width: 100%;position:relative;margin-top: 40rpx;" bindtap="gotoGSGG">
-			<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;">
-					<view style="display:flex;align-items:center;justify-content:center;">
-						<image src="{{imgUrl}}notice-icon.png" style="height: 50rpx;width: 56rpx"></image>
-					</view>
-					<view class="data-center-title-font">公示公告</view>
-				</view>
-				<!-- 标题 -->
-				<!-- 内容 -->
-				<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;">
-							<image src="{{ imgUrl }}notice-bg.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 class="center-analysis-enter-button">
-								<view style="background: linear-gradient(90deg, #F58661 0%, #FCAF96 100%);" class="center-analysis-enter-button-item">
-									进入 ></view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<!-- 内容 -->
-			</view>
-		</view>
-		<!-- 公示公告 -->
-
 		<!-- 地图服务 -->
 		<view style="width: 100%;position:relative;margin-top: 40rpx;">
 			<view style="margin-left: 20rpx;border-radius: 20rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">

nnzwminiapp/pages/publics/interpretation/interpretation.wxml

@@ -56,7 +56,7 @@
 				</view> -->
 				<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>{{filter.formateDate(item.DOCRELTIME)}}</view>
 				</view>
 			</scroll-view>
 		</swiper-item>