”

components/statusBar/statusBar.vue

@@ -3,7 +3,7 @@
 			<view class="nav" v-if="meunButtonInfo" :style="{height:navheight + 'px'}">
 				<view v-if="item.btn" class="backBtnSty" style="position: fixed;transform: translate(0,-50%);" :style="{width:'30px',marginTop:navTop+meunButtonInfo/2 +'px'}">
 					<!-- <image @click="backIndex" src="../../static/logo.png" mode="aspectFill"></image> -->
-					<uni-icons @click="backIndex" type="back" size="20"></uni-icons>
+					<uni-icons @click="backIndex" type="back" size="25"></uni-icons>
 				</view>
 				<view class="navTit" :style="{paddingTop:navTop+ 'px',lineHeight:meunButtonInfo+'px'}">
 					<view class="postTit">{{item.title}} </view>

components/teaching-case/teaching-case.vue

@@ -2,7 +2,7 @@
 	<view>
 
 
-		<view class="teaching_case" v-for="(i,index) in classList" :key="index + 'a'" @click="gotoTeDetail" :data-index="index">
+		<view class="teaching_case" v-for="(i,index) in classList" :key="index + 'a'" @click="" :data-index="index">
 			<view class="img cell-img">
 				<image :src="i.img" v-if="!item.btn" mode="aspectFill"></image>
 			</view>
@@ -190,6 +190,7 @@
 				console.log(e.currentTarget.dataset['index'], 123);
 				let edata = e.currentTarget.dataset['index'];
 				const clickedAcId = this.activeList[edata].acId;
+				const type = this.activeList[edata].type;
 				console.log(clickedAcId);
 				const value = this.$store.state.user.openid;
 
@@ -215,11 +216,11 @@
 						});
 					}else if (this.item.btn_2 === 2) {
 						uni.navigateTo({
-							url: "/pages/activityDetail/activityDetail?acId=" + clickedAcId + "&ty=0",
+							url: "/pages/activityDetail/activityDetail?acId=" + clickedAcId + "&ty=" + type,
 						});
 					}else{
 						uni.navigateTo({
-							url: "/pages/activityDetail/activityDetail?acId=" + clickedAcId + "&ty=1",
+							url: "/pages/activityDetail/activityDetail?acId=" + clickedAcId + "&ty=" + type,
 						});
 					}
 					// console.log("/pages/activityDetail/activityDetail?openid=" + value);

pages.json

@@ -223,6 +223,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/mineRelease/mineRelease",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"tabBar": {
 		// "custom": true,

pages/activityDetail/activityDetail.vue

@@ -46,7 +46,7 @@
 
 
 		<!-- 当前成员 -->
-		<view style="padding: 0 30rpx;">
+		<view style="padding: 0 30rpx; display: none;">
 			<view class="member">
 				<view class="memberTop">
 					<view class="btn-font">报名情况(已报名0人)</view>
@@ -77,7 +77,7 @@
 		</view>
 
 		<!-- 申请加入 -->
-		<view class="btnBlock">
+		<view class="btnBlock" v-show="btnShow">
 			<button class="btn" @click="gotoAdd">立即报名</button>
 		</view>
 	</view>
@@ -91,6 +91,7 @@
 					title: '活动详情',
 					btn: 1
 				},
+				btnShow: true,  //控制按钮显示隐藏
 				judge: {
 					isShow: 1,
 					info: ''
@@ -146,8 +147,21 @@
 				// 获取当前页面的URL
 				const routes = getCurrentPages();
 				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;
+				// 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;
+				// if (routes[2]) {
+				// 	this.isShow = routes[2].options.isShow ?false : true
+				// }
+				// this.isShow = routes[2].options.isShow
+				// console.log(this.isShow);
+				let acId, ty, isShow;
+				if (routes.length > 1) {
+				    acId = routes[1].options.acId ? routes[1].options.acId : routes[2].options.acId;
+				    ty = routes[1].options.ty ? routes[1].options.ty : routes[2].options.ty;
+				    isShow = routes[2] ? (routes[2].options.isShow ? false : true) : true;
+				}
+					this.btnShow = isShow;
+				
 				let data = {
 					acId: acId,
 					ty: ty

pages/jys/jys.vue

@@ -1,51 +1,51 @@
 <template>
 	<view class="hd">
 		<statusBar :item="navBarData"></statusBar>
-		
+
 		<view class="top" v-for="(item,index) in actItemList" :key="index">
-				<view class="card">
-					<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">{{ item.acName }}</view>
-						</view>
-						<view class="col sZw-font">
-							负责人：{{ item.username }}
-						</view>
-						<view class="col sZw-font">
-							教研室标签：暂无
-						</view>
+			<view class="card">
+				<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">{{ item.acName }}</view>
+					</view>
+					<view class="col sZw-font">
+						负责人：{{ item.username }}
+					</view>
+					<view class="col sZw-font">
+						教研室标签：{{ typetext }}
 					</view>
 				</view>
+			</view>
 		</view>
-		
+
 		<!-- <uni-card :is-shadow="false"> -->
-			<view class="xinxi">
-				<view class="card2">
-					<view class="hdxx">
-						<view class="xxTit btn-font">活动信息</view>
-						<view class="textcolor">
-							<view class="name  sZw-font">
-								姓名:
-								<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">
-								联系方式:
-								<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">
-								单位:
-								<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 class="xinxi">
+			<view class="card2">
+				<view class="hdxx">
+					<view class="xxTit btn-font">活动信息</view>
+					<view class="textcolor">
+						<view class="name  sZw-font">
+							姓名:
+							<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">
+							联系方式:
+							<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">
+							单位:
+							<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>
 			</view>
+		</view>
 		<!-- </uni-card> -->
 		<view class="buttons">
 			<view class="button-container">
@@ -59,190 +59,216 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			navBarData: {
-				title: '教研室报名',
-				btn: 1
-			},
-			nickname: '',
-			telephone: '',
-			units: '',
-			actItemList:[]
-		};
-	},
-	methods: {
-		button1Action() {
-			this.nickname = ''
-			this.telephone = ''
-			this.units = ''
-		},
-		gotoSign() {
-			// 这里添加按钮2点击后触发的动作
-			if(this.nickname.trim() === '' || this.telephone.trim() === '') {
-				uni.showToast({
-					title: '请填写完整的表单内容',
-					icon: 'none'
-				});
-				return;
-			}
-			uni.navigateTo({
-				url: '/pages/Sign/Sign'
-			})
+	export default {
+		data() {
+			return {
+				navBarData: {
+					title: '教研室报名',
+					btn: 1
+				},
+				nickname: '',
+				telephone: '',
+				units: '',
+				actItemList: [],
+				typetext: ''
+			};
 		},
-		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]
-			})
+		methods: {
+			button1Action() {
+				this.nickname = ''
+				this.telephone = ''
+				this.units = ''
+			},
+			gotoSign() {
+				// 这里添加按钮2点击后触发的动作
+				if (this.nickname.trim() === '' || this.telephone.trim() === '') {
+					uni.showToast({
+						title: '请填写完整的表单内容',
+						icon: 'none'
+					});
+					return;
+				}
+				uni.navigateTo({
+					url: '/pages/Sign/Sign'
+				})
+			},
+			mapTypeToText(type) {
+				if (type === 0) {
+					return "直播活动";
+				} else if (type === 1) {
+					return "常规教研活动";
+				} else {
+					return "专题教研活动";
+				}
+			},
+			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]
+					this.typetext = this.mapTypeToText(this.actItemList.type);
+				})
+			},
 		},
-	},
-	onShow() {
-		this.getActivity()
-	}
-};
+		onShow() {
+			this.getActivity()
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
-.hd {
-	.top{
-		width: 690rpx;
-		height: 192rpx;
-		background-color: #ffffff;
-		margin: auto;
-		margin-top: 30rpx;
-		// padding: 24rpx;
-		padding: 16rpx 24rpx;
-		border-radius: 10rpx;
-		.col{
-			color: #999999;
-		}
-	}
-	.card {
-		// margin-top: 40rpx;
-		display: flex;
-		.image {
-			flex-shrink: 0;
-			width: 160rpx;
-			height: 160rpx;
-			border-radius: 4px;
+	.hd {
+		.top {
+			width: 690rpx;
+			height: 192rpx;
+			background-color: #ffffff;
+			margin: auto;
+			margin-top: 30rpx;
+			// padding: 24rpx;
+			padding: 16rpx 24rpx;
+			border-radius: 10rpx;
+
+			.col {
+				color: #999999;
+			}
 		}
-		
-		.text {
-			margin-left: 10px; // 增加一点空间
+
+		.card {
+			// margin-top: 40rpx;
 			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-			.text_title {
+
+			.image {
+				flex-shrink: 0;
+				width: 160rpx;
+				height: 160rpx;
+				border-radius: 4px;
+			}
+
+			.text {
+				margin-left: 10px; // 增加一点空间
 				display: flex;
-				align-items: center;
-				.manage {
-					// padding:4rpx 12rpx 4rpx 12rpx;
+				flex-direction: column;
+				justify-content: space-between;
+
+				.text_title {
 					display: flex;
-					justify-content: center;
 					align-items: center;
-					width: 68rpx;
-					height: 36rpx;
-					border-radius: 5rpx;
-					color: #00b2b6;
-					border: 1px solid #00b2b6;
-					// border-radius: 10rpx;
-					margin-right: 10rpx;
-				}
-				.t1 {
-					color: black;
-					width: 350rpx;
-					font-weight: 550;
-					overflow:hidden;
-					text-overflow:ellipsis;
-					white-space:nowrap;
+
+					.manage {
+						// padding:4rpx 12rpx 4rpx 12rpx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						width: 68rpx;
+						height: 36rpx;
+						border-radius: 5rpx;
+						color: #00b2b6;
+						border: 1px solid #00b2b6;
+						// border-radius: 10rpx;
+						margin-right: 10rpx;
+					}
+
+					.t1 {
+						color: black;
+						width: 350rpx;
+						font-weight: 550;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
 				}
-			}
 
+			}
 		}
-	}
-	.xinxi{
-		background-color: #ffffff;
-		width: 690rpx;
-		// height: 272rpx;
-		margin: auto;
-		margin-top: 20rpx;
-		padding: 20rpx 24rpx;
-		border-radius: 12rpx;
-	}
-	.hdxx {
-		.xxTit {
-			color: black;
-			// font-size: 18px;
-			// font-weight: 400px;
-			line-height: 42px;
+
+		.xinxi {
+			background-color: #ffffff;
+			width: 690rpx;
+			// height: 272rpx;
+			margin: auto;
+			margin-top: 20rpx;
+			padding: 20rpx 24rpx;
+			border-radius: 12rpx;
 		}
-		.textcolor {
-			color: #999999;
-			line-height: 42px;
-			.name {
-				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);
+
+		.hdxx {
+			.xxTit {
+				color: black;
+				// font-size: 18px;
+				// font-weight: 400px;
+				line-height: 42px;
+			}
+
+			.textcolor {
+				color: #999999;
+				line-height: 42px;
+
+				.name {
+					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);
+					}
 				}
 			}
 		}
-	}
-	.buttons {
-		background-color: white;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		height: 137rpx;
-		// padding-bottom: 50rpx;
-		// font-size: 30rpx;
-		.button-container {
+
+		.buttons {
+			background-color: white;
+			position: fixed;
+			bottom: 0;
+			left: 0;
 			width: 100%;
 			display: flex;
 			justify-content: space-around;
-			.btn1{
-				width: 326rpx;
-				height: 71rpx;
-				border: 1px solid #666666;
-				border-radius: 50px;
-				height: 70rpx;
-				line-height: 70rpx;
-				// font-size: 35rpx;
-				color: #666666;
-			}
-			.btn2{
-				width: 326rpx;
-				height: 71rpx;
-				background-color: #0056a8;
-				border-radius: 50px;
-				height: 70rpx;
-				line-height: 70rpx;
-				color: #ffffff;
+			align-items: center;
+			height: 137rpx;
+
+			// padding-bottom: 50rpx;
+			// font-size: 30rpx;
+			.button-container {
+				width: 100%;
+				display: flex;
+				justify-content: space-around;
+
+				.btn1 {
+					width: 326rpx;
+					height: 71rpx;
+					border: 1px solid #666666;
+					border-radius: 50px;
+					height: 70rpx;
+					line-height: 70rpx;
+					// font-size: 35rpx;
+					color: #666666;
+				}
+
+				.btn2 {
+					width: 326rpx;
+					height: 71rpx;
+					background-color: #0056a8;
+					border-radius: 50px;
+					height: 70rpx;
+					line-height: 70rpx;
+					color: #ffffff;
+				}
 			}
+
+
 		}
-		
-		
 	}
-}
-</style>
+</style>

pages/mine/mine.vue

@@ -72,6 +72,19 @@
 							</image>
 						</view>
 					</view>
+					<view class="optionItem" @click="gotomyRelease">
+						<view class="option_left">
+							<span class="option_icon">
+								<image src="../../static/fabu.png" mode="aspectFill">
+								</image>
+							</span>
+							<text class="option_text fwb-font">我的发布</text>
+						</view>
+						<view class="option_right">
+							<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" mode="aspectFill">
+							</image>
+						</view>
+					</view>
 				</view>
 				<view class="optionsItemBox">
 					<view class="optionItem">
@@ -128,7 +141,7 @@
 		methods: {
 			getFile(val) {
 				// console.log(val);
-				
+
 				this.ajax
 					.post("https://cxcy.ssti.net.cn/api/UploadFirmFile", {
 						uid: this.$store.state.userInfo.userid,
@@ -173,12 +186,24 @@
 				uni.navigateTo({
 					url: '/pages/mineActive/mineActive'
 				})
+			},
+			gotomyRelease() {
+				const value = this.$store.state.user.openid;
+				if (value == '') {
+					uni.navigateTo({
+						url: "/pages/login_Wechat/login_Wechat",
+					});
+				} else {
+					uni.navigateTo({
+						url: '/pages/mineRelease/mineRelease'
+					})
+				}
 			}
 		},
 		onShow() {
 			console.log(this.$store.state);
-			this.userAvatar=this.$store.state.user.avatar;
-			this.username=this.$store.state.user.username;
+			this.userAvatar = this.$store.state.user.avatar;
+			this.username = this.$store.state.user.username;
 			this.isManage = this.$store.state.user.openid;
 			console.log(this.isManage == "");
 		}

pages/mineActive/mineActive.vue

@@ -49,7 +49,7 @@
 		data() {
 			return {
 				navBarData: {
-					title: '专题教研活动列表',
+					title: '我的活动',
 					btn: 1
 				},
 				activeList: [{

pages/mineClass/mineClass.vue

@@ -65,7 +65,7 @@
 		data() {
 			return {
 				navBarData: {
-					title: '专题教研活动列表',
+					title: '我的教研室',
 					btn: 1
 				},
 				classList: [{

pages/mineRelease/mineRelease.vue

@@ -0,0 +1,390 @@
+<template>
+	<view>
+		<statusBar :item="navBarData"></statusBar>
+		<view class="activeBox" v-for="(item,index) in activeList" :key="index">
+			<view class="teaching_case" @click="gotoActdetail" :data-index="index">
+				<view class="img">
+					<!-- <image src="http://43.139.158.220:5007/img/static/activity/bg2.png" mode="aspectFill"></image> -->
+					<image :src="item.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">
+						<view class="money fNum-font"><text class="three-font">￥</text> {{ item.cost }}</view>
+					</view>
+
+					<view class="operate">
+						<view class="left">
+
+							<view class="person">浏览0 · 订阅0 · 收藏0 · 已购0</view>
+						</view>
+
+						<view class="Oright">
+							<view class="text">查看详情</view>
+							<view class="arrow">
+								<image src="http://43.139.158.220:5007/img/static/mine/arrow-right-blue.png"
+									mode="aspectFill"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="controls">
+				<view class="controls_btns">
+					<button @click="gotoEdit(index)">编辑</button>
+					<button @click="actDelete(index)">删除</button>
+				</view>
+			</view>
+		</view>
+		<view class="" style="width: 100%;height: 50rpx;"></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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				navBarData: {
+					title: '我的发布', //导航栏标题
+					btn: 1 //是否显示返回按钮 0不显示  1 显示
+				},
+				showPopup: false,
+				deleteAcId : '',
+				activeList: [
+					// {
+					// 	img: "http://43.139.158.220:5007/img/static/img/1695656271245-image.png",
+					// 	count: "3842",
+					// 	price: "299",
+					// 	className: "丽湖职教双创教育国际虚拟教研室启动大会暨双创教育国际论坛圆满举行",
+					// 	intro: "丽湖职教双创教育国际虚拟教研室为立足全国，辐射海外的国际化教研室，围绕创新创业教育的人才培养与课程建设开展深度研究。教研室以贯彻落实立德树人根本任务，通过加强跨专业、跨校、跨地域的教研交流，推动高校协同打造国际化的精品教学资",
+					// }, 
+				],
+			};
+		},
+		methods: {
+			getpublish() {
+				let data={
+					openid:uni.getStorageSync('oId')
+				}
+				this.$request('/selectMyPublish', "POST", data).then(res => {
+					console.log(res[0]);
+					this.activeList = res[0]
+					if (this.activeList === []) {
+						uni.showToast({
+							title: '没有您发布的内容',
+							icon: 'none'
+						});
+						return;
+					}
+				})
+			},
+			gotoActdetail(e) {
+				let edata = e.currentTarget.dataset['index'];
+				const clickedAcId = this.activeList[edata].acId;
+				const type = this.activeList[edata].type;
+				const isShow = false
+				uni.navigateTo({
+					url: "/pages/activityDetail/activityDetail?acId=" + clickedAcId + "&ty=" + type + "&isShow=" + isShow,
+				});
+			},
+			gotoEdit(index) {
+				const clickedAcId = this.activeList[index].acId;
+				const type = this.activeList[index].type;
+				// console.log(clickedAcId);
+				uni.navigateTo({
+					url: "/pages/publish/publish?acId=" + clickedAcId + "&ty=" + type,
+				});
+			},
+			actDelete(index) {
+				this.deleteAcId = this.activeList[index].acId;
+				this.showPopup = true; //显示弹窗
+			},
+			confirm() {
+				let data={
+					id: this.deleteAcId
+				}
+				console.log(this.deleteAcId);
+				this.$request('/deleteMyPublish', "POST", data).then(res => {
+					// console.log(res);
+					console.log('删除成功');
+					this.getpublish()
+				})
+				this.closePopup()
+			},
+			closePopup() {
+				// 取消操作
+				this.showPopup = false
+				this.deleteAcId = null
+			},
+		},
+		onShow() {
+			this.getpublish();
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.activeBox {
+		width: 100%;
+		background-color: #fff;
+		&:first-child{
+			padding: 10px 0 0 0;
+		}
+
+		.teaching_case {
+			display: flex;
+			justify-content: space-between;
+			padding: 10px 10px;
+			border-top: 1px solid #E7E7E7;
+
+			.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: 190px;
+						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;
+
+					.money {
+						color: #FFA338;
+						font-weight: bold;
+						font-size: 36rpx;
+						line-height: 20px;
+					}
+				}
+
+				.operate {
+					display: flex;
+					justify-content: space-between;
+					// align-items: flex-end;
+					align-items: baseline;
+					// margin-top: 15px;
+
+					.left {
+						display: flex;
+						flex-direction: row;
+						justify-content: space-between;
+						align-items: baseline;
+						width: 260rpx;
+
+
+
+						.person {
+							color: #00000099;
+							font-size: 20rpx;
+							// margin-left: 6px;
+						}
+					}
+
+					.Oright {
+						width: 80px;
+						display: flex;
+						// justify-content: end;
+						align-items: center;
+						padding-left: 15px;
+						// flex-direction: row;
+						// justify-content: space-around;
+						// align-items: flex-end;
+
+						.text {
+							font-size: 24rpx;
+							color: #3081E8;
+						}
+
+						.arrow {
+							display: flex;
+							justify-content: center;
+							margin-top: 5rpx;
+
+							image {
+								width: 32rpx;
+								height: 32rpx;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		.controls {
+			display: flex;
+			justify-content: flex-end;
+			padding: 0 10px;
+			border-top: 1px solid #E7E7E7;
+			align-items: center;
+			height: 45px;
+
+			.controls_btns {
+				display: flex;
+				align-items: center;
+				width: 115px;
+				height: 35px;
+
+				button {
+					width: 96rpx;
+					height: 48rpx;
+					font-size: 24rpx;
+					border-radius: 10rpx;
+					border: 1px solid #3081E8;
+					background-color: white;
+					color: #3081E8;
+					padding: 0;
+					line-height: 23px;
+				}
+
+			}
+		}
+	}
+	.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;
+				}
+			}
+		}
+	}
+</style>

pages/publish/publish.vue

@@ -230,7 +230,7 @@
 
 		<view class="" style="height: 10vh;width: 750rpx;position: relative;">
 			<view class="publish_now">
-				<button class="btn" @click="submitForm">立即发布</button>
+				<button class="btn" @click="submitForm">{{ btntext }}</button>
 			</view>
 		</view>
 
@@ -240,7 +240,7 @@
 			<view class="popup-container" v-show="showPopup">
 				<view class="popup">
 					<view class="header">
-						<text>确认发布</text>
+						<text>确认{{ poptext }}</text>
 					</view>
 					<view class="footer">
 						<button class="cancel-btn" @click="closePopup">取消</button>
@@ -254,11 +254,11 @@
 			<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 class="header" style="margin-top: 15px;">
+						<image src="http://43.139.158.220:5007/img/static/gou1.png" mode="aspectFill"></image>
+						<text style="margin-bottom: 24px;">{{ poptext }}成功</text>
 					</view>
-					<view class="footer">
+					<view class="footer" style="padding-top: 0px;">
 						<button class="confirm-btn_2" @click="closePopup">确认</button>
 					</view>
 				</view>
@@ -281,6 +281,13 @@
 				},
 				showPopup: false,
 				showPopupConfirm: false,
+				isFirstShow: true,
+				//按钮文本
+				btntext: '立即发布',
+				// 弹窗文本
+				poptext: '发布',
+				//acId
+				acId: '',
 				// 标题
 				activitytitle: '',
 				// 内容
@@ -327,6 +334,49 @@
 			}
 		},
 		methods: {
+			editPublish() {
+				const routes = getCurrentPages()
+				console.log(routes);
+				if (routes.length == 3) {
+					const acId = routes[2].options.acId
+					const type = routes[2].options.ty
+					if (acId) {
+						this.navBarData.title = '修改发布'
+						this.btntext = '修改发布'
+						this.poptext = '修改'
+						console.log(acId);
+						console.log(type);
+						let data = {
+							acId: acId,
+							ty: type
+						}
+						this.$request('/selectActivityID', "POST", data).then(res => {
+							console.log(res[0]);
+							// this.actItemList = res[0]
+							const item = res[0][0]
+							this.acId = item.acId
+							this.activitytitle = item.acName
+							this.activityintro = item.brief
+							this.imageValue = item.pic
+							this.classify = item.type
+							this.recruitment = item.pers
+							this.activityform = item.acshape
+							this.address = item.address
+							this.funds = item.cost
+							this.activityDate = item.begin_at
+							this.deadlineDate = item.endTime
+							
+							if (this.classify == 0) {
+								this.classify = "直播活动"
+							} else if (this.classify == 1) {
+								this.classify = "常规教研活动"
+							} else {
+								this.classify = "专题教研活动"
+							}
+						})
+					}
+				}
+			},
 			submitForm() {
 				if (
 					this.activitytitle.trim() === '' ||
@@ -365,17 +415,18 @@
 				}
 				// 将文本框内容和图片链接存储在一个对象中
 				const formData = {
-					id: this.$store.state.user.openid,
+					// id: this.$store.state.user.openid,
+					id: this.btntext === '修改发布' ? this.acId : this.$store.state.user.openid,
 					activitytitle: this.activitytitle,
 					activityintro: this.activityintro,
 					img: this.imageValue,
-					classify: this.classify,
 					recruitment: this.recruitment,
 					activityform: this.activityform,
 					address: this.address,
-					funds: this.funds,
+					classify: this.classify,
 					activityDate: this.activityDate,
 					deadlineDate: this.deadlineDate,
+					funds: this.funds
 					// price: "188",
 					// count: "6",
 				};
@@ -383,14 +434,29 @@
 				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) {
-						uni.switchTab({
-							url: "/pages/activityPage/activityPage"
-						})
-					}
-				})
+				console.log(this.btntext);
+				if (this.btntext === '修改发布') {
+					// formData.acId = this.acId
+					// console.log(formData);
+					this.$request('/updateMyPublish', 'POST', formData).then(res => {
+						console.log(res);
+						setTimeout(() => {
+							uni.navigateBack();
+						}, 500)
+					})
+				}else {
+					this.$request('/insertActive', 'POST', formData).then(res => {
+						console.log(res.data);
+						if (res.code == 200) {
+							setTimeout(() => {
+								uni.switchTab({
+									url: "/pages/activityPage/activityPage"
+								})
+							}, 500)
+						}
+					})
+				}
+
 			},
 			handelclassify(e) {
 				this.classify = this.classifyList[e.detail.value]
@@ -469,6 +535,12 @@
 
 			},
 		},
+		onShow() {
+			if (this.isFirstShow) {
+				this.editPublish()
+				this.isFirstShow = false
+			}
+		}
 	}
 </script>
 
@@ -730,7 +802,7 @@
 					justify-content: space-around;
 					align-items: end;
 					padding-top: 17px;
-					
+
 					.cancel-btn {
 						width: 259rpx;
 						height: 100rpx;

pages/teachingDetail/teachingDetail.vue

@@ -2,7 +2,7 @@
 	<!-- 教研室详情 -->
 	<view class="teachingDetail">
 		<statusBar :item="navbar"></statusBar>
-		
+
 		<!-- 顶部 -->
 		<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>
@@ -11,15 +11,17 @@
 					<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>
+							<image src="http://43.139.158.220:5007/img/static/yym/Star 1 (Stroke) (2).png"
+								style="width: 42rpx;height: 40rpx;" mode="aspectFill"></image>
 						</view>
 						<view class="icon">
-							<image src="http://43.139.158.220:5007/img/static/yym/Vector (Stroke) (1).png" style="width: 38rpx;height: 42rpx;" mode="aspectFill"></image>
+							<image src="http://43.139.158.220:5007/img/static/yym/Vector (Stroke) (1).png"
+								style="width: 38rpx;height: 42rpx;" mode="aspectFill"></image>
 						</view>
 					</view>
 				</view>
 				<view class="col fz-font">
-					成立日期：暂无
+					成立日期：{{ item.begin_at }}
 				</view>
 				<view class="col fz-font">
 					人数：{{ item.pers }}人
@@ -27,14 +29,15 @@
 				<view class="tag col">
 					<view class="fz-font">教研标签：</view>
 					<view class="" style="display: flex;">
-						<view class="bqZ-font" style="color: #00b2b6; border: 1px #00b2b6 solid;padding: 2rpx 10rpx;border-radius: 5rpx;font-weight: 600;">
-							类型标签
+						<view class="bqZ-font"
+							style="color: #00b2b6; border: 1px #00b2b6 solid;padding: 2rpx 10rpx;border-radius: 5rpx;font-weight: 600;">
+							{{ typetext }}
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-		
+
 		<!-- 两个大资料文件 -->
 		<view class="teaData">
 			<view class="cla">
@@ -46,34 +49,38 @@
 				<view class="tit2 titColor fz-font">教研室专属资源</view>
 			</view>
 		</view>
-		
+
 		<!-- 教研室详情 -->
 		<view class="" style="padding: 0 30rpx;">
 			<detailBlock :actItemList='actItemList' :item="judge"></detailBlock>
 		</view>
-		
+
 		<!-- 创建者用户名 -->
 		<view style="padding: 0 30rpx;">
 			<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>
+				<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>
-		
+
 		<!-- 当前成员 -->
-		<view style="padding: 0 30rpx;">
+		<view style="padding: 0 30rpx; display: none;">
 			<view class="member">
 				<view class="memberTop">
-					<view class="btn-font" >当前成员</view>
-					<view class="fz-font" style="color: rgba(0, 0, 0, 0.4);display: flex;align-items: center;" @click="gotoMorePer">
+					<view class="btn-font">当前成员</view>
+					<view class="fz-font" style="color: rgba(0, 0, 0, 0.4);display: flex;align-items: center;"
+						@click="gotoMorePer">
 						<text>查看更多</text>
-						<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" style="width: 32rpx;height: 32rpx;" mode="aspectFill"></image>
+						<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png"
+							style="width: 32rpx;height: 32rpx;" mode="aspectFill"></image>
 						<!-- <uni-icons type="right"></uni-icons> -->
 					</view>
 				</view>
-				
+
 				<view class="pers">
 					<!-- <view class="per" v-for="i in perNum">
 						<image :src="i.img"></image>
@@ -90,7 +97,7 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<!-- 申请加入 -->
 		<view class="btnBlock">
 			<button class="btn zw-font" @click="applyAdd">申请加入</button>
@@ -102,38 +109,65 @@
 	export default {
 		data() {
 			return {
-				navbar:{
-					title:'教研室详情',
-					btn:1
+				navbar: {
+					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'},
-					{Name:'李红',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (3).png'},
-					{Name:'杨婉',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (4).png'},
-					{Name:'郑元雄',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4.png'},
-					{Name:'罗佳诚',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (3).png'}
+				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'
+					},
+					{
+						Name: '李红',
+						img: 'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (3).png'
+					},
+					{
+						Name: '杨婉',
+						img: 'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (4).png'
+					},
+					{
+						Name: '郑元雄',
+						img: 'http://43.139.158.220:5007/img/static/yym/Ellipse 4.png'
+					},
+					{
+						Name: '罗佳诚',
+						img: 'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (3).png'
+					}
 				],
 				judge: {
 					isShow: 0,
-					info:""
-				}
+					info: ""
+				},
+				typetext: ''
 			};
 		},
-		methods:{
-			gotoMorePer(){
+		methods: {
+			gotoMorePer() {
 				uni.navigateTo({
-					url:'/pages/dy/dy'
+					url: '/pages/dy/dy'
 				})
 			},
-			applyAdd(){
+			applyAdd() {
 				const clickedAcId = this.actItemList[0].acId;
 				console.log(clickedAcId);
 				uni.navigateTo({
-					url:'/pages/jys/jys?acId=' + clickedAcId
+					url: '/pages/jys/jys?acId=' + clickedAcId
 				})
 			},
+			mapTypeToText(type) {
+				if (type === 0) {
+					return "直播活动";
+				} else if (type === 1) {
+					return "常规教研活动";
+				} else {
+					return "专题教研活动";
+				}
+			},
 			getActivity() {
 				// 获取当前页面的URL
 				const routes = getCurrentPages();
@@ -147,6 +181,7 @@
 					console.log(res[0]);
 					// this.activeList=[...this.activeList,...res[0]]
 					this.actItemList = res[0]
+					this.typetext = this.mapTypeToText(this.actItemList.type);
 				})
 			},
 		},
@@ -157,16 +192,19 @@
 </script>
 
 <style lang="scss">
-	.teachingDetail{
+	.teachingDetail {
 		padding-bottom: 80px;
-		.backPic{
+
+		.backPic {
 			width: 750rpx;
 			position: relative;
-			image{
+
+			image {
 				width: 100%;
 				display: block;
 			}
-			.card{
+
+			.card {
 				position: absolute;
 				width: 690rpx;
 				height: 256rpx;
@@ -175,16 +213,18 @@
 				padding: 30rpx;
 				background-color: rgba(0, 0, 0, 0.26);
 				border-radius: 10px;
-				transform: translate(-50%,0);
+				transform: translate(-50%, 0);
 				border: 1rpx #667870 solid;
 				color: #ffffff;
+
 				// display: flex;
 				// flex-direction: column;
 				// justify-content: space-between;
-				.cardTop{
+				.cardTop {
 					display: flex;
 					justify-content: space-between;
-					.title{
+
+					.title {
 						// padding-bottom: 20rpx;
 						margin-bottom: 20rpx;
 						width: 506rpx;
@@ -193,15 +233,17 @@
 						font-family: PingFang SC;
 						// font-weight: 550;
 						overflow: hidden;
-						text-overflow:ellipsis;
+						text-overflow: ellipsis;
 						white-space: nowrap;
 					}
-					.icons{
+
+					.icons {
 						flex: 1;
 						display: flex;
 						align-items: center;
 						justify-content: space-between;
-						.icon{
+
+						.icon {
 							width: 48rpx;
 							height: 48rpx;
 							display: flex;
@@ -209,124 +251,140 @@
 							justify-content: center;
 						}
 					}
-					
+
 				}
-				.col{
+
+				.col {
 					margin-bottom: 10rpx;
 					font-weight: 100;
 					color: #f0edea;
 					// font-size: 30rpx;
 				}
-				.tag{
+
+				.tag {
 					display: flex;
 				}
 			}
+
 			// background-image: url(http://43.139.158.220:5007/img/static/resource/jqr.png);
 		}
-		
-		.teaData{
+
+		.teaData {
 			width: 750rpx;
 			display: flex;
-			padding:20rpx 30rpx;
+			padding: 20rpx 30rpx;
 			justify-content: space-between;
+
 			// padding: 20px 0;
-			.cla{
+			.cla {
 				width: 49%;
-				background: linear-gradient(to bottom , #fcfcff 30%, #e8ecfd 100%);
+				background: linear-gradient(to bottom, #fcfcff 30%, #e8ecfd 100%);
 				border-radius: 10px;
 				padding: 35rpx 30rpx;
 				color: #424f85;
-				.tit1{
+
+				.tit1 {
 					// font-size: 38rpx;
 					margin-bottom: 10rpx;
 					font-weight: bold;
 				}
-				.tit2{
+
+				.tit2 {
 					// font-size: 22px;
 					// font-size: 30rpx;
 					// margin-bottom: 5px;
 				}
 			}
-			.cla2{
+
+			.cla2 {
 				width: 45%;
-				background: linear-gradient(to bottom , #fcfcff 10%, #fef3ea 100%);
+				background: linear-gradient(to bottom, #fcfcff 10%, #fef3ea 100%);
 				border-radius: 10px;
 				padding: 35rpx 30rpx;
 				color: #855e42;
-				.tit1{
+
+				.tit1 {
 					// font-size: 38rpx;
 					margin-bottom: 10rpx;
 					font-weight: bold;
 				}
-				.tit2{
+
+				.tit2 {
 					// font-size: 22px;
 					// margin-bottom: 5px;
 					// font-size: 30rpx;
 				}
 			}
 		}
-		
-		
-		.creator{
+
+
+		.creator {
 			display: flex;
 			padding: 30rpx;
 			background-color: #ffffff;
 			align-items: center;
 			margin-top: 20rpx;
 			border-radius: 10px;
-			image{
+
+			image {
 				width: 96rpx;
 				height: 96rpx;
 				border-radius: 50%;
 				margin-right: 20rpx;
 			}
-			.creName{
+
+			.creName {
 				font-weight: bold;
 			}
 		}
-		
-		.member{
+
+		.member {
 			background-color: #ffffff;
 			margin-top: 20rpx;
 			padding: 30rpx;
 			border-radius: 10px;
 			margin-bottom: 30rpx;
-			.memberTop{
+
+			.memberTop {
 				display: flex;
 				justify-content: space-between;
 				margin-bottom: 10px;
 			}
-				
-				.pers{
+
+			.pers {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.per {
 					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					.per{
-						display: flex;
-						flex-direction: column;
-						image{
-							width: 72rpx;
-							height: 72rpx;
-							border-radius: 50%;
-						}
-						.perName{
-							// font-size: 14px;
-							text-align: center;
-						}
+					flex-direction: column;
+
+					image {
+						width: 72rpx;
+						height: 72rpx;
+						border-radius: 50%;
+					}
+
+					.perName {
+						// font-size: 14px;
+						text-align: center;
 					}
-					
 				}
-				
+
+			}
+
 		}
-		
-		.btnBlock{
+
+		.btnBlock {
 			position: fixed;
 			bottom: 0;
 			width: 750rpx;
 			background-color: #ffffff;
 			// padding: 20px 0;
 			padding: 2vh 0;
-			.btn{
+
+			.btn {
 				width: 432rpx;
 				height: 88rpx;
 				font-weight: 500;