"

components/detailBlock/detailBlock.vue

@@ -1,12 +1,12 @@
 <template>
 	<view>
-		<view class="detailBlock" v-if="!item.isShow">
+		<view class="detailBlock" v-if="!item.isShow" v-for="(i,index) in actItemList" :key="indexa + 'a'">
 			<view class="tit fwb-font">教研室详情</view>
 			<view class="cont sZw-font">
-				会议时间：<text>10月7日上午八点(周日)</text>
+				会议时间：<text>{{ i.begin_at }}</text>
 			</view>
 			<view class="cont sZw-font">
-				活动形式：<text style="color: #0056a8;">线上直播</text>
+				活动形式：<text style="color: #0056a8;">{{ i.acshape }}</text>
 			</view>
 			<view class="cont sZw-font">
 				<!-- <view id="myElement" class="activeTit">
@@ -16,7 +16,7 @@
 				<view class="content">
 					<view ref="p" :class="getClassNames">
 						<text style="color: #999999;">教研室概况：</text>
-						{{i.info}}
+						{{i.brief}}
 					</view>
 
 					<view ref="btnnn" :class="getClassNames1" @click="qqq">
@@ -26,7 +26,7 @@
 			</view>
 		</view>
 
-		<view class="detailBlock" v-else v-for="(i,index) in actItemList" :key="index" :data-index="index">
+		<view class="detailBlock" v-else v-for="(i,index) in actItemList" :key="index + 'b'">
 			<view class="tit fwb-font">活动详情</view>
 			<view class="cont sZw-font">
 				会议时间：<text>{{ i.begin_at }}</text>

components/teaching-case/teaching-case.vue

@@ -100,7 +100,7 @@
 				default () {
 					return {
 						btn: 0, //0教研列表 1活动列表
-						btn_2: 0 //0 activityList 1 activityList_2
+						btn_2: 0 //0 activityList 0 activityList_2 1 liveactivityList 2
 					};
 				},
 			},
@@ -190,7 +190,7 @@
 				console.log(e.currentTarget.dataset['index'], 123);
 				let edata = e.currentTarget.dataset['index'];
 				const clickedAcId = this.activeList[edata].acId;
-				
+				console.log(clickedAcId);
 				const value = this.$store.state.user.openid;
 
 				const urls = [
@@ -209,9 +209,19 @@
 						url: "/pages/login_Wechat/login_Wechat",
 					});
 				} else {
-					uni.navigateTo({
-						url: "/pages/activityDetail/activityDetail?acId=" + clickedAcId,
-					});
+					if (this.item.btn_2 === 1) {
+						uni.navigateTo({
+							url: "/pages/teachingDetail/teachingDetail?acId=" + clickedAcId,
+						});
+					}else if (this.item.btn_2 === 2) {
+						uni.navigateTo({
+							url: "/pages/activityDetail/activityDetail?acId=" + clickedAcId + "&ty=0",
+						});
+					}else{
+						uni.navigateTo({
+							url: "/pages/activityDetail/activityDetail?acId=" + clickedAcId + "&ty=1",
+						});
+					}
 					// console.log("/pages/activityDetail/activityDetail?openid=" + value);
 					// switch (edata) {
 					// 	case 0:

pages/activityDetail/activityDetail.vue

@@ -134,20 +134,23 @@
 			gotoAdd() {
 				// console.log(e.currentTarget.dataset['index'], 123);
 				// let edata = e.currentTarget.dataset['index'];
+				const routes = getCurrentPages();
+				const ty = routes[1].options.ty ? routes[1].options.ty : routes[2].options.ty;
 				const clickedAcId = this.actItemList[0].acId;
 				console.log(clickedAcId);
 				uni.navigateTo({
-					url: '/pages/hd/hd?acId=' + clickedAcId
+					url: '/pages/hd/hd?acId=' + clickedAcId + '&ty=' + ty
 				})
 			},
 			getActivity() {
 				// 获取当前页面的URL
 				const routes = getCurrentPages();
-				console.log(routes[1].options.acId);
-				const acId = routes[1].options.acId
+				console.log(routes);
+				const acId = routes[1].options.acId ? routes[1].options.acId : routes[2].options.acId;
+				const ty = routes[1].options.ty ? routes[1].options.ty : routes[2].options.ty;
 				let data = {
 					acId: acId,
-					ty: 1
+					ty: ty
 				}
 				this.$request('/selectActivityID', "POST", data).then(res => {
 					console.log(res[0]);

pages/activityList_2/activityList_2.vue

@@ -3,7 +3,7 @@
 		<statusBar :item="navbarData"></statusBar>
 		<!-- <teaching-case :item="teaData"></teaching-case> -->
 		<view class="" style="padding-bottom: 50rpx;">
-			<teaching-case  :activeList="activeList" :indexId="index"></teaching-case>
+			<teaching-case  :activeList="activeList" :indexId="index" :item="teaData"></teaching-case>
 		</view>
 
 

pages/activityPage/activityPage.vue

@@ -9,7 +9,7 @@
 				<view class="lookMore fz-font" @click="gotoLiveList">查看更多</view>
 			</template>
 			<template #activeBlock>
-				<view class="activeData" v-for="(item, index) in liveList" :key="index" @click="gotoAnnoun(index)">
+				<view class="activeData" v-for="(item, index) in liveList" :key="index" @click="gotoAnnoun" :data-index="index">
 					<!-- <image src="http://43.139.158.220:5007/img/static/activity/bg1.png" mode="aspectFill"></image> -->
 					<image :src="item.pic" mode="aspectFill"></image>
 
@@ -56,7 +56,7 @@
 		
 		<view class="" style="height: 30rpx; width: 100%"> </view>
 		<view class="qiu" @click="fabClick">
-			<image src="/static/yym/jia.png" mode="aspectFill"></image>
+			<image src="http://43.139.158.220:5007/img/static/yym/jia.png" mode="aspectFill"></image>
 		</view>
 	</view>
 </template>
@@ -131,25 +131,32 @@
 					});
 				}
 			},
-			gotoAnnoun(index) {
+			gotoAnnoun(e) {
+				let edata = e.currentTarget.dataset['index'];
+				console.log(e.currentTarget.dataset['index'], 123);
+				const clickedAcId = this.liveList[edata].acId;
+				console.log(clickedAcId);
 				const value = this.$store.state.user.openid;
 				if (value == '') {
 					uni.navigateTo({
 						url: "/pages/login_Wechat/login_Wechat",
 					});
 				} else {
-					const urls = [
-						"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1181",//丽湖职教双创教育国际虚拟教研室启动大会暨双创教育国际论坛圆满举行
-						"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1234",//丽湖职教双创教育国际虚拟教研室 • 常规教研活动 第9期
-						"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1210",//产教融合情境下的双创通识课程建设 | 丽湖职教双创教育国际虚拟教研室常规教研活动第2期顺利举行
-						"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1209",//打造双创“金课” | 丽湖职教双创教育国际虚拟教研室常规
-					];
-					if (index >= 0 && index < urls.length) {
-						const url = urls[index];
-						uni.navigateTo({
-							url: "/pages/skipone/skipone?url=" + encodeURIComponent(url),
-						});
-					}
+					uni.navigateTo({
+						url: "/pages/activityDetail/activityDetail?acId=" + clickedAcId + "&ty=0",
+					});
+					// const urls = [
+					// 	"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1181",//丽湖职教双创教育国际虚拟教研室启动大会暨双创教育国际论坛圆满举行
+					// 	"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1234",//丽湖职教双创教育国际虚拟教研室 • 常规教研活动 第9期
+					// 	"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1210",//产教融合情境下的双创通识课程建设 | 丽湖职教双创教育国际虚拟教研室常规教研活动第2期顺利举行
+					// 	"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1209",//打造双创“金课” | 丽湖职教双创教育国际虚拟教研室常规
+					// ];
+					// if (index >= 0 && index < urls.length) {
+					// 	const url = urls[index];
+					// 	uni.navigateTo({
+					// 		url: "/pages/skipone/skipone?url=" + encodeURIComponent(url),
+					// 	});
+					// }
 				}
 			},
 			

pages/hd/hd.vue

@@ -96,9 +96,10 @@ export default {
 			const routes = getCurrentPages();
 			console.log(routes);
 			const acId = routes[2].options.acId
+			const ty = routes[2].options.ty
 			let data = {
 				acId: acId,
-				ty: 1
+				ty: ty
 			}
 			this.$request('/selectActivityID', "POST", data).then(res => {
 				console.log(res[0]);

pages/index/index.vue

@@ -15,8 +15,7 @@
 				<view class="lookMore fz-font" @click="gotoActivity">查看更多</view>
 			</template>
 			<template #activeBlock>
-				<view class="activeData" @click="gotoActivityDetail(index)" v-for="(item, index) in activeList"
-					:key="index">
+				<view class="activeData" @click="gotoActivityDetail" v-for="(item, index) in activeList" :key="index" :data-index="index">
 					<image :src="item.pic" mode="aspectFill"></image>
 					<view class="activeTit sBtn-font" style="font-weight: bold">
 						{{ item.acName }}
@@ -83,51 +82,52 @@
 					// },
 				],
 				classList: [
-					
+
 					// "https://szptxnjys.yuketang.cn/pro/portal/about/szpt-99Q00351166273N",
 					// "https://szptxnjys.yuketang.cn/pro/portal/about/szpt-99Q00330324841N",
 					// "https://szptxnjys.yuketang.cn/pro/portal/about/szpt-99Q00231455802N",
 					// "https://szptxnjys.yuketang.cn/pro/portal/about/szpt-99Q00406339964N",
-					
-					
+
+
 					{
 						img: "http://43.139.158.220:5007/img/static/img/jiaoxueship.jpg",
 						className: "教学视频",
 						intro: "课程简介：丽湖职教双创教育国际虚拟教研室教学视频",
-						url:'https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1210'
+						url: 'https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1210'
 					},
 					{
 						img: "http://43.139.158.220:5007/img/static/img/jiaoxuedagang.jpg",
 						className: "教学大纲",
 						intro: "课程简介：丽湖职教双创教育国际虚拟教研室教学大纲",
-						url:'https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1210'
+						url: 'https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1210'
 					},
 					{
 						img: "http://43.139.158.220:5007/img/static/img/peiyangfangan.jpg",
 						className: "培养方案",
 						intro: "课程简介：丽湖职教双创教育国际虚拟教研室培养方案",
-						url:'https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1210'
+						url: 'https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1210'
 					},
 					{
 						img: "http://43.139.158.220:5007/img/static/img/xitishiti.jpg",
 						className: "习题试题",
 						intro: "课程简介：丽湖职教双创教育国际虚拟教研室习题试题",
-						url:'https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1210'
+						url: 'https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1210'
 					},
 				],
 			};
 		},
 		onLoad() {},
 		methods: {
-			getData(){
-				let data={
-					openid:uni.getStorageSync('oId'),ty:2
+			getData() {
+				let data = {
+					openid: uni.getStorageSync('oId'),
+					ty: 2
 				}
-					this.$request('/selectActivity',"POST",data).then(res=>{
-						console.log(res[0]);
-						// this.activeList=[...this.activeList,...res[0]]
-						this.activeList=res[0].slice(0, 6);
-					})
+				this.$request('/selectActivity', "POST", data).then(res => {
+					console.log(res[0]);
+					// this.activeList=[...this.activeList,...res[0]]
+					this.activeList = res[0].slice(0, 6);
+				})
 			},
 			teachmore() {
 				const value = this.$store.state.user.openid;
@@ -165,31 +165,38 @@
 					});
 				}
 			},
-			gotoActivityDetail(index) {
+			gotoActivityDetail(e) {
+				let edata = e.currentTarget.dataset['index'];
+				console.log(e.currentTarget.dataset['index'], 123);
+				const clickedAcId = this.activeList[edata].acId;
+				console.log(clickedAcId);
 				const value = this.$store.state.user.openid;
 				if (value == '') {
 					uni.navigateTo({
 						url: "/pages/login_Wechat/login_Wechat",
 					});
 				} else {
-					const urls = [
-						"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1181",
-						"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1183",
-						"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1210",
-						"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1234",
-					];
-					if (index >= 0 && index < urls.length) {
-						const url = urls[index];
-						uni.navigateTo({
-							url: "/pages/skipone/skipone?url=" + encodeURIComponent(url),
-						});
-					}
+					uni.navigateTo({
+						url: "/pages/teachingDetail/teachingDetail?acId=" + clickedAcId,
+					});
+					// const urls = [
+					// 	"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1181",
+					// 	"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1183",
+					// 	"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1210",
+					// 	"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1234",
+					// ];
+					// if (index >= 0 && index < urls.length) {
+					// 	const url = urls[index];
+					// 	uni.navigateTo({
+					// 		url: "/pages/skipone/skipone?url=" + encodeURIComponent(url),
+					// 	});
+					// }
 				}
 			},
 			gotoHd(index) {
 				// console.log(this.$store.state.user.openid,33333333333333333);
 				const value = this.$store.state.user.openid;
-				if (value=='') {
+				if (value == '') {
 					console.log(11);
 					uni.navigateTo({
 						url: "/pages/login_Wechat/login_Wechat",
@@ -216,7 +223,7 @@
 					url: "/pages/skipone/skipone?url=" + encodeURIComponent(url),
 				});
 			},
-			
+
 		},
 		onShow() {
 			this.getData()

pages/jys/jys.vue

@@ -1,42 +1,46 @@
 <template>
-	<view class="jys">
+	<view class="hd">
 		<statusBar :item="navBarData"></statusBar>
-		<view class="top">
+		
+		<view class="top" v-for="(item,index) in actItemList" :key="index">
 				<view class="card">
-					<image class="image" src="http://43.139.158.220:5007/img/static/mine/img1.jpg" mode="aspectFill"></image>
+					<image class="image" :src="item.pic" mode="aspectFill"></image>
 					<view class="text">
 						
 						<view class="text_title">
 							<view class="manage bqZ-font">类型</view>
-							<view class="t1 bmTit-font">创业者管理能力训练基础</view>
+							<view class="t1 bmTit-font">{{ item.acName }}</view>
 						</view>
 						<view class="col sZw-font">
-							活动日期：5.12~5.13
+							负责人：{{ item.username }}
 						</view>
 						<view class="col sZw-font">
-							招募人数：23/50
+							教研室标签：暂无
 						</view>
 					</view>
 				</view>
 		</view>
 		
-<!-- <uni-card :is-shadow="false"> -->
+		<!-- <uni-card :is-shadow="false"> -->
 			<view class="xinxi">
 				<view class="card2">
 					<view class="hdxx">
-						<view class="hd btn-font">活动信息</view>
+						<view class="xxTit btn-font">活动信息</view>
 						<view class="textcolor">
 							<view class="name  sZw-font">
 								姓名:
-								<text class="name1  sZw-font">李芳</text>
+								<input type="text" style=" text-align: right;" maxlength="10" placeholder="请输入姓名"
+									placeholder-style="font-size: 28rpx; color: rgb(153, 153, 153);" v-model="nickname" />
 							</view>
 							<view class="name  sZw-font">
 								联系方式:
-								<text class="lx1  sZw-font">172xxxxx5678</text>
+								<input type="text" style=" text-align: right;" maxlength="10" placeholder="请输入联系方式"
+									placeholder-style="font-size: 28rpx; color: rgb(153, 153, 153);" v-model="telephone" />
 							</view>
 							<view class="name  sZw-font">
 								单位:
-								<text class="dw1  sZw-font"> 浙江工贸职业技术学院</text>
+								<input type="text" style=" text-align: right;" maxlength="10" placeholder="请输入单位"
+									placeholder-style="font-size: 28rpx; color: rgb(153, 153, 153);" v-model="units" />
 							</view>
 						</view>
 					</view>
@@ -48,7 +52,7 @@
 				<button @click="button1Action" class="btn1 sZw-font">清空填写信息</button>
 				<!-- <text class="button-spacing"></text> -->
 				<!-- 添加间距 -->
-				<button @click="button2Action" class="btn2 sZw-font">申请加入</button>
+				<button @click="gotoSign" class="btn2 sZw-font">申请加入</button>
 			</view>
 		</view>
 	</view>
@@ -61,30 +65,63 @@ export default {
 			navBarData: {
 				title: '教研室报名',
 				btn: 1
-			}
+			},
+			nickname: '',
+			telephone: '',
+			units: '',
+			actItemList:[]
 		};
 	},
 	methods: {
 		button1Action() {
-			// 这里添加按钮1点击后触发的动作
-			console.log('Button 1 clicked');
+			this.nickname = ''
+			this.telephone = ''
+			this.units = ''
 		},
-		button2Action() {
+		gotoSign() {
 			// 这里添加按钮2点击后触发的动作
-			console.log('Button 2 clicked');
-		}
+			if(this.nickname.trim() === '' || this.telephone.trim() === '') {
+				uni.showToast({
+					title: '请填写完整的表单内容',
+					icon: 'none'
+				});
+				return;
+			}
+			uni.navigateTo({
+				url: '/pages/Sign/Sign'
+			})
+		},
+		getActivity() {
+			// 获取当前页面的URL
+			const routes = getCurrentPages();
+			console.log(routes);
+			const acId = routes[2].options.acId
+			let data = {
+				acId: acId,
+				ty: 2
+			}
+			this.$request('/selectActivityID', "POST", data).then(res => {
+				console.log(res[0]);
+				// this.activeList=[...this.activeList,...res[0]]
+				this.actItemList = res[0]
+			})
+		},
+	},
+	onShow() {
+		this.getActivity()
 	}
 };
 </script>
 
 <style lang="scss" scoped>
-.jys {
+.hd {
 	.top{
 		width: 690rpx;
-		// height: 192rpx;
+		height: 192rpx;
 		background-color: #ffffff;
 		margin: auto;
 		margin-top: 30rpx;
+		// padding: 24rpx;
 		padding: 16rpx 24rpx;
 		border-radius: 10rpx;
 		.col{
@@ -92,41 +129,37 @@ export default {
 		}
 	}
 	.card {
+		// margin-top: 40rpx;
 		display: flex;
-		justify-content: flex-start;
 		.image {
 			flex-shrink: 0;
 			width: 160rpx;
 			height: 160rpx;
 			border-radius: 4px;
 		}
-
+		
 		.text {
 			margin-left: 10px; // 增加一点空间
 			display: flex;
 			flex-direction: column;
 			justify-content: space-between;
-			// line-height: 35px; // 根据你的需求调整，使/文本与图片保持
 			.text_title {
 				display: flex;
 				align-items: center;
 				.manage {
 					// padding:4rpx 12rpx 4rpx 12rpx;
 					display: flex;
-					align-items: center;
 					justify-content: center;
+					align-items: center;
 					width: 68rpx;
-					// line-height: 68rpx;
 					height: 36rpx;
-					font-weight: 600rpx;
-					// text-align: center;
+					border-radius: 5rpx;
 					color: #00b2b6;
 					border: 1px solid #00b2b6;
-					border-radius: 5rpx;
+					// border-radius: 10rpx;
 					margin-right: 10rpx;
 				}
 				.t1 {
-					// font-size: 35rpx;
 					color: black;
 					width: 350rpx;
 					font-weight: 550;
@@ -148,10 +181,10 @@ export default {
 		border-radius: 12rpx;
 	}
 	.hdxx {
-		.hd {
+		.xxTit {
 			color: black;
 			// font-size: 18px;
-			font-weight: 400px;
+			// font-weight: 400px;
 			line-height: 42px;
 		}
 		.textcolor {
@@ -161,6 +194,14 @@ export default {
 				display: flex;
 				justify-content: space-between;
 				margin-bottom: 20rpx;
+				.nickname {
+					width: 350rpx;
+					text-align: end;
+					// padding-right: 10rpx;
+					// margin-right: 10rpx;
+					font-size: 28rpx;
+					color: rgb(153, 153, 153);
+				}
 			}
 		}
 	}
@@ -173,7 +214,6 @@ export default {
 		display: flex;
 		justify-content: space-around;
 		align-items: center;
-		// padding: 30rpx 0;
 		height: 137rpx;
 		// padding-bottom: 50rpx;
 		// font-size: 30rpx;
@@ -198,11 +238,11 @@ export default {
 				border-radius: 50px;
 				height: 70rpx;
 				line-height: 70rpx;
-				// font-size: 35rpx;
 				color: #ffffff;
 			}
 		}
 		
+		
 	}
 }
 </style>

pages/liveActivityList/liveActivityList.vue

@@ -3,7 +3,7 @@
 		<statusBar :item="navbarData"></statusBar>
 		<!-- <teaching-case :item="teaData"></teaching-case> -->
 		<view class="" style="padding-bottom: 50rpx;">
-			<teaching-case :activeList="activeList" :indexId="index"></teaching-case>
+			<teaching-case :activeList="activeList" :indexId="index" :item="teaData"></teaching-case>
 		</view>
 
 
@@ -19,7 +19,8 @@
 					btn: 1
 				},
 				teaData: {
-					btn: 1
+					btn: 1,
+					btn_2: 2
 				},
 				activeList: [],
 			};

pages/publish/publish.vue

@@ -234,6 +234,37 @@
 			</view>
 		</view>
 
+		<!-- 弹窗 -->
+		<view>
+			<view class="mask" v-show="showPopup" @click="closePopup"></view>
+			<view class="popup-container" v-show="showPopup">
+				<view class="popup">
+					<view class="header">
+						<text>确认发布</text>
+					</view>
+					<view class="footer">
+						<button class="cancel-btn" @click="closePopup">取消</button>
+						<button class="confirm-btn" @click="confirm">确认</button>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view>
+			<view class="mask" v-show="showPopupConfirm" @click="closePopup"></view>
+			<view class="popup-container" style="height: 175px;" v-show="showPopupConfirm">
+				<view class="popup">
+					<view class="header">
+						<image src="../../static/gou1.png" mode="aspectFill"></image>
+						<text style="margin-bottom: 24px;">发布成功</text>
+					</view>
+					<view class="footer">
+						<button class="confirm-btn_2" @click="closePopup">确认</button>
+					</view>
+				</view>
+			</view>
+		</view>
+
 	</view>
 </template>
 
@@ -248,6 +279,8 @@
 					title: '发布', //导航栏标题
 					btn: 1 //是否显示返回按钮 0不显示  1 显示
 				},
+				showPopup: false,
+				showPopupConfirm: false,
 				// 标题
 				activitytitle: '',
 				// 内容
@@ -257,7 +290,7 @@
 				imageValue: '',
 
 				// 分类
-				classifyList: ['直播活动', '常规教研活动','专题教研活动'],
+				classifyList: ['直播活动', '常规教研活动', '专题教研活动'],
 				classify: '请选择',
 
 				// 人数
@@ -265,7 +298,7 @@
 					length: 100
 				}, (_, index) => index + 1), //100人
 				recruitment: '请选择',
-				
+
 				// 活动形式
 				activityformList: ['户外活动', 'xxxx', 'xxxx'],
 				activityform: '请选择',
@@ -294,16 +327,14 @@
 			}
 		},
 		methods: {
-
-
 			submitForm() {
 				if (
 					this.activitytitle.trim() === '' ||
 					this.activityintro.trim() === '' ||
 					this.imageValue == '' ||
-					this.classify == '请选择' ||
+					// this.classify == '请选择' ||
 					this.recruitment.value === '请选择' ||
-					this.activityform.trim() === '请选择' ||
+					// this.activityform.trim() === '请选择' ||
 					this.address.trim() === '请选择' ||
 					this.funds === '请选择'
 				) {
@@ -314,12 +345,23 @@
 					});
 					return;
 				}
-				if(this.classify=="直播活动"){
-					this.classify=0
-				}else if(this.classify=="常规教研活动"){
-					this.classify=1
-				}else{
-					this.classify=2
+
+				this.showPopup = true; //显示弹窗
+
+			},
+			closePopup() {
+				// 取消操作
+				this.showPopup = false;
+				this.showPopupConfirm = false;
+			},
+			confirm() {
+				// 确认操作
+				if (this.classify == "直播活动") {
+					this.classify = 0
+				} else if (this.classify == "常规教研活动") {
+					this.classify = 1
+				} else {
+					this.classify = 2
 				}
 				// 将文本框内容和图片链接存储在一个对象中
 				const formData = {
@@ -327,7 +369,7 @@
 					activitytitle: this.activitytitle,
 					activityintro: this.activityintro,
 					img: this.imageValue,
-					classify:this.classify,
+					classify: this.classify,
 					recruitment: this.recruitment,
 					activityform: this.activityform,
 					address: this.address,
@@ -337,9 +379,10 @@
 					// price: "188",
 					// count: "6",
 				};
-				// return console.log(formData);
-
 
+				this.showPopup = false;
+				this.showPopupConfirm = true
+				// return console.log(formData);
 				this.$request('/insertActive', 'POST', formData).then(res => {
 					console.log(res.data);
 					if (res.code == 200) {
@@ -347,9 +390,7 @@
 							url: "/pages/activityPage/activityPage"
 						})
 					}
-
 				})
-
 			},
 			handelclassify(e) {
 				this.classify = this.classifyList[e.detail.value]
@@ -425,7 +466,7 @@
 						});
 					}
 				});
-			
+
 			},
 		},
 	}
@@ -636,5 +677,98 @@
 			}
 		}
 
+		.mask {
+			position: fixed;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			background-color: rgba(0, 0, 0, 0.3);
+			z-index: 999;
+			// display: none;
+		}
+
+		.popup-container {
+			position: fixed;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+			width: 520rpx;
+			height: 260rpx;
+			z-index: 1000;
+			// display: none;
+
+			.popup {
+				width: 100%;
+				height: 100%;
+				display: flex;
+				flex-direction: column;
+				background-color: #fff;
+				border-radius: 16rpx;
+
+				.header {
+					flex: 1;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					flex-direction: column;
+					margin-top: 24px;
+					font-size: 34rpx;
+					font-weight: 600;
+
+					image {
+						width: 150rpx;
+						height: 150rpx;
+						margin-top: 15px;
+						margin-bottom: 15px;
+					}
+				}
+
+				.footer {
+					flex: 1;
+					display: flex;
+					justify-content: space-around;
+					align-items: end;
+					padding-top: 17px;
+					
+					.cancel-btn {
+						width: 259rpx;
+						height: 100rpx;
+						background-color: #F7F7F7;
+						color: #000;
+						font-size: 34rpx;
+						text-align: center;
+						border-radius: 0;
+						border-bottom-left-radius: 16rpx;
+						line-height: 50px;
+					}
+
+					.confirm-btn {
+						width: 259rpx;
+						height: 100rpx;
+						background-color: #0081FE;
+						color: #fff;
+						font-size: 34rpx;
+						text-align: center;
+						border-radius: 0;
+						border-bottom-right-radius: 16rpx;
+						line-height: 50px;
+					}
+
+					.confirm-btn_2 {
+						width: 518rpx;
+						height: 100rpx;
+						background-color: #F7F7F7;
+						color: #000;
+						font-size: 34rpx;
+						text-align: center;
+						border-radius: 0;
+						border-bottom-left-radius: 16rpx;
+						border-bottom-right-radius: 16rpx;
+						line-height: 50px;
+					}
+				}
+			}
+		}
 	}
 </style>

pages/teachingDetail/teachingDetail.vue

@@ -4,11 +4,11 @@
 		<statusBar :item="navbar"></statusBar>
 		
 		<!-- 顶部 -->
-		<view class="backPic">
+		<view class="backPic" v-for="(item,index) in actItemList" :key="index + 'a' ">
 			<image src="http://43.139.158.220:5007/img/static/yym/Rectangle 40.png" mode="aspectFill"></image>
 			<view class="card">
 				<view class="cardTop">
-					<view class="title three-font">创业者管理能力训练基础</view>
+					<view class="title three-font">{{ item.acName }}</view>
 					<view class="icons">
 						<view class="icon">
 							<image src="http://43.139.158.220:5007/img/static/yym/Star 1 (Stroke) (2).png" style="width: 42rpx;height: 40rpx;" mode="aspectFill"></image>
@@ -19,10 +19,10 @@
 					</view>
 				</view>
 				<view class="col fz-font">
-					成立日期：2023.5.12
+					成立日期：暂无
 				</view>
 				<view class="col fz-font">
-					人数：7679人
+					人数：{{ item.pers }}人
 				</view>
 				<view class="tag col">
 					<view class="fz-font">教研标签：</view>
@@ -49,15 +49,15 @@
 		
 		<!-- 教研室详情 -->
 		<view class="" style="padding: 0 30rpx;">
-			<detailBlock :item="judge"></detailBlock>
+			<detailBlock :actItemList='actItemList' :item="judge"></detailBlock>
 		</view>
 		
 		<!-- 创建者用户名 -->
 		<view style="padding: 0 30rpx;">
-			<view class="creator">
-				<image src="https://file.icve.com.cn/file_doc_public/950/667/EDAA6EB078AC9BB59B9635A1823CE552.jpg" mode="aspectFill"></image>
+			<view class="creator" v-for="(item,index) in actItemList" :key="index + 'b' ">
+				<image :src="item.avatar == null ? 'http://43.139.158.220:5007/img/static/mine/Avatar_default.png' : item.avatar" mode="aspectFill"></image>
 				<view class="creName btn-font">
-					李芳
+					{{ item.username }}
 				</view>
 			</view>
 		</view>
@@ -75,11 +75,17 @@
 				</view>
 				
 				<view class="pers">
-					<view class="per" v-for="i in perNum">
+					<!-- <view class="per" v-for="i in perNum">
 						<image :src="i.img"></image>
 						<view class="perName fz-font">
 							{{i.Name}}
 						</view>
+					</view> -->
+					<view class="per">
+						<!-- <image :src="item.img"></image> -->
+						<view class="perName fz-font">
+							暂无人员
+						</view>
 					</view>
 				</view>
 			</view>
@@ -100,6 +106,7 @@
 					title:'教研室详情',
 					btn:1
 				},
+				actItemList: [],
 				perNum:[
 					{Name:'金晶',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (1).png'},
 					{Name:'朱心艺',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (2).png'},
@@ -110,7 +117,7 @@
 				],
 				judge: {
 					isShow: 0,
-					info:"《创业者管理能力训练基础》通过管理学、营销学、财税理论、创业基础知识及创业操作实务的提炼，以专题化的形式面向高职类所有专业的学生。本课程一共有三大部分、七个专题。分别为：第一部分，一般管理者能力训练基础，四个专题，即自我管理能力训练、团队管理能力训练、社会关系管理能力训练与团队建设能力训练。第二部分，创业者重要能力的领悟与训练，二个专题，即成功创业者的智力要素、成功创业者商务能力的领悟与训练"
+					info:""
 				}
 			};
 		},
@@ -121,10 +128,30 @@
 				})
 			},
 			applyAdd(){
+				const clickedAcId = this.actItemList[0].acId;
+				console.log(clickedAcId);
 				uni.navigateTo({
-					url:'/pages/jys/jys'
+					url:'/pages/jys/jys?acId=' + clickedAcId
 				})
-			}
+			},
+			getActivity() {
+				// 获取当前页面的URL
+				const routes = getCurrentPages();
+				console.log(routes);
+				const acId = routes[1].options.acId ? routes[1].options.acId : routes[2].options.acId
+				let data = {
+					acId: acId,
+					ty: 2
+				}
+				this.$request('/selectActivityID', "POST", data).then(res => {
+					console.log(res[0]);
+					// this.activeList=[...this.activeList,...res[0]]
+					this.actItemList = res[0]
+				})
+			},
+		},
+		onShow() {
+			this.getActivity()
 		}
 	}
 </script>