订阅人数接口修改，修改我的收藏不能跳转

pages/activityDetailNew/activityDetailNew.vue

@@ -72,7 +72,7 @@
 				<!-- 	<web-view :src="actItemList.link"  webview-styles="{'height': '700rpx';}"></web-view> -->
 				<!-- <br /> -->
 				<!-- <view class="bricon" @longpress="scanCode"> -->
-				<view class="bricon" @click="handleCoverClick">
+				<view class="bricon">
 
 					<!-- <rich-text style="white-space:pre-wrap;" :nodes="actItemList.brief"></rich-text> -->
 					<u-parse :content="actItemList.brief" :selectable="true"></u-parse>
@@ -192,18 +192,18 @@
 				applyUserlist: [],
 				pic_coll2: 'https://teacherapi.cocorobo.cn/teaching-file/static/mine/Collect_yellow.png',
 
-				nodes: [{
-					name: 'div',
-					attrs: {
-						class: 'div-class',
-						style: 'line-height: 60px; color: red; text-align:center;'
-					},
-					children: [{
-						type: 'text',
-						text: 'Hello&nbsp;uni-app!'
-					}]
-				}],
-				strings: '<div style="text-align:center;"><img src="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/uni@2x.png"/></div>'
+				// nodes: [{
+				// 	name: 'div',
+				// 	attrs: {
+				// 		class: 'div-class',
+				// 		style: 'line-height: 60px; color: red; text-align:center;'
+				// 	},
+				// 	children: [{
+				// 		type: 'text',
+				// 		text: 'Hello&nbsp;uni-app!'
+				// 	}]
+				// }],
+				// strings: '<div style="text-align:center;"><img src="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/uni@2x.png"/></div>'
 				// pic_sub: 'https://teacherapi.cocorobo.cn/teaching-file/static/yym/Vector (Stroke) (1).png',
 				// pic_sub2: 'https://teacherapi.cocorobo.cn/teaching-file/static/dingyue_blue.png',
 			};
@@ -228,11 +228,6 @@
 		// 	this.$store.dispatch('asyncDelAll')
 		// },
 		methods: {
-			handleCoverClick(event) {
-				// 处理点击事件
-				console.log('rich-text clicked', event);
-			},
-
 			//跳转到第三方链接
 			gotoLink(e) {
 
@@ -251,6 +246,9 @@
 				}
 				this.$request('/selectActivityID', "POST", data).then(res => {
 					// console.log('页面数据', res[0][0]);
+					let srrt = this.datejudge(res[0][0].begin_at)
+					console.log('srrt', srrt);
+					res[0][0].begin_at = srrt
 					this.uLoading = false
 					this.actItemList = res[0][0]
 					this.actItemList.brief = this.actItemList.brief.replace(/<img/gi,
@@ -259,7 +257,28 @@
 				})
 
 			},
+			datejudge(e) {
+				const dates = e.split(",");
+
+				const date1 = new Date(dates[0]);
+				const date2 = new Date(dates[1]);
+
+				const year1 = date1.getFullYear();
+				const month1 = date1.getMonth();
+				const day1 = date1.getDate();
+
+				const year2 = date2.getFullYear();
+				const month2 = date2.getMonth();
+				const day2 = date2.getDate();
+
+				if (year1 === year2 && month1 === month2 && day1 === day2) {
+					const modifiedDate = dates[1].substring(11); // 保留时间部分（小时和分钟）
+					dates[1] = modifiedDate;
+				}
 
+				const result = dates.join("-");
+				return result
+			},
 			// 申请加入弹窗
 			applyAdd() {
 				const value = this.$store.state.user.openid;
@@ -329,52 +348,7 @@
 						this.showPopupConfirm = false
 						// this.getData()
 					}, 1500)
-
-
-					// 弹窗关闭
-					// uni.reLaunch({
-					// 	url: '/pages/Sign/Sign',
-					// })
 				})
-
-				// this.showPopup = false;
-				// this.showPopupConfirm = true
-				// 做最后判断防止同一时间进入报名页面都报名成功
-				// this.$request('/selectIntercept', "POST", {
-				// 	oid: this.$store.state.user.openid,
-				// 	acid: this.acId
-				// }).then(res => {
-				// 	let c = res[0][0]
-				// 	console.log('报名人数', res[0][0]);
-				// 	console.log(c.bnum >= c.pers * 1);
-				// 	if (c.bnum >= c.pers * 1) {
-				// 		return uni.showToast({
-				// 			title: '已有人先您一步报名，名额已满',
-				// 			icon: "none"
-				// 		})
-				// 	} else {
-				// 		let data = {
-				// 			oid: this.$store.state.user.openid, //用户id
-				// 			acid: this.acId,
-				// 			ty: 2,
-				// 		}
-				// 		this.$request('/insertSignup', "POST", data).then(res => {
-
-				// 			console.log('报名返回', res);
-
-				// 			// 添加消息页面系统通知提示报名成功
-				// 			this.addMessage()
-
-
-				// 			// 弹窗关闭
-				// 			this.showPopup = false
-				// 			uni.reLaunch({
-				// 				url: '/pages/Sign/Sign',
-				// 			})
-				// 		})
-				// 	}
-				// })
-
 			},
 			// 添加消息页面系统通知提示报名成功
 			addMessage() {
@@ -502,8 +476,11 @@
 					lim: 6 //一次获取多少数据
 				}
 				this.$request('/selectApplyUser', 'POST', data).then(res => {
-					// console.log('获取报名用户列表', res[0]);
-					this.stuNum = res[0].length
+					console.log('获取报名用户列表', res[0]);
+					if (res[0].length > 0) {
+						this.stuNum = res[0][0].unum
+					}
+					// this.stuNum = res[0].length
 					this.applyUserlist = []
 					let arr = res[0]
 					arr = arr.slice(0, 6)

pages/dy/dy.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="dy">
 		<statusBar :item="navBarData"></statusBar>
-		
+
 		<view class="bigBox" v-for=" i in applyUserlist">
 			<view class="imgblk">
 				<image class="img" :src="i.avatar" mode="aspectFill"></image>
@@ -16,85 +16,80 @@
 				<view class="sch1">{{i.schoolName}}</view>
 			</view>
 		</view>
-		
-	<!-- 	<view class="loading">
+
+		<view class="loading">
 			<view v-if="newsLoading==1">数据加载中...</view>
 			<view v-if="newsLoading==2">没有更多了~~</view>
-		</view> -->
+		</view>
 	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			navBarData: {
-				title: '新增订阅',
-				btn: 1
-			},
-			// 报名列表
-			applyUserlist:[],
-						
-			// 活动id	
-			acId:'',
-			// 触底加载动画提示
-			newsLoading: 0, //0默认值  1加载中 2没有更多了
-			currentPage: 1,
-			// items:[   //1回粉 2关注 3相互关注
-			// 	{tit:'hf',btn:1},
-			// 	{tit:'hf2',btn:1},
-			// 	{tit:'gz',btn:2},
-			// 	{tit:'hx',btn:3},
-			// ]
-		};
-	},
-	methods:{
-		// 获取报名用户
-		getUsers(){
-			let data = {
-				oid: this.$store.state.user.openid, //用户id
-				aid:this.acId,
-				type: 2,
-				page: this.currentPage, //下拉获取更多的备用字段
-				lim: 20 //一次获取多少数据
+	export default {
+		data() {
+			return {
+				navBarData: {
+					title: '新增订阅',
+					btn: 1
+				},
+				// 报名列表
+				applyUserlist: [],
+
+				// 活动id	
+				acId: '',
+				// 触底加载动画提示
+				newsLoading: 0, //0默认值  1加载中 2没有更多了
+				currentPage: 1,
+
+			};
+		},
+		methods: {
+			// 获取报名用户
+			getUsers() {
+				let data = {
+					oid: this.$store.state.user.openid, //用户id
+					aid: this.acId,
+					type: 2,
+					page: this.currentPage, //下拉获取更多的备用字段
+				}
+				this.$request('/selectEnrollUser', 'get', data).then(res => {
+					console.log(res);
+					// this.applyUserlist = res[0]
+
+					console.log('获取报名用户列表', res[0]);
+					if (!res[0].length) {
+						this.newsLoading = 2
+					} else {
+						this.newsLoading = 0
+					}
+					this.applyUserlist = [...this.applyUserlist, ...res[0]]
+				})
+			}
+
+		},
+		// 触底加载更多
+		onReachBottom() {
+			if (this.newsLoading == 2) {
+				return
 			}
-			this.$request('/selectApplyUser', 'POST', data).then(res => {
-				this.applyUserlist=res[0]
-				
-				// console.log('获取报名用户列表', res[0]);
-				// if (!res[0].length) {
-				// 	this.newsLoading = 2
-				// } else {
-				// 	this.newsLoading = 0
-				// }
-				// this.applyUserlist=[...this.applyUserlist,...res[0]]
-			})
+			this.newsLoading = 1
+			this.currentPage++
+			setTimeout(() => {
+				this.getUsers()
+			}, 1500)
+		},
+		onLoad(e) {
+			// console.log('接受参数',e);
+			this.acId = e.acId
+			this.getUsers()
 		}
-	
-	},
-	// 触底加载更多
-	// onReachBottom() {
-	// 	if (this.newsLoading == 2) {
-	// 		return
-	// 	}
-	// 	this.newsLoading = 1
-	// 	this.currentPage++
-	// 	setTimeout(this.getUsers(),1500)
-		
-	// },
-	onLoad(e) {
-		// console.log('接受参数',e);
-		this.acId=e.acId
-		this.getUsers()
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-	.dy{
-		
-	}
-	.bigBox{
+	.dy {}
+
+	.bigBox {
 		background-color: white;
 		width: 750rpx;
 		height: 136rpx;
@@ -102,57 +97,63 @@ export default {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		.imgblk{
+
+		.imgblk {
 			height: 80rpx;
 			display: flex;
 			justify-content: center;
 			align-items: center;
+
 			// background-color: #888;
-			.img{
+			.img {
 				width: 72rpx;
 				height: 72rpx;
 				border-radius: 50%;
 			}
 		}
-		
-		.info{
+
+		.info {
 			flex: 1;
 			display: flex;
 			flex-direction: column;
 			height: 80rpx;
 			justify-content: space-between;
 			margin-left: 20rpx;
+
 			// background-color: rebeccapurple;
-			.uname{
+			.uname {
 				display: flex;
 				justify-content: space-between;
-				.nameTxt{
+
+				.nameTxt {
 					font-size: 28rpx;
 					color: rgba(0, 0, 0, 0.8);
 					// line-height: 50%;
 				}
-				.sch{
+
+				.sch {
 					font-size: 24rpx;
 					color: rgba(0, 0, 0, 0.6);
 				}
 			}
-			.sch1{
+
+			.sch1 {
 				// flex: 1;
 				font-size: 24rpx;
 				color: rgba(0, 0, 0, 0.6);
 			}
 		}
-		
-		
+
+
 	}
-	.loading{
+
+	.loading {
 		height: 50rpx;
 		text-align: center;
 		padding-top: 20rpx;
 		padding-bottom: 100rpx;
 		font-size: 26rpx;
-		color:#888;
+		color: #888;
 		line-height: 2em;
 	}
-
-</style>
+</style>

pages/mineActive/mineActive.vue

@@ -3,17 +3,20 @@
 		<statusBar :item="navBarData"></statusBar>
 		<!-- 消息提示 -->
 		<msgPop></msgPop>
-		
-		<scroll-view class="scrollV" scroll-y="true" @scrolltolower="lower" style="height: 100%;">
-			<view>
-				<listBlock1 ref="listBlock1" :classList="activeList"></listBlock1>
-			</view>
-			<view class="loading">
-				<view v-if="Loading==1">数据加载中...</view>
-				<view v-if="Loading==2">没有更多了~~</view>
-			</view>
-		</scroll-view>
-		
+
+		<view class="list">
+			<scroll-view style="height: 100%;" scroll-y="true" @scrolltolower="lower">
+				<view>
+					<listBlock1 ref="listBlock1" :classList="activeList"></listBlock1>
+				</view>
+				<view class="loading">
+					<view v-if="Loading==1">数据加载中...</view>
+					<view v-if="Loading==2">没有更多了~~</view>
+				</view>
+			</scroll-view>
+		</view>
+
+
 	</view>
 </template>
 
@@ -26,7 +29,7 @@
 					btn: 1
 				},
 				activeList: [],
-				
+
 				Loading: 0, //0默认值  1加载中 2没有更多了
 				currentPage: 1, //页数
 			};
@@ -36,7 +39,7 @@
 		// },
 		methods: {
 			gotoDetail(e) {
-				let data=e.currentTarget.dataset.all
+				let data = e.currentTarget.dataset.all
 				uni.navigateTo({
 					url: `/pages/activityDetail/activityDetail?acId=${data.acId}`,
 				});
@@ -55,26 +58,37 @@
 					oid: this.$store.state.user.openid, //用户id
 					type: 2,
 					currentPage: this.currentPage, //页数
-					lim:15
+					lim: 30
 				}
+
 				this.$request('/selectRegistered', "POST", data).then(res => {
-					console.log('获取数据',res[0]);
-					
-					
+					console.log('获取数据', res[0]);
+
+
 					if (!res[0].length) {
 						this.Loading = 2
 					} else {
 						this.Loading = 0
 					}
 					
-					this.activeList = [...this.activeList,...res[0]]
-					
+					// console.log('this.currentPage',this.currentPage);
+					if (this.currentPage == 1) {
+						// console.log('haha');
+						this.activeList = []
+					}
+
+					this.activeList = [...this.activeList, ...res[0]]
+
 					// this.activeList = res[0]
 				})
 			}
 		},
+		onLoad() {},
 		onShow() {
-			this.activeList=[]
+
+			this.Loading = 0
+			this.currentPage = 1
+			
 			this.getdata()
 			// 获取收藏事件
 			this.$refs.listBlock1.getdata()
@@ -92,13 +106,15 @@
 		color: #888;
 		line-height: 2em;
 	}
-	.mineActive{
+
+	.mineActive {
 		display: flex;
 		flex-direction: column;
-		height: 100%;
-		.scrollV{
+		height: 100vh;
+
+		.list {
 			flex: 1;
+			overflow: hidden;
 		}
 	}
-	
 </style>

pages/mineCollNew/mineCollNew.vue

@@ -192,7 +192,8 @@
 				// return console.log('aaaaaa', e.currentTarget.dataset);
 				let acid = e.currentTarget.dataset.kid
 				uni.navigateTo({
-					url: "/pages/skipone/skipone?url=" + encodeURIComponent(acid),
+					url: "/pages/skipone/skipone?item="+encodeURIComponent(JSON.stringify(acid))
+					// url: "/pages/skipone/skipone?url=" + encodeURIComponent(acid),
 				});
 
 			},