pages报错

components/courselist/courselist.vue

@@ -27,7 +27,9 @@
 
 <script>
 	import api from "../../api/api";
+	
 	export default{
+		props:['tagIds'],
 		data(){
 			return{
 				cffpCourseInfos:[]
@@ -37,7 +39,8 @@
 		components:{
 		},
 		onLoad(){
-			this.courseList()
+			console.log(this.tagIds)
+			this.courseList();
 		},
 		methods:{
 			goDetail(item){
@@ -46,6 +49,7 @@
 				});
 			},
 			courseList(){
+				debugger;
 				api.courseList().then(res=>{
 					console.log(res)
 					if(res['success']){

pages.json

@@ -28,7 +28,6 @@
 		            "navigationBarTitleText": "",
 		            "enablePullDownRefresh": false
 		        }
-		        
 		    }
 		    ,{
 		        "path" : "pages/shareFriend/shareFriend",
@@ -74,45 +73,7 @@
 			        "enablePullDownRefresh": false
 			    }
 			}
-<<<<<<< HEAD
-			
 	],
-=======
-	    ,{
-            "path" : "pages/inviteJoin/inviteJoin",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        },{
-            "path" : "pages/invitationRegister/invitationRegister",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        },{
-            "path" : "pages/myCertify/myCertify",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        },{
-            "path" : "pages/certifyDetail/certifyDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
->>>>>>> 3ef1480d0dbd758ecf9ffea4c0641ecf16c57490
 	"tabBar": {
 	        "color": "#7A7E83", // tab 上的文字默认颜色
 	        "selectedColor": "#7A7E83", // tab 上的文字选中时的颜色

pages/index/index.vue

@@ -43,8 +43,12 @@
 			  </view>
 			</view>
 		</view>
-		<view class="">
-			<courselist></courselist>
+		<view class="course_content">
+			<view class="tag">
+				<h4>精品课程</h4>
+				<view @click="goToCourselist()">更多<text class="iconfont icon-youjiantou"></text></view>
+			</view>
+			<courselist :tagIds="tagIds"></courselist>
 		</view>
 		
 	</view>
@@ -85,10 +89,11 @@
 				interval: 2000,
 				duration: 500,
 				announcementInfo:null,
-				messageUnreadCount:null
+				messageUnreadCount:null,
+				tagIds:123
 			}
 		},
-		comments:{
+		components:{
 			courselist
 		},
 		onLoad() {
@@ -149,6 +154,11 @@
 					        this.messageUnreadCount = null;
 					      }
 				})
+			},
+			goToCourselist(){
+				uni.navigateTo({
+					url:'../../components/courselist/courselist'
+				})
 			}
 		},
 		onShow() {
@@ -242,6 +252,7 @@
 			margin-bottom: 20rpx;
 			overflow: hidden;
 			background: #fff;
+			position: relative;
 			.featureContent{
 			  padding-top: 10px;
 			  .nav_wrapper{
@@ -267,6 +278,29 @@
 			  }
 			}
 		}
+		.course_content{
+			background: #fff;
+			position: relative;
+			.tag{
+				padding: 20rpx;
+				display: flex;
+				justify-content: space-between;
+				h4{
+					margin-left: 20rpx;
+				}
+			}
+			.tag:before{
+				position: absolute;
+				left: 20rpx;
+				top: 20rpx;
+				display: inline-block;
+				content: '';
+				width: 2px;
+				height: 16px;
+				background-color: #5F83FF;
+				border-radius: 2px;
+			}
+		}
 	}
 	.description{
 		padding: 40rpx;