#

components/listBlock1/listBlock1.vue

@@ -5,8 +5,10 @@
 			<view class="img cell-img">
 				<image :src="i.pic" mode="aspectFill"></image>
 
-				<image class="star" @click.stop="coll" :data-e="i"
-					:src="collArr.includes(i.acId) ? pic_coll2 : pic_coll " mode="aspectFill"></image>
+				<view class="starView" @click.stop="coll" :data-e="i">
+					<image class="star" :src="collArr.includes(i.acId) ? pic_coll2 : pic_coll " mode="aspectFill"></image>
+
+				</view>
 
 
 			</view>
@@ -78,7 +80,7 @@
 				// 收藏list
 				collArr: [],
 				// 节流阀
-				stopTimer:0,
+				stopTimer: 0,
 
 				timer: null,
 				// animationDataArr: [],
@@ -116,10 +118,10 @@
 					title: '点击过快'
 				})
 				this.stopTimer = 1
-				
-				setTimeout(()=>{
-					this.stopTimer=0
-				},500)
+
+				setTimeout(() => {
+					this.stopTimer = 0
+				}, 500)
 
 				// return	console.log(event);
 				let aId = event.currentTarget.dataset.e.acId
@@ -215,7 +217,7 @@
 
 			// 获取收藏事件
 			getdata() {
-				console.log(111);
+				// console.log(111);
 				// this.timer=setInterval(() => {
 				// 	if(this.animationDataArr.length>0){
 				// 		console.log(this.animationDataArr.length);
@@ -227,7 +229,7 @@
 				if (!value) return this.collArr = []
 
 				// 触发收藏事件
-				console.log('触发收藏事件');
+				// console.log('触发收藏事件');
 				// this.collArr: [],
 				let data = {
 					oid: this.$store.state.user.openid, //用户id
@@ -268,10 +270,22 @@
 			flex-shrink: 0;
 			position: relative;
 
-			.star {
+			.starView {
+				width: 40rpx;
+				height: 40rpx;
+			
+				box-sizing: content-box;
+				padding-bottom: 10rpx;
+				padding-left: 10rpx;
 				position: absolute;
-				right: 10rpx;
-				top: 10rpx;
+				right: 0rpx;
+				top: 0rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			.star {
 				width: 30rpx;
 				height: 30rpx;
 			}

components/teaching-case/teaching-case.vue

@@ -2,8 +2,11 @@
 	<view class="teaching_case">
 
 		<view class="cont" @click="gotoWeb" v-for="(item, index) in acList" :key="index" :data-kid="item.href">
-			<image class="star" :src="collArr.includes(item.cid) ? pic_coll2 : pic_coll " @click.stop="coll"
-				:data-e="item" mode="aspectFill"></image>
+			
+			<view class="starView"  @click.stop="coll" :data-e="item">
+				<image class="star" :src="collArr.includes(item.cid) ? pic_coll2 : pic_coll " mode="aspectFill"></image>
+			</view>
+			
 			<image class="img" :src="item.img" mode="aspectFill" />
 			<view class="tit btn-font">{{ item.ctit }}</view>
 			<!-- <view class="teacher fz-font">{{ item.school }}</view> -->
@@ -199,10 +202,25 @@
 			margin-bottom: 20rpx;
 			position: relative;
 
-			.star {
+			.starView {
+				width: 40rpx;
+				height: 40rpx;
+			
+				box-sizing: content-box;
+				padding-bottom: 10rpx;
+				padding-left: 10rpx;
 				position: absolute;
-				right: 30rpx;
-				top: 30rpx;
+				right: 20rpx;
+				top: 20rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+			
+			.star {
+				// position: absolute;
+				// right: 30rpx;
+				// top: 30rpx;
 				width: 30rpx;
 				height: 30rpx;
 			}

pages/index/index.vue

@@ -2,6 +2,7 @@
 	<view class="content">
 		<statusBar :item="navBarData"></statusBar>
 		<!-- 消息提示 -->
+
 		<msgPop></msgPop>
 
 		<view class="top">
@@ -74,7 +75,12 @@
 					title: "首页", //导航栏标题
 					btn: 0, //是否显示返回按钮 0不显示  1 显示
 				},
-				
+
+				isRote: false,
+				animation: null,
+				animationData: {},
+
+
 				// 推荐课程
 				classList: [],
 				sortList: [{
@@ -157,12 +163,15 @@
 		},
 		onLoad() {
 			// this.animation = uni.createAnimation()	
+
 		},
 		onShow() {
 			// 清空推荐课程
-			this.classList = []
+			// this.classList = []
+
 			// 获取数据
 			this.getlistBlock1Data()
+
 			this.getAllMessage() // 调用app.js中的方法
 
 			// 因为组件没有onshow

pages/mine/mine.vue

@@ -1,7 +1,9 @@
 <template>
 	<view>
 		<statusBar :item="navBarData"></statusBar>
+		<!-- 消息提示 -->
 		
+		<msgPop></msgPop>
 		<view class="mineBox">
 			<view class="userInformation" >
 				<view class="userAvatar" @click="gotoMineEdit">

pages/mineCollNew/mineCollNew.vue

@@ -143,6 +143,7 @@
 					page: this.currentPage, //下拉获取更多的备用字段
 					lim: 15 //一次获取多少数据
 				}
+				console.log('data',data);
 				this.$request('/selectCollAcList', 'POST', data).then(res => {
 					console.log('获取活动数据', res);
 					if (!res[0].length) {
@@ -215,8 +216,6 @@
 					if (this.aclist.length < 15) {
 						this.lower()
 					}
-
-					// this.getData()
 				})
 			},
 			// 取消课程收藏事件
@@ -285,6 +284,9 @@
 			this.aclist=[] //活动数据list
 			this.classlist= [] //课程数据list
 			
+			this.clcurrentPage = 1;
+			this.currentPage = 1;
+			
 			// 获取数据
 			this.getData()
 			this.getTeachData()