惠民通与政策推荐

pages/index/index.vue

@@ -35,8 +35,8 @@
                     <text>法律乡下</text>
                     <image :src="loadImgSrc('/fv.jpg')"></image>
                 </view>
-                <view class="hm">
-                    <text>惠民通</text>
+                <view class="hm" @click='toGovernmentList1'>
+                    <text >惠民通</text>
                     <image :src="loadImgSrc('/hm.jpg')"></image>
                 </view>
             </view>
@@ -337,6 +337,11 @@ export default {
 			    url: '/pages/toGovernmentList/toGovernmentList'
 			});
 		},
+		toGovernmentList1(){
+			uni.navigateTo({
+			    url: '/pages/toGovernmentList/toGovernmentList?type=10'
+			});
+		},
 		governmentListData(){
 			let params = {
 			  pageSize: 10,

pages/informationDetail/informationDetail.vue

@@ -6,9 +6,9 @@
             <view class="wenzhangLy">
                 <!-- 头像昵称 -->
                 <view class="txTime">
-                    <image :src="loadImgSrc('/moren.png')"></image>
+                    <image :src="loadImgSrc(detailInfo.headImg!=null?detailInfo.headImg:'/moren.png')"></image>
                     <view class="time">
-                        <p>国家乡村振兴局</p>
+                        <p>{{detailInfo.nickName?detailInfo.nickName:'网友'}}</p>
                         <span>{{ detailInfo.createTime }}</span>
                     </view>
                 </view>

pages/toGovernmentList/index.css

@@ -1,44 +1,96 @@
-/*
+/* pages/fuwu.wxss */
+/* pages/sannong.wxss */
+.snTab {
+    width: 100%;
+}
+
+.fontColorBox,
+.fontColorBox1 {
+    color: #07c160;
+}
+
+.navBox {
+    /* 顶部tab盒子样式 */
+    width: 100%;
+    height: 108rpx;
+    background: white;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    justify-content: center;
+}
+/* 最后一个tab标题的样式 */
+
+.titleBox {
+    /* 未选中文字的样式 */
+    color: rgb(168, 170, 175);
+    font-size: 30rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 32%;
+}
+.lineBox,
+.notLineBox {
+    /* 选中及未选中底线共同样式 */
+    width: 32rpx;
+    height: 8rpx;
+}
+
+.lineBox {
+    /* 选中底线样式 */
+    background: #07c160;
+    margin-top: 16rpx;
+    border-radius: 4rpx;
+}
+
+.notLineBox {
+    /* 未选中底线样式 */
+    background: transparent;
+}
+
+.swiperTtemBox {
+    /* 底部内容样式 */
+    height: 100vh;
+    overflow: scroll;
+    margin: 12rpx 0rpx;
+    background: white;
+    font-size: 28rpx;
+}
+
 /* 热门问答 */
 .rnwdList {
     width: 100%;
+    height: 100%;
 }
-
 .list {
     border-bottom: solid 2rpx #f6f6f6;
     padding: 10rpx 0;
     width: 100%;
 }
-
 .listTitle {
     font-size: 32rpx;
     color: #333;
     line-height: 40rpx;
 }
-
 .jlSj {
     height: 40rpx;
     display: flex;
     justify-content: space-between;
-    align-items: center;
     font-size: 24rpx;
     margin: 20rpx 0 0 0;
 }
-
 .jf {
     color: #07c160;
 }
-
 .icon-jifen {
-    font-size: 26rpx;
+    font-size: 28rpx;
     color: #07c160;
     margin: 0 0 0 6rpx;
 }
-
 .ck {
     color: #c4c4c4;
 }
-
 .icon-pinglun,
 .icon-chakan,
 .icon-shoucang {
@@ -46,7 +98,6 @@
     margin: 0 6rpx 0 20rpx;
     color: #c4c4c4;
 }
-
 .onePic {
     width: 100%;
     height: 360rpx;
@@ -54,31 +105,10 @@
     overflow: hidden;
     margin: 20rpx 0;
 }
-
 .onePic image {
     width: 100%;
     height: 100%;
 }
-.imageContainer {
-  display: flex;
-}
-
-.imageContainer.one-image {
-  justify-content: center;
-  align-items: center;
-}
-
-.imageContainer.two-images {
-  justify-content: space-between;
-}
-
-.imageContainer.three-images {
-  justify-content: space-between;
-}
-
-.imageContainer image {
-  /* 根据需要设置图片样式 */
-}
 .twoPic {
     width: 100%;
     height: 220rpx;
@@ -86,13 +116,11 @@
     display: flex;
     justify-content: space-between;
 }
-
 .twoPic image {
     width: 49%;
     height: auto;
     border-radius: 20rpx;
 }
-
 .threePic {
     width: 100%;
     height: 160rpx;
@@ -100,95 +128,77 @@
     display: flex;
     justify-content: space-between;
 }
-
 .threePic image {
     width: 32%;
     height: auto;
     border-radius: 20rpx;
 }
 
-/* 热门知识 */
-.rmzsList li {
-    width: 100%;
-    border-bottom: solid 2rpx #f6f6f6;
-    padding: 20rpx 0;
-    display: flex;
-    justify-content: space-between;
-}
-
-.rmzsList li image {
-    width: 40%;
-    height: 200rpx;
+.pane-con {
+    margin: 20rpx 0;
 }
-
-.listCont {
-    width: 58%;
+.tabs-pane {
+    padding: 10rpx 20rpx;
+    margin-right: 20rpx;
+    border: 1px solid lightgrey;
 }
-
-.listCont p {
-    font-size: 32rpx;
-    color: #333;
-    overflow: hidden;
-    line-height: 40rpx;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
+.tabs-pane:nth-last-child(1) {
+    margin-right: 0;
 }
-
-.listCont text {
-    font-size: 24rpx;
-    color: #9c9c9c;
+.tabs-pane.active {
+    background: #5495df;
+    border-color: #5495df;
+    color: #fff;
 }
 
-.biaoqian {
-    display: flex;
-    margin: 6rpx 0;
+.tab-class {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100vw;
+    bottom: 0;
 }
 
-.biaoqian span {
-    padding: 2rpx 20rpx;
-    font-size: 20rpx;
-    background: #e0e0e0;
-    color: #9c9c9c;
-    margin: 0 20rpx 0 0;
-    border-radius: 30rpx;
+.guidebook .img_box {
+    margin-bottom: 12rpx;
+    padding-left: 4rpx;
 }
-
-.jiage {
+.guidebook .img_box .many_img {
     display: flex;
+    justify-self: start;
+    flex-wrap: wrap;
+}
+.guidebook .img_item.four {
+    width: 198rpx;
+    height: 198rpx;
+    margin-right: 16rpx;
+    margin-bottom: 16rpx;
+    border-radius: 16rpx;
+    overflow: hidden;
 }
-
-.yhjg {
-    font-size: 30rpx;
-    color: #07c160;
-}
-
-.yhjg em {
-    font-size: 24rpx;
-    color: #07c160;
-}
-
-.yjjg {
-    font-size: 24rpx;
-    color: #9c9c9c;
-    margin: 6rpx 0 0 20rpx;
-    text-decoration: line-through;
-}
-
-/* 公告start */
-
-.swiper_container {
-    height: 55rpx;
-    width: 70%;
-    line-height: 60rpx;
+.guidebook .img_item.four:nth-child(2n) {
+    margin-right: 30rpx;
 }
-
-.swiper_item {
-    color: #000;
-    font-size: 28rpx;
+.guidebook .img_item.many {
+    width: 198rpx;
+    height: 198rpx;
+    margin-right: 16rpx;
+    margin-bottom: 16rpx;
+    border-radius: 16rpx;
     overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
 }
+.guidebook .img_item.many:nth-child(3n) {
+    margin-right: 0;
+}
+.addInfomarionBtn{
+	position: fixed;
+	bottom: 3%;
+	right: 3%;
+	width: 40px;
+	height: 40px;
+	background: url('@/static/images/upload/add.png') 0 0 no-repeat;
+	background-size: 100% 100%;
+}
+.addInfomarionBtn::after{
+	border: none;
+}

pages/toGovernmentList/toGovernmentList.vue

@@ -1,72 +1,163 @@
 <template>
-        <!-- 分割线 -->
-        <view class="container">
-            <view class="rnwdList">
-                <view class="list" v-for="(item, index) in indexList1" :key="index" @click="toGovernmentList1">
-                    <span class="listTitle">{{ item.titleName }}</span>
-                    <view class="onePic" v-if="item.urls!=null&&item.urls.length > 0" v-for="(url, i) in item.urls">
-                        <image :src="'http://localhost:88/dev-api'+url" :key="i"></image>
-                    </view>
-                    <view class="jlSj">
-                        <span class="jf">
-                            {{ item.createTime }}
-                        </span>
-                        <view class="ck">
-                            <span>
-                                <em class="iconfont icon-chakan"></em>
-                                {{ item.watchNum }}
-                            </span>
-                            <span>
-                                <em class="iconfont icon-shoucang"></em>
-                                {{ item.likeNum }}
-                            </span>
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-
+    <!-- pages/me.wxml -->
+	<view class="container">
+		<uni-search-bar @confirm="search" :focus="true" v-model="searchValue" @blur="search"  @input="search"
+		style="width: 100%;"
+			@cancel="cancel">
+		</uni-search-bar>
+	    <view class="rnwdList">
+	        <view class="list" @tap="goDetails(item)" v-for="(item, index1) in qbwd" :key="index1">
+	            <span class="listTitle">{{ item.titleName }}</span>
+	
+	            <view class="onePic" v-if="item.urls.length == 1">
+	                <image :src="loadImgSrc(item.urls[index2])" v-for="(v, index2) in item.urls" :key="index2">
+					</image>
+	            </view>
+	            <view class="twoPic" v-if="item.urls.length == 2">
+	                <image :src="loadImgSrc(item.urls[index2])" v-for="(v, index2) in item.urls" :key="index2">
+					</image>
+	            </view>
+	
+	            <view class="threePic" v-if="item.urls.length == 3">
+	                <image :src="loadImgSrc(item.urls[index2])" v-for="(v, index2) in item.urls" :key="index2">
+					</image>
+	            </view>
+	
+	           <!-- <view class="jlSj">
+	                <span class="jf">
+	                    {{ item.jf }}
+	                    <em class="iconfont icon-jifen"></em>
+	                </span>
+	                <view class="ck">
+	                    <span>
+	                        <em class="iconfont icon-pinglun"></em>
+	                        {{ item.pl }}
+	                    </span>
+	                    <span>
+	                        <em class="iconfont icon-chakan"></em>
+	                        {{ item.ck }}
+	                    </span>
+	                    <span>
+	                        <em class="iconfont icon-shoucang"></em>
+	                        {{ item.dz }}
+	                    </span>
+	                </view>
+	            </view> -->
+	
+			</view>
+	    </view>
+		<!-- 新增资讯按钮 -->
+		<!-- <button class="addInfomarionBtn" @click="addInfomation()"></button> -->
+	</view>
 </template>
 
 <script>
-	import {governmentListMore} from '@/api/information/information.js'
+import { listWxs ,listWx} from '@/api/information/information.js'
+// pages/me.js
 export default {
     data() {
         return {
-            indexList1: []
-        };
-    }
-    /**
-     * 生命周期函数--监听页面加载
-     */,
-    onLoad(options) {
-		this.governmentListMores()
+			qbwd:[],
+			listParams:{
+			  pageNum: 1,
+			  pageSize: 7,
+			  titleName: '',
+			  isGovernment:'',
+			  type: 10,
+			  flag:''
+			},
+			total:0,
+			searchValue:''
+		};
     },
-	mounted() {
-
+	created(){
+		
 	},
-    methods: {
-      toGovernmentList1(){
-        uni.navigateTo({
-          url: '/pages/toGovernmentList/toGovernmentListDetail'
-        });
-      },
-		governmentListMores(){
-			let params = {
-			  pageSize: 10,
-			  pageNum: 1,
-			  type:10,
-			  isGovernment:1
-			  }
-			governmentListMore(params).then(res =>{
-				if (res.code==200) {
-					this.indexList1=res.rows
-				}
+	onReachBottom(){
+		let pageNum = this.listParams.pageNum
+		let pageSize = this.listParams.pageSize
+		let total = this.total
+		if(pageNum * pageSize >= total){
+			uni.showToast({
+				title:'暂无更多数据'
+			})
+			return
+		} else {
+			this.listParams.pageNum += 1;
+			this.getList()
+		}
+	},
+	methods:{
+		search(){
+			this.listParams.titleName = this.searchValue
+			this.qbwd = []
+			this.getList()
+		},
+		getList(){
+			listWxs(this.listParams).then(res => {
+				this.qbwd = [...this.qbwd,...res.rows]
+				this.total = res.total
 			})
+		},
+		goDetails(e) {
+			let id = e.id || ''
+			let type = 10
+		    uni.navigateTo({
+		        url: `../informationDetail/informationDetail?id=${id}&type=${type}`
+		    });
+		},
+		// 新增资讯
+		addInfomation(){
+			uni.navigateTo({
+			    url: `../informationAdd/informationAdd`
+			});
 		}
-    }
+	},
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+		console.log(options)
+		if(options.type!=null){
+			this.listParams.type = options.type
+		}
+		if(options.type==null){
+			this.listParams.isGovernment = 1
+		}
+		this.getList()
+		// 查置顶
+		listWx({}).then(e => {
+		})
+	},
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {},
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {},
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {},
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {},
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {},
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {},
 };
 </script>
-<style scoped>
-	@import url("./index.css");
+<style>
+@import './index.css';
+.container{
+	height: 100%;
+}
 </style>

pages/toGovernmentList/toGovernmentListDetail.css

@@ -1,160 +0,0 @@
-/* pages/wenbaxiangqing.wxss */
-.title {
-    font-size: 44rpx;
-    text-align: center;
-    line-height: 70rpx;
-    color: #333;
-    margin: 30rpx 0;
-}
-.wenzhangLy {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    border-bottom: solid 2rpx #e8e8e8;
-    padding: 0 0 14rpx 0;
-}
-.txTime {
-    display: flex;
-    flex-direction: row;
-}
-.txTime image {
-    width: 80rpx;
-    height: 80rpx;
-}
-.time {
-    display: flex;
-    flex-direction: column;
-    padding: 10rpx 0 0 8px;
-}
-.time p {
-    font-size: 28rpx;
-    color: #9c9c9c;
-}
-.time span {
-    font-size: 24rpx;
-    color: #c4c4c4;
-}
-
-.jf {
-    color: #07c160;
-    line-height: 80rpx;
-    font-size: 24rpx;
-}
-.icon-jifen {
-    font-size: 28rpx;
-    color: #07c160;
-    margin: 0 0 0 6rpx;
-}
-.ck {
-    color: #c4c4c4;
-    font-size: 28rpx;
-}
-.icon-pinglun,
-.icon-chakan,
-.ck .icon-shoucang {
-    font-size: 28rpx;
-    margin: 0 6rpx 0 20rpx;
-    color: #c4c4c4;
-    line-height: 0;
-}
-.wenzhangCont {
-    font-size: 34rpx;
-    margin: 30rpx 0;
-}
-.wenzhangCont image {
-    width: 100%;
-    height: 320rpx;
-    margin: 20rpx auto;
-}
-.pinglunTj {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    margin: 30rpx 0;
-}
-.pinglunTitle {
-    font-size: 34rpx;
-    color: #2e2e2e;
-    font-weight: 600;
-}
-.pinglunTitle em {
-    font-size: 34rpx;
-    color: #9b9b9b;
-    font-weight: normal;
-    margin: 0 0 0 10rpx;
-}
-.pinglunList {
-    width: 100%;
-    padding: 0 0 120rpx 0;
-}
-.pinglunList li {
-    margin: 20rpx 0;
-    border-bottom: solid 2rpx #e8e8e8;
-    padding: 0 0 20rpx 0;
-    display: flex;
-    flex-direction: column;
-}
-.plListcont {
-    font-size: 30rpx;
-    color: #696868;
-    margin: 20rpx 0;
-}
-.pinglunList li button {
-    width: 80%;
-    border-radius: 10rpx;
-    background: #07c160;
-    color: #fff;
-    font-size: 28rpx;
-    font-weight: normal;
-    margin: 16rpx auto;
-}
-.fabiaoPl {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    position: fixed;
-    left: 0;
-    bottom: 0;
-    height: 112rpx;
-    background: #e8e8e8;
-    box-shadow: 0rpx 0rpx 16rpx #999;
-}
-.shuRu {
-    width: 72%;
-    display: flex;
-    flex-direction: row;
-    height: 76rpx;
-    background: #e0e0e0;
-    border-radius: 60rpx;
-    margin: 20rpx 0 0 20rpx;
-}
-.shuRu input {
-    line-height: 38px;
-    height: 76rpx;
-    font-size: 30rpx;
-    width: 83%;
-}
-.icon-bianji {
-    font-size: 38rpx;
-    line-height: 76rpx;
-    margin: 0 10rpx 0 20rpx;
-    color: #828181;
-}
-.icon-shoucang {
-    font-size: 50rpx;
-    line-height: 112rpx;
-    color: #828181;
-}
-.fasong {
-    width: 58rpx;
-    height: 58rpx;
-    border-radius: 50rpx;
-    background: #07c160;
-    margin: 26rpx 20rpx 0 10rpx;
-    text-align: center;
-    line-height: 58rpx;
-}
-.icon-fasong {
-    font-size: 40rpx;
-    color: #fff;
-}