Merge branch 'frontend' of gitcode.net:qq_50679803/great-teamwork into frontend

teamwork/pages/team/activity-detail.vue

@@ -58,7 +58,7 @@
 	export default {
 		data() {
 			return {
-				signStatus: '报名',
+				signStatus: '',
 				userId: '',
 				icon: '',
 				activityId: '',
@@ -73,6 +73,22 @@
 			}
 		},
 		methods: {
+			happenTimeFun(){//时间戳数据处理
+			        let date = new Date();
+			         //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+			        let y = date.getFullYear();
+			        let MM = date.getMonth() + 1;
+			        MM = MM < 10 ? ('0' + MM) : MM;//月补0
+			        let d = date.getDate();
+			        d = d < 10 ? ('0' + d) : d;//天补0
+			        let h = date.getHours();
+			        h = h < 10 ? ('0' + h) : h;//小时补0
+			        let m = date.getMinutes();
+			        m = m < 10 ? ('0' + m) : m;//分钟补0
+			        let s = date.getSeconds();
+			        s = s < 10 ? ('0' + s) : s;//秒补0
+			        return y + '-' + MM + '-' + d + ' ' + h + ':' + m+ ':' + s;
+			},
 			goBack() {
 				uni.navigateBack({
 					delta: 1, //返回层数，2则上上页
@@ -169,26 +185,32 @@
 			console.log(option.activityId)
 			console.log(this.userId)
 			uniCloud.callFunction({
-				name: 'fe-team-activityDetail',
-				data: {
-					userId: this.userId,
-					activityId: this.activityId
-				}
-			}).then(res => {
-				console.log(res)
-				this.name = res.result.data.username
-				this.production = res.result.data.content
-				this.startDate = res.result.data.startDate
-				this.endDate = res.result.data.endDate
-				this.object = res.result.data.participants
-				this.alreadyObject = res.result.data.enrollment
-				this.place = res.result.data.place
-				this.contact = res.result.data.contact
-				this.icon = res.result.data.icon
-				this.signStatus = res.result.qualification
-			}).catch((err => {
-				console.log(err)
-			}))
+					name: 'fe-team-activityDetail',
+					data: {
+						userId: this.userId,
+						activityId: this.activityId
+					}
+				})
+				.then(res => {
+					console.log(res)
+					this.name = res.result.data.username
+					this.production = res.result.data.content
+					this.startDate = res.result.data.startDate
+					this.endDate = res.result.data.endDate
+					this.object = res.result.data.participants
+					this.alreadyObject = res.result.data.enrollment
+					this.place = res.result.data.place
+					this.contact = res.result.data.contact
+					this.icon = res.result.data.icon
+					this.signStatus = res.result.qualification
+				}).catch((err => {
+					console.log(err)
+				}))
+			if(this.happenTimeFun()>this.startDate){
+				console.log(this.happenTimeFun(),'this.happenTimeFun()')
+				console.log(this.startDate,'this.startDate')
+				this.signStatus="报名时间截止"
+			}
 		}
 	}
 </script>

teamwork/pages/team/add-team-activity.vue

@@ -118,6 +118,36 @@
 					});
 					return;
 				}
+				
+				uniCloud.callFunction({
+						name: 'fe-team-createActivity',
+						data: {
+							title: this.name,
+							content: this.content,
+							startDate: this.start_date,
+							endDate: this.end_date,
+							userId: this.userId,
+							place: this.place,
+							participants: this.object,
+							contact: this.contact,
+						}
+					})
+					.then(res => {
+						console.log(res)
+						if (res.result.code == 200) {
+							uni.showToast({
+								title: '提交成功',
+								icon: 'success'
+							});
+							this.goBack()
+						} else {
+							uni.showToast({
+								title: '提交失败',
+								icon: 'error'
+							});
+						}
+
+					})
 			},
 			handleDateChange1(event) {
 				this.start_date = event.detail.value

teamwork/pages/team/add-team.vue

@@ -75,7 +75,7 @@
 				}
 				if (this.avatar == '') {
 					this.avatar =
-						'https://mp-6f6feaec-a026-4402-8e8d-18f7572890da.cdn.bspapp.com/cloudstorage/7d3feb79-8efe-4686-b745-3b7dc5d5df36.png'
+						'https://mp-6f6feaec-a026-4402-8e8d-18f7572890da.cdn.bspapp.com/cloudstorage/433d3cc6-4b8f-475c-83e1-35acc747cab2.jpg'
 				}
 				await uniCloud.callFunction({
 					name: 'fe-team-createTeam',

teamwork/pages/team/main.vue

@@ -95,6 +95,7 @@
 			};
 		},
 		methods: {
+			
 			tabChange(index) {
 				this.current = index.index;
 				if (index.index == 1) {