样式修改

components/pcNav/pcNav.vue

@@ -100,22 +100,23 @@
 		position: relative;
 	}
 	.logoImg{
-		width: 77px;
-		height: 36px;
+		width: 62px;
+		height: 28px;
 		margin-top: 19px;
 	}
 	.navTitle{
 		line-height: 72px;
 		font-weight: 500;
 		color: #3C3C3C;
-		font-size: 22px;
-		padding-left: 24px;
+		font-size: 20px;
+		padding-left: 10px;
+		font-family: PingFangSC-Medium, PingFang SC;
 	}
 	.indexNav{
 		line-height: 72px;
-		font-weight: 500;
+		
 		color: #3C3C3C;
-		font-size: 18px;
+		font-size: 16px;
 		padding-left: 54px;
 		cursor: pointer;
 	}
@@ -127,38 +128,38 @@
 		line-height: 72px;
 	}
 	.allCategoryLine{
-		padding-left: 44px;
+		padding-left: 30px;
 		color: #3C3C3C;
-		font-size: 18px;
+		font-size: 16px;
 		cursor: pointer;
 	}
 	.allCategoryMore{
-		padding-left: 44px;
+		padding-left: 30px;
 		color: #3C3C3C;
-		font-size: 18px;
+		font-size: 16px;
 		display: flex;
 		cursor: pointer;
 		position: relative;
 	}
 	.navMoret{
 		position: absolute;
-		width: 130px;
+		width: 140px;
 		background: #FFFFFF;
 		box-shadow: 0px 4px 10px 0px rgba(153, 153, 153, 0.12);
 		border-radius: 6px;
 		top: 72px;
-		left:0 ;
-		font-size: 18px;
-		 display: none; 
+		left:0px ;
+		font-size: 16px;
+		display: none; 
 	}
 	.allCategoryMore:hover .navMoret{
 		display: block;
 	}
 	.navMoreTline{
-		width: 130px;
+		width: 140px;
 		text-align: center;
-		font-size: 18px;
-		line-height: 60px;
+		font-size: 16px;
+		line-height: 50px;
 	}
 	.allCategoryMore:hover .moreBtn{
 		 color: #FF4F00; 
@@ -183,8 +184,8 @@
 		display: block;
 	}
 	.navSsimg{
-		width: 24px;
-		height: 24px;
+		width: 20px;
+		height: 20px;
 	}
 	.navSs{
 		position: absolute;

pages/pc/detail.vue

@@ -15,7 +15,7 @@
 			<view class="html" v-html="detailData.contents"></view>
 		</view>
 		<view class="itemArr" v-if="itemArr.length>0">
-		  <view class="itemArrLine" v-for="(item,index) in itemArr">
+		  <view class="itemArrLine" :class="{'itemArrLineBottom':itemArr.length!=(index+1)}" v-for="(item,index) in itemArr">
 			  <view class="itemArrLeft" >
 				  <image src="../../static/pcimg/icon_fujian@2x.png" mode="" class="fileIcon"></image>
 				  <view class="fileName" @click="gofile(item.fileUrl)">{{item.fileName}}</view>
@@ -25,7 +25,7 @@
 			  </view> -->
 		  </view>
 		</view>
-		<view class="lbel">
+		<view class="lbel" v-if="topName">
 			<view class="topName">{{topName}}</view>
 		</view>
        
@@ -93,6 +93,9 @@
 					}
 
 					this.detailData = data;
+					uni.setNavigationBarTitle({
+					    title: this.detailData.title
+					});
 					console.log()
 					if (this.detailData.contents) {
 						var replaceStr = "application/x-shockwave-flash"
@@ -140,6 +143,9 @@
 		padding: 30px 0;
 		font-size: 14px;
 	}
+	.content{
+		font-family: PingFangSC-Regular, PingFang SC;
+	}
 	.htmlBox{
 		width: 720px;
 		margin: 0 auto;
@@ -158,6 +164,7 @@
 		font-weight: 500;
 		color: #3C3C3C;
 		line-height: 33px;
+		font-family: PingFangSC-Medium, PingFang SC;
 	}
 	.time{
 		font-size: 14px;
@@ -183,12 +190,15 @@
 		display: flex;
 		justify-content: space-between;
 		padding: 16px 0;
-		border-bottom: 1px solid #EEEEEE;
+		
 		color: #333333;
 		line-height: 22px;
 		font-size: 16px;
 		width: 720px;
 	}
+	.itemArrLineBottom{
+		border-bottom: 1px solid #EEEEEE;
+	}
 	.itemArr{
 		width: 686px;
 		margin: 0 auto;
@@ -221,7 +231,7 @@
 		height: 24px;
 		background: rgba(63, 144, 247, 0.1);
 		border-radius: 14px;
-		font-size: 12px;
+		font-size: 14px;
 		color: #3F90F7;
 		line-height: 24px;
 		text-align: center;

pages/pc/groupingList.vue

@@ -15,35 +15,50 @@
 		</view>
 		<view class="">
 			<view class="topName">{{name}}</view>
-			<view class="comment">{{title}}</view>
+			<view class="comment "  v-if="title">{{title}}</view>
 		</view>
 		<view class="main">
-			
+			<view class="dynamicCol">
+				<view class="dynamicColLeft">
+					
+				</view>
+				<view class="dynamicColRight">
+					<image src="../../static/pcimg/icon_kapian_def@2x.png" v-show="qhIndex==2" class="qhImg" @click="qhIndex=1"></image>
+					<image src="../../static/pcimg/icon_kapian_sel@2x.png" v-show="qhIndex==2" class="qhImg"></image>
+				    <image src="../../static/pcimg/icon_liebiao_sel@2x.png" v-show="qhIndex==1" class="qhImg" ></image>
+				    <image src="../../static/pcimg/qh2.png" v-show="qhIndex==1" class="qhImg" @click="qhIndex=2"></image>
+				</view>
+			</view>
 			<view class="cont2">
-				<view class="contf" v-if="qhIndex==2">
-					<view class="mainwzline" v-for="(wz,wzindex) in list"  :class="{'mainwzlineR':(wzindex+1)%4==0&&wzindex!=0}" @click="goDetail(wz)">
-						<view class="mainwzImgBox">
-						  <img :src="wz.LogoImg" alt="" class="mainwzImg">	
+				<view class="contBox">
+					<view class="contf" v-if="qhIndex==2&&list.length>0">
+						<view class="mainwzline" v-for="(wz,wzindex) in list"  :class="{'mainwzlineR':(wzindex+1)%4==0&&wzindex!=0}" @click="goDetail(wz)">
+							<view class="mainwzImgBox">
+							  <img :src="wz.LogoImg" alt="" class="mainwzImg">	
+							</view>
+							<view class="wztitle">{{wz.Title}}</view>
+							<view class="wztime">2022-3-30</view>
 						</view>
-						<view class="wztitle">{{wz.Title}}</view>
 					</view>
-				</view>
-				<view class="contL" v-if="qhIndex==1">
-					<view class="wxLine" v-for="(wz,wzindex) in list" @click="goDetail(wz)">
-						<view class="wzLineLeft">
-							<image :src="wz.LogoImg" class="wzLeftIMg"></image>
-						</view>
-						<view class="wzLineRight">
-							<view class="wzTitle">{{wz.Name}}</view>
-							<view class="wzComment">{{wz.Comment}}</view>
+					<view class="contL" v-if="qhIndex==1&&list.length>0">
+						<view class="wxLine" v-for="(wz,wzindex) in list" @click="goDetail(wz)">
+							<view class="wzLineLeft">
+								<image :src="wz.LogoImg" class="wzLeftIMg"></image>
+							</view>
+							<view class="wzLineRight">
+								<view class="wzTitle2">{{wz.Title}}</view>
+								<view class="wzComment">{{wz.Comment}}</view>
+							</view>
 						</view>
 					</view>
+					<view class="nodata" v-show="list.length==0">
+						<image src="../../static/pcimg/listnodata.png" mode="" class="nodataImg"></image>
+						<view class="nodataTitle">暂无数据</view>
+					</view>
 				</view>
+			
 			</view>
-			<view class="nodata" v-show="list.length==0">
-				<image src="../../static/pcimg/listnodata.png" mode="" class="nodataImg"></image>
-				<view class="nodataTitle">暂无数据</view>
-			</view>
+			
 			
 		</view>
 		
@@ -92,6 +107,9 @@
 		   this.topName=opt.topName;
 		   this.comment=opt.comment;
 		   this.getgroupPageData()
+		   uni.setNavigationBarTitle({
+		       title: this.name
+		   });
 		},
 		methods: {
 			goIndex(){
@@ -166,10 +184,18 @@
 	 	padding: 30px 0;
 	 	font-size: 14px;
 	 }
+	 .content{
+	 	background: #F4F5F7;
+	 	min-height: 100vh;
+		font-family: PingFangSC-Regular, PingFang SC;
+	 }
 	 .htmlBox{
 	 	width: 720px;
 	 	margin: 0 auto;
 	 }
+	 .contBox{
+	 	min-height: 58vh;
+	 }
 	 .topline{
 	 	padding-right: 10px;
 	 	cursor: pointer;
@@ -190,17 +216,17 @@
 	}
 	.gotop{
 		position: fixed;
-		right:15vh ;
-		bottom: 100px;
+		right:5vh ;
+		bottom: 60px;
 		cursor: pointer;
 	}
 	.topName{
 		text-align: center;
-		font-size: 24px;
+		font-size: 22px;
 		font-weight: 500;
 		color: #3C3C3C;
 		line-height: 33px;
-		padding-top: 30px;
+		font-family: PingFangSC-Medium, PingFang SC;
 	}
 	.comment{
 		text-align: center;
@@ -235,81 +261,122 @@
 	.dynamicCol{
 		display: flex;
 		justify-content: space-between;
+		background: #FFFFFF;
+		padding:15px 20px;
+		border-radius: 8px;
 	}
 	.activeTab{
 		color: #FF4F00;
 	}
 	.mainwzImg{
-		width: 276px;
-		height: 184px;
+		width: 284px;
+		height: 160px;
 	}
 	.mainwzImgBox{
-		border-radius: 15px;
+		border-top-left-radius: 6px;
+		border-top-right-radius: 6px;
 	    overflow: hidden;
+		height: 160px;
+		border: 1px solid #eeeeee;
 	}
 	.contf{
 		display: flex;
 		flex-wrap: wrap;
 	}
 	.mainwzline{
-		width: 276px;
-		height: 260px;
+		width: 284px;
+		height: 244px;
 		background: #FFFFFF;
-		margin-right: 32px;	
-		padding-top: 33px;
+		margin-right: 21px;	
+		margin-top: 20px;
 		cursor: pointer;
+		border-radius: 6px;
+	}
+	.wztime{
+		font-size: 14px;
+		color: #999999;
+		padding-left: 14px;
+		padding-top: 10px;
 	}
 	.mainwzlineR{
 	  margin-right: 0px;	
 	}
 	.wztitle{
-		width: 250px;
+		width: 256px;
 		font-size: 16px;
 		color: #333333;
 		line-height: 22px;
-		height: 44px;
+		height: 22px;
 		text-overflow: -o-ellipsis-lastline;
 		 overflow: hidden;
 		 text-overflow: ellipsis;
 		 display: -webkit-box;
-		 -webkit-line-clamp: 2;
-		 line-clamp: 2;
+		 -webkit-line-clamp: 1;
+		 line-clamp: 1;
 		 -webkit-box-orient: vertical;
-		 padding-top: 16px;
 		 padding:0 13px ;
+		 padding-top: 16px;
+	}
+	.wzComment{
+		font-size: 14px;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #999999;
+		line-height: 20px;
+		padding-top: 10px;
+		width: 948px;
+		height: 80px;
+		text-overflow: -o-ellipsis-lastline;
+		 overflow: hidden;
+		 text-overflow: ellipsis;
+		 display: -webkit-box;
+		 -webkit-line-clamp: 4;
+		 line-clamp: 4;
+		 -webkit-box-orient: vertical;
 	}
 	.wzLeftIMg{
 		width: 200px;
 		height: 132px;
 	}
+	.contL{
+		background: #FFFFFF;
+		margin-top: 20px ;
+		border-radius: 8px;
+		padding: 0 20px;
+	}
 	.wxLine{
 		display: flex;
-		padding-top: 30px;
+		padding: 20px 0px;
 		cursor: pointer;
+		border-bottom: 1px solid #EEEEEE;
 	}
 	.wzLineLeft{
-		border-radius: 10px;
+		border-radius: 6px;
 		overflow: hidden;
 		width: 200px;
 		height: 132px;
 	}
 	.wzLineRight{
 		padding-left: 16px;
-		width: 950px;
+		width: 788px;
 	}
 	.wzTitle{
 		font-size: 16px;
-		font-weight: 500;
 		color: #3C3C3C;
 	}
-	.wzComment{
-		font-size: 12px;
-		font-family: PingFangSC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #999999;
-		line-height: 17px;
-		padding-top: 10px;
-		width: 1000px;
+	.wzTitle2{
+		font-size: 16px;
+		color: #3C3C3C;
+		width: 948px;
+		height: 20px;
+		line-height: 20px;
+		text-overflow: -o-ellipsis-lastline;
+		 overflow: hidden;
+		 text-overflow: ellipsis;
+		 display: -webkit-box;
+		 -webkit-line-clamp: 1;
+		 line-clamp: 1;
+		 -webkit-box-orient: vertical;
 	}
 	.pageView{
 		margin-top: 20px;

pages/pc/index.vue

@@ -17,17 +17,17 @@
 								</view>
 								<view class="swpTitleBox">
 									<view class="swpTitle">{{item.title}}</view>
-									<view class="categoryName" @click.stop="goList(item)">{{item.categoryName}}</view>
+									<view class="categoryName" @click.stop="goList(item)">{{item.categoryName.substring(0,5)}}</view>
 								</view>
 								
 							</view>
-							<view class="swiper-item" v-if="(index+1)<recommendList.length" @click="goDetail(item)">
+							<view class="swiper-item" v-if="(index+1)<recommendList.length" @click="goDetail(recommendList[index+1])">
 								<view class="swpimgBox swpBr">
 								   <image :src="recommendList[index+1].logoImg" mode="" class="swpimg"></image>
 								</view>
 								<view class="swpTitleBox">
 									<view class="swpTitle">{{recommendList[index+1].title}}</view>
-									<view class="categoryName">{{recommendList[index+1].categoryName}}</view>
+									<view class="categoryName">{{recommendList[index+1].categoryName.substring(0,5)}}</view>
 								</view>
 							</view>
 						</view>
@@ -42,7 +42,7 @@
 		
 		<view class="main">
 			<view class="mainCont">
-				<view class="mainline" v-for="(item,index) in indexData.categoryList">
+				<view class="mainline" :class="{'mainline1':index==0}" v-for="(item,index) in indexData.categoryList" v-if="item.children.length>0">
 					<view class="mainlineTop">
 						<view class="mainlineTopleft">
 							<view class="mainlineTitle">{{item.name}}</view>
@@ -59,6 +59,7 @@
 							  <img :src="wz.logoImg" alt="" class="mainwzImg">	
 							</view>
 							<view class="wztitle">{{wz.title}}</view>
+							<view class="wztime">2022-3-30</view>
 						</view>
 						
 					</view>
@@ -169,28 +170,34 @@
 </script>
 
 <style scoped>
-	
+	.content{
+		background: #F4F5F7;
+		min-height: 100vh;
+		font-family: PingFangSC-Regular, PingFang SC;
+	}
 	.swiperBox{
-		height: 356px;
-		background: #F3F8FF;
+		/* height: 280px; */
+		/* background: #F3F8FF; */
 		width: 100%;
 	}
 	.swiperCont{
-		width: 1232px;
+		width: 1236px;
 		margin: 0 auto;
 		position: relative;
 	}
 	.tuijImg{
 		width: 24px;height: 24px;
+		
 	}
 	.tuijbox{
-		display: flex;padding-top: 44px;padding-bottom: 30px;
+		display: flex;padding-top: 32px;padding-bottom: 20px;
+		padding-left: 15px;
 	}
 	.tuijTitle{
-		font-size: 24px;
+		font-size: 22px;
 		font-family: PingFangSC-Medium, PingFang SC;
 		font-weight: 500;
-		color: #111111;
+		color: #3C3C3C;
 		padding-left: 7px;
 		line-height: 24px;
 	}
@@ -198,7 +205,7 @@
 		width: 44px;
 		height: 44px;
 		position: absolute;
-		top: 175px;
+		top: 165px;
 		left: -60px;
 		cursor: pointer;
 	}
@@ -206,17 +213,17 @@
 		width: 44px;
 		height: 44px;
 		position: absolute;
-		top: 175px;
+		top: 165px;
 		right: -60px;
 		cursor: pointer;
 	}
 	.swiper-item{
-		width: 576px;
-		height: 183px;
+		width: 590px;
+		height: 163px;
 		background: #FFFFFF;
 		margin-left: 16px;
-		margin-right: 16px;
-		border-radius: 9px;
+		margin-right: 12px;
+		border-radius: 6px;
 		margin-top: 14px;
 		position: relative;
 		cursor: pointer;
@@ -230,41 +237,40 @@
 		justify-content: space-between;
 	}
 	.swpimg{
-		width: 276px;
-		height: 184px;
+		width: 284px;
+		height: 160px;
 	}
 	.swpimgBox{
-		width: 276px;
-		height: 184px;
+		width: 284px;
+		height: 160px;
 		position: absolute;
 		left: 0;
 		top: -14px;
 		
 	}
 	.swpBr{
-		width: 276px;
-		height: 184px;
-		border-radius: 10px;
+		width: 284px;
+		height: 160px;
+		border-radius: 7px;
 		overflow: hidden;
 	}
 	.swiper{
-		height: 220px;
+		height: 190px;
 	}
 	.swpTitleBox{
-		padding-left: 296px;
+		padding-left: 304px;
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
-		height: 160px;
+		height: 140px;
 		padding-top: 10px;
 		
 	}
 	
 	.swpTitle{
-		width: 260px;
+		width: 240px;
 		height: 44px;
 		font-size: 16px;
-		font-weight: 500;
 		color: #3C3C3C;
 		line-height: 22px;
 		 text-overflow: -o-ellipsis-lastline;
@@ -284,7 +290,7 @@
 		height: 24px;
 		background: rgba(63, 144, 247, 0.1);
 		border-radius: 14px;
-		font-size: 12px;
+		font-size: 14px;
 		color: #3F90F7;
 		text-align: center;
 		white-space: nowrap; 
@@ -294,9 +300,10 @@
 	.mainCont{
 		width: 1200px;
 		margin: 0 auto;
+		padding-bottom: 20px;
 	}
 	.mainline{
-		padding-top: 48px;
+		padding-top: 34px;
 	}
 	.mainlineTop{
 		display: flex;
@@ -306,10 +313,11 @@
 		display: flex;
 	}
 	.mainlineTitle{
-		font-size: 20px;
+		font-size: 22px;
 		font-weight: 500;
-		color: #111111;
+		color: #3C3C3C;
 		line-height: 33px;
+		font-family: PingFangSC-Medium, PingFang SC;
 	}
 	.mainlinecount{
 		font-size: 14px;
@@ -320,49 +328,56 @@
 	}
 	.mainlineMore{
 		font-size: 14px;
-		color: #333333;
+		color: #999999;
 	}
 	.mainwzbox{
 		display: flex;
-		padding-top: 30px;
+		padding-top: 20px;
 		
 	}
 	.mainwzImg{
-		width: 276px;
-		height: 184px;
+		width: 284px;
+		height: 160px;
 	}
 	.mainwzImgBox{
-		border-radius: 8px;
+		border-top-left-radius: 6px;
+		border-top-right-radius: 6px;
 	    overflow: hidden;
-		height: 184px;
+		height: 160px;
 		border: 1px solid #eeeeee;
 	}
 	.mainwzline{
-		width: 276px;
-		height: 260px;
+		width: 284px;
+		height: 244px;
 		background: #FFFFFF;
-		
+		border-radius: 6px;
 	}
 	.mainwzlineR{
-	  margin-right: 32px;	
+	  margin-right: 22px;	
 	}
 	.wztitle{
-		width: 250px;
-		font-size: 15px;
+		width: 256px;
+		font-size: 16px;
 		color: #333333;
 		line-height: 22px;
-		height: 44px;
+		height: 22px;
 		text-overflow: -o-ellipsis-lastline;
 		 overflow: hidden;
 		 text-overflow: ellipsis;
 		 display: -webkit-box;
-		 -webkit-line-clamp: 2;
-		 line-clamp: 2;
+		 -webkit-line-clamp: 1;
+		 line-clamp: 1;
 		 -webkit-box-orient: vertical;
 		 padding:0 13px ;
 		 padding-top: 16px;
-		 font-weight: 600;
 		
+		
+	}
+	.wztime{
+		font-size: 14px;
+		color: #999999;
+		padding-left: 14px;
+		padding-top: 10px;
 	}
 	.mainwzline:hover{
 		background: #FFFFFF;
@@ -383,8 +398,8 @@
 	}
 	.gotop{
 		position: fixed;
-		right:15vh ;
-		bottom: 100px;
+		right:5vh ;
+		bottom: 60px;
 		cursor: pointer;
 	}
 	.linegdImg1{
@@ -409,4 +424,7 @@
 	.mainlineMore:hover .linegdImg2{
 		display: block;
 	}
+	.mainline1{
+		padding-top: 20px;
+	}
 </style>

pages/pc/list.vue

@@ -9,7 +9,7 @@
 		</view>
 		<view class="top">
 			<view class="topName">{{topName}}</view>
-			<view class="comment">{{comment}}</view>
+			<view class="comment " v-if="comment">{{comment}}</view>
 		</view>
 		<view class="main">
 			<view class="dynamicCol">
@@ -24,29 +24,34 @@
 				</view>
 			</view>
 			<view class="cont2">
-				<view class="contf" v-if="qhIndex==2">
-					<view class="mainwzline" v-for="(wz,wzindex) in list"  :class="{'mainwzlineR':(wzindex+1)%4==0&&wzindex!=0}" @click="goDetail(wz)">
-						<view class="mainwzImgBox">
-						  <img :src="wz.LogoImg" alt="" class="mainwzImg">	
+				<view class="contBox">
+					<view class="contf" v-if="qhIndex==2&&list.length>0">
+						<view class="mainwzline" v-for="(wz,wzindex) in list"  :class="{'mainwzlineR':(wzindex+1)%4==0&&wzindex!=0}" @click="goDetail(wz)">
+							<view class="mainwzImgBox">
+							  <img :src="wz.LogoImg" alt="" class="mainwzImg">	
+							</view>
+							<view class="wztitle">{{wz.Title}}</view>
+							<view class="wztime">2022-3-30</view>
 						</view>
-						<view class="wztitle">{{wz.Title}}</view>
 					</view>
-				</view>
-				<view class="contL" v-if="qhIndex==1">
-					<view class="wxLine" v-for="(wz,wzindex) in list" @click="goDetail(wz)">
-						<view class="wzLineLeft">
-							<image :src="wz.LogoImg" class="wzLeftIMg"></image>
-						</view>
-						<view class="wzLineRight">
-							<view class="wzTitle">{{wz.Name}}</view>
-							<view class="wzComment">{{wz.Comment}}</view>
+					<view class="contL" v-if="qhIndex==1&&list.length>0">
+						<view class="wxLine" v-for="(wz,wzindex) in list" @click="goDetail(wz)">
+							<view class="wzLineLeft">
+								<image :src="wz.LogoImg" class="wzLeftIMg"></image>
+							</view>
+							<view class="wzLineRight">
+								<view class="wzTitle2">{{wz.Title}}</view>
+								<view class="wzComment">{{wz.Comment}}</view>
+							</view>
 						</view>
 					</view>
+					<view class="nodata" v-show="list.length==0">
+						<image src="../../static/pcimg/listnodata.png" mode="" class="nodataImg"></image>
+						<view class="nodataTitle">暂无数据</view>
+					</view>
 				</view>
-				<view class="nodata" v-show="list.length==0">
-					<image src="../../static/pcimg/listnodata.png" mode="" class="nodataImg"></image>
-					<view class="nodataTitle">暂无数据</view>
-				</view>
+			
+				
 			</view>
 			
 		</view>
@@ -90,7 +95,10 @@
 		   this.comment=opt.comment;
 		   this.topCode=opt.code;
 		   this.parentCode='';
-		   this.getcategoryPageData()
+		   this.getcategoryPageData();
+		   uni.setNavigationBarTitle({
+		       title: this.topName
+		   });
 		},
 		methods: {
 			goDetail(wz){
@@ -156,23 +164,32 @@
 		padding: 0;
 		margin: 0;
 	}
+	.content{
+		background: #F4F5F7;
+		min-height: 100vh;
+		font-family: PingFangSC-Regular, PingFang SC;
+	}
+	.contBox{
+		min-height: 58vh;
+	}
 	.gotopImg{
 		width: 60px;
 		height: 60px;
 	}
 	.gotop{
 		position: fixed;
-		right:15vh ;
-		bottom: 100px;
+		right:5vh ;
+		bottom: 60px;
 		cursor: pointer;
 	}
 	.topName{
 		text-align: center;
-		font-size: 20px;
+		font-size: 22px;
 		font-weight: 500;
 		color: #3C3C3C;
 		line-height: 33px;
 		padding-top: 30px;
+		font-family: PingFangSC-Medium, PingFang SC;
 	}
 	.comment{
 		text-align: center;
@@ -197,7 +214,7 @@
 		font-size: 16px;
 		color: #3C3C3C;
 		cursor: pointer;
-		line-height: 28px;
+		line-height: 32px;
 	}
 	.qhImg{
 		width: 28px;
@@ -208,32 +225,42 @@
 	.dynamicCol{
 		display: flex;
 		justify-content: space-between;
+		background: #FFFFFF;
+		padding:15px 20px;
+		border-radius: 8px;
 	}
 	.activeTab{
 		color: #FF4F00;
 	}
 	.mainwzImg{
-		width: 276px;
-		height: 184px;
+		width: 284px;
+		height: 160px;
 	}
 	.mainwzImgBox{
-		border-radius: 15px;
+		border-top-left-radius: 6px;
+		border-top-right-radius: 6px;
 	    overflow: hidden;
-		height: 184px;
-			border: 1px solid #eeeeee;
+		height: 160px;
+		border: 1px solid #eeeeee;
 	}
 	.contf{
 		display: flex;
 		flex-wrap: wrap;
 	}
 	.mainwzline{
-		width: 276px;
-		height: 260px;
+		width: 284px;
+		height: 244px;
 		background: #FFFFFF;
-		margin-right: 32px;	
+		margin-right: 21px;	
 		margin-top: 20px;
 		cursor: pointer;
-		border-radius: 15px;
+		border-radius: 6px;
+	}
+	.wztime{
+		font-size: 14px;
+		color: #999999;
+		padding-left: 14px;
+		padding-top: 10px;
 	}
 	.mainwzline:hover{
 		box-shadow: 0px 0px 16px 0px rgba(153, 153, 153, 0.2);
@@ -242,62 +269,79 @@
 	  margin-right: 0px;	
 	}
 	.wztitle{
-		width: 250px;
-		font-size: 15px;
+		width: 256px;
+		font-size: 16px;
 		color: #333333;
 		line-height: 22px;
-		height: 44px;
+		height: 22px;
 		text-overflow: -o-ellipsis-lastline;
 		 overflow: hidden;
 		 text-overflow: ellipsis;
 		 display: -webkit-box;
-		 -webkit-line-clamp: 2;
-		 line-clamp: 2;
+		 -webkit-line-clamp: 1;
+		 line-clamp: 1;
 		 -webkit-box-orient: vertical;
 		 padding:0 13px ;
 		 padding-top: 16px;
-		  font-weight: 600;
+		
+		  
 	}
 	.wzLeftIMg{
 		width: 200px;
-		height: 132px;
+		height: 112px;
+	}
+	.contL{
+		background: #FFFFFF;
+		margin-top: 20px;
+		border-radius: 8px;
+		padding: 0 20px;
+		
 	}
 	.wxLine{
 		display: flex;
-		padding: 20px 0;
+		padding: 20px 0px;
 		cursor: pointer;
 		border-bottom: 1px solid #EEEEEE;
 	}
 	.wzLineLeft{
-		border-radius: 10px;
+		border-radius: 6px;
 		overflow: hidden;
 		width: 200px;
-		height: 132px;
+		height: 112px;
 	}
 	.wzLineRight{
 		padding-left: 16px;
-		width: 950px;
+		width: 788px;
 	}
-	.wzTitle{
+	.wzTitle2{
 		font-size: 16px;
-		font-weight: 500;
 		color: #3C3C3C;
+		width: 948px;
+		height: 20px;
+		line-height: 20px;
+		text-overflow: -o-ellipsis-lastline;
+		 overflow: hidden;
+		 text-overflow: ellipsis;
+		 display: -webkit-box;
+		 -webkit-line-clamp: 1;
+		 line-clamp: 1;
+		 -webkit-box-orient: vertical;
 	}
 	.wzComment{
-		font-size: 12px;
+		font-size: 14px;
 		font-family: PingFangSC-Regular, PingFang SC;
 		font-weight: 400;
 		color: #999999;
-		line-height: 17px;
+		line-height: 20px;
 		padding-top: 10px;
-		width: 980px;
-		height: 100px;
+		width: 948px;
+		height: 80px;
 		text-overflow: -o-ellipsis-lastline;
 		 overflow: hidden;
 		 text-overflow: ellipsis;
 		 display: -webkit-box;
-		 -webkit-line-clamp: 6;
-		 line-clamp: 6;
+		 -webkit-line-clamp: 4;
+		 line-clamp: 4;
 		 -webkit-box-orient: vertical;
 	}
 	.pageView{

pages/pc/searchlist.vue

@@ -9,32 +9,35 @@
 		</view>
 		
 		<view class="main">
-			<view class="searchTitle">搜索</view>
 			<view class="searchBox">
 				<view class="searchInputBox">
 					<input class="searchInput" type="text" v-model="title" placeholder="请输入您想搜索到内容~" placeholder-style="color:#CCCCCC" @confirm="search"/>
 				</view>
-				<image src="../../static/pcimg/icon_sousuo@2x.png" mode="" class="searchBtn" @click="search"></image>
+				<view class="searchBtn" @click="search">查询</view>
+				<!-- <image src="../../static/pcimg/icon_sousuo@2x.png" mode="" class="searchBtn" @click="search"></image> -->
 				
 			</view>
 			<view class="ssjg" v-if="sstype">为你找到“{{sstitle}}”相关结果共{{TotalSize}}条</view>
 			<view class="cont2">
-				
-				<view class="contL">
-					<view class="wxLine" v-for="(wz,wzindex) in list" @click="goDetail(wz)">
-						<view class="wzLineLeft">
-							<image :src="wz.LogoImg" class="wzLeftIMg"></image>
-						</view>
-						<view class="wzLineRight">
-							<view class="wzTitle">{{wz.Name}}</view>
-							<view class="wzComment">{{wz.Comment}}</view>
+				<view class="contBox">
+					<view class="contL" v-show="list.length!=0&&sstype">
+						<view class="wxLine" v-for="(wz,wzindex) in list" @click="goDetail(wz)">
+							<view class="wzLineLeft">
+								<image :src="wz.LogoImg" class="wzLeftIMg"></image>
+							</view>
+							<view class="wzLineRight">
+								<view class="wzTitle2">{{wz.Title}}</view>
+								<view class="wzComment">{{wz.Comment}}</view>
+							</view>
 						</view>
 					</view>
+					<view class="nodata" v-show="list.length==0&&sstype">
+						<image src="../../static/pcimg/pic_empty_search@2x.png" mode="" class="nodataImg"></image>
+						<view class="nodataTitle">暂无数据</view>
+					</view>
 				</view>
-				<view class="nodata" v-show="list.length==0&&sstype">
-					<image src="../../static/pcimg/pic_empty_search@2x.png" mode="" class="nodataImg"></image>
-					<view class="nodataTitle">暂无数据</view>
-				</view>
+				
+				
 			</view>
 			
 		</view>
@@ -151,6 +154,11 @@
 </script>
 
 <style scoped>
+	.content{
+		background: #F4F5F7;
+		min-height: 100vh;
+		font-family: PingFangSC-Regular, PingFang SC;
+	}
 	.searchTitle{
 		font-size: 20px;
 		font-weight: 500;
@@ -159,24 +167,38 @@
 	}
 	.ssjg{
 		font-size: 16px;
-		color: #999999;
+		color: #666666;
 		padding-top: 20px;
 	}
+	.contBox{
+		min-height: 60vh;
+	}
 	.searchInput{
-		width: 1060px;
+		width: 520px;
+		height: 40px;
 		padding-left: 20px;
-		line-height: 50px;
+		line-height: 40px;
 		border: 2px solid #EEEEEE;
-		height: 50px;
 		border-radius: 6px;
+		border-right: none;
+		background: #FFFFFF;
 	}
 	.searchBtn{
-		width: 120px;
-		height: 54px;
-		margin-left: -2px;
+		width: 72px;
+		height: 42px;
+		background: #FF4F00;
+		border-radius: 0px 6px 6px 0px;
+		line-height: 42px;
+		color: #FFFFFF;
+		font-size: 16px;
+		text-align: center;
+		cursor: pointer;
+		margin-left: -5px;
 	}
 	.searchBox{
 		display: flex;
+		justify-content: center;
+		padding-top: 20px;
 	}
 	*{
 		padding: 0;
@@ -188,8 +210,8 @@
 	}
 	.gotop{
 		position: fixed;
-		right:15vh ;
-		bottom: 100px;
+		right:5vh ;
+		bottom: 60px;
 		cursor: pointer;
 	}
 	.topName{
@@ -250,6 +272,12 @@
 		display: flex;
 		flex-wrap: wrap;
 	}
+	.contL{
+		background: #FFFFFF;
+		padding:0px 20px;
+		margin-top: 30px;
+		border-radius: 8px;
+	}
 	.mainwzline{
 		width: 276px;
 		height: 260px;
@@ -289,35 +317,44 @@
 		
 	}
 	.wzLineLeft{
-		border-radius: 10px;
+		border-radius: 6px;
 		overflow: hidden;
 		width: 200px;
 		height: 132px;
 	}
 	.wzLineRight{
 		padding-left: 16px;
-		width: 900px;
+		width: 788px;
 	}
-	.wzTitle{
+	.wzTitle2{
 		font-size: 16px;
-		font-weight: 500;
 		color: #3C3C3C;
+		width: 948px;
+		height: 20px;
+		line-height: 20px;
+		text-overflow: -o-ellipsis-lastline;
+		 overflow: hidden;
+		 text-overflow: ellipsis;
+		 display: -webkit-box;
+		 -webkit-line-clamp: 1;
+		 line-clamp: 1;
+		 -webkit-box-orient: vertical;
 	}
 	.wzComment{
-		font-size: 12px;
+		font-size: 14px;
 		font-family: PingFangSC-Regular, PingFang SC;
 		font-weight: 400;
 		color: #999999;
-		line-height: 17px;
+		line-height: 20px;
 		padding-top: 10px;
-		width: 960px;
-		height: 100px;
+		width: 948px;
+		height: 80px;
 		text-overflow: -o-ellipsis-lastline;
 		 overflow: hidden;
 		 text-overflow: ellipsis;
 		 display: -webkit-box;
-		 -webkit-line-clamp: 6;
-		 line-clamp: 6;
+		 -webkit-line-clamp: 4;
+		 line-clamp: 4;
 		 -webkit-box-orient: vertical;
 	}
 	.pageView{

uni_modules/page-pagination/components/page-pagination/page-pagination.vue

@@ -157,7 +157,7 @@
 			//页码颜色
 			color: {
 				type: String,
-				default: "#1989FA"
+				default: "#ff4f00"
 			},
 			//是否显示页面信息
 			showPageInfo: {
@@ -339,8 +339,9 @@
 	}
 
 	.page-pagination .page-con .page-scroll-child .pag-btn.active {
-		background-color: #1989FA;
+		background-color: #FF4F00;
 		color: #FFFFFF !important;
+		    border: 1px solid #ff4f00;
 	}
 
 	.page-pagination .page-con .page-scroll-child .pag-btn.btn-ban {