diff --git a/apis/modules/activity.js b/apis/modules/activity.js
index 4656b43..f442e7e 100644
--- a/apis/modules/activity.js
+++ b/apis/modules/activity.js
@@ -6,4 +6,19 @@ export const postLoginActivity = (data) => {
 }
 export const getCompetition = (id) => {
   return post(`competition/competition/management/getCompetition?competitionId=${id}`)
+}
+export const individualEventRegistration = (data) => {
+  return post(`competition/competition/registration/individualEventRegistration`, data)
+}
+export const getCurrentTime = () => {
+  return get(`competition/competition/management/getCurrentTime`)
+}
+export const queryRegistrationByCondition = (data) => {
+  return post(`competition/competition/registration/queryRegistrationByCondition`, data)
+}
+export const competitionUserDel = (data) => {
+  return post(`competition/competitionUserDel/save`, data)
+}
+export const cancelRegistration = (id) => {
+  return post(`competition/competition/registration/cancelRegistration?competitionId=${id}`)
 }
\ No newline at end of file
diff --git a/components/filter-popup/filter-popup.vue b/components/filter-popup/filter-popup.vue
index 636217d..d74cfa8 100644
--- a/components/filter-popup/filter-popup.vue
+++ b/components/filter-popup/filter-popup.vue
@@ -162,7 +162,7 @@ export default {
 		}
 	},
 	mounted() {
-		this.getDis()
+		
 	},
     methods: {
         //选择存value 还是id
diff --git a/components/sideSelect/sideSelect.vue b/components/sideSelect/sideSelect.vue
new file mode 100644
index 0000000..896a4f8
--- /dev/null
+++ b/components/sideSelect/sideSelect.vue
@@ -0,0 +1,42 @@
+<template>
+	<view class="sideSelect">
+		<view v-for="(item, i) in menus" :key="i" :class="['item', {active: cur === item.id }]" @click="menuChange(item)">{{ item.name }}</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"sideSelect",
+		props: {
+			menus: {
+				type: Array,
+				default: () => []
+			},
+		},
+		data() {
+			return {
+				cur: ''
+			};
+		},
+		methods: {
+			menuChange(item) {
+				this.cur = item.id
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.sideSelect {
+	min-width: 200rpx;
+	font-size: 28rpx;
+	text-align: center;
+	.item {
+		padding: 20rpx 0;
+	}
+	.active {
+		color: #fff;
+		background-color: $uni-primary;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/libs/util.js b/libs/util.js
index a5c4644..5763151 100644
--- a/libs/util.js
+++ b/libs/util.js
@@ -1,4 +1,5 @@
 import Product from '@/config/product'
+import { getCurrentTime } from '@/apis/modules/activity.js'
 
 const files = [
 	'https://huorantech.cn/%E7%94%A8%E6%88%B7%E6%9C%8D%E5%8A%A1%E5%8D%8F%E8%AE%AE.docx', // 用户服务协议
@@ -125,4 +126,11 @@ export default {
     getFileExt(fileName) {
         return fileName.substring(fileName.lastIndexOf(".") + 1);
     },
+    // 获取当前时间
+    getNow () {
+      return new Promise(async (resolve, reject) => {
+        const res = await getCurrentTime()
+        resolve(new Date(res.currentTime))
+      })
+    },
 }
\ No newline at end of file
diff --git a/order/activityDetail/activityDetail.vue b/order/activityDetail/activityDetail.vue
deleted file mode 100644
index cb82e9f..0000000
--- a/order/activityDetail/activityDetail.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<template>
-	<view class="wrap">
-		<view class="banner">
-			<image class="pic" :src="form.coverUrl" mode="widthFix"></image>
-		</view>
-		
-		<view class="info">
-			<view class="line">
-				<view class="label">状态：</view>
-				<view class="val">进行中</view>
-			</view>
-			<view class="line">
-				<view class="label">人数限制：</view>
-				<view class="val">{{ form.quantityLimit }}</view>
-			</view>
-			<view class="line">
-				<view class="label">举办时间：</view>
-				<view class="val">{{ form.playStartTime + ' ~ ' + form.playEndTime }}</view>
-			</view>
-			<view class="line">
-				<view class="label">活动地点：</view>
-				<view class="val">{{ form.reportingPlace }}</view>
-			</view>
-			<view class="line">
-				<view class="label">主办方：</view>
-				<view class="val">{{ form.sponsor }}</view>
-			</view>
-			<view v-if="form.whetherToShowApplicants === '1'" class="line">
-				<view class="label">已报名人员：</view>
-				<view class="val">(0/{{ form.quantityLimit }})</view>
-			</view>
-		</view>
-		
-		<ul class="tab">
-			<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
-		</ul>
-		
-		<view v-if="!curTab" class="detail">
-			<mp-html :content="form.description"/>
-		</view>
-		<view v-else class="list">
-			
-		</view>
-		
-		<view class="btns">
-			<view class="btn share">分享</view>
-			<view class="btn sign">立刻报名</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { getCompetition } from '@/apis/modules/activity.js'
-	export default {
-		data() {
-			return {
-				id: '',
-				curTab: 0,
-				tabs: [
-					{
-						name: '活动详情',
-						id: 0
-					},
-					{
-						name: '活动通知',
-						id: 1
-					},
-				],
-				form: {
-					quantityLimit: '',
-					playStartTime: '',
-					playEndTime: '',
-					reportingPlace: '',
-					sponsor: '',
-				},
-				shopCartTotal: 0,
-				types: [],
-				mpStyle: {
-					p: 'font-size: 25rpx !important;font-family: Microsoft Yahei !important;font-weight: 400 !important;color: #333 !important;',
-					span: 'font-size: 25rpx !important;font-family: Microsoft Yahei !important;font-weight: 400 !important;color: #333 !important;'
-				}
-			}
-		},
-		onShow() {
-			const pages = getCurrentPages()
-			const { options } = pages[pages.length - 1]
-			this.id = options.id
-			this.getInfo()
-		},
-		methods: {
-			// 获取详情
-			getInfo() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				getCompetition(this.id).then(res => {
-					const data = res.competition
-					data.whetherToShowApplicants === '1' && this.tabs.push({
-						name: '已报名人员',
-						id: 2
-					})
-					this.form = data
-					uni.hideLoading()
-				}).catch(e => {
-					uni.hideLoading()
-				})
-			},
-			// tab切换
-			tabChange(tab) {
-				this.curTab = tab.id
-			},
-			// 下载附件
-			download(item) {
-				uni.setStorageSync('files', {
-					copyWriting: this.form.mall.productName,
-					fileName: [item.fileName],
-					urls: [item.filePath]
-				})
-				this.$util.to(`/team/send/send`)
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-.wrap {
-	padding-bottom: 140rpx;
-}
-.banner {
-	.pic {
-		width: 100%;
-	}
-}
-.info {
-	position: relative;
-	padding: 20rpx;
-	margin: -150rpx 30rpx 30rpx;
-	background-color: #fff;
-	border-radius: 8px;
-	.line {
-		display: flex;
-		align-items: center;
-		margin: 20rpx 0;
-	}
-	.label {
-		min-width: 180rpx;
-		font-size: 28rpx;
-	}
-	.val {
-		font-size: 28rpx;
-		font-weight: 600;
-		color: #333;
-	}
-}
-.detail {
-	padding: 34rpx 32rpx;
-	margin: 20rpx;
-	border-radius: 20px;
-	background-color: #fff;
-}
-.btns {
-	position: fixed;
-	bottom: 0;
-	display: flex;
-	justify-content: center;
-	width: 100%;
-	padding: 20rpx 0;
-	background-color: #fff;
-	.btn {
-		width: 200rpx;
-		padding: 16rpx 0;
-		font-size: 28rpx;
-		color: #fff;
-		text-align: center;
-	}
-	.share {
-		background-color: #75b4ff;
-		border-top-left-radius: 40rpx;
-		border-bottom-left-radius: 40rpx;
-	}
-	.sign {
-		background-color: $uni-primary;
-		border-top-right-radius: 40rpx;
-		border-bottom-right-radius: 40rpx;
-	}
-}
-</style>
diff --git a/other/activityDetail/activityDetail.vue b/other/activityDetail/activityDetail.vue
new file mode 100644
index 0000000..6570536
--- /dev/null
+++ b/other/activityDetail/activityDetail.vue
@@ -0,0 +1,321 @@
+<template>
+	<view class="wrap">
+		<view class="banner">
+			<image class="pic" :src="form.coverUrl" mode="widthFix"></image>
+		</view>
+		
+		<view class="info">
+			<view class="line">
+				<view class="label">活动名称：</view>
+				<view class="val">{{ form.name }}</view>
+			</view>
+			<view class="line">
+				<view class="label">状态：</view>
+				<view class="val">进行中</view>
+			</view>
+			<view class="line">
+				<view class="label">人数限制：</view>
+				<view class="val">{{ form.quantityLimit }}</view>
+			</view>
+			<view class="line items-start">
+				<view class="label">举办时间：</view>
+				<view class="val">{{ form.playStartTime + ' ~ ' + form.playEndTime }}</view>
+			</view>
+			<view class="line">
+				<view class="label">活动地点：</view>
+				<view class="val">{{ form.reportingPlace }}</view>
+			</view>
+			<view class="line">
+				<view class="label">主办方：</view>
+				<view class="val">{{ form.sponsor }}</view>
+			</view>
+			<view v-if="form.whetherToShowApplicants === '1'" class="line">
+				<view class="label">已报名人员：</view>
+				<view class="val">({{ form.applicantNum }}/{{ form.quantityLimit }})</view>
+			</view>
+		</view>
+		
+		<ul class="tab">
+			<li :class="{active: curTab === 0}" @click="tabChange(0)">活动详情</li>
+			<li :class="{active: curTab === 1}" @click="tabChange(1)">活动通知</li>
+			<li v-if="form.whetherToShowApplicants === '1'" :class="{active: curTab === 2}" @click="tabChange(2)">已报名人员({{ form.applicantNum }}/{{ form.quantityLimit }})</li>
+		</ul>
+		
+		<view v-if="!curTab" class="detail">
+			<mp-html :content="form.description"/>
+		</view>
+		<view v-else class="list">
+			<view v-for="(item, i) in list" :key="i" class="item" @click="toDetail(item)">
+				<view class="top">
+					<image class="avatar" :src="item.userAvatars"></image>
+					<view class="name">{{ item.username }}</view>
+				</view>
+				
+				<view class="meta">组织名称：</view>
+				<view class="meta">手机号：</view>
+			</view>
+		</view>
+		
+		<view class="btns">
+			<view class="btn share">分享</view>
+			<view :class="['btn sign', {disabled: !form.signing}]" @click="presign">立刻报名</view>
+		</view>
+		
+		<uni-popup ref="popup" type="dialog">
+			<uni-popup-dialog mode="input" placeholder="请输入4位数邀请码" :duration="2000" :before-close="true" @close="closePopup" @confirm="codeSubmit"></uni-popup-dialog>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import { getCompetition, individualEventRegistration, queryRegistrationByCondition } from '@/apis/modules/activity.js'
+	import Util from '@/libs/util'
+	export default {
+		data() {
+			return {
+				id: '',
+				curTab: 0,
+				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
+				status: 'more', // 上拉加载状态 more|loading|noMore
+				list: [],
+				page: 1,
+				pageSize: 5,
+				total: 0,
+				form: {
+					quantityLimit: '',
+					playStartTime: '',
+					playEndTime: '',
+					reportingPlace: '',
+					sponsor: '',
+				},
+				shopCartTotal: 0,
+				types: [],
+				mpStyle: {
+					p: 'font-size: 25rpx !important;font-family: Microsoft Yahei !important;font-weight: 400 !important;color: #333 !important;',
+					span: 'font-size: 25rpx !important;font-family: Microsoft Yahei !important;font-weight: 400 !important;color: #333 !important;'
+				},
+				timer: null,
+				now: '',
+				invitationCode: '',
+			}
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.initList()
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 1500)
+		},
+		// 上拉加载
+		onReachBottom() {
+			if (this.reachBottom >= 0) {
+				this.reachBottom = 1
+				this.status = 'loading'
+				this.getList()
+			}
+		},
+		onShow() {
+			const pages = getCurrentPages()
+			const { options } = pages[pages.length - 1]
+			this.id = options.id
+			this.getInfo()
+		},
+		methods: {
+			// 获取详情
+			getInfo() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				getCompetition(this.id).then(async (res) => {
+					const data = res.competition
+					this.form = data
+					
+					this.now = await Util.getNow()
+					this.statusInterval()
+					this.timer = setInterval(() => {
+						this.now = new Date(this.now.setSeconds(this.now.getSeconds() + 1))
+						this.statusInterval()
+					}, 1000)
+					uni.hideLoading()
+				}).catch(e => {
+					uni.hideLoading()
+				})
+			},
+			async statusInterval () {
+				const data = this.form
+				if (data.signUpStartTime && data.signUpEndTime) {
+					this.handleStatus()
+				}
+			},
+			// 定时处理时间及状态
+			handleStatus () {
+				const data = this.form
+				let signing = 0
+				const signUpStartTime = new Date(data.signUpStartTime) // 报名开始时间
+				const signUpEndTime = new Date(data.signUpEndTime) // 报名结束时间
+				const { now } = this
+				// 报名中(whetherToSignUp 是否已报名 1已报名，0未报名)
+				if (!data.competitionRegistration && now > signUpStartTime && now < signUpEndTime) {
+					signing = 1
+				}
+				this.$set(this.form, 'signing', signing)
+			},
+			// 已报名人员
+			getRegList() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				queryRegistrationByCondition({
+					competitionId: this.id,
+					pageNum: this.page,
+					pageSize: this.pageSize,
+				}).then(async ({ data }) => {
+					this.list = this.reachBottom > 0 ? [...this.list, ...data.records] : data.records
+					this.page++ // 每次获取了数据后page+1
+					const noMore = this.list.length === data.total // 是否加载完所有数据
+					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
+					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
+					uni.hideLoading()
+				}).catch(e => {
+					uni.hideLoading()
+				})
+			},
+			initList() {
+				this.page = 1
+				this.reachBottom = 0
+				this.getRegList()
+			},
+			// tab切换
+			tabChange(id) {
+				id === 2 && this.initList()
+				this.curTab = id
+			},
+			// 报名前的判断
+			async presign() {
+				if (this.form.competitionRegistration) return this.$util.errMsg('你已经报名过该活动！')
+				if (!this.form.signing) return this.$util.errMsg('现在不在报名时间！')
+				this.invitationCode = ''
+				// 需要输入验证码就弹出邀请码弹框，否则直接报名
+				this.form.isNeedCode ? this.$refs.popup.open() : this.sign()
+			},
+			// 报名
+			async sign() {
+				const res = await individualEventRegistration({
+					competitionId: this.form.id,
+					registrationInvitationCode: this.invitationCode
+				})
+				this.getInfo()
+				this.$util.sucMsg('报名成功！')
+				this.closePopup()
+			},
+			// 关闭邀请码弹框
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			// 邀请码确定
+			codeSubmit(value) {
+				if (!value || value.length !== 4) return this.$util.errMsg('请输入4位数邀请码！')
+				this.invitationCode = value
+				this.sign()
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.wrap {
+	padding-bottom: 140rpx;
+}
+.banner {
+	.pic {
+		width: 100%;
+	}
+}
+.info {
+	position: relative;
+	padding: 20rpx;
+	margin: -150rpx 30rpx 0;
+	background-color: #fff;
+	border-radius: 8px;
+	.line {
+		display: flex;
+		align-items: center;
+		margin: 20rpx 0;
+	}
+	.items-start {
+		align-items: flex-start;
+	}
+	.label {
+		min-width: 180rpx;
+		font-size: 28rpx;
+	}
+	.val {
+		font-size: 28rpx;
+		font-weight: 600;
+		color: #333;
+	}
+}
+.detail {
+	padding: 34rpx 32rpx;
+	margin: 20rpx;
+	border-radius: 20px;
+	background-color: #fff;
+}
+.list {
+	margin: 0 30rpx;
+	.item {
+		padding: 30rpx;
+		margin: 10rpx 0;
+		background-color: #fff;
+		border-radius: 8px;
+	}
+	.top {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+	}
+	.avatar {
+		width: 60rpx;
+		height: 60rpx;
+		margin-right: 20rpx;
+		border-radius: 50%;
+	}
+	.name {
+		font-size: 30rpx;
+		font-weight: 600;
+	}
+	.meta {
+		margin: 10rpx 0;
+		font-size: 26rpx;
+	}
+}
+.btns {
+	position: fixed;
+	bottom: 0;
+	display: flex;
+	justify-content: center;
+	width: 100%;
+	padding: 20rpx 0;
+	background-color: #fff;
+	.btn {
+		width: 200rpx;
+		padding: 16rpx 0;
+		font-size: 28rpx;
+		color: #fff;
+		text-align: center;
+	}
+	.share {
+		background-color: #75b4ff;
+		border-top-left-radius: 40rpx;
+		border-bottom-left-radius: 40rpx;
+	}
+	.sign {
+		background-color: $uni-primary;
+		border-top-right-radius: 40rpx;
+		border-bottom-right-radius: 40rpx;
+		&.disabled {
+			background-color: #d7d7d7;
+		}
+	}
+}
+</style>
diff --git a/order/registeredActivity/registeredActivity.vue b/other/registeredActivity/registeredActivity.vue
similarity index 64%
rename from order/registeredActivity/registeredActivity.vue
rename to other/registeredActivity/registeredActivity.vue
index 75d82ed..64c56c2 100644
--- a/order/registeredActivity/registeredActivity.vue
+++ b/other/registeredActivity/registeredActivity.vue
@@ -1,41 +1,67 @@
 <template>
-	<view>
+	<view class="page">
 		<view class="filter">
 			<uni-search-bar class="search" radius="30" placeholder="请输入活动名称" v-model="keyword" clearButton="auto" cancelButton="none" />
 			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
 		</view>
 		
-		<ul class="tab-wrap">
-			<view class="tab">
-				<li :class="{active: curTab === ''}" @click="tabChange('')">全部</li>
+		<view class="wrap">
+			<sideSelect :menus="menus" />
+			<view class="list">
+				<uni-swipe-action>
+					<uni-swipe-action-item
+						v-for="item in list"
+						:key="i"
+						:threshold="0"
+						:right-options="ops"
+						@click="e => handle(e, item)"
+					>
+						<view class="item" @click="toDetail(item)">
+							<view class="top">
+								<image class="pic" :src="item.coverUrl"></image>
+								<view class="">
+									<view class="name ell">{{ item.competitionName }}</view>
+									<view v-if="item.whetherToShowApplicants === '1'" class="meta ell">{{ item.applicantNum }}/{{ item.quantityLimit }}人已报名</view>
+								</view>
+							</view>
+							
+							<view class="texts">
+								<view class="meta">举办时间：{{ item.playStartTime + ' ~ ' + item.playEndTime }}</view>
+								<view class="meta ell">主办方：{{ item.sponsor }}</view>
+							</view>
+						</view>
+					</uni-swipe-action-item>
+				</uni-swipe-action>
 			</view>
-			
-			<scroll-view scroll-x :scroll-left="scrollLeft" class="tab tab-scroll">
-				<li v-for="(tab, i) in tabs" :key="i" :class="{active: curTab === tab.value}" @click="tabChange(tab.value)">{{ tab.title }}</li>
-			</scroll-view>
-		</ul>
-		
-		<ul class="list">
-			<li v-for="(item, i) in list" :key="i" @click="toDetail(item)">
-				<image class="pic" src="@/static/image/info-bg.jpg"></image>
-				<view class="right">
-					<view class="name">测试名称</view>
-					<view class="meta">时间：23323</view>
-					<view class="meta">主办方：23323</view>
-					<view class="meta">12/343人已报名</view>
-				</view>
-			</li>
-		</ul>
+		</view>
 		
 		<filter-popup ref="filter" showCategory :data="filters" :form.sync="filterForm" v-model="popup" title="全部筛选" height="1104rpx" @finsh="subFinsh"></filter-popup>
 	</view>
 </template>
 
 <script>
-	import { tagsList, listOfGoods, productTypeList, shoppingCartList } from '@/apis/modules/product.js'
+	import { postLoginActivity, competitionUserDel, cancelRegistration } from '@/apis/modules/activity.js'
 	export default {
 		data() {
 			return {
+				menus: [
+					{
+						id: '',
+						name: '全部'
+					},
+					{
+						id: 1,
+						name: '活动'
+					},
+					{
+						id: 2,
+						name: '需求'
+					},
+					{
+						id: 3,
+						name: '招募'
+					},
+				],
 				popup: false,
 				//筛选表单数据
 				filters: [
@@ -98,6 +124,20 @@
 				productTypeName: '',
 				tagName: '',
 				categoryName: '',
+				ops: [
+					{
+						text: '删除',
+						style: {
+							backgroundColor: '#F56C6C'
+						}
+					},
+					{
+						text: '取消报名',
+						style: {
+							backgroundColor: '#f79c69'
+						}
+					}
+				],
 			}
 		},
 		watch: {
@@ -124,41 +164,21 @@
 			}
 		},
 		onShow() {
-			const pages = getCurrentPages()
-			const { options } = pages[pages.length - 1]
-			const { tagId, tagsName } = options
-			this.form.tagId = +tagId || ''
-			if (tagId) {
-				this.filterForm.tagId = [+tagId]
-				// this.tagName = tagsName
-			}
-			
-			this.keyword = options.keyword || ''
-			this.page = 1
-			this.getList()
-			this.getFilter()
-			this.getShopCart()
+			this.initList()
+			// this.getFilter()
 		},
 		methods: {
 			getList() {
-				listOfGoods({
+				postLoginActivity({
 					pageNum: this.page,
 					pageSize: this.pageSize,
-					sort: 0,
-					isShelves: 0,
-					hotTag: this.form.tagId ? 2 : 1,
-					...this.form,
-					productName: this.keyword,
-					productType: this.curTab
-				}).then(({ page }) => {
-					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
-					const list = page.records
-					list.map(e => {
-						e.productIntroduction = this.$util.removeTag(e.productIntroduction)
-					})
-					this.list = this.reachBottom > 0 ? [...this.list, ...list] : list
+					listType: 1,
+					keyWord: this.keyword,
+					platformSource: ''
+				}).then(async ({ data }) => {
+					this.list = this.reachBottom > 0 ? [...this.list, ...data.records] : data.records
 					this.page++ // 每次获取了数据后page+1
-					const noMore = this.list.length === page.total // 是否加载完所有数据
+					const noMore = this.list.length === data.total // 是否加载完所有数据
 					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
 					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
 				}).catch(e => {})
@@ -168,15 +188,6 @@
 				this.reachBottom = 0
 				this.getList()
 			},
-			// 获取购物车数量
-			getShopCart() {
-				shoppingCartList({
-					pageNum: 1,
-					pageSize: 1000,
-				}).then(({ data }) => {
-					this.total = data.total
-				}).catch(e => {})
-			},
 			// 筛选
 			getFilter() {
 				// 产品类型
@@ -254,39 +265,79 @@
 			},
 			// 跳转详情
 			toDetail(item) {
-				this.$util.to(`../activityDetail/activityDetail?id=${item.mallId}`)
+				this.$util.to(`../activityDetail/activityDetail?id=${item.id}`)
+			},
+			// 删除
+			handle(e, row) {
+				const that = this
+				if (!e.index) {
+					uni.showModal({
+						title: '提示',
+						content: '确定要删除吗？',
+						success(res) {
+							if (res.confirm) {
+								competitionUserDel({
+									competitionId: row.id
+								}).then(res => {
+									that.$util.sucMsg('删除成功')
+									that.initList()
+								}).catch(res => {})
+							}
+						}
+					})
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '确定要取消报名吗？',
+						success(res) {
+							if (res.confirm) {
+								cancelRegistration(row.id).then(res => {
+									that.$util.sucMsg('取消报名成功')
+									that.initList()
+								}).catch(res => {})
+							}
+						}
+					})
+				}
 			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-.tab-wrap {
+.page {
+	// background-color: #fff;
+}
+.wrap {
 	display: flex;
-	.tab-scroll {
-		width: calc(100% - 100rpx);
-		white-space: nowrap;
-		li {
-			display: inline-block;
-		}
-	}
+	align-items: flex-start;
+	margin: 0 0;
 }
 .list {
-	li {
+	flex: 1;
+	padding: 20rpx;
+	margin: 20rpx;
+	border-radius: 8px;
+	background-color: #fff;
+	.item {
+		padding: 28rpx 0;
+		overflow: hidden;
+		border-bottom: 1px solid rgba(225, 225, 225, .4);
+	}
+	.top {
 		display: flex;
-		padding: 20rpx;
-		margin: 16rpx 20rpx;
-		background-color: #fff;
-		border-radius: 16rpx;
 	}
 	.pic {
-		width: 240rpx;
-		height: 180rpx;
+		width: 160rpx;
+		height: 100rpx;
 		margin-right: 20rpx;
 		border-radius: 8px;
 	}
+	.texts {
+		// width: calc(100% - 240rpx);
+	}
 	.name {
-		font-size: 30rpx;
+		font-size: 28rpx;
 		font-weight: 600;
 		color: #333;
 	}
@@ -294,6 +345,9 @@
 		margin: 10rpx 0;
 		font-size: 26rpx;
 		color: #999;
+		&:last-child {
+			margin-bottom: 0;
+		}
 	}
 }
 </style>
diff --git a/order/supplierDetail/supplierDetail.vue b/other/supplierDetail/supplierDetail.vue
similarity index 100%
rename from order/supplierDetail/supplierDetail.vue
rename to other/supplierDetail/supplierDetail.vue
diff --git a/pages.json b/pages.json
index 84122fb..6f7fd66 100644
--- a/pages.json
+++ b/pages.json
@@ -52,7 +52,7 @@
     ],
 	"subPackages": [
 		{
-			"root": "order",
+			"root": "other",
 			"pages": [
 				{
 					"path" : "supplierDetail/supplierDetail",
@@ -67,7 +67,7 @@
 					"style" : 
 					{
 						"navigationBarTitleText" : "活动详情",
-						"enablePullDownRefresh" : false
+						"enablePullDownRefresh" : true
 					}
 				},
 				{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3c78d89..b9a630e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -31,32 +31,43 @@
 						<image class="pic" :src="item.coverUrl"></image>
 						<view class="texts">
 							<view class="name ell">{{ item.competitionName }}</view>
-							<view class="meta">时间：{{ item.playStartTime + ' ~ ' + item.playEndTime }}</view>
+							<view class="meta">举办时间：{{ item.playStartTime + ' ~ ' + item.playEndTime }}</view>
 							<view class="meta ell">主办方：{{ item.sponsor }}</view>
-							<view v-if="item.whetherToShowApplicants === '1'" class="meta ell">(0/{{ item.quantityLimit }})人已报名</view>
-							<view class="sign" @click.stop="sign(item)">报名</view>
+							<view v-if="item.whetherToShowApplicants === '1'" class="meta ell">{{ item.applicantNum }}/{{ item.quantityLimit }}人已报名</view>
+							<view v-if="item.signing" class="sign" @click.stop="presign(item)">报名</view>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view v-if="!per" class="per-mask">功能升级中，敬请期待...</view>
+		
+		<uni-popup ref="popup" type="dialog">
+			<uni-popup-dialog mode="input" placeholder="请输入4位数邀请码" :duration="2000" :before-close="true" @close="closePopup" @confirm="codeSubmit"></uni-popup-dialog>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
-	import { postLoginActivity } from '@/apis/modules/activity.js'
+	import { postLoginActivity, individualEventRegistration } from '@/apis/modules/activity.js'
+	import Util from '@/libs/util'
 	export default {
 		data() {
 			return {
 				per: true, // 是否有权限
 				teamId: uni.getStorageSync('teamId') || '',
+				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
+				status: 'more', // 上拉加载状态 more|loading|noMore
 				keyword: '',
 				list: [],
 				page: 1,
-				pageSize: 10,
+				pageSize: 5,
 				total: 0,
 				curTab: 0,
+				curItem: null,
+				timer: null,
+				now: '',
+				invitationCode: '',
 				tabs: [
 					{
 						name: '全部',
@@ -85,11 +96,26 @@
 				],
 			}
 		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.initList()
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 1500)
+		},
+		// 上拉加载
+		onReachBottom() {
+			if (this.reachBottom >= 0) {
+				this.reachBottom = 1
+				this.status = 'loading'
+				this.getList()
+			}
+		},
 		onShow() {
 			uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNzAyMjg4MDEzLCJleHAiOjE3MDMxNTIwMTMsImFjY291bnRJZCI6IjEifQ.3dZSZAG7w8tSPU9DBL0VdULgkQmiZpYVzjf1qfxx5HY')
 			this.keyword = ''
 			this.per = true
-			this.getProducts()
+			this.initList()
 		},
 		methods: {
 			// 初始化权限
@@ -99,34 +125,94 @@
 				}
 				this.getProducts()
 			},
+			initList() {
+				this.page = 1
+				this.reachBottom = 0
+				this.getList()
+			},
 			// 列表
-			getProducts() {
+			getList() {
 				postLoginActivity({
 					pageNum: this.page,
 					pageSize: this.pageSize,
 					listType: 0,
+					keyWord: this.keyword,
 					platformSource: ''
-				}).then(({ data }) => {
-					this.list = data.records
+				}).then(async ({ data }) => {
+					this.list = this.reachBottom > 0 ? [...this.list, ...data.records] : data.records
+					this.page++ // 每次获取了数据后page+1
+					const noMore = this.list.length === data.total // 是否加载完所有数据
+					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
+					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
+					
+					this.now = await Util.getNow()
+					this.statusInterval()
+					this.timer = setInterval(() => {
+						this.now = new Date(this.now.setSeconds(this.now.getSeconds() + 1))
+						this.statusInterval()
+					}, 1000)
 				}).catch(e => {})
 			},
+			async statusInterval () {
+				this.list.map(item => {
+					if (item.signUpStartTime && item.signUpEndTime) {
+						this.handleStatus(item)
+					}
+				})
+			},
+			// 定时处理时间及状态
+			handleStatus (item) {
+				let signing = 0
+				const signUpStartTime = new Date(item.signUpStartTime) // 报名开始时间
+				const signUpEndTime = new Date(item.signUpEndTime) // 报名结束时间
+				const { now } = this
+				// 报名中(whetherToSignUp 是否已报名 1已报名，0未报名)
+				if (item.whetherToSignUp && now > signUpStartTime && now < signUpEndTime) {
+					signing = 1
+				}
+				this.$set(item, 'signing', signing)
+			},
+			
 			// 模糊查询回调
-			searchConfirm(e) {
-				e.value && this.$util.to(`/order/products/products?keyword=${e.value}`)
+			searchConfirm() {
+				this.initList()
 			},
 			// 跳转活动详情
 			toDetail(item) {
-				this.$util.to('/order/activityDetail/activityDetail?id=' + item.id)
+				this.$util.to('/other/activityDetail/activityDetail?id=' + item.id)
 			},
 			// tab切换
 			tabChange(tab) {
 				this.curTab = tab.id
 				// this.initList()
 			},
+			// 报名前的判断
+			async presign(item) {
+				this.invitationCode = ''
+				this.curItem = item
+				// 需要输入验证码就弹出邀请码弹框，否则直接报名
+				item.isNeedCode ? this.$refs.popup.open() : this.sign()
+			},
 			// 报名
-			sign(item) {
-				
-			}
+			async sign() {
+				const res = await individualEventRegistration({
+					competitionId: this.curItem.id,
+					registrationInvitationCode: this.invitationCode
+				})
+				this.initList()
+				this.$util.sucMsg('报名成功！')
+				this.closePopup()
+			},
+			// 关闭邀请码弹框
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			// 邀请码确定
+			codeSubmit(value) {
+				if (!value || value.length !== 4) return this.$util.errMsg('请输入4位数邀请码！')
+				this.invitationCode = value
+				this.sign()
+			},
 		}
 	}
 </script>
@@ -146,16 +232,6 @@
 .hot {
 	width: 100%;
 }
-.search-wrap {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	padding: 0 10rpx;
-	background-color: #fff;
-	.search {
-		flex: 1;
-	}
-}
 .module {
 	margin: 20rpx;
 	padding: 20rpx;
@@ -180,17 +256,16 @@
 		display: flex;
 		margin-bottom: 28rpx;
 		background-color: #fff;
-		border-radius: 8px;
 		overflow: hidden;
 	}
 	.pic {
 		width: 320rpx;
 		height: 240rpx;
 		margin-right: 20rpx;
+		border-radius: 8px;
 	}
 	.texts {
 		width: calc(100% - 240rpx);
-		padding: 10rpx;
 	}
 	.name {
 		font-size: 28rpx;
diff --git a/pages/person/person.vue b/pages/person/person.vue
index f1b83e5..4bacfdf 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -26,7 +26,7 @@
 						<image src="https://occupationlab.com/images/preschoolEdu/icon2.png" />
 						<view class="text ell">我的关注</view>
 					</li>
-					<li @click="toPage('/order/registeredActivity/registeredActivity')">
+					<li @click="toPage('/other/registeredActivity/registeredActivity')">
 						<image src="https://occupationlab.com/images/preschoolEdu/icon3.png" />
 						<view class="text ell">已报名活动</view>
 					</li>
diff --git a/pages/supplier/supplier.vue b/pages/supplier/supplier.vue
index fa3ba5f..023c281 100644
--- a/pages/supplier/supplier.vue
+++ b/pages/supplier/supplier.vue
@@ -6,7 +6,7 @@
 			</view>
 			
 			<view class="banner">
-				<!-- <image class="pic" src="@/static/image/index/banner.png" mode="widthFix"></image> -->
+				<image class="pic" src="@/static/image/info-bg.jpg" mode="widthFix"></image>
 			</view>
 			
 			<ul class="tab">
@@ -203,7 +203,7 @@
 			},
 			// 跳转学习详情
 			toDetail(item) {
-				this.$util.to('/order/supplierDetail/supplierDetail?id=')
+				this.$util.to('/other/supplierDetail/supplierDetail?id=')
 			},
 			// tab切换
 			tabChange(tab) {
diff --git a/styles/common.scss b/styles/common.scss
index 71ec886..5d14d1c 100644
--- a/styles/common.scss
+++ b/styles/common.scss
@@ -77,6 +77,16 @@ ul {
 		@include sort;
 	}
 }
+.search-wrap {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 0 10rpx;
+	background-color: #fff;
+	.search {
+		flex: 1;
+	}
+}
 .form-list {
 	.line {
 		display: flex;
@@ -151,7 +161,6 @@ ul {
 	display: flex;
 	justify-content: space-around;
 	margin-bottom: 20rpx;
-	background-color: #fff;
 	li {
 		padding: 0 20rpx;
 		font-size: 28rpx;