#

App.vue

@@ -156,7 +156,8 @@
 		width: 520rpx;
 		height: 260rpx;
 		z-index: 1000;
-	
+		border-radius: 16rpx;
+		overflow: hidden;
 		.popup {
 			width: 100%;
 			height: 100%;

components/listBlock1/listBlock1.vue

@@ -82,12 +82,12 @@
 			// 收藏事件
 			coll(event) {
 				const value = this.$store.state.user.openid;
-				if (value == '') {
-					uni.navigateTo({
-						url: "/pages/login_Wechat/login_Wechat",
-					});
+				if(!value){
+					uni.showToast({title: '未登录，请登录',icon: 'none'})
+					setTimeout(this.goLog,1000)
 					return
 				}
+				
 				// return	console.log(event);
 				let aId = event.currentTarget.dataset.e.acId
 
@@ -124,37 +124,42 @@
 
 			// 跳转到详情页
 			gotoDetail(e) {
-				let aid = e.currentTarget.dataset.aid;
 				const value = this.$store.state.user.openid;
-				if (value == '') return this.goLog()
-
+				if(!value){
+					uni.showToast({title: '未登录，请登录',icon: 'none'})
+					setTimeout(this.goLog,1000)
+					return
+				}
+				
+				let aid = e.currentTarget.dataset.aid;
 				uni.navigateTo({
 					url: `/pages/activityDetailNew/activityDetailNew?acId=${aid}`
-					// url:'/pages/activityDetailNew/activityDetailNew'
-					// url: `/pages/teachingDetail?acId=${aid}`
 				});
 			},
-			
+
 			//跳转到第三方链接
-			gotoLink(e){
+			gotoLink(e) {
 				const value = this.$store.state.user.openid;
-				if (value == '') {
-					uni.navigateTo({
-						url: "/pages/login_Wechat/login_Wechat",
-					});
+				if(!value){
+					uni.showToast({title: '未登录，请登录',icon: 'none'})
+					setTimeout(this.goLog,1000)
 					return
 				}
-				// return console.log('aaaaaa', e.currentTarget.dataset);
+				
 				let link = e.currentTarget.dataset.link;
 				uni.navigateTo({
 					url: "/pages/skipone/skipone?url=" + encodeURIComponent(link),
 				});
 			},
-			
+
 			// 获取收藏事件
 			getdata() {
+				const value = this.$store.state.user.openid;
+				if(!value) return this.collArr = []
+				
 				// 触发收藏事件
 				console.log('触发收藏事件');
+				// this.collArr: [],
 				let data = {
 					oid: this.$store.state.user.openid, //用户id
 					type: 0
@@ -171,10 +176,6 @@
 				})
 			},
 			goLog() {
-				uni.showToast({
-					title:'请登录',
-					icon:'none'
-				})
 				uni.navigateTo({
 					url: "/pages/login_Wechat/login_Wechat",
 				});
@@ -225,14 +226,15 @@
 				width: 500rpx;
 				justify-content: flex-start;
 				align-items: center;
-				.titTxt{
+
+				.titTxt {
 					flex: 1;
 					font-weight: bold;
 					overflow: hidden;
 					text-overflow: ellipsis;
 					white-space: nowrap;
 				}
-				
+
 			}
 
 			.introduce {
@@ -262,6 +264,7 @@
 					align-items: baseline;
 					position: relative;
 					width: 60%;
+
 					.add {
 						position: absolute;
 						bottom: 0;
@@ -317,9 +320,10 @@
 			align-items: center;
 			border-radius: 4rpx;
 			margin-right: 10rpx;
-			color:rgba(0, 178, 182, 1);
+			color: rgba(0, 178, 182, 1);
 			line-height: 32rpx;
 		}
+
 		.tag1 {
 			border: 1px rgba(0, 86, 168, 1) solid;
 			flex-shrink: 0;

components/teaching-case/teaching-case.vue

@@ -43,12 +43,12 @@
 			// 收藏事件
 			coll(event) {
 				const value = this.$store.state.user.openid;
-				if (value == '') {
-					uni.navigateTo({
-						url: "/pages/login_Wechat/login_Wechat",
-					});
+				if(!value){
+					uni.showToast({title: '未登录，请登录',icon: 'none'})
+					setTimeout(this.goLog,1000)
 					return
 				}
+				
 				// return	console.log(event);
 				let cId = event.currentTarget.dataset.e.cid
 
@@ -92,12 +92,12 @@
 			// 查看课程内容
 			gotoWeb(e) {
 				const value = this.$store.state.user.openid;
-				if (value == '') {
-					uni.navigateTo({
-						url: "/pages/login_Wechat/login_Wechat",
-					});
+				if(!value){
+					uni.showToast({title: '未登录，请登录',icon: 'none'})
+					setTimeout(this.goLog,1000)
 					return
 				}
+				
 				// return console.log('aaaaaa', e.currentTarget.dataset);
 				let acid = e.currentTarget.dataset.kid
 				uni.navigateTo({
@@ -107,6 +107,10 @@
 			},
 			// 获取课程收藏事件
 			getdata() {
+				const value = this.$store.state.user.openid;
+				if(!value) return this.collArr = []
+				
+				
 				// 触发收藏事件
 				// console.log('触发收藏事件');
 				let data = {
@@ -124,6 +128,11 @@
 					// console.log(this.collArr);
 				})
 			},
+			goLog() {
+				uni.navigateTo({
+					url: "/pages/login_Wechat/login_Wechat",
+				});
+			},
 		},
 	};
 </script>

pages.json

@@ -101,7 +101,7 @@
 		}, {
 			"path": "pages/teachingList/teachingList",
 			"style": {
-				"navigationBarTitleText": "教研室列表",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 

pages/Sign/Sign.vue

@@ -3,12 +3,12 @@
 		<statusBar :item="navBarData"></statusBar>
 		<view class="signBox">
 			<view class="img">
-				<image src="https://teacherapi.cocorobo.cn/teaching-file/static//lg.png" mode="aspectFill"></image>
+				<image src="https://teacherapi.cocorobo.cn/teaching-file/static/lg.png" mode="aspectFill"></image>
 			</view>
-			<text>报名已提交</text>
-			<text>等待管理员审核</text>
-			<button @click="gotoAct">查看课程</button>
-			<text @click="gotoIndex">返回首页</text>
+			<view style="font-size: 34rpx;font-weight: 400;color: rgba(0, 0, 0, 0.8);padding: 30rpx 0;">报名成功</view>
+			<!-- <text>等待管理员审核</text> -->
+			<button @click="gotoAct">查看活动</button>
+			<text style="font-size: 24rpx;font-weight: 400;color: rgba(0, 86, 168, 1);" @click="gotoIndex">返回首页</text>
 		</view>
 	</view>
 </template>
@@ -19,7 +19,7 @@
 			return {
 				navBarData: {
 					title: '报名结果',
-					btn: 2
+					// btn: 2
 				},
 			};
 		},
@@ -54,7 +54,7 @@
 
 			.img {
 				width: 100%;
-				height: 100px;
+				height: 160rpx;
 
 				image {
 					width: 160rpx;
@@ -62,29 +62,29 @@
 				}
 			}
 
-			text {
-				&:nth-child(2) {
-					font-size: 34rpx;
-					margin-bottom: 8px;
-					font-weight: 600;
-				}
+			// text {
+			// 	&:nth-child(2) {
+			// 		font-size: 34rpx;
+			// 		margin-bottom: 8px;
+			// 		font-weight: 600;
+			// 	}
 
-				&:nth-child(3) {
-					font-size: 24rpx;
-					color: rgb(144, 145, 147);
-					margin-bottom: 15px;
-				}
+			// 	&:nth-child(3) {
+			// 		font-size: 24rpx;
+			// 		color: rgb(144, 145, 147);
+			// 		margin-bottom: 15px;
+			// 	}
 
-				&:nth-child(5) {
-					font-size: 24rpx;
-				}
-			}
+			// 	&:nth-child(5) {
+			// 		font-size: 24rpx;
+			// 	}
+			// }
 
 			button {
 				width: 200rpx;
 				height: 64rpx;
 				color: white;
-				line-height: 33px;
+				line-height: 64rpx;
 				background-color: #0056A8;
 				font-size: 28rpx;
 				border-radius: 100px;

pages/activityDetailNew/activityDetailNew.vue

@@ -29,12 +29,12 @@
 				<view class="">
 					时间：<text class="inf">{{actItemList.begin_at}}</text>
 				</view>
-				<view class="">
+				<view class="acinfoAddress">
 					地点：<text class="inf">{{actItemList.address}}</text>
 				</view>
-				<view class="">
+				<!-- <view class="">
 					主办单位：<text class="inf">暂无字段</text>
-				</view>
+				</view> -->
 				<view class="">
 					活动形式：<text style="color:rgba(0, 86, 168, 1) ;">{{actItemList.acshape}}</text>
 				</view>
@@ -331,8 +331,6 @@
 
 			.acinfo {
 				width: 100%;
-				height: 304rpx;
-				// background-color: #000;
 				display: flex;
 				flex-direction: column;
 				justify-content: space-between;
@@ -341,7 +339,9 @@
 				color: rgba(0, 0, 0, 0.6);
 				border-bottom: 1rpx rgba(231, 231, 231, 1) solid;
 				padding-bottom: 30rpx;
-
+				.acinfoAddress{
+					padding: 30rpx 0;
+				}
 				.inf {
 					color: rgba(0, 0, 0, 0.8);
 				}

pages/activityPageNew/activityPageNew.vue

@@ -15,6 +15,7 @@
 						mode="aspectFill"></image>
 				</view>
 			</view>
+			
 			<view class="right" @click="accountLogin" :class="current == 1 ? info1 : info2">
 				<text class="">常规教研</text>
 				<view v-if="current == 1" class="yun">
@@ -22,6 +23,7 @@
 						mode="aspectFill"></image>
 				</view>
 			</view>
+			
 			<view class="right" @click="costClass" :class="current == 2 ? info1 : info2">
 				<text class="">付费教研</text>
 				<view v-if="current == 2" class="yun">

pages/dy/dy.vue

@@ -3,7 +3,9 @@
 		<statusBar :item="navBarData"></statusBar>
 		
 		<view class="bigBox" v-for=" i in applyUserlist">
-			<image class="img" :src="i.avatar" mode="aspectFill"></image>
+			<view class="imgblk">
+				<image class="img" :src="i.avatar" mode="aspectFill"></image>
+			</view>
 			<view class="info">
 				<view class="uname">
 					<view class="nameTxt">
@@ -54,7 +56,7 @@ export default {
 				aid:this.acId,
 				type: 2,
 				page: this.currentPage, //下拉获取更多的备用字段
-				lim: 15 //一次获取多少数据
+				lim: 20 //一次获取多少数据
 			}
 			this.$request('/selectApplyUser', 'POST', data).then(res => {
 				console.log('获取报名用户列表', res[0]);
@@ -66,27 +68,10 @@ export default {
 				this.applyUserlist=[...this.applyUserlist,...res[0]]
 			})
 		}
-		// btn1(e){
-		// 	// console.log(e.btn==1);
-		// 	// console.log(e);
-		// 	this.items.find(i=>{
-		// 		if(i.tit==e) return i.btn=3
-		// 	})
-		// },
-		// btn2(e){
-		// 	this.items.find(i=>{
-		// 		if(i.tit==e) return i.btn=2
-		// 	})
-		// },
-		// btn3(e){
-		// 	this.items.find(i=>{
-		// 		if(i.tit==e) return i.btn=1
-		// 	})
-		// }
+	
 	},
 	// 触底加载更多
 	onReachBottom() {
-		console.log(111);
 		if (this.newsLoading == 2) {
 			return
 		}
@@ -115,24 +100,34 @@ export default {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		.img{
-			width: 72rpx;
-			height: 72rpx;
-			border-radius: 50%;
+		.imgblk{
+			height: 80rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			// background-color: #888;
+			.img{
+				width: 72rpx;
+				height: 72rpx;
+				border-radius: 50%;
+			}
 		}
+		
 		.info{
 			flex: 1;
 			display: flex;
 			flex-direction: column;
+			height: 80rpx;
 			justify-content: space-between;
 			margin-left: 20rpx;
+			// background-color: rebeccapurple;
 			.uname{
 				display: flex;
 				justify-content: space-between;
 				.nameTxt{
 					font-size: 28rpx;
 					color: rgba(0, 0, 0, 0.8);
-					line-height: 50%;
+					// line-height: 50%;
 				}
 				.sch{
 					font-size: 24rpx;
@@ -140,7 +135,7 @@ export default {
 				}
 			}
 			.sch1{
-				flex: 1;
+				// flex: 1;
 				font-size: 24rpx;
 				color: rgba(0, 0, 0, 0.6);
 			}

pages/index/index.vue

@@ -14,7 +14,7 @@
 						收费专区
 					</view>
 					<view class="costbri">
-						<text class="di">简短描述</text>
+						<text class="di">暂未开放</text>
 					</view>
 				</view>
 				
@@ -74,14 +74,14 @@
 				classList: [],
 				sortList: [{
 						tit: '活动专区',
-						bri: '简短简介',
+						bri: '精彩纷呈',
 						img: '../../static/Framehhh.png',
 						cla: 'sortcon',
 						briCla:'di'
 					},
 					{
 						tit: '课程专区',
-						bri: '简短简介',
+						bri: '海量资源',
 						img: '../../static/Framesss.png',
 						cla: 'sortcon sortcon2',
 						briCla:'di2'

pages/jys/jys.vue

@@ -22,7 +22,7 @@
 		</view>
 
 		<!-- <uni-card :is-shadow="false"> -->
-		<view class="xinxi">
+<!-- 		<view class="xinxi">
 			<view class="card2">
 				<view class="hdxx">
 					<view class="xxTit btn-font">活动信息</view>
@@ -46,10 +46,10 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="buttons">
 			<view class="button-container">
-				<button @click="button1Action" class="btn1 sZw-font">清空填写信息</button>
+				<!-- <button @click="button1Action" class="btn1 sZw-font">清空填写信息</button> -->
 				<!-- <text class="button-spacing"></text> -->
 				<!-- 添加间距 -->
 				<button style="background-colo:#0056a8;" @click="showPop" class="btn2 sZw-font">申请加入</button>
@@ -87,10 +87,6 @@
 			</view>
 		</view>
 
-
-
-
-
 	</view>
 </template>
 
@@ -142,22 +138,22 @@
 			},
 			// 确定按钮显示弹窗
 			showPop() {
-				if (this.applyname == '') return uni.showToast({
-					title: '请输入姓名',
-					icon: 'none'
-				})
-				if (this.phone == '') return uni.showToast({
-					title: '请输入联系方式',
-					icon: 'none'
-				})
-				if (this.stations == '') return uni.showToast({
-					title: '请输入单位',
-					icon: 'none'
-				})
-				if (this.phone.length != 11) return uni.showToast({
-					title: '号码不足11位，请检查',
-					icon: 'none'
-				})
+				// if (this.applyname == '') return uni.showToast({
+				// 	title: '请输入姓名',
+				// 	icon: 'none'
+				// })
+				// if (this.phone == '') return uni.showToast({
+				// 	title: '请输入联系方式',
+				// 	icon: 'none'
+				// })
+				// if (this.stations == '') return uni.showToast({
+				// 	title: '请输入单位',
+				// 	icon: 'none'
+				// })
+				// if (this.phone.length != 11) return uni.showToast({
+				// 	title: '号码不足11位，请检查',
+				// 	icon: 'none'
+				// })
 				this.showPopup = true
 			},
 			// 确定报名
@@ -378,7 +374,7 @@
 				}
 
 				.btn2 {
-					width: 326rpx;
+					width: 600rpx;
 					height: 71rpx;
 					background-color: #0056a8;
 					border-radius: 50px;

pages/login_Wechat/login_Wechat.vue

@@ -116,7 +116,7 @@
 				// 专业
 				speList: ['互联网', '网络通信', '航空', '汽修', '珠宝', '文秘', '设计'],
 				// 职称
-				rankList: ['xx', 'xx', 'xx'],
+				rankList: ['教授', '副教授', '讲师','助教','其他'],
 				// 默认头像的
 				isShow: false,
 

pages/mine/mine.vue

@@ -128,12 +128,7 @@
 				</view>
 			</view>
 		</view>
-		
-		
-		
-		
-		
-		
+
 	</view>
 </template>
 
@@ -160,6 +155,12 @@
 			
 			// 我的收藏
 			gotoMineCollect() {
+				const value = this.$store.state.user.openid;
+				if(!value){
+					uni.showToast({title: '未登录，请登录',icon: 'none'})
+					setTimeout(this.goLog,1000)
+					return
+				}
 				uni.navigateTo({
 					// url: '/pages/mineCollect/mineCollect'
 					url:'/pages/mineCollNew/mineCollNew'
@@ -167,18 +168,36 @@
 			},
 			// 我的设置
 			gotoMineEdit() {
+				const value = this.$store.state.user.openid;
+				if(!value){
+					uni.showToast({title: '未登录，请登录',icon: 'none'})
+					setTimeout(this.goLog,1000)
+					return
+				}
 				uni.navigateTo({
 					url: '/pages/mineEdit/mineEdit'
 				})
 			},
 			// 我的活动
 			gotoMineActive() {
+				const value = this.$store.state.user.openid;
+				if(!value){
+					uni.showToast({title: '未登录，请登录',icon: 'none'})
+					setTimeout(this.goLog,1000)
+					return
+				}
 				uni.navigateTo({
 					url: '/pages/mineActive/mineActive'
 				})
 			},
 			// 信息
 			goMsg(){
+				const value = this.$store.state.user.openid;
+				if(!value){
+					uni.showToast({title: '未登录，请登录',icon: 'none'})
+					setTimeout(this.goLog,1000)
+					return
+				}
 				uni.navigateTo({
 					url: '/pages/msg/msg'
 				})
@@ -203,7 +222,12 @@
 						})
 					}
 				})
-			}
+			},
+			goLog() {
+				uni.navigateTo({
+					url: "/pages/login_Wechat/login_Wechat",
+				});
+			},
 
 		},
 		onShow() {

pages/mineActive/mineActive.vue

@@ -1,45 +1,17 @@
 <template>
-	<view>
+	<view class="mineActive">
 		<statusBar :item="navBarData"></statusBar>
-
-		<listBlock1 :classList="activeList"></listBlock1>
-		<!-- <view class="activeBox" v-for="(item,index) in activeList" :key="index">
-			<view class="teaching_case">
-				<view class="img">
-					<image :src="activeList[index].pic" mode="aspectFill"></image>
-
-				</view>
-
-				<view class="right">
-					<view class="title">
-						<view class="tag bqZ-font">类型</view>
-						<text class="three-font" style="font-weight: 600;">{{ item.acName }}</text>
-					</view>
-
-					<view class="introduce">
-						{{ item.brief }}
-					</view>
-
-					<view class="operate">
-						<view class="left">
-							<view class="money fNum-font"><text class="three-font">￥</text> {{ item.cost }}</view>
-							<view class="person">已报名{{ item.bnum }}/{{ item.pers }}人</view>
-						</view>
-
-						<view class="Oright" @click="gotoDetail" :data-all="item">
-							<view class="text">查看详情</view>
-							<view class="arrow">
-								<image src="https://teacherapi.cocorobo.cn/teaching-file/static/mine/arrow-right-blue.png"
-									mode="aspectFill"></image>
-							</view>
-						</view>
-					</view>
-				</view>
+		
+		<scroll-view class="scrollV" scroll-y="true" @scrolltolower="relower">
+			<view>
+				<listBlock1 :classList="activeList"></listBlock1>
 			</view>
-		</view> -->
-		<view class="" style="width: 100%;height: 50rpx;">
-
-		</view>
+			<view class="loading">
+				<view v-if="Loading==1">数据加载中...</view>
+				<view v-if="Loading==2">没有更多了~~</view>
+			</view>
+		</scroll-view>
+		
 	</view>
 </template>
 
@@ -52,6 +24,9 @@
 					btn: 1
 				},
 				activeList: [],
+				
+				Loading: 0, //0默认值  1加载中 2没有更多了
+				currentPage: 1, //页数
 			};
 		},
 		methods: {
@@ -60,152 +35,63 @@
 				uni.navigateTo({
 					url: `/pages/activityDetail/activityDetail?acId=${data.acId}`,
 				});
-				// if(data.type<=1){
-				// 	uni.navigateTo({
-				// 		url: `/pages/activityDetail/activityDetail?acId=${data.acId}`,
-				// 	});
-				// }else{
-				// 	uni.navigateTo({
-				// 		url: `/pages/teachingDetail/teachingDetail?acId=${data.acId}`
-				// 	});
-				// }
+			},
+			// 资源库触底
+			lower() {
+				console.log('没触底？');
+				if (this.Loading == 2) return
+				this.Loading = 1
+				this.currentPage++
+				setTimeout(this.getdata, 1000)
 			},
 			// 获取数据
 			getdata() {
 				let data = {
 					oid: this.$store.state.user.openid, //用户id
-					type: 2
+					type: 2,
+					currentPage: this.currentPage, //页数
+					lim:15
 				}
-				this.$request('/selectOperator', "POST", data).then(res => {
+				this.$request('/selectRegistered', "POST", data).then(res => {
 					console.log('获取数据',res[0]);
-					this.activeList = res[0]
+					
+					
+					if (!res[0].length) {
+						this.Loading = 2
+					} else {
+						this.Loading = 0
+					}
+					
+					this.activeList = [...this.activeList,...res[0]]
+					
+					// this.activeList = res[0]
 				})
 			}
 		},
 		onShow() {
+			this.activeList=[]
 			this.getdata()
 		}
 	}
 </script>
 
 <style lang="scss">
-	.activeBox {
-		width: 100%;
-		background-color: #fff;
-		padding: 10px 0;
-
-		.teaching_case {
-			display: flex;
-			justify-content: space-between;
-			padding: 0 15px;
-
-			.img {
-				width: 160rpx;
-				height: 160rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-					border-radius: 10rpx;
-				}
-			}
-
-			.right {
-				padding-left: 15px;
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				// align-content: flex-end;
-				justify-content: space-between;
-
-				.title {
-					display: flex;
-					align-items: center;
-
-					margin-bottom: 5px;
-
-					.tag {
-						border: 1px #00b2b6 solid;
-						// font-size: 20rpx;
-						width: 64rpx;
-						height: 38rpx;
-						display: flex;
-						white-space: nowrap;
-						justify-content: center;
-						align-items: center;
-						padding: 1rpx 4rpx;
-						border-radius: 3px;
-						margin-right: 10rpx;
-						color: #00b2b6;
-					}
-
-					text {
-						width: 180px;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-					}
-
-				}
-
-				.introduce {
-					width: 230px;
-					font-size: 28rpx;
-					color: #a7a7a7;
-					// margin-top: 8px;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-				}
-
-				.operate {
-					display: flex;
-					justify-content: space-between;
-					align-items: baseline;
-					.left {
-						display: flex;
-						flex-direction: row;
-						justify-content: space-between;
-						align-items: baseline;
-						width: 260rpx;
-
-						.money {
-							color: #FFA338;
-							font-weight: bold;
-							font-size: 36rpx;
-							line-height: 20px;
-						}
-
-						.person {
-							color: #00000099;
-							font-size: 24rpx;
-							// margin-left: 6px;
-						}
-					}
-
-					.Oright {
-						width: 80px;
-						display: flex;
-						justify-content: flex-end;
-						align-items: center;
-						.text {
-							font-size: 24rpx;
-							color: #3081E8;
-						}
-
-						.arrow {
-							display: flex;
-							justify-content: center;
-							margin-top: 5rpx;
-
-							image {
-								width: 32rpx;
-								height: 32rpx;
-							}
-						}
-					}
-				}
-			}
+	.loading {
+		height: 30rpx;
+		text-align: center;
+		padding-top: 20rpx;
+		padding-bottom: 100rpx;
+		font-size: 26rpx;
+		color: #888;
+		line-height: 2em;
+	}
+	.mineActive{
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+		.scrollV{
+			flex: 1;
 		}
 	}
+	
 </style>

pages/mineCollNew/mineCollNew.vue

@@ -21,6 +21,9 @@
 			<swiper-item>
 				<scroll-view scroll-y="true" @scrolltolower="lower" style="height: 100%;">
 					<view class="">
+						<view class="classListFlex" v-if="aclist.length==0">
+							
+						</view>
 						<view class="listBlock1" v-for="(i,index) in aclist" :key="index+'a'" @click="gotoDetail"
 							:data-aid="i.acId">
 							<view class="img cell-img">
@@ -65,6 +68,7 @@
 							</view>
 						</view>
 					</view>
+					
 					<view class="loading">
 						<view v-if="newsLoading==1">数据加载中...</view>
 						<view v-if="newsLoading==2">没有更多了~~</view>
@@ -114,10 +118,10 @@
 				classlist: [], //课程数据list
 
 
-				// 收藏活动list
-				collArr: [],
-				// 收藏课程list
-				collArrcl: [],
+				// // 收藏活动list
+				// collArr: [],
+				// // 收藏课程list
+				// collArrcl: [],
 
 				// 触底加载动画提示
 				newsLoading: 0, //0默认值  1加载中 2没有更多了
@@ -171,7 +175,6 @@
 
 					this.classlist = [...this.classlist,...res[0]]
 					// this.classlist = res[0]
-					// console.log(this.collArr);
 				})
 			},
 			
@@ -272,11 +275,18 @@
 			},
 		},
 		onLoad() {
-			// this.getDatacl()
-			// this.getColldata()
+			
+		},
+		onShow() {
+			this.aclist=[] //活动数据list
+			this.classlist= [] //课程数据list
+			
 			// 获取数据
 			this.getData()
 			this.getTeachData()
+			
+			
+		
 		}
 	}
 </script>

pages/mineEdit/mineEdit.vue

@@ -139,7 +139,7 @@
 		</view>
 
 		<view>
-			<view class="popup-container" style="height: 175px;" v-show="showPopupConfirm">
+			<view class="popup-container2" style="height: 175px;" v-show="showPopupConfirm">
 				<view class="popup">
 					<view class="header" style="margin-top: 15px;">
 						<image src="https://teacherapi.cocorobo.cn/teaching-file/static//gou1.png" mode="aspectFill">
@@ -180,7 +180,8 @@
 				//专业选项
 				speList: ['互联网', '网络通信', '航空', '汽修', '珠宝', '文秘', '设计'],
 				//职称选项
-				rankList: ['xx', 'xx', 'xx'],
+				rankList: ['教授', '副教授', '讲师','助教','其他'],
+				// rankList: ['xx', 'xx', 'xx'],
 				// 兴趣选项
 				hobbyList: ['篮球', '编程', '钢琴', '美术', '摄影'],
 
@@ -382,16 +383,18 @@
 		// display: none;
 	}
 
-	.popup-container {
+	.popup-container2 {
 		position: fixed;
 		top: 50%;
 		left: 50%;
 		transform: translate(-50%, -50%);
 		width: 520rpx;
-		height: 260rpx;
+		height: 260rpx; 
 		z-index: 1000;
+		border-radius: 16rpx;
 		// display: none;
-
+		box-shadow: 0rpx 0rpx 10rpx 5rpx rgba(0, 0, 0, .5);
+		overflow: hidden;
 		.popup {
 			width: 100%;
 			height: 100%;

pages/msg/msg.vue

@@ -321,6 +321,8 @@
 			},
 		},
 		onShow() {
+			this.Msglist= []
+			this.syslist= []
 			this.getdata()
 			this.getdata2()
 			this.getMag()

pages/resource/resource.vue

@@ -129,14 +129,13 @@
 				}, 1000);
 
 				// 资源库
-				this.classList= []
-				this.reLoading= 0 //0默认值  1加载中 2没有更多了
-				this.recurrentPage= 1 //页数
-				
-				
+				this.classList = []
+				this.reLoading = 0 //0默认值  1加载中 2没有更多了
+				this.recurrentPage = 1 //页数
+
+
 
 				this.getreList()
-				console.log(111);
 			},
 			// 精品慕课下拉刷新
 			purepulling() {
@@ -147,9 +146,9 @@
 				}, 1000);
 
 				// 精品课程
-				this.classList2= []
-				this.teaLoading= 0 //0默认值  1加载中 2没有更多了
-				this.teacurrentPage= 1
+				this.classList2 = []
+				this.teaLoading = 0 //0默认值  1加载中 2没有更多了
+				this.teacurrentPage = 1
 
 				this.getteaList()
 				console.log(111);
@@ -234,43 +233,29 @@
 
 			// this.teaLoading: 0 //0默认值  1加载中 2没有更多了
 			// this.teacurrentPage: 1
+			this.getreList()
+			this.getteaList()
 
-			
 
 		},
 		onShow() {
 			// 精品课程
-			this.classList2= []
-			this.teaLoading= 0 //0默认值  1加载中 2没有更多了
-			this.teacurrentPage= 1
-			
+			// this.classList2= []
+			// this.teaLoading= 0 //0默认值  1加载中 2没有更多了
+			// this.teacurrentPage= 1
+
 			// 资源库
-			this.classList= []
-			this.reLoading= 0 //0默认值  1加载中 2没有更多了
-			this.recurrentPage= 1 //页数
-			
-			this.getreList()
-			this.getteaList()
+			// this.classList= []
+			// this.reLoading= 0 //0默认值  1加载中 2没有更多了
+			// this.recurrentPage= 1 //页数
+
+
 
 			this.getAllMessage() // 调用app.js中的方法
 			// 获取收藏
 			this.$refs.reso.getdata()
 			this.$refs.tech.getdata()
 		}
-		// onShow() {
-		// 	// 资源库
-
-
-
-
-
-		// 	this.getAllMessage() // 调用app.js中的方法
-		// 	this.getreList()
-		// 	this.getteaList()
-		// 	// 获取收藏
-		// 	this.$refs.reso.getdata()
-		// 	this.$refs.tech.getdata()
-		// },
 	};
 </script>
 

pages/teachingList/teachingList.vue

@@ -1,22 +1,20 @@
 <template>
 	<view class="teachingList">
 		<statusBar :item="navbarData"></statusBar>
-		<!-- <teaching-case :item="teaData"></teaching-case> -->
-		<!-- <view class="" style="padding-bottom: 50rpx;">
-			<teaching-case :activeList="activeList" :indexId="index" :item="teaData"></teaching-case>
-		</view> -->
-
-		<scroll-view class="list" scroll-y="true">
-			<view>
-				<!-- 推荐课程插槽组件 -->
-				<listBlock1 ref="listBlock1" :classList='classList'></listBlock1>
-			</view>
-		</scroll-view>
-
-		<view class="loading">
-			<view v-if="newsLoading==1">数据加载中...</view>
-			<view v-if="newsLoading==2">没有更多了~~</view>
+		
+		<view class="list">
+			<scroll-view style="height: 100%;" scroll-y="true" refresher-enabled='true' :refresher-triggered="trigger"
+					@refresherrefresh='pulling'  @scrolltolower="lower">
+				<view>
+					<listBlock1 ref="listBlock1" :classList='classList'></listBlock1>
+				</view>
+				<view class="loading">
+					<view v-if="Loading==1">数据加载中...</view>
+					<view v-if="Loading==2">没有更多了~~</view>
+				</view>
+			</scroll-view>
 		</view>
+		
 	</view>
 </template>
 
@@ -29,18 +27,39 @@
 					btn: 1
 				},
 
-				teaData: {
-					btn: 1,
-					btn_2: 1,
-				},
+				// 控制刷新
+				trigger: false, 
 				// 渲染数据
 				classList: [],
 				// 触底加载动画提示
-				newsLoading: 0, //0默认值  1加载中 2没有更多了
+				Loading: 0, //0默认值  1加载中 2没有更多了
 				currentPage: 1,
 			};
 		},
 		methods: {
+			// 资源库下拉刷新
+			pulling() {
+				this.trigger = true
+				// this.isrepulling = true
+				setTimeout(() => {
+					this.trigger = false;
+				}, 1000);
+			
+				// 资源库
+				this.classList = []
+				this.Loading = 0 //0默认值  1加载中 2没有更多了
+				this.currentPage = 1 //页数
+
+				this.getData()
+			},
+			// 触底
+			lower() {
+				console.log('没触底？');
+				if (this.Loading == 2) return
+				this.Loading = 1
+				this.currentPage++
+				setTimeout(this.getData, 1000)
+			},
 			// 获取页面数据
 			getData() {
 				let data = {
@@ -51,32 +70,37 @@
 				}
 				this.$request('/selectActivity', "POST", data).then(res => {
 					console.log('获取数据', res[0]);
+					
 					if (!res[0].length) {
-						this.newsLoading = 2
+						this.Loading = 2
 					} else {
-						this.newsLoading = 0
+						this.Loading = 0
 					}
 					// return
 					this.classList = [...this.classList, ...res[0]]
+					// this.trigger = false;
 					// this.activeList = res[0]
 				})
 			},
 		},
 		// 触底加载更多
-		onReachBottom() {
-			console.log(111);
-			if (this.newsLoading == 2) {
-				return
-			}
-			this.newsLoading = 1
-			this.currentPage++
-			setTimeout(this.getData, 2000)
+		// onReachBottom() {
+		// 	if (this.newsLoading == 2) {
+		// 		return
+		// 	}
+		// 	this.newsLoading = 1
+		// 	this.currentPage++
+		// 	setTimeout(this.getData, 2000)
 
+		// },
+		onLoad() {
+			// this.getData()
 		},
-
 		onShow() {
+			this.classList= []
 			// 一进页面就加载数据
 			this.getData()
+			
 			this.$refs.listBlock1.getdata()
 			// this.$refs.listBlock1.getSub()
 		}
@@ -85,16 +109,12 @@
 
 <style lang="scss">
 	.teachingList {
-		.loading {
-			height: 50rpx;
-			text-align: center;
-			padding-top: 20rpx;
-			padding-bottom: 100rpx;
-			font-size: 26rpx;
-			color: #888;
-			line-height: 2em;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		.list{
+			flex: 1;
 		}
-
 		.list1btn {
 			z-index: 5;
 			border: none;