样式修改

components/pcNav/pcNav.vue

@@ -3,17 +3,17 @@
 		<view class="nav">
 			<view class="navCont">
 				<view class="logo">
-					<image src="../../static/pcimg/nav_logo@2x.png" mode="" class="logoImg"></image>
+					<image :src="info.logo" mode="" class="logoImg"></image>
 				</view>
-				<view class="navTitle">门店学院</view>
+				<view class="navTitle">{{info.title}}</view>
 				<view class="indexNav" :class="{'indexActive':data=='index'}" @click="goIndex">首页</view>
 				<view class="allCategory">
-					<view class="allCategoryLine" :class="{'indexActive':itemName==item.name}" v-for="(item,index) in allCategory" v-if="index<4" @click="goItem(item)">{{item.name}}</view>
+					<view class="allCategoryLine" :class="{'indexActive':itemName==item.name}" v-for="(item,index) in allCategory" v-if="index<5" @click="goItem(item)">{{item.name}}</view>
 				    <view class="allCategoryMore" v-if="allCategory.length>1">
 					 <span @click="moreBtn">更多</span> 
 					 <image @click="moreBtn" src="../../static/pcimg/icon_arrow_xia@2x.png" mode="widthFix" class="navmoreImg"></image>
-					 <view class="navMoret" v-show="navMoret">
-					 	<view class="navMoreTline" v-for="(item,index) in allCategory" v-if="index>3" @click="goItem(item)">{{item.name}}</view>
+					 <view class="navMoret" >
+					 	<view class="navMoreTline" v-for="(item,index) in allCategory" v-if="index>4" @click="goItem(item)">{{item.name}}</view>
 					 </view>
 					
 					</view>
@@ -36,7 +36,7 @@
 			return {
 				allCategory:[],
 				navMoret:false,
-				
+				info:'',
 			};
 		},
 		onLoad() {
@@ -44,6 +44,7 @@
 		},
 		created(){
 			this.getallCategory();
+			this.getInfo()
 		},
 		methods:{
 			gosearchlist(){
@@ -57,6 +58,11 @@
 					url:'list?code='+item.code+'&topName='+item.name+'&comment='+item.comment
 				})
 			},
+			getInfo(){
+				this.$http('/trainingOpenApi/getInfo', {}, 'GET').then(res => {
+					this.info = res.data
+				})
+			},
 			goIndex(){
 				uni.navigateTo({
 					url:'../../pages/pc/index'
@@ -93,7 +99,7 @@
 		position: relative;
 	}
 	.logoImg{
-		width: 86px;
+		width: 77px;
 		height: 36px;
 		margin-top: 19px;
 	}
@@ -101,7 +107,7 @@
 		line-height: 72px;
 		font-weight: 500;
 		color: #3C3C3C;
-		font-size: 24px;
+		font-size: 22px;
 		padding-left: 24px;
 	}
 	.indexNav{
@@ -122,30 +128,36 @@
 	.allCategoryLine{
 		padding-left: 44px;
 		color: #3C3C3C;
-		font-size: 20px;
+		font-size: 18px;
 		cursor: pointer;
 	}
 	.allCategoryMore{
 		padding-left: 44px;
 		color: #3C3C3C;
-		font-size: 20px;
+		font-size: 18px;
 		display: flex;
 		cursor: pointer;
 		position: relative;
 	}
 	.navMoret{
 		position: absolute;
-		width: 160px;
+		width: 130px;
 		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; 
+	}
+	.allCategoryMore:hover .navMoret{
+		display: block;
 	}
 	.navMoreTline{
-		width: 160px;
+		width: 130px;
 		text-align: center;
 		font-size: 20px;
+		line-height: 60px;
 	}
 	.navmoreImg{
 		width: 12px;

pages/pc/detail.vue

@@ -7,7 +7,7 @@
 			<view class="topjt">></view>
 			<view class="topline" @click="goList()">{{topName}}</view>
 			<view class="topjt" v-if="twoName">></view>
-			<view class="topline">{{twoName}}</view>
+			<view class="topline" :class="{'c999':twoName}">{{twoName}}</view>
 		</view>
 		<view class="htmlBox">
 			<view class="htmlTitle">{{detailData.name}}</view>
@@ -93,6 +93,7 @@
 					}
 
 					this.detailData = data;
+					console.log()
 					if (this.detailData.contents) {
 						var replaceStr = "application/x-shockwave-flash"
 					    this.detailData.contents=this.detailData.contents.replace(new RegExp(replaceStr,'gm'),'video/webm')//(/''/g,"video/webm")
@@ -174,11 +175,12 @@
 	.itemArrLine{
 		display: flex;
 		justify-content: space-between;
-		padding: 22px 0;
+		padding: 16px 0;
 		border-bottom: 1px solid #EEEEEE;
 		color: #333333;
 		line-height: 22px;
 		font-size: 16px;
+		width: 720px;
 	}
 	.itemArr{
 		width: 720px;
@@ -205,6 +207,7 @@
 		width: 720px;
 		margin: 0 auto;
 		margin-top: 30px;
+		padding-bottom: 30px;
 	}
 	.topName{
 		width: 84px;
@@ -220,4 +223,7 @@
 		text-decoration:underline;
 		color: #3F90F7;
 	}
+	.c999{
+		color: #999999;
+	}
 </style>

pages/pc/groupingList.vue

@@ -7,7 +7,7 @@
 	    	<view class="topjt">></view>
 	    	<view class="topline" @click="goList">{{topName}}</view>
 	    	<view class="topjt" v-if="name">></view>
-	    	<view class="topline">{{name}}</view>
+	    	<view class="topline" :class="{'c999':name}">{{name}}</view>
 	    </view>
 		
 		<view class="gotop" @click="gotoTop">
@@ -41,7 +41,7 @@
 				</view>
 			</view>
 			<view class="nodata" v-show="list.length==0">
-				<image src="../../static/pcimg/pic_empty_search@2x.png" mode="" class="nodataImg"></image>
+				<image src="../../static/pcimg/listnodata.png" mode="" class="nodataImg"></image>
 				<view class="nodataTitle">暂无数据</view>
 			</view>
 			
@@ -81,12 +81,14 @@
 				pageSize:20,
 				topName:'',
 				comment:'',
+				code:'',
 			}
 		},
 		onLoad(opt) {
            this.name=opt.name;
 		   this.title=opt.title;
 		   this.parentCode=opt.parentCode;
+		   this.code=opt.code;
 		   this.topName=opt.topName;
 		   this.comment=opt.comment;
 		   this.getgroupPageData()
@@ -132,7 +134,7 @@
 			},
 			getgroupPageData(){
 				var params={
-					parentCode:this.parentCode,
+					parentCode:this.code,
 					limit:this.pageSize,
 					page:this.page,
 				}
@@ -327,4 +329,7 @@
 		font-weight: 400;
 		color: #999999;
 	}
+	.c999{
+		color: #999999;
+	}
 </style>

pages/pc/index.vue

@@ -304,7 +304,7 @@
 		display: flex;
 	}
 	.mainlineTitle{
-		font-size: 24px;
+		font-size: 20px;
 		font-weight: 500;
 		color: #111111;
 		line-height: 33px;

pages/pc/list.vue

@@ -44,7 +44,7 @@
 					</view>
 				</view>
 				<view class="nodata" v-show="list.length==0">
-					<image src="../../static/pcimg/pic_empty_search@2x.png" mode="" class="nodataImg"></image>
+					<image src="../../static/pcimg/listnodata.png" mode="" class="nodataImg"></image>
 					<view class="nodataTitle">暂无数据</view>
 				</view>
 			</view>
@@ -97,7 +97,7 @@
 				// 1分类2文章
 				if (wz.Type == 1) {
 					uni.navigateTo({
-						url:'groupingList?parentCode='+wz.Code+'&name='+wz.Name+'&title='+wz.Title+'&topName='+this.topName+"&comment="+this.comment
+						url:'groupingList?parentCode='+this.topCode+'&code='+wz.Code+'&name='+wz.Name+'&title='+wz.Title+'&topName='+this.topName+"&comment="+this.comment
 					})
 				}else{
 					uni.navigateTo({
@@ -168,7 +168,7 @@
 	}
 	.topName{
 		text-align: center;
-		font-size: 24px;
+		font-size: 20px;
 		font-weight: 500;
 		color: #3C3C3C;
 		line-height: 33px;
@@ -197,6 +197,7 @@
 		font-size: 16px;
 		color: #3C3C3C;
 		cursor: pointer;
+		line-height: 28px;
 	}
 	.qhImg{
 		width: 28px;
@@ -218,6 +219,8 @@
 	.mainwzImgBox{
 		border-radius: 15px;
 	    overflow: hidden;
+		height: 184px;
+			border: 1px solid #eeeeee;
 	}
 	.contf{
 		display: flex;
@@ -228,15 +231,18 @@
 		height: 260px;
 		background: #FFFFFF;
 		margin-right: 32px;	
-		padding-top: 33px;
+		margin-top: 20px;
 		cursor: pointer;
 	}
+	.mainwzline:hover{
+		box-shadow: 0px 0px 16px 0px rgba(153, 153, 153, 0.2);
+	}
 	.mainwzlineR{
 	  margin-right: 0px;	
 	}
 	.wztitle{
 		width: 250px;
-		font-size: 16px;
+		font-size: 15px;
 		color: #333333;
 		line-height: 22px;
 		height: 44px;
@@ -247,8 +253,9 @@
 		 -webkit-line-clamp: 2;
 		 line-clamp: 2;
 		 -webkit-box-orient: vertical;
-		 padding-top: 16px;
 		 padding:0 13px ;
+		 padding-top: 16px;
+		  font-weight: 600;
 	}
 	.wzLeftIMg{
 		width: 200px;
@@ -256,8 +263,9 @@
 	}
 	.wxLine{
 		display: flex;
-		padding-top: 30px;
+		padding: 20px 0;
 		cursor: pointer;
+		border-bottom: 1px solid #EEEEEE;
 	}
 	.wzLineLeft{
 		border-radius: 10px;
@@ -281,7 +289,15 @@
 		color: #999999;
 		line-height: 17px;
 		padding-top: 10px;
-		width: 1000px;
+		width: 980px;
+		height: 100px;
+		text-overflow: -o-ellipsis-lastline;
+		 overflow: hidden;
+		 text-overflow: ellipsis;
+		 display: -webkit-box;
+		 -webkit-line-clamp: 6;
+		 line-clamp: 6;
+		 -webkit-box-orient: vertical;
 	}
 	.pageView{
 		margin-top: 20px;

pages/pc/searchlist.vue

@@ -17,7 +17,7 @@
 				<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">
@@ -66,6 +66,7 @@
 				sstype:false,
 				TotalSize:0,
 				pageSize:20,
+				sstitle:'',
 			}
 		},
 		onLoad(opt) {
@@ -83,6 +84,8 @@
 					title: '加载中'
 				})
 				this.$http('/trainingOpenApi/searchPageData', params, 'GET').then(res => {
+					this.sstitle=this.title;
+					this.sstype=true;
 					uni.hideLoading();
 					this.list=res.data.Items;
 					this.TotalSize=res.data.TotalSize;
@@ -149,21 +152,28 @@
 
 <style scoped>
 	.searchTitle{
-		font-size: 24px;
+		font-size: 20px;
 		font-weight: 500;
 		color: #3C3C3C;
 		padding-bottom: 30px;
 	}
+	.ssjg{
+		font-size: 16px;
+		color: #999999;
+		padding-top: 20px;
+	}
 	.searchInput{
 		width: 1060px;
 		padding-left: 20px;
 		line-height: 50px;
 		border: 2px solid #EEEEEE;
 		height: 50px;
+		border-radius: 6px;
 	}
 	.searchBtn{
 		width: 120px;
 		height: 54px;
+		margin-left: -2px;
 	}
 	.searchBox{
 		display: flex;
@@ -200,6 +210,7 @@
 		padding-top: 10px;
 		margin: 0 auto;
 	}
+	
 	.main{
 		width: 1200px;
 		margin: 0 auto;
@@ -272,8 +283,10 @@
 	}
 	.wxLine{
 		display: flex;
-		padding-top: 30px;
+		padding: 20px 0;
 		cursor: pointer;
+		border-bottom: 1px solid #EEEEEE;
+		
 	}
 	.wzLineLeft{
 		border-radius: 10px;
@@ -283,7 +296,7 @@
 	}
 	.wzLineRight{
 		padding-left: 16px;
-		width: 950px;
+		width: 900px;
 	}
 	.wzTitle{
 		font-size: 16px;
@@ -297,7 +310,15 @@
 		color: #999999;
 		line-height: 17px;
 		padding-top: 10px;
-		width: 1000px;
+		width: 960px;
+		height: 100px;
+		text-overflow: -o-ellipsis-lastline;
+		 overflow: hidden;
+		 text-overflow: ellipsis;
+		 display: -webkit-box;
+		 -webkit-line-clamp: 6;
+		 line-clamp: 6;
+		 -webkit-box-orient: vertical;
 	}
 	.pageView{
 		margin-top: 20px;