Merge branch 'master' of http://47.98.226.240:3000/twt/college

* 'master' of http://47.98.226.240:3000/twt/college:
  1
  链接跳转

components/pcNav/pcNav.vue

@@ -6,14 +6,14 @@
 					<image src="../../static/pcimg/nav_logo@2x.png" mode="" class="logoImg"></image>
 				</view>
 				<view class="navTitle">门店学院</view>
-				<view class="indexNav" @click="goIndex">首页</view>
+				<view class="indexNav" :class="{'indexActive':data=='index'}" @click="goIndex">首页</view>
 				<view class="allCategory">
-					<view class="allCategoryLine" v-for="(item,index) in allCategory" v-if="index<4">{{item.name}}</view>
+					<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="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">{{item.name}}</view>
+					 	<view class="navMoreTline" v-for="(item,index) in allCategory" v-if="index>3" @click="goItem(item)">{{item.name}}</view>
 					 </view>
 					
 					</view>
@@ -31,13 +31,12 @@
 <script>
 	export default {
 		name: "searchBox",
-		props: {
-			
-		},
+		props: ['data','itemName'],
 		data() {
 			return {
 				allCategory:[],
 				navMoret:false,
+				
 			};
 		},
 		onLoad() {
@@ -52,6 +51,12 @@
 					url:'../../pages/pc/searchlist'
 				})
 			},
+			goItem(item){
+				console.log(item)
+				uni.navigateTo({
+					url:'list?code='+item.code+'&topName='+item.name+'&comment='+item.comment
+				})
+			},
 			goIndex(){
 				uni.navigateTo({
 					url:'../../pages/pc/index'
@@ -102,9 +107,13 @@
 	.indexNav{
 		line-height: 72px;
 		font-weight: 500;
-		color: #FF4F00;
+		color: #3C3C3C;
 		font-size: 20px;
 		padding-left: 54px;
+		cursor: pointer;
+	}
+	.indexActive{
+		color: #FF4F00 !important;
 	}
 	.allCategory{
 		display: flex;

pages/index/index.vue

@@ -19,6 +19,11 @@
 			}
 		},
 		onLoad() {
+		  if(navigator.userAgent.indexOf('UCBrowser') > -1) {
+			uni.navigateTo({
+				url:'../mobile/index'
+			})
+		  }
           if (navigator.userAgent.indexOf('Mobile') === -1) {  
             console.log("PC")
 			uni.navigateTo({

pages/pc/detail.vue

@@ -5,8 +5,8 @@
 		<view class="top">
 			<view class="topline" @click="goIndex">首页</view>
 			<view class="topjt">></view>
-			<view class="topline">{{topName}}</view>
-			<view class="topjt">></view>
+			<view class="topline" @click="goList()">{{topName}}</view>
+			<view class="topjt" v-if="twoName">></view>
 			<view class="topline">{{twoName}}</view>
 		</view>
 		<view class="htmlBox">
@@ -16,13 +16,13 @@
 		</view>
 		<view class="itemArr" v-if="itemArr.length>0">
 		  <view class="itemArrLine" v-for="(item,index) in itemArr">
-			  <view class="itemArrLeft">
+			  <view class="itemArrLeft" >
 				  <image src="../../static/pcimg/icon_fujian@2x.png" mode="" class="fileIcon"></image>
-				  <view class="fileName">{{item.fileName}}</view>
+				  <view class="fileName" @click="gofile(item.fileUrl)">{{item.fileName}}</view>
 			  </view>
-			  <view class="dload">
+			<!-- <view class="dload">
 				  <a class="dloadbtn" :href="item.fileUrl" target='_blank' >下载</a>
-			  </view>
+			  </view> -->
 		  </view>
 		</view>
 		<view class="lbel">
@@ -46,6 +46,8 @@
 				itemArr: [],
 				topName:'',
 				twoName:'',
+				comment:'',
+				parentCode:'',
 			}
 		},
 		onLoad(opt) {
@@ -53,12 +55,22 @@
 			this.id = opt.id
             this.topName=opt.topName;
 			this.twoName=opt.twoName;
+			this.comment=opt.comment;
+			this.parentCode=opt.parentCode
 			this.getDetailData()
 			// uni.setNavigationBarTitle({
 			// 	title: this.topName
 			// })
 		},
 		methods: {
+			gofile(url){
+				window.location.href=url
+			},
+			goList(){
+				uni.navigateTo({
+					url:'list?code='+this.parentCode+'&topName='+this.topName+'&comment='+this.comment
+				})
+			},
              goIndex(){
 					uni.navigateTo({
 						url:'index'
@@ -204,4 +216,8 @@
 		line-height: 24px;
 		text-align: center;
 	}
+	.fileName{
+		text-decoration:underline;
+		color: #3F90F7;
+	}
 </style>

pages/pc/groupingList.vue

@@ -1,19 +1,19 @@
 <template>
 	<view class="content">
-		<pcNav></pcNav>
+		<pcNav :itemName="topName"></pcNav>
 		<view style="height: 72px;"></view>
 	    <view class="top">
 	    	<view class="topline" @click="goIndex">首页</view>
 	    	<view class="topjt">></view>
-	    	<view class="topline">{{topName}}</view>
-	    	<view class="topjt">></view>
+	    	<view class="topline" @click="goList">{{topName}}</view>
+	    	<view class="topjt" v-if="name">></view>
 	    	<view class="topline">{{name}}</view>
 	    </view>
 		
 		<view class="gotop" @click="gotoTop">
 			<image src="../../static/pcimg/btn_top@2x.png" mode="" class="gotopImg"></image>
 		</view>
-		<view class="top">
+		<view class="">
 			<view class="topName">{{name}}</view>
 			<view class="comment">{{title}}</view>
 		</view>
@@ -80,6 +80,7 @@
 				TotalSize:0,
 				pageSize:20,
 				topName:'',
+				comment:'',
 			}
 		},
 		onLoad(opt) {
@@ -87,6 +88,7 @@
 		   this.title=opt.title;
 		   this.parentCode=opt.parentCode;
 		   this.topName=opt.topName;
+		   this.comment=opt.comment;
 		   this.getgroupPageData()
 		},
 		methods: {
@@ -95,6 +97,11 @@
 					url:'index'
 				}) 
 			},
+			goList(){
+				uni.navigateTo({
+					url:'list?code='+this.parentCode+'&topName='+this.topName+'&comment='+this.comment
+				})
+			},
 			goDetail(wz){
 				// 1分类2文章
 				if (wz.Type == 1) {

pages/pc/index.vue

@@ -17,7 +17,7 @@
 								</view>
 								<view class="swpTitleBox">
 									<view class="swpTitle">{{item.title}}</view>
-									<view class="categoryName">{{item.categoryName}}</view>
+									<view class="categoryName" @click.stop="goList(item)">{{item.categoryName}}</view>
 								</view>
 								
 							</view>
@@ -50,8 +50,8 @@
 						</view>
 						<view class="mainlineMore" @click="mainMore(item)">查看更多></view>
 					</view>
-					<view class="mainwzbox" >
-						<view class="mainwzline" v-for="(wz,wzindex) in item.children" v-if="wzindex<4" :class="{'mainwzlineR':wzindex!=3}">
+					<view class="mainwzbox" v-if="item.children.length>0">
+						<view class="mainwzline" v-for="(wz,wzindex) in item.children" @click="goDetail2(wz,item)" v-if="wzindex<4" :class="{'mainwzlineR':wzindex!=3}">
 							<view class="mainwzImgBox">
 							  <img :src="wz.logoImg" alt="" class="mainwzImg">	
 							</view>
@@ -105,8 +105,24 @@
 		   this.getindexData()
 		},
 		methods: {
+			goList(item){
+				console.log(item)
+				uni.navigateTo({
+					url:'list?code='+item.code+'&topName='+item.categoryName//+'&comment='+item.comment
+				})
+			},
 			goDetail(item){
 				console.log(item)
+				uni.navigateTo({
+					url:'detail?id='+item.id+'&topName='+item.categoryName+"&comment="+item.comment+'&parentCode='+item.code
+				})
+			},
+			goDetail2(wz,item){
+				/* console.log(item)
+				console.log(wz) */
+				 uni.navigateTo({
+					url:'detail?id='+wz.id+'&topName='+item.name+"&comment="+item.comment+'&parentCode='+item.code
+				}) 
 			},
 			gotoTop(){
 				uni.pageScrollTo({ 
@@ -181,31 +197,34 @@
 		width: 44px;
 		height: 44px;
 		position: absolute;
-		top: 150px;
-		left: -50px;
+		top: 175px;
+		left: -60px;
 		cursor: pointer;
 	}
 	.swpImgright{
 		width: 44px;
 		height: 44px;
 		position: absolute;
-		top: 150px;
-		right: -50px;
+		top: 175px;
+		right: -60px;
 		cursor: pointer;
 	}
 	.swiper-item{
 		width: 576px;
-		height: 184px;
+		height: 183px;
 		background: #FFFFFF;
-		box-shadow: 0px 0px 16px 0px rgba(153, 153, 153, 0.2);
+		box-shadow: 0px 0px 16px 0px rgba(153, 153, 153, 0.25);
 		border-radius: 9px;
 		margin-top: 14px;
 		position: relative;
 		cursor: pointer;
 	}
+	.swiper-item:hover{
+		box-shadow: 0px 0px 16px 0px rgba(153, 153, 153, 0.25);
+	}
 	.swpCont{
 		display: flex;
-		height: 200px;
+		height: 210px;
 		justify-content: space-between;
 	}
 	.swpimg{
@@ -311,20 +330,23 @@
 		height: 184px;
 	}
 	.mainwzImgBox{
-		border-radius: 15px;
+		border-radius: 8px;
 	    overflow: hidden;
+		height: 184px;
+		border: 1px solid #eeeeee;
 	}
 	.mainwzline{
 		width: 276px;
 		height: 260px;
 		background: #FFFFFF;
+		
 	}
 	.mainwzlineR{
 	  margin-right: 32px;	
 	}
 	.wztitle{
 		width: 250px;
-		font-size: 16px;
+		font-size: 15px;
 		color: #333333;
 		line-height: 22px;
 		height: 44px;
@@ -335,8 +357,10 @@
 		 -webkit-line-clamp: 2;
 		 line-clamp: 2;
 		 -webkit-box-orient: vertical;
-		 padding-top: 16px;
 		 padding:0 13px ;
+		 padding-top: 16px;
+		 font-weight: 600;
+		
 	}
 	.mainwzline:hover{
 		background: #FFFFFF;

pages/pc/list.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<pcNav></pcNav>
+		<pcNav :itemName="topName"></pcNav>
 		<view style="height: 72px;"></view>
 	
 		
@@ -97,11 +97,11 @@
 				// 1分类2文章
 				if (wz.Type == 1) {
 					uni.navigateTo({
-						url:'groupingList?parentCode='+wz.Code+'&name='+wz.Name+'&title='+wz.Title+'&topName='+this.topName
+						url:'groupingList?parentCode='+wz.Code+'&name='+wz.Name+'&title='+wz.Title+'&topName='+this.topName+"&comment="+this.comment
 					})
 				}else{
 					uni.navigateTo({
-						url:'detail?id='+wz.ID+'&topName='+this.topName+'&twoName='+this.dynamicCol[this.tabIndex].name
+						url:'detail?id='+wz.ID+'&topName='+this.topName+'&twoName='+this.dynamicCol[this.tabIndex].name+"&comment="+this.comment+'&parentCode='+wz.Code
 					})
 				}
 				//console.log(wz)