提交

pages/detail/detail.vue

@@ -4,40 +4,64 @@
 	<view class="topContent">
 		<!-- 这里是状态栏 -->
 		<view class="status_bar"></view>
-		<u-navbar height="50" :autoBack="true" :bgColor="'transparent'">
+		<u-navbar height="50" :autoBack="true" :bgColor="tagList.length>0?'transparent':'#ffffff'">
 			<view
 				class="u-nav-slot"
 				slot="left"
-				 @click="backHandle"
+				
 				
 			>
 				<u-icon
 					name="arrow-left"
 					size="19"
-					color="#ffffff"
+					:color="tagList.length>0?'#ffffff':'#000000'"
 				></u-icon>
-				<view class="title" style="background: transparent;color:#ffffff">
+				<view class="title" :style="{background: 'transparent',color:tagList.length>0?'#ffffff':'#000000'}">
 					详情
 				</view>
 			</view>
 		</u-navbar>
-		<image :src="baseUrl+titleInfo.listimage" class="listImage" mode="aspectFill"></image>
+		<view class="" v-if="tagList.length>0">
-		<view class="schoolItem">
+			<image :src="baseUrl+titleInfo.listimage" class="listImage" mode="aspectFill"></image>
-			<image :src="logo" class="logo"  mode="aspectFill"></image>
+			<view class="schoolItem">
-			<view class="textContentInfo">
+				<image :src="logo" class="logo"  mode="aspectFill"></image>
-				<view class="itemTitle">{{titleInfo.title}}</view>
+				<view class="textContentInfo">
-				<view class="itemSubTitle">{{titleInfo.sectitle}}</view>
+					<view class="itemTitle">{{titleInfo.title}}</view>
+					<view class="itemSubTitle">{{titleInfo.sectitle}}</view>
+				</view>
+				<view class="tagListContent">
+					<view class="tagItem" v-for="(item,index) in tagList" :key="index" @click="getArticleText(item,index)">
+						<image :src="item.icon" class="tagImage" mode="aspectFill"></image>
+						<text :class="index==activeIndex?'activeText':''">{{item.name}}</text>
+					</view>
+				</view>
 			</view>
-			<view class="tagListContent">
+			<view class="detailContent">
-				<view class="tagItem" v-for="(item,index) in tagList" :key="index" @click="getArticleText(item,index)">
+				<view class="detailTitle">
-					<image :src="item.icon" class="tagImage" mode="aspectFill"></image>
+					{{activeText}}
-					<text :class="index==activeIndex?'activeText':''">{{item.name}}</text>
 				</view>
+				<view class="tools">
+					<view class="time">
+						{{titleInfo.updatetime}}
+					</view>
+					<view class="toolItem">
+						<view class="" @click="addCollect">
+							<image src="/static/m1.png" mode="widthFix" v-if="!isCollect"></image>
+							<image src="/static/collected.png" mode="widthFix" v-else></image>
+							<text>收藏</text>
+						</view>
+						<view class="" @click="addShare">
+							<image src="/static/m3.png" mode="widthFix"></image>
+							<text>分享</text>
+						</view>
+					</view>
+				</view>
+				<u-parse :content="titleInfo.content"></u-parse>
 			</view>
 		</view>
-		<view class="detailContent">
+		<view class="detailContent" style="margin-top:120upx" v-if="tagList.length==0">
 			<view class="detailTitle">
-				{{activeText}}
+				{{titleInfo.title}}
 			</view>
 			<view class="tools">
 				<view class="time">
@@ -107,8 +131,13 @@
 				getNavList({menu_id:this.menu_id}).then(res=>{
 					console.log(res);
 					this.tagList = res;
-					this.activeText = this.tagList[0].name
+					if(this.tagList.length>0){
-					this.articleDetails(this.tagList[0].id)
+						this.activeText = this.tagList[0].name
+						this.articleDetails(this.tagList[0].id)
+					}else{
+						this.articleDetails()
+					}
+					
 				})
 			},
 			backHandle(){
@@ -229,7 +258,13 @@
 					
 				// })
 				// {custom: { auth: true }}
-				articleDetails({ids:this.id,nav_id:navId}).then(res=>{
+				let params;
+				if(navId){
+					params={ids:this.id,nav_id:navId}
+				}else{
+					params = {ids:this.id}
+				}
+				articleDetails(params).then(res=>{
 					this.titleInfo = res;
 					if(res.is_collect==0){
 						this.isCollect = false
@@ -354,7 +389,7 @@
 	
 	padding:38upx 25upx;
 	position: relative;
-	z-index:99;
+	z-index:60;
 	background: #fff;
 	margin: 0 24upx;
 	margin-top:30upx;

pages/index/index.vue

@@ -88,7 +88,7 @@
 				// #endif
 			},
 			click(name) {
-				console.log(name)
+				console.log(name,"777")
 				uni.navigateTo({
 					url:'/pages/index/searchPage?id='+name.id+'&typedata='+name.typedata
 				})