diff --git a/src/api/index.js b/src/api/index.js
index b2afc28..6957068 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -146,6 +146,19 @@ export default {
     disableActivityApplicant: `occupationlab/occupationlab/activity/applicant/disableRegistration`,
     excelExportApplicant: `${host}occupationlab/occupationlab/activity/applicant/excelExport`,
     exportDataInBatchesApplicant: `${host}occupationlab/occupationlab/activity/applicant/exportDataInBatches`,
+    addActivityProgress: `occupationlab/occupationlab/activity/progress/addCompetitionProgress`,
+    delActivityProgress: `occupationlab/occupationlab/activity/progress/batchDeletion`,
+    findActivityProgress: `occupationlab/occupationlab/activity/progress/findById`,
+    listActivityProgress: `occupationlab/occupationlab/activity/progress/getCompetitionProgress`,
+    updateActivityProgress: `occupationlab/occupationlab/activity/progress/update`,
+    addActivityAnnouncement: `occupationlab/occupationlab/activity/announcement/addAnnouncement`,
+    updateActivityAnnouncement: `occupationlab/occupationlab/activity/announcement/amendmentAnnouncement`,
+    delActivityAnnouncement: `occupationlab/occupationlab/activity/announcement/deleteAnnouncement`,
+    disableActivityAnnouncement: `occupationlab/occupationlab/activity/announcement/disableAnnouncement`,
+    listActivityAnnouncement: `occupationlab/occupationlab/activity/announcement/queryAnnouncementByCompetitionId`,
+    findActivityAnnouncement: `occupationlab/occupationlab/activity/announcement/queryAnnouncementDetails`,
+    delActivityAnnouncementAnnex: `occupationlab/occupationlab/activity/announcement/annex/delete`,
+    saveActivityAnnouncementAnnex: `occupationlab/occupationlab/activity/announcement/annex/save`,
 
     // 阿里云文件/视频管理
     fileDeletion: `${uploadURL}oss/manage/fileDeletion`, // 删除OSS文件
diff --git a/src/assets/img/activity-bg.jpg b/src/assets/img/activity-bg.jpg
new file mode 100644
index 0000000..dd97b20
Binary files /dev/null and b/src/assets/img/activity-bg.jpg differ
diff --git a/src/pages/activity/details/index.vue b/src/pages/activity/details/index.vue
index 3fb7616..6371297 100644
--- a/src/pages/activity/details/index.vue
+++ b/src/pages/activity/details/index.vue
@@ -1,29 +1,29 @@
 <template>
     <div class="wrap index">
-        <div class="banner" :style="{backgroundImage: 'url(' + (form.carouselUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220613/png/1536269450851409920.png') + ')'}"></div>
+        <div class="banner" :style="{backgroundImage: 'url(' + (form.carouselUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20230515/jpg/1658017103770836992.jpg') + ')'}">创业活动详情</div>
         <div class="center-con">
           <div class="center-wrap">
-              <breadcrumb ref="breadcrumb" :data="'全部赛事/' + form.name"></breadcrumb>
+              <breadcrumb ref="breadcrumb" :data="'全部项目/' + form.projectName"></breadcrumb>
               <div class="content">
-                  <div :class="['tool flex-between', {logView: !logView}]">
+                  <div class="tool flex-between">
                       <el-tabs v-model="curType" @tab-click="typeChange">
                           <el-tab-pane v-for="(item, index) in typeList" :key="index" :label="item.name" :name="item.id"></el-tab-pane>
                       </el-tabs>
                       <div class="action">
-                          <!-- <p class="end-text" v-if="end">
+                          <p class="end-text" v-if="end">
                               距离{{ endList[status] }}还有
                               <em>{{ end }}</em>
-                          </p> -->
-                          <a v-if="status != 4 || (status == 4 && curStage)" class="status" :class="{wait: status == 0,signing: status == 2,signed: status == 1,playing: status == 4,finish: status == 3 || status == 5}" :title="statusList[status]" @click.stop="signup">{{ statusList[status] }}</a>
+                          </p>
+                          <a class="status" :class="{wait: status == 0,signing: status == 2,signed: status == 1,finish: status == 3 || status == 4}" :title="statusList[status]" @click.stop="signup">{{ statusList[status] }}</a>
                       </div>
                   </div>
-                  <div class="info">
+                  <div class="info" id="part1">
                     <h6 class="title">{{ form.projectName }}</h6>
                     <div class="meta">最近编辑时间：{{ form.updateTime }}</div>
                   </div>
                   
                   <div v-show="curType < 4">
-                    <div class="l-title" id="part1"><img src="@/assets/img/label.png" alt=""> 项目信息</div>
+                    <div class="l-title"><img src="@/assets/img/label.png" alt=""> 项目信息</div>
                     <div v-if="form.projectDescribe" class="texts ql-editor" v-html="form.projectDescribe"></div>
                     <template v-if="form.activityFileList">
                       <h6 class="p-title">附件下载</h6>
@@ -77,15 +77,15 @@
           </div>
         </div>
         
-        <el-dialog title="报名" :visible.sync="peopleSignupVisible" :close-on-click-modal="false" width="300px">
+        <el-dialog title="报名" :visible.sync="signupVisible" :close-on-click-modal="false" width="300px">
           <el-form class="dia-form">
             <el-form-item>
-              <el-input placeholder="请输入4位数大赛邀请码" maxlength="4" v-model="peopleSignupForm.registrationInvitationCode"></el-input>
+              <el-input placeholder="请输入4位数大赛邀请码" maxlength="4" v-model="invitationCode"></el-input>
             </el-form-item>
           </el-form>
           <span slot="footer" class="dialog-footer">
-            <el-button size="small" type="primary" @click="peopleSignupSubmit">报名</el-button>
-            <el-button size="small" @click="peopleSignupVisible = false">取消</el-button>
+            <el-button size="small" type="primary" @click="signupSubmit">报名</el-button>
+            <el-button size="small" @click="signupVisible = false">取消</el-button>
           </span>
         </el-dialog>
     </div>
@@ -105,12 +105,8 @@ export default {
             id: +this.$route.query.id,
             end: '',
             status: '',
-            statusList: ["等待报名", "取消报名", "立即报名", "报名截止", "进入项目", "已结束"],
-            endList: ["报名开始", "报名截止", "报名截止", "项目开始", "项目结束", ""],
-            rules: Const.rules,
-            methods: Const.methods,
-            teamCalculationMethods: Const.teamCalculationMethods,
-            timerList: [],
+            statusList: ["待报名", "取消报名", "马上报名", "报名截止", "已结束"],
+            endList: ["报名开始", "报名截止", "报名截止", "项目开始", "项目结束"],
             form: {
               founder: 1,
               isOpen: 0, // 职站是否开启(0开启 1未开启 默认0)
@@ -148,90 +144,22 @@ export default {
             timer: null,
             notices: [],
             noticeDetail: {},
-            curArch: '0',
-            arches: [],
-            ranks: [],
-
-            enterVisible: false,
-            enterForm: {
-              competitionId: this.$route.query.id,
-              teamId: '',
-              invitationCode: '',
-              registrationInvitationCode: '',
-              whetherSignUp: 1
-            },
-            
-            teamVisible: false,
-            teams: [],
-            teamNameRepeat: false,
-            teamForm: {
-              competitionId: this.$route.query.id,
-              registrationInvitationCode: '',
-              teamName: '',
-              invitationCode: '',
-              whetherSignUp: 1
-            },
-            curStage: null,
-            originInfo: {},
-            info: {
-              isCaption: 0,
-              person: {},
-              caption: {},
-              team: {
-                captain: 1,
-                invitationCode: ''
-              },
-              stages: [],
-              teamDetail: [],
-              teamInstructors: []
-            },
-            originIns: {
-              position: '',
-              name: '',
-              phone: '',
-            },
-            checkedPlayer: '',
-            transferVisible: false,
-            editing: false,
-            memberVisible: false,
-            members: [],
-            curRow: {},
-            chooseVisible: false,
-            checkedMember: '',
-            checkedMembers: [],
-            chooses: [],
-            lastType: 1,
-            playingStages: [],
-            peopleSignupVisible: false,
-            peopleSignupForm: {
-              registrationInvitationCode: ''
-            },
+            signupVisible: false,
+            invitationCode: ''
         };
     },
-    computed: {
-        ...mapState("user", [
-            'logView'
-        ]),
-    },
     components: {
         breadcrumb
     },
     mounted() {
       this.$once('hook:beforeDestroy', function() {
         clearInterval(this.timer)
-        this.timerList.forEach(n => {
-          clearTimeout(n)
-        })
-        this.timerList = []
       })
       this.getData()
-      // this.getProgress()
-      // this.getNotice()
+      this.getProgress()
+      this.getNotice()
     },
     methods: {
-        ...mapMutations('match', [
-          'SET_SOURCE'
-        ]),
         getData() { // 获取项目信息
             clearInterval(this.timer)
             this.$post(`${this.api.findByIdActivity}?id=${this.id}`).then(({ data }) => {
@@ -245,9 +173,8 @@ export default {
               }
 
               this.form = data
-              console.log("🚀 ~ file: index.vue:282 ~ this.$post ~ this.form:", this.form)
-              this.$refs.breadcrumb.update('全部赛事/' + data.projectName)
-              // this.handleStatus()
+              this.$refs.breadcrumb.update('全部项目/' + data.projectName)
+              this.handleStatus()
             }).catch(err => {})
         },
         // 定时处理时间及状态
@@ -266,67 +193,13 @@ export default {
                 status = 0
                 total = signUpStartTime - now
               } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
-                // 1已报名，2立即报名(没登录的情况下，直接显示立即报名，登录了则取报名信息，有则已报名，无则立即报名)
-                status = this.token ?
-                  (form.competitionRegistration ?
-                    1 :
-                    2) :
-                  2
+                status = this.form.whetherToSignUp === undefined ? 2 : 1 // 1已报名，2立即报名
                 total = signUpEndTime - now
               } else if (now > signUpEndTime && now < playStartTime) { // 报名结束了,但比赛没开始
                 status = 3
                 total = playStartTime - now
-              } else if (now > playStartTime && now < playEndTime) { // 比赛进行中
-                // 如果是完整比赛
-                if (form.releaseType) {
-                  // 进行中的赛事，则遍历每个阶段的开始结束时间，看阶段比赛是否开始
-                  let curStage = null
-                  const stages = form.competitionStage
-                  if (stages) {
-                    this.playingStages = []
-                    form.competitionRegistration && stages.forEach(e => {
-                      if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && e.method !== 2) this.playingStages.push(e)
-                    })
-                    let endText = ''
-                    for (const i in stages) {
-                      const e = stages[i]
-                      const startTime = new Date(e.startTime)
-                      const endTime = new Date(e.endTime)
-                      if (now < startTime) { // 阶段比赛未开始，不显示进入比赛按钮
-                        endText = '阶段开始'
-                        total = startTime - now
-                        break
-                      } else if (now >= startTime && now <= endTime && e.method !== 2) { // 阶段比赛进行中，显示进入比赛按钮
-                        if (form.competitionRegistration) { // 报名了才能进入比赛
-                          this.statusList[4] = e.count ? '已提交' : '进入' + e.stageName
-                          curStage = e
-                        } else if (!this.token) {
-                          this.statusList[4] = '进入' + e.stageName
-                          curStage = e
-                        }
-                        endText = '阶段结束'
-                        total = endTime - now
-                        break
-                      } else if (stages[i + 1] && now > endTime && now < new Date(stages[i + 1].startTime)) { // 过了该阶段的结束时间，但是没到下个阶段的开始时间，不显示进入比赛按钮
-                        endText = '阶段开始'
-                        total = new Date(stages[i + 1].startTime) - now
-                        break
-                      } else if (i === stages.length - 1) { // 当前时间在比赛开始结束时间之间，并且是最后一个阶段结束时间之后
-                        this.$set(form, 'stageName', '')
-                        endText = '项目结束'
-                        total = playEndTime - now
-                        break
-                      }
-                    }
-                    this.endList[4] = endText
-                  }
-                  this.curStage = curStage
-                } else { // 仅发布信息
-                  total = playEndTime - now
-                }
-                status = 4
               } else if (now > playEndTime) { // 比赛结束
-                status = 5
+                status = 4
               }
               this.status = status
               total = total / 1000
@@ -340,21 +213,21 @@ export default {
                 let seconds = Math.floor(total % (60 * 60) % 60)
                 time = `${this.core.formateTime(hours)}:${this.core.formateTime(minutes)}:${this.core.formateTime(seconds)}`
                 if (total > 0) this.end = time
-              } else if (this.status === 5) { // 项目结束，清除定时器
+              } else if (this.status === 4) { // 项目结束，清除定时器
                 clearInterval(this.timer)
               }
           }, 1000)
         },
         getProgress() { // 获取项目进展
-            this.$get(this.api.getCompetitionProgress, {
-              competitionId: this.id
+            this.$get(this.api.listActivityProgress, {
+              activityId: this.id
             }).then(res => {
-                this.progress = res.competitionProgressList.reverse()
+                this.progress = res.activityProgressList.reverse()
             }).catch(err => {});
         },
         // 公告列表
         getNotice() {
-          this.$post(`${this.api.queryAnnouncementByCompetitionId}?pageNum=1&pageSize=1000&competitionId=${this.id}`).then(({ data }) => {
+          this.$post(`${this.api.listActivityAnnouncement}?pageNum=1&pageSize=1000&competitionId=${this.id}`).then(({ data }) => {
             const records = data.records.filter(e => e.status) // 只显示已发布的（status 0草稿 1为已发布）
             records.map(e => {
               e.announcementText = e.announcementText.replace(/<img.*?(?:>|\/>)/gi, '')
@@ -372,416 +245,55 @@ export default {
         download(item) {
           util.downloadFile(item.fileName, item.filePath)
         },
-        // tab切换 前三个滚动，后两个切换
+        // tab切换
         typeChange() {
-          const type = +this.curType
-          // 如果上个选中的是参赛信息，则检查修改数据后有没保存(团队名称、邀请码、指导老师)
-          if (this.lastType == 5) {
-            const { team, teamInstructors } = this.info
-            const { originInfo } = this
-            let notSave = 0
-            // 如果团队名称或者邀请码有修改
-            if (team.teamName !== originInfo.team.teamName || team.invitationCode !== originInfo.team.invitationCode) {
-              notSave = 1
-            } else if (JSON.stringify(teamInstructors) !== JSON.stringify(originInfo.teamInstructors)) {
-              notSave = 2
-            }
-            if (notSave) {
-              this.$confirm('所填写内容暂未保存，是否保存？', "提示", {
-                type: "warning"
-              }).then(() => {
-                // 保存团队名称和邀请码
-                if (notSave === 1) {
-                  this.edit()
-                } else { // 保存指导老师
-                  teamInstructors.map(e => {
-                    e.name && this.$post(this.api.addAnAdvisor, {
-                      name: e.name,
-                      competitionId: this.id,
-                      id: e.id,
-                      teamId: this.form.competitionRegistration ? this.form.competitionRegistration.teamId : '',
-                      phone: e.phone,
-                      position: e.position,
-                    }).then(res => {}).catch(res => {})
-                  })
-                }
-              }).catch(() => {})
-            } else {
-              type < 4 && document.querySelector(`#part${type}`).scrollIntoView()
-            }
-          } else {
-            type == 5 && this.getInfo()
-            type < 4 && document.querySelector(`#part${type}`).scrollIntoView()
-          }
-          this.editing = false
-          this.lastType = type
+          document.querySelector(`#part${this.curType}`).scrollIntoView()
         },
         // 跳转公告详情
         toNotice(item) {
-          this.$router.push(`noticeDetail?id=${item.id}&matchId=${this.id}&name=${this.form.name}&end=${this.end}&status=${this.status}`)
-        },
-        // 获取排名
-        getRank() {
-          const cur = +this.curArch
-          const data = {
-            pageNum: 1,
-            pageSize: 1000,
-            competitionId: this.id,
-            isOverallRanking: cur ? 0 : 1
-          }
-          data.stageIds = cur ? cur: ''
-          this.token && this.$post(this.api.frontOfficeCompetitionRanking, data).then(({ list }) => {
-            this.ranks = list
-          }).catch(res => {})
-        },
-        
-        // 删除指导老师
-        delAdvisor(row, i) {
-          if (row.id) {
-            this.$confirm('确定要删除吗？', '提示', {
-              type: 'warning'
-            }).then(() => {
-              this.$post(`${this.api.deleteAnAdvisor}?id=${row.id}`).then(res => {
-                util.successMsg('删除成功')
-                this.getInfo()
-              }).catch(res => {})
-            }).catch(() => {})
-          } else {
-            this.info.teamInstructors.splice(i, 1)
-          }
-        },
-        // 添加指导老师
-        addAdvisor() {
-          if (this.info.teamInstructors.length > 4) return util.errorMsg('指导老师仅限添加5个！')
-          this.info.teamInstructors.push(JSON.parse(JSON.stringify(this.originIns)))
-        },
-        // 编辑导老师
-        editAdvisor(row) {
-          this.$set(row, 'edit', 1)
-        },
-        // 提交指导老师
-        submitAdvisor(row) {
-          if (!row.name) return util.errorMsg('请输入姓名')
-          const { phone } = row
-          if (phone && !/^1[3456789]\d{9}$/.test(phone)) return util.errorMsg('请输入正确手机号格式')
-          this.$post(this.api.addAnAdvisor, {
-            name: row.name,
-            competitionId: this.id,
-            id: row.id,
-            teamId: this.form.competitionRegistration ? this.form.competitionRegistration.teamId : '',
-            phone: row.phone,
-            position: row.position,
-          }).then(res => {
-            util.successMsg((row.id ? '修改' : '新增') + '成功')
-            this.getInfo()
-          }).catch(res => {})
-        },
-        // 显示转让队长
-        transfer() {
-          // 取每个阶段的开始结束时间，有任何阶段开始了都不能转让队长和踢出队员
-          const now = new Date()
-          let start = 0
-          for (const e of this.form.competitionStage) {
-            if (now >= new Date(e.startTime) && now <= new Date(e.endTime)) {
-              util.errorMsg('比赛已经开始，无法转让队长！')
-              start = 1
-              break
-            }
-          }
-          if (!start) this.transferVisible = true
-        },
-        // 转让队长提交
-        transferSubmit() {
-          if (!this.checkedPlayer) return util.errorMsg('请选择成员')
-          this.$post(this.api.captainOfTransfer, {
-            captainId: this.info.caption.teamId,
-            playerId: this.checkedPlayer
-          }).then(res => {
-            this.checkedPlayer = ''
-            util.successMsg('转让成功')
-            this.transferVisible = false
-            this.getInfo()
-          }).catch(res => {})
-        },
-        // 踢出团队
-        removeLine(row) {
-          // 取每个阶段的开始结束时间，有任何阶段开始了都不能转让队长和踢出队员
-          const now = new Date()
-          let start = 0
-          for (const e of this.form.competitionStage) {
-            if (now >= new Date(e.startTime) && now <= new Date(e.endTime)) {
-              util.errorMsg('比赛已经开始，无法踢出成员！')
-              start = 1
-              break
-            }
-          }
-          if (!start) {
-            let include
-            for (const e of this.info.stages) {
-              if (e.participantAccountIds) {
-                const ids = e.participantAccountIds.split(',').map(n => +n)
-                if (ids.includes(row.accountId)) {
-                  include = e.stageName
-                  break
-                }
-              }
-            }
-            this.$confirm(include ? `该成员已被指定参加${include}，踢出后需重新指定成员参加，是否确认踢出团队？` : '确定要踢出该成员吗？', '提示', {
-              type: 'warning'
-            }).then(() => {
-              this.$post(`${this.api.removeTheLine}?teamId=${this.info.teamId}&competitionId=${this.id}&accountId=${row.accountId}`).then(res => {
-                util.successMsg('移除成功')
-                this.getInfo()
-              }).catch(res => {})
-            }).catch(() => {})
-          }
-        },
-        // 移除参赛人员
-        removePar(e, stage) {
-          this.$confirm('确定要移除该成员吗？', '提示', {
-            type: 'warning'
-          }).then(() => {
-            this.$post(this.api.cancelParticipant, {
-              accountId: e.id,
-              competitionId: this.id,
-              stageId: stage.stageId,
-              teamId: this.info.teamId
-            }).then(res => {
-              util.successMsg('移除成功')
-              this.getInfo()
-            }).catch(res => {})
-          }).catch(() => {})
-        },
-        // 选择参赛人员
-        selectPar(row) {
-          const item = this.form.competitionStage.find(e => e.stageId == row.stageId)
-          if (item) {
-            // 该阶段已经开始比赛则不能修改
-            const now = new Date()
-            if (now >= new Date(item.startTime) && now <= new Date(item.endTime)) {
-              return util.errorMsg('该阶段比赛已经开始，无法修改允许参赛人员！')
-            } else {
-              const { teamLimit, stages, teamDetail } = this.info
-              // teamLimit=true，则每个成员只能参加一个阶段的比赛，要获取stages里返回的所有participantAccountIds（参赛人员的accountId），然后不显示这些参赛人员
-              if (teamLimit) {
-                const chooses = []
-                let ids = []
-                // 获取已经允许参赛的人员accountId
-                stages.map(e => {
-                  const id = e.participantAccountIds
-                  if (e.stageId != row.stageId && id) ids.push(...id.split(',').map(n => +n))
-                })
-                ids = [...new Set(ids)]
-                teamDetail.map(e => {
-                  ids.includes(e.accountId) || chooses.push(e) // 没有参赛的人员则显示出来
-                })
-                this.chooses = chooses
-              } else {
-                this.chooses = this.info.teamDetail
-              }
-              this.curRow = row
-              this.checkedMembers = row.participantAccountIds ? row.participantAccountIds.split(',').map(e => +e) : [] // 选中了的人员要回显
-              this.chooseVisible = true
-            }
-          }
-        },
-        // 选择参赛人员提交
-        chooseSubmit() {
-          const accountIds = this.checkedMembers
-          if (!accountIds.length) return util.errorMsg('请选择参赛成员！')
-          const limit = this.curRow.teamNumLimit // 参赛人数限制
-          if (limit && accountIds.length > limit) return util.errorMsg(`请选择${limit}个以下参赛成员！`) // 选择的参赛人员个数不能大于参赛人数限制
-          this.$post(this.api.stageSelectParticipants, {
-            accountIds,
-            competitionId: this.id,
-            stageId: this.curRow.stageId,
-            teamId: this.info.teamId
-          }).then(res => {
-            this.checkedMembers = []
-            util.successMsg('修改成功')
-            this.getInfo()
-            this.chooseVisible = false
-          }).catch(res => {})
-        },
-        // 查看成绩详情
-        show(row) {
-          // 团队展示弹框，个人跳转实验报告
-          if (this.form.completeCompetitionSetup.competitionType) { // 团队比赛则展示团队成员成绩详情
-            this.curRow = row
-            this.memberVisible = true
-            const teamId = this.form.competitionRegistration.teamId
-            if (teamId) {
-              this.$post(this.api.stageTeamScoreDetails, {
-                pageNum: 1,
-                pageSize: 1000,
-                competitionId: this.id,
-                stageId: row.stageId,
-                teamId
-              }).then(({ page }) => {
-                this.members = page.records
-              }).catch(res => {})
-            } else {
-              this.members = []
-            }
-          } else if (row.reportId) { // 个人比赛，并且有reportId，则进入实验报告
-            this.toReport(row)
-          }
+          this.$router.push(`notice?id=${item.id}&matchId=${this.id}&name=${this.form.projectName}&end=${this.end}&status=${this.status}`)
         },
         // 跳转实验报告
         toReport(row) {
           this.$router.push(`/record/show?reportId=${row.reportId}&matchId=${this.id}&matchName=${this.form.name}`)
         },
         
-        // 个人报名提交
-        peopleSignupSubmit() {
-          this.$post(this.api.addCompetitionRegistration, {
-            competitionId: this.id,
-            registrationInvitationCode: this.peopleSignupForm.registrationInvitationCode
+
+        // 报名提交
+        signupSubmit() {
+          this.$post(this.api.saveActivityApplicant, {
+            activityId: this.id,
+            registrationInvitationCode: this.invitationCode
           }).then(res => {
-            this.peopleSignupVisible = false
+            this.signupVisible = false
             this.getData()
             this.$message.success('报名成功')
           }).catch(res => {})
         },
-        // 团队报名提交
-        enterSubmit() {
-          const form = this.enterForm
-          if (!form.teamId) return util.errorMsg('请选择团队')
-          if (!form.invitationCode) return util.errorMsg('请输入团队邀请码')
-          if (this.form.completeCompetitionSetup.isNeedCode && !form.registrationInvitationCode) return util.errorMsg('请输入大赛邀请码')
-          this.$post(this.api.joinCompetitionTeam, form).then(({ status, data, message }) => {
-            this.enterVisible = false
-            this.getData()
-            util.successMsg('报名成功！')
-          }).catch(res => {})
-        },
-        // 团队关闭
-        enterClose() {
-          this.enterForm = {
-            competitionId: this.id,
-            teamId: '',
-            registrationInvitationCode: '',
-            invitationCode: '',
-            whetherSignUp: 1
-          }
-        },
-
-        
-        // 创建团队
-        toTeam() {
-          this.teamVisible = true
-        },
-        // 获取团队列表
-        getTeam() {
-          this.$get(this.api.searchTeam, {
-            teamName: '',
-            competitionId: this.id
-          }).then(({ teamList }) => {
-            this.teams = teamList
-          }).catch(res => {})
-        },
-        // 团队提交
-        teamSubmit() {
-          const form = this.teamForm
-          if (!form.teamName) return util.errorMsg('请输入团队名称')
-          if (this.teamNameRepeat) return util.errorMsg('团队名称重复，请重新输入')
-          if (form.invitationCode.length !== 6) return util.errorMsg('请输入6位数团队邀请码')
-          if (this.form.completeCompetitionSetup.isNeedCode && !form.registrationInvitationCode) return util.errorMsg('请输入大赛邀请码')
-          this.$post(this.api.addCompetitionTeam, form).then(({ status, data, message }) => {
-            this.teamVisible = false
-            this.enterVisible = false
-            this.getData()
-            util.successMsg('报名成功！')
-          }).catch(res => {})
-        },
-        // 团队关闭
-        teamClose() {
-          this.teamForm = {
-            competitionId: this.id,
-            teamName: '',
-            invitationCode: '',
-            registrationInvitationCode: '',
-            whetherSignUp: 1
-          }
-        },
-
-        // 选择要进入的阶段
-        chooseStage(e) {
-          this.curStage = e
-          this.signup()
-        },
-        // 判断是否能进赛事
-        getAllow() {
-          // 是否允许参加赛事（淘汰赛制）
-          if (this.form.rule === 1) {
-            this.$post(this.api.allowedParticipateCompetition, {
-              competitionId: this.id,
-              number: this.curStage.number,
-              stageId: this.curStage.stageId,
-              teamId: this.form.competitionRegistration.teamId,
-            }).then(res => {
-              this.toSub()
-            }).catch(res => {})
-          } else {
-            this.toSub()
-          }
-        },
         // 立即报名
-        signup(){
-          const { status, form } = this
-          // 如果登录了
-          if (util.local.get(Setting.tokenKey)) {
-            const { competitionType } = form.completeCompetitionSetup
-            if (status == 4) { // 进入比赛
-              // 参加过比赛不让参加
-              if (this.curStage && this.curStage.count) return util.errorMsg('您已经参加过该阶段项目！')
-              if (form.competitionRegistration.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛
-              // 团队赛，则判断是否为参赛人员
-              if (competitionType) {
-                this.$post(this.api.isParticipant, {
-                  competitionId: this.id,
-                  stageId: this.curStage.stageId,
-                  teamId: form.competitionRegistration.teamId,
-                }).then(res => {
-                  this.getAllow()
-                }).catch(res => {})
-              } else {
-                this.getAllow()
-              }
-            } else if (status == 2) { // 报名
-              // 团队赛报名
-              if (competitionType) {
-                this.enterVisible = true
-              } else { // 个人赛报名
-                if (form.completeCompetitionSetup.isNeedCode) {
-                  this.peopleSignupForm.registrationInvitationCode = ''
-                  this.peopleSignupVisible = true
-                } else {
-                  this.$post(this.api.addCompetitionRegistration, {
-                    competitionId: this.id
-                  }).then(res => {
-                    this.getData()
-                    this.$message.success('报名成功')
-                  }).catch(res => {})
-                }
-              }
-            } else if (status == 1) {
-              // 已报名，点击取消报名
-              this.$confirm('是否要取消报名？', '提示', {
-                type: 'success'
-              }).then(() => {
-                this.$post(`${this.api.cancelRegistration}?competitionId=${this.id}`).then(res => {
-                  this.$message.success('取消报名成功')
-                  this.getData()
-                }).catch(res => {})
-              }).catch(() => {})
+        signup() {
+          const { status, id } = this
+          if (status == 2) { // 报名// 如果需要邀请码
+            if (this.form.isNeedCode) {
+              this.invitationCode = ''
+              this.signupVisible = true
+            } else {
+              this.$post(this.api.saveActivityApplicant, {
+                activityId: id
+              }).then(res => {
+                this.getData()
+                this.$message.success('报名成功')
+              }).catch(res => {})
             }
-          } else { // 如果没登录，提示去登录
-            this.$confirm('请先登录，是否直接前往登录？', "提示", {
+          } else if (status == 1) {
+            // 已报名，点击取消报名
+            this.$confirm('是否要取消报名？', '提示', {
               type: 'success'
             }).then(() => {
-              this.SET_SOURCE(this.id)
-              this.$router.push('/login')  
+              this.$post(`${this.api.delActivityApplicant}?id=${this.form.cancelId}`).then(res => {
+                this.getData()
+                this.$message.success('取消报名成功')
+              }).catch(res => {})
             }).catch(() => {})
           }
         },
@@ -837,9 +349,11 @@ export default {
 .banner{
     width: 100%;
     height: 350px;
-    padding: 120px 0 0 20%;
+    padding: 120px 0 0 24%;
+    font-size: 34px;
+    font-weight: 600;
     color: #fff;
-    background-size: 100% 350px;
+    background-size: 100% 100%;
     background-repeat: no-repeat;
 }
 .l-title {
@@ -887,9 +401,6 @@ export default {
       top: 64px;
       margin-bottom: 20px;
       background-color: #fff;
-      &.logView {
-        z-index: 0;
-      }
     }
     .info .meta{
         padding: 16px 0;
diff --git a/src/pages/activity/list/index.vue b/src/pages/activity/list/index.vue
index 5cc8878..f185775 100644
--- a/src/pages/activity/list/index.vue
+++ b/src/pages/activity/list/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="wrap index">
         <div class="search">
-            <h6>赛事竞技，精彩纷呈</h6>
+            <h6>创业活动</h6>
             <div class="input">
                 <img src="@/assets/img/search.png" alt="">
                 <input type="text" placeholder="请输入关键词" v-model="keyword">
@@ -31,9 +31,8 @@
                             <ul>
                                 <li v-for="(item,index) in listData" :key="index" @click="toDetail(item)">
                                     <div class="left">
-                                        <!-- <el-button v-if="item.status === 1 || item.status === 2 || item.curStage" :class="['stage-label', {playing: item.curStage}]" type="primary">{{ item.status === 1 || item.status === 2 ? '报名中' : item.curStage ? '竞赛中' : '' }}</el-button> -->
                                         <div class="cover">
-                                            <img :src="item.coverUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220623/png/1539857403162943488.png'" alt="">
+                                            <img :src="item.coverUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20230515/jpg/1657937339328520192.jpg'" alt="">
                                         </div>
                                         <div class="info">
                                             <div class="title">{{ item.projectName }}</div>
@@ -55,7 +54,7 @@
                                     </div>
                                     <div class="right">
                                         <p class="status"
-                                        :class="{wait: item.status == 0,signing: item.status == 2,signed: item.status == 1,playing: item.status == 4,finish: item.status == 3 || item.status == 5}" @click.stop="signup(item)">{{ statusList[item.status] }}</p>
+                                        :class="{wait: item.status == 0,signing: item.status == 2,signed: item.status == 1,playing: item.status == 4,finish: item.status == 3 || item.status == 4}" @click.stop="signup(item)">{{ statusList[item.status] }}</p>
                                         <p class="end-text" v-if="item.end">
                                             距离{{ endList[item.status] }}还有
                                             <em >{{ item.end }}</em>
@@ -82,6 +81,18 @@
                 </div>
             </div>
         </div>
+        
+        <el-dialog title="报名" :visible.sync="signupVisible" :close-on-click-modal="false" width="300px">
+          <el-form class="dia-form">
+            <el-form-item>
+              <el-input placeholder="请输入4位数大赛邀请码" maxlength="4" v-model="invitationCode"></el-input>
+            </el-form-item>
+          </el-form>
+          <span slot="footer" class="dialog-footer">
+            <el-button size="small" type="primary" @click="signupSubmit">报名</el-button>
+            <el-button size="small" @click="signupVisible = false">取消</el-button>
+          </span>
+        </el-dialog>
     </div>
 </template>
 
@@ -131,6 +142,9 @@ export default {
             listData: [],
             loadIns: null,
             timerList: [],
+            signupVisible: false,
+            curRow: {},
+            invitationCode: ''
         };
     },
     watch: {
@@ -227,10 +241,10 @@ export default {
         getData() {
           // this.loadIns = Loading.service()
           this.getList()
-          if (!Setting.isDev) {
+          // if (!Setting.isDev) {
             clearInterval(this.redisTimer)
             this.redisTimer = setInterval(this.getRedis, 1000)
-          }
+          // }
         },
         initData() {
             this.page = 1
@@ -239,7 +253,10 @@ export default {
         // 获取redis缓存
         getRedis() {
           this.$post(this.api.getRedisCacheActivity).then(({ data }) => {
-            data && this.getList()
+            if (data) {
+              localStorage.getItem('activityTimestampClient') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表
+              localStorage.setItem('activityTimestampClient', data)
+            }
           }).catch(res => {})
         },
         changeType(type) {
@@ -264,13 +281,13 @@ export default {
             this.getData();
         },
 
-        // 个人报名提交
-        peopleSignupSubmit() {
-          this.$post(this.api.addCompetitionRegistration, {
-            competitionId: this.curRow.id,
-            registrationInvitationCode: this.peopleSignupForm.registrationInvitationCode
+        // 报名提交
+        signupSubmit() {
+          this.$post(this.api.saveActivityApplicant, {
+            activityId: this.curRow.id,
+            registrationInvitationCode: this.invitationCode
           }).then(res => {
-            this.peopleSignupVisible = false
+            this.signupVisible = false
             this.getData()
             this.$message.success('报名成功')
           }).catch(res => {})
@@ -279,18 +296,25 @@ export default {
         signup(item) {
           const { status, id } = item
           if (status == 2) { // 报名
-            this.$post(this.api.saveActivityApplicant, {
-              activityId: id
-            }).then(res => {
-              this.getData()
-              this.$message.success('报名成功')
-            }).catch(res => {})
+            // 如果需要邀请码
+            if (item.isNeedCode) {
+              this.invitationCode = ''
+              this.curRow = item
+              this.signupVisible = true
+            } else {
+              this.$post(this.api.saveActivityApplicant, {
+                activityId: id
+              }).then(res => {
+                this.getData()
+                this.$message.success('报名成功')
+              }).catch(res => {})
+            }
           } else if (status == 1) {
             // 已报名，点击取消报名
             this.$confirm('是否要取消报名？', '提示', {
               type: 'success'
             }).then(() => {
-              this.$post(`${this.api.delActivityApplicant}?id=${item.id}`).then(res => {
+              this.$post(`${this.api.delActivityApplicant}?id=${item.cancelId}`).then(res => {
                 this.getData()
                 this.$message.success('取消报名成功')
               }).catch(res => {})
@@ -350,9 +374,7 @@ export default {
     position: relative;
     padding: 100px 0 130px;
     text-align: center;
-    background: url(../../../assets/img/match-bg4.png) (27px 10px)/auto no-repeat,
-                url(../../../assets/img/match-bg5.png) (98% 20px)/auto no-repeat,
-                url(../../../assets/img/match-bg3.png) 0 0/100% 100% no-repeat;
+    background: url(../../../assets/img/activity-bg.jpg) 0 0/100% 100% no-repeat;
     h6 {
         margin-bottom: 25px;
         font-size: 26px;
@@ -560,16 +582,7 @@ export default {
         .left {
             position: relative;
             display: inline-flex;
-            .stage-label {
-              position: absolute;
-              top: -16px;
-              left: -16px;
-              border: 0;
-              background-color: rgb(101, 227, 181);
-              &.playing {
-                background-color: rgb(251, 174, 41);
-              }
-            }
+            width: 430px;
             .cover {
                 img {
                     width: 275px;
@@ -585,7 +598,8 @@ export default {
                     font-size: 20px;
                     font-weight: 500;
                     color: #0B1D30;
-                    line-height: 1;
+                    word-break: break-all;
+                    @include mul-ellipsis(2);
                 }
                 .metas {
                     font-size: 14px;
diff --git a/src/pages/activity/manage/add/index.vue b/src/pages/activity/manage/add/index.vue
index e0dccd4..a239e08 100644
--- a/src/pages/activity/manage/add/index.vue
+++ b/src/pages/activity/manage/add/index.vue
@@ -13,9 +13,13 @@
                         class="avatar-uploader"
                         accept=".jpg,.png,.jpeg,.gif"
                         :on-success="uploadSuccess"
-                        :limit="1"
                         :action="this.api.fileupload"
                         :headers="headers"
+                        :limit="1"
+                        :on-exceed="handleExceed"
+                        :before-remove="beforeRemove"
+                        :on-remove="handleRemove"
+                        :on-error="uploadError"
                         name="file"
                     >
                         <img v-if="form.coverUrl" :src="form.coverUrl" class="avatar">
@@ -33,9 +37,13 @@
                         class="avatar-uploader avatar-uploader-lg"
                         accept=".jpg,.png,.jpeg,.gif"
                         :on-success="uploadLgSuccess"
-                        :limit="1"
                         :action="this.api.fileupload"
                         :headers="headers"
+                        :limit="1"
+                        :on-exceed="handleExceed"
+                        :before-remove="beforeRemove"
+                        :on-remove="handleCarouselRemove"
+                        :on-error="uploadError"
                         name="file"
                     >
                         <img v-if="form.carouselUrl" :src="form.carouselUrl" class="avatar-lg">
@@ -98,12 +106,15 @@
                 </el-form-item>
                 <el-form-item label="附件">
                   <el-upload
+                      :on-remove="handleAnnexRemove"
+                      :on-error="uploadError"
                       :before-upload="beforeUpload"
                       :on-success="uploadAnnexSuccess"
+                      :on-exceed="handleExceedAnnex"
                       :limit="5"
                       :action="this.api.fileupload"
                       :headers="headers"
-                      :file-list="fileList"
+                      :file-list="form.activityFileList"
                       name="file"
                   >
                     <el-button size="small" type="primary">点击上传</el-button>
@@ -117,7 +128,7 @@
             <div class="btns">
               <el-button @click="save(0)">保存</el-button>
               <el-button type="primary" @click="save(1)">发布</el-button>
-              <el-button type="danger" @click="preview" v-auth="'/activity/list:管理:大赛详情:预览'">预览</el-button>
+              <el-button type="danger" @click="preview">预览</el-button>
               <el-button @click="back">取消</el-button>
             </div>
           </div>
@@ -147,6 +158,7 @@ export default {
               activityFileList: [], // 赛事附件
               initiator: '',
               isNeedCode: 0,
+              invitationCode: '',
               maximumNumber: 0,
               signUpStartTime: '',
               signUpEndTime: '',
@@ -167,6 +179,7 @@ export default {
             sponsorList: [""],
             fileList: [],
             submiting: false,
+            pass: false,
             updateTime: 0,
         };
     },
@@ -202,6 +215,27 @@ export default {
           }
         }
     },
+    // 页面离开的时候如果没有保存则提示
+    beforeRouteLeave(to, from, next) {
+      if (this.submiting) {
+        next()
+      } else if (!this.pass) {
+        // 更改了信息才需要提示
+        if (this.updateTime) {
+          this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', {
+            type: 'warning'
+          }).then(() => {
+            this.save(this.form.publishStatus)
+          }).catch(() => {
+            next()
+          })
+        } else {
+          next()
+        }
+      } else {
+        next()
+      }
+    },
     mounted() {
       this.getData()
     },
@@ -215,24 +249,38 @@ export default {
           // 附件
           const fileList = data.activityFileList
           if (fileList) {
-            const files = []
             fileList.map(e => {
-              files.push({
-                name: e.fileName,
-                url: e.filePath
-              })
+              e.name = e.fileName
+              e.url = e.filePath
             })
-            this.fileList = files
           } else {
             data.activityFileList = []
           }
-
           this.form = data
           this.$nextTick(() => {
             this.updateTime = 0
           })
         }).catch(err => {})
       },
+      handleExceed(files, fileList) {
+        util.warningMsg(`当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`);
+      },
+      beforeRemove(file, fileList) {
+        return this.$confirm(`确定移除 ${file.name}？`);
+      },
+      handleRemove(file, fileList) {
+        this.form.coverUrl = ''
+      },
+      handleCarouselRemove(file, fileList) {
+        this.form.carouselUrl = ''
+      },
+      uploadError(err, file, fileList) {
+        this.$message({
+          message: "上传出错，请重试！",
+          type: "error",
+          center: true
+        })
+      },
       uploadSuccess(res) {
         this.form.coverUrl = res.data.filesResult.fileUrl
       },
@@ -242,14 +290,19 @@ export default {
       // 附件上传成功
       uploadAnnexSuccess(res) {
         const file = res.data.filesResult
-        const { id } = this.form
+        const url = file.fileUrl || file.fileId
         const data = {
-          activityId: id || '',
+          activityId: this.form.id || '',
           fileName: this.fileName,
-          filePath: file.fileUrl || file.fileId
+          name: this.fileName,
+          filePath: url,
+          url
         }
         this.form.activityFileList.push(data)
       },
+      handleExceedAnnex(files, fileList) {
+          util.warningMsg(`当前限制选择 5 个文件，如需更换，请删除一个文件再重新选择！`);
+      },
       // 附件上传前
       beforeUpload(file) {
         const isLt2M = file.size / 1024 / 1024 < 10
@@ -262,7 +315,7 @@ export default {
         }
       },
       handleAnnexRemove(file, fileList) {
-        
+        this.form.activityFileList = fileList
       },
       // 随机邀请码
       randomInv() {
@@ -270,7 +323,7 @@ export default {
         for (let i = 0; i < 4; i++) {
           result += Math.floor(Math.random() * 10);
         }
-        this.form.completeCompetitionSetup.invitationCode = result
+        this.form.invitationCode = result
       },
       // 提交
       save(status) {
@@ -293,24 +346,28 @@ export default {
           }
           form.publishStatus = status
           form.id = this.$route.query.id
+          if (this.submiting) return false
+          this.submiting = true
           if (form.id) {
               this.$post(this.api.updateActivity, form).then(res => {
-                  this.updateTime = 0
-                  this.$router.back()
+                  this.backList()
                   util.successMsg("修改成功");
-              }).catch(err => {});
+              }).catch(err => {
+                this.submiting = false
+              });
           } else {
               this.$post(this.api.saveActivity, form).then(res => {
-                  this.updateTime = 0
-                  this.$router.back()
+                  this.backList()
                   util.successMsg("创建成功");
-              }).catch(err => {});
+              }).catch(err => {
+                this.submiting = false
+              });
           }
       },
       // 预览
       preview() {
         util.local.set('activity', this.form)
-        window.open(this.$router.resolve('/matchPreview').href)
+        window.open(this.$router.resolve('/activity/preview').href)
       },
       addSponsor() {
           this.sponsorList.push("");
@@ -318,25 +375,26 @@ export default {
       delSponsor(index) {
           this.sponsorList.splice(index, 1);
       },
+      backList() {
+        this.pass = true
+        this.updateTime = 0
+        this.$router.back()
+      },
       back() {
+        this.pass = true
         // 更改了信息才需要提示
-        const { updateTime } = this.$refs['step' + this.step]
-        console.log("🚀 ~ file: index.vue:142 ~ back ~ updateTime", updateTime)
-        if (this.step < 4 && updateTime) {
+        if (this.updateTime) {
           this.$confirm(`编辑的内容未保存，是否保存？`, '提示', {
             type: 'warning'
           }).then(() => {
-            this.save(0)
+            this.save(this.form.publishStatus)
           }).catch(() => {
-            this.backPage()
+            this.backList()
           })
         } else {
-          this.backPage()
+          this.backList()
         }
       },
-      backPage() {
-        this.$router.push(`/activity?page=${this.$store.state.activity.page}`)
-      }
     }
 };
 </script>
diff --git a/src/pages/activity/manage/list/index.vue b/src/pages/activity/manage/list/index.vue
index be7f621..2e60810 100644
--- a/src/pages/activity/manage/list/index.vue
+++ b/src/pages/activity/manage/list/index.vue
@@ -34,8 +34,8 @@
                 </li>
             </ul>
             <div>
-                <el-button type="primary" round @click="add" v-auth>创建项目</el-button>
-                <el-button type="primary" round @click="delAllSelection" v-auth>批量删除</el-button>
+                <el-button type="primary" round @click="add">创建项目</el-button>
+                <el-button type="primary" round @click="delAllSelection">批量删除</el-button>
             </div>
         </div>
 
@@ -66,11 +66,10 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="170">
                 <template slot-scope="scope">
-                    <el-button v-auth type="text" @click="manage(scope.row)">管理</el-button>
-                    <el-button v-auth type="text" @click="delData(scope.row)">删除</el-button>
+                    <el-button type="text" @click="manage(scope.row)">管理</el-button>
+                    <el-button type="text" @click="delData(scope.row)">删除</el-button>
                     <el-switch
                         v-if="scope.row.publishStatus"
-                        v-auth="'禁用'"
                         v-model="scope.row.isOpen"
                         :active-value="0"
                         :inactive-value="1"
@@ -194,9 +193,9 @@ export default {
         })
     },
     methods: {
-        // ...mapMutations('activity', [
-        //   'setPage'
-        // ]),
+        ...mapMutations('activity', [
+          'setPage'
+        ]),
         getList() {
           // const load = Loading.service()
           const { form } = this
@@ -260,21 +259,24 @@ export default {
         // 获取redis缓存
         getRedis() {
           this.$post(this.api.getRedisCacheActivity).then(({ data }) => {
-            data && this.getList()
+            if (data) {
+              localStorage.getItem('activityTimestampClient') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表
+              localStorage.setItem('activityTimestampClient', data)
+            }
           }).catch(res => {})
         },
         getData() {
           this.getList()
-          if (!Setting.isDev) {
+          // if (!Setting.isDev) {
             clearInterval(this.redisTimer)
             this.redisTimer = setInterval(this.getRedis, 1000)
-          }
+          // }
         },
         add() {
             this.$router.push("add");
         },
         manage(row) {
-            this.$router.push(`manage?id=${row.id}&name=${row.projectName}`)
+            this.$router.push(`manageDetail?id=${row.id}&name=${row.projectName}`)
         },
 
         changeType() {
@@ -286,7 +288,7 @@ export default {
                 type: "warning"
             })
                 .then(() => {
-                    this.$post(`${this.api.batchDeletionActivity}?ids=${row.id}`).then(res => {
+                    this.$post(this.api.batchDeletionActivity, [row.id]).then(res => {
                         util.successMsg("删除成功");
                         this.getData();
                     }).catch(res => {
@@ -304,8 +306,8 @@ export default {
                 this.$confirm("确定要删除吗？", "提示", {
                     type: "warning"
                 }).then(() => {
-                    let ids = this.multipleSelection.map(i => 'ids=' + i.id);
-                    this.$post(`${this.api.batchDeletionActivity}?${ids.join('&')}`).then(res => {
+                    let ids = this.multipleSelection.map(e => e.id);
+                    this.$post(this.api.batchDeletionActivity, this.multipleSelection.map(e => e.id)).then(res => {
                         this.getData();
                         this.$message.success("删除成功");
                         this.$refs.table.clearSelection()
@@ -314,14 +316,14 @@ export default {
                 }).catch(() => {
                 });
             } else {
-                this.$message.warning("请先选择赛事 ！");
+                this.$message.warning("请先选择项目 ！");
             }
         },
         handleCurrentChange(val) {
             this.page = val;
             this.$router.push(`list?page=${val}`)
             this.getData()
-            // this.setPage(val)
+            this.setPage(val)
         },
         transferTime(date, type) {
             if (date == "0000-00-00 00:00:00") return "---";
diff --git a/src/pages/activity/manage/manage/index.vue b/src/pages/activity/manage/manage/index.vue
index b6da536..d6a2e35 100644
--- a/src/pages/activity/manage/manage/index.vue
+++ b/src/pages/activity/manage/manage/index.vue
@@ -1,5 +1,4 @@
 <template>
-    <!--  赛事管理  -->
     <div>
         <el-card shadow="hover" class="m-b-20">
             <div class="flex-between">
@@ -46,37 +45,24 @@ export default {
         notice,
         MatchSignup
     },
-    // computed: {
-    //   ...mapState("user", [
-    //     'page'
-    //   ]),
-    //   ...mapState('auth', [
-    //     'btns'
-    //   ])
-    // },
+    beforeRouteLeave(to, from, next) {
+      const detail = this.$refs.detail
+      if (detail && detail.updateTime) {
+        this.$confirm(`编辑的内容未保存，是否保存并且发布？`, '提示.......', {
+          type: 'warning'
+        }).then(() => {
+          detail.save(detail.form.publishStatus)
+        }).catch(() => {
+          next()
+        })
+      } else {
+        next()
+      }
+    },
     mounted() {
-      // Setting.dynamicRoute && this.initTabs()
+      
     },
     methods: {
-        initTabs() {
-          // const { btns } = this
-          // const tab1 = btns.includes('/activity/list:管理:大赛详情')
-          // const tab3 = btns.includes('/activity/list:管理:竞赛进展')
-          // const tab4 = btns.includes('/activity/list:管理:公告通知')
-          // const tab5 = btns.includes('/activity/list:管理:报名人员')
-
-          // tab1 || this.$delete(this.tabs, 'tab1')
-          // tab3 || this.$delete(this.tabs, 'tab3')
-          // tab4 || this.$delete(this.tabs, 'tab4')
-          // tab5 || this.$delete(this.tabs, 'tab5')
-          // const type = this.$route.query.tab
-          // const keys = Object.keys(this.tabs)
-          // this.active = keys.includes(type) ? type : keys[0]
-        },
-        // 移除成绩管理
-        hideArch() {
-          this.$delete(this.tabs, 'tab2')
-        },
         back() {
           this.handleSave(0) && this.backPage()
         },
@@ -85,11 +71,11 @@ export default {
           // 如果是赛事详情，则要判断是否已经保存，未保存则提示是否保存
           if (this.active === 'tab1') {
             const detail = this.$refs.detail
-            if (detail.step < 4 && detail.$refs['step' + detail.step].updateTime) {
+            if (detail && detail.updateTime) {
               this.$confirm(`编辑的内容未保存，是否保存并且发布？`, '提示', {
                 type: 'warning'
               }).then(() => {
-                detail.save(1, 1)
+                detail.save(detail.form.publishStatus)
                 this.backOrTab(i)
               }).catch(() => {
                 this.backOrTab(i)
@@ -104,13 +90,12 @@ export default {
         },
         // 返回列表
         backPage(){
-          console.log(444, this.$store.state)
-          this.$router.push(`/activity?page=${this.$store.state.activity.page}`)
+          this.$router.push(`/activity/manage?page=${this.$store.state.activity.page}`)
         },
         // tab切换
         tabSwitch(i) {
           this.active = i
-          this.$router.push(`/activity/manage?id=${this.$route.query.id}&tab=${i}&name=${this.name}`)
+          this.$router.push(`manageDetail?id=${this.$route.query.id}&tab=${i}&name=${this.name}`)
         },
         // 判断返回还是tab
         backOrTab(i) {
@@ -124,6 +109,39 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+.tabs {
+  display: flex;
+  align-items: center;
+  padding: 0 24px;
+  border-bottom: 1px solid rgba(0, 0, 0, .06);
+  .item {
+    position: relative;
+    padding: 20px 0;
+    margin-right: 40px;
+    font-size: 16px;
+    color: rgba(0, 0, 0, 0.65);
+    cursor: pointer;
 
+    &:after {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      width: 100%;
+      height: 3px;
+      border-bottom: 3px solid transparent;
+      border-radius: 2px;
+    }
+
+    &.active {
+      font-weight: 500;
+      color: rgba(0, 0, 0, 0.85);
+    }
+
+    &.active:after {
+      border-bottom-color: $main-color;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/activity/manage/manage/matchProgress.vue b/src/pages/activity/manage/manage/matchProgress.vue
index 605b7d1..c138368 100644
--- a/src/pages/activity/manage/manage/matchProgress.vue
+++ b/src/pages/activity/manage/manage/matchProgress.vue
@@ -26,13 +26,13 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="170">
                 <template slot-scope="scope">
-                    <el-button v-if="!scope.row.operate" type="text" @click="operateIt(scope.row)" v-auth="'/activity:管理:竞赛进展:编辑'">编辑</el-button>
+                    <el-button v-if="!scope.row.operate" type="text" @click="operateIt(scope.row)">编辑</el-button>
                     <el-button v-else type="text" @click="saveData(scope.row)">保存</el-button>
-                    <el-button type="text" @click="handleDelete(scope.row, scope.$index)" v-auth="'/activity/list:管理:竞赛进展:删除'">删除</el-button>
+                    <el-button type="text" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
-        <div class="plus" @click="addData" v-auth="'/activity/list:管理:竞赛进展:新增'">
+        <div class="plus" @click="addData">
             <i class="el-icon-circle-plus-outline"></i>
         </div>
     </div>
@@ -77,10 +77,10 @@ export default {
             row.operate = true
         },
         getData() {
-            this.$get(this.api.getCompetitionProgress, {
-              competitionId: this.id
+            this.$get(this.api.listActivityProgress, {
+              activityId: this.id
             }).then(res => {
-                this.listData = res.competitionProgressList;
+                this.listData = res.activityProgressList;
                 for(let index=0; index<this.listData.length; index++) {
                     // 未点编辑时不可输入
                     this.$set(this.listData, index, { operate: false, ...this.listData[index]})
@@ -93,14 +93,14 @@ export default {
             let data = row;
             if (data.title.length) {
                 if (row.id) {
-                    this.$put(this.api.editCompetitionProgress, data).then(res => {
+                    this.$post(this.api.updateActivityProgress, data).then(res => {
                         this.touchTime = this.touchTime-1
                         util.successMsg("修改成功");
                         this.getData();
                     }).catch(res => {
                     });
                 } else {
-                    this.$post(this.api.addCompetitionProgress, data).then(res => {
+                    this.$post(this.api.addActivityProgress, data).then(res => {
                         this.touchTime = this.touchTime-1
                         util.successMsg("创建成功");
                         this.getData();
@@ -114,10 +114,6 @@ export default {
         handleSelectionChange(val) {
             this.multipleSelection = val;
         },
-        onSearch() {
-            this.pageNo = 1;
-            this.getData();
-        },
         handleCurrentChange(val) {
             this.pageNo = val;
             this.getData();
@@ -131,7 +127,7 @@ export default {
                     util.successMsg("删除成功");
                 }else {
                     this.touchTime = this.touchTime+1
-                    this.$del(`${this.api.deleteCompetitionProgress}?competitionProgressId=${row.id}`).then(res => {
+                    this.$post(this.api.delActivityProgress, [row.id]).then(res => {
                         util.successMsg("删除成功");
                         this.getData();
                     }).catch(res => {
@@ -147,7 +143,7 @@ export default {
             if (this.listData.length) {
                 if (this.listData[this.listData.length - 1].id) {
                     this.listData.push({
-                        competitionId: this.id,
+                        activityId: this.id,
                         id: "",
                         title: "",
                         description: "",
@@ -160,7 +156,7 @@ export default {
                 }
             } else {
                 this.listData.push({
-                    competitionId: this.id,
+                    activityId: this.id,
                     id: "",
                     title: "",
                     description: "",
diff --git a/src/pages/activity/manage/manage/matchSignup.vue b/src/pages/activity/manage/manage/matchSignup.vue
index 015b491..54516f5 100644
--- a/src/pages/activity/manage/manage/matchSignup.vue
+++ b/src/pages/activity/manage/manage/matchSignup.vue
@@ -8,18 +8,18 @@
                     <el-input placeholder="请输入姓名/手机号/学号" prefix-icon="el-icon-search" v-model="keyword" clearable size="mini" style="width: 250px"></el-input>
                 </li>
                 <li>
-                    <label>参赛人员状态：</label>
+                    <label>报名人员状态：</label>
                     <el-select v-model="isDisable" @change="initData">
                       <el-option v-for="(item, i) in statusList" :key="i" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </li>
             </ul>
             <div>
-                <el-button type="primary" round @click="exportAll" v-auth="'/activity/list:管理:报名人员:批量导出'">批量导出</el-button>
+                <el-button type="primary" round @click="exportAll">批量导出</el-button>
             </div>
         </div>
 
-        <el-table ref="table" :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id" @sort-change="sortChange">
+        <el-table ref="table" :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id">
             <el-table-column type="selection" width="80" align="center" :reserve-selection="true"></el-table-column>
             <el-table-column type="index" width="60" label="序号" align="center">
                 <template slot-scope="scope">
@@ -37,7 +37,6 @@
             <el-table-column label="操作" align="center" width="320">
                 <template slot-scope="scope">
                   <el-switch
-                      v-auth="'/activity/list:管理:报名人员:禁用'"
                       v-model="scope.row.isDisable"
                       :active-text="scope.row.isDisable ? '关' : '开'"
                       :active-value="0"
diff --git a/src/pages/activity/manage/manage/notice.vue b/src/pages/activity/manage/manage/notice.vue
index d76c7b3..a532ee3 100644
--- a/src/pages/activity/manage/manage/notice.vue
+++ b/src/pages/activity/manage/manage/notice.vue
@@ -2,7 +2,7 @@
     <!-- 报名人员 -->
     <div class="page-content" style="padding: 24px">
         <div class="tool" style="justify-content: flex-end">
-          <el-button type="primary" round @click="add" v-auth="'/activity/list:管理:公告通知:新增'">新增</el-button>
+          <el-button type="primary" round @click="add">新增</el-button>
         </div>
 
         <el-table ref="table" :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id">
@@ -24,10 +24,9 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="250">
                 <template slot-scope="scope">
-                    <el-button type="text" @click="edit(scope.row)" v-auth="'/activity/list:管理:公告通知:编辑'">编辑</el-button>
-                    <el-button type="text" @click="del(scope.row)" v-auth="'/activity/list:管理:公告通知:删除'">删除</el-button>
+                    <el-button type="text" @click="edit(scope.row)">编辑</el-button>
+                    <el-button type="text" @click="del(scope.row)">删除</el-button>
                     <el-switch
-                        v-auth="'/activity/list:管理:公告通知:启用'"
                         v-model="scope.row.isOpen"
                         :active-text="scope.row.isOpen ? '关' : '开'"
                         :active-value="0"
@@ -76,7 +75,7 @@ export default {
     },
     methods: {
         getData() {
-          this.$post(`${this.api.queryAnnouncementByCompetitionId}?pageNum=${this.pageNo}&pageSize=${this.pageSize}&competitionId=${this.id}`).then(({ data }) => {
+          this.$post(`${this.api.listActivityAnnouncement}?pageNum=${this.pageNo}&pageSize=${this.pageSize}&competitionId=${this.id}`).then(({ data }) => {
               this.listData = data.records
               this.totals = data.total
               this.$refs.table.clearSelection()
@@ -94,7 +93,7 @@ export default {
                 type: "warning"
             })
                 .then(() => {
-                    this.$post(`${this.api.deleteAnnouncement}?id=${row.id}`).then(res => {
+                    this.$post(`${this.api.delActivityAnnouncement}?id=${row.id}`).then(res => {
                         util.successMsg("删除成功");
                         this.getData();
                     }).catch(res => {
@@ -105,13 +104,13 @@ export default {
         },
         switchOff(val, row, index) {
           if (val) {
-            this.$put(`${this.api.disableAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => {}).catch(err => {})
+            this.$put(`${this.api.disableActivityAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => {}).catch(err => {})
           } else if (!row.status) {
             this.$confirm('是否发布该公告？', '提示', {
               type: 'success'
             }).then(() => {
-              this.$put(`${this.api.disableAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => {
-                this.$post(this.api.amendmentAnnouncement, {
+              this.$put(`${this.api.disableActivityAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => {
+                this.$post(this.api.updateActivityAnnouncement, {
                   id: row.id,
                   status: 1
                 }).then(res => {
@@ -122,14 +121,14 @@ export default {
               row.isOpen = 1
             })
           } else {
-            this.$put(`${this.api.disableAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => {}).catch(err => {})
+            this.$put(`${this.api.disableActivityAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => {}).catch(err => {})
           }
         },
         add() {
-          this.$router.push(`noticeDetail?competitionId=${this.id}`)
+          this.$router.push(`noticeDetail?activityId=${this.id}`)
         },
         edit(row) {
-          this.$router.push(`noticeDetail?id=${row.id}&competitionId=${this.id}`)
+          this.$router.push(`noticeDetail?id=${row.id}&activityId=${this.id}`)
         }
     }
 };
diff --git a/src/pages/activity/manage/manage/noticeDetail.vue b/src/pages/activity/manage/manage/noticeDetail.vue
index 519d4f4..37a6d52 100644
--- a/src/pages/activity/manage/manage/noticeDetail.vue
+++ b/src/pages/activity/manage/manage/noticeDetail.vue
@@ -38,8 +38,8 @@
                     </el-upload>
                   </el-form-item>
                   <el-form-item>
-                      <el-button v-if="!form.id" @click="save(0)" v-auth="'/activity/list:管理:公告通知:草稿'">草稿</el-button>
-                      <el-button type="primary" @click="save(1)" v-auth="'/activity/list:管理:公告通知:发布'">发布</el-button>
+                      <el-button v-if="!form.id" @click="save(0)">草稿</el-button>
+                      <el-button type="primary" @click="save(1)">发布</el-button>
                       <el-button @click="back">取消</el-button>
                   </el-form-item>
               </el-form>
@@ -61,7 +61,7 @@ export default {
             },
             form: {
               id: this.$route.query.id,
-              competitionId: this.$route.query.competitionId,
+              activityId: this.$route.query.activityId,
               announcementText: '',
               announcementTitle: '',
               announcementAnnexList: [],
@@ -80,7 +80,6 @@ export default {
         form: {
             handler(){
                 this.updateTime++
-                if(this.updateTime > 1) this.$store.commit('activity/setWait', 0)
             },
             deep:true
         },
@@ -90,7 +89,7 @@ export default {
     },
     methods: {
         getData() {
-          this.$post(`${this.api.queryAnnouncementDetails}?id=${this.form.id}`).then(({ data }) => {
+          this.$post(`${this.api.findActivityAnnouncement}?id=${this.form.id}`).then(({ data }) => {
             this.form = data
             // 附件
             const fileList = data.announcementAnnexList
@@ -117,13 +116,13 @@ export default {
             if (form.id) {
                 form.isOpen = 0
                 delete form.announcementAnnexList
-                this.$post(this.api.amendmentAnnouncement, form).then(res => {
+                this.$post(this.api.updateActivityAnnouncement, form).then(res => {
                     util.successMsg("修改成功")
                     this.$router.back()
                 }).catch(err => {})
             } else {
               form.isOpen = status ? 0 : 1
-              this.$post(this.api.addAnnouncement, form).then(res => {
+              this.$post(this.api.addActivityAnnouncement, form).then(res => {
                 util.successMsg("创建成功")
                 this.$router.back()
               }).catch(err => {})
@@ -143,7 +142,7 @@ export default {
           }
           this.form.announcementAnnexList.push(data)
           // 编辑的时候需要调新增附件接口
-          id && this.$post(this.api.saveAnnouncementAnnex, data).then(res => {}).catch(res => {})
+          id && this.$post(this.api.saveActivityAnnouncementAnnex, data).then(res => {}).catch(res => {})
         },
         // 附件上传前
         beforeUpload(file) {
@@ -163,7 +162,7 @@ export default {
           if (file.url) {
             this.$del(`${this.api.fileDeletion}?keys=${file.url}`).then(res => {}).catch(res => {})
             const id = this.form.announcementAnnexList.find(e => e.fileName === file.name).id
-            this.$post(`${this.api.delAnnex}?id=${id}`).then(res => {}).catch(res => {})
+            this.$post(`${this.api.delActivityAnnouncementAnnex}?id=${id}`).then(res => {}).catch(res => {})
           }
         },
         back() {
@@ -276,7 +275,7 @@ $upload-lg-height: 150px;
         .remove {
             width: 16px;
             height: 16px;
-            background: url("../../../assets/img/close.png") 0 0/cover no-repeat;
+            background: url("../../../../assets/img/close.png") 0 0/cover no-repeat;
             cursor: pointer;
         }
     }
diff --git a/src/pages/activity/manage/preview/index.vue b/src/pages/activity/manage/preview/index.vue
index 12b2f85..028ec02 100644
--- a/src/pages/activity/manage/preview/index.vue
+++ b/src/pages/activity/manage/preview/index.vue
@@ -1,465 +1,431 @@
 <template>
-    <div class="activity">
-      <div class="banner" :style="{backgroundImage: 'url(' + (form.carouselUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220613/png/1536269450851409920.png') + ')'}"></div>
-      <div class="center">
-        <breadcrumb ref="breadcrumb" :data="'全部赛事/' + form.name" route="matchPreview"></breadcrumb>
-        <div class="activity-inner">
-          <div class="flex-between">
-              <el-tabs v-model="curType" @tab-click="typeChange">
-                  <el-tab-pane v-for="(item, index) in typeList" :key="index" :label="item.name" :name="item.id"></el-tab-pane>
-              </el-tabs>
-              <div class="status wait">等待报名</div>
-          </div>
-          <div class="info">
-            <h6 class="title">{{ form.name }}</h6>
-            <div class="meta">最近编辑时间：{{ form.updateTime }}</div>
-          </div>
-
-          <div class="l-title" id="part1"><img src="@/assets/img/label.png" alt=""> 竞赛信息</div>
-          <div v-if="form.description" class="texts ql-editor" v-html="form.description"></div>
-          <template v-if="form.competitionAnnexList && form.competitionAnnexList.length">
-            <h6 class="p-title">附件下载</h6>
-            <ul class="files">
-              <li v-for="(item, i) in form.competitionAnnexList" :key="i">
-                <el-link v-if="item.canPreview" class="m-r-10" type="primary" @click="previewFile(item)">{{ item.fileName }}</el-link>
-                <span v-else class="file-name">{{ item.fileName }}</span>
-                <el-link type="primary" :underline="false" @click="download(item)">下载</el-link>
-              </li>
-            </ul>
-          </template>
-          <template v-if="!form.description && (!form.competitionAnnexList || !form.competitionAnnexList.length )">
-              <div class="empty">
-                  <div>
-                      <img src="@/assets/img/none.png" alt="">
-                      <p>暂无数据</p>
+    <div class="wrap index">
+        <div class="banner" :style="{backgroundImage: 'url(' + (form.carouselUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220613/png/1536269450851409920.png') + ')'}"></div>
+        <div class="center-con">
+          <div class="center-wrap">
+              <breadcrumb ref="breadcrumb" :data="'全部项目/' + form.projectName"></breadcrumb>
+              <div class="content">
+                  <div class="tool flex-between">
+                      <el-tabs v-model="curType" @tab-click="typeChange">
+                          <el-tab-pane v-for="(item, index) in typeList" :key="index" :label="item.name" :name="item.id"></el-tab-pane>
+                      </el-tabs>
+                      <div class="status wait">等待报名</div>
                   </div>
-              </div>
-          </template>
-
-          <template v-if="form.releaseType && form.competitionStage.length">
-            <div class="l-title"><img src="@/assets/img/label.png" alt=""> 赛程、规则与内容</div>
-            <h6 class="rule-title">共{{ form.competitionStage.length }}个竞赛阶段，同一个团队每个成员只能参加一个阶段赛项</h6>
-            <div v-for="(rule, i) in form.competitionStage" :key="i" class="rule">
-              <p style="font-size: 16px;color: #333;">{{ rule.stageName }}</p>
-              <p>比赛时间：{{ rule.startTime && rule.startTime + ' ~ ' + rule.endTime }}</p>
-              <p>比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}</p>
-              <p v-if="!rule.method">课程系统：{{ rule.systemName }}</p>
-              <p v-if="rule.onlineButton">线上地点：{{ rule.onlineAddress }}</p>
-              <p v-if="rule.offlineButton">线下地点：{{ rule.offlineAddress }}</p>
-              <template v-if="rule.method === 2">
-                <p>线下地点：{{ rule.offlineAddress }}</p>
-                <p>比赛内容：{{ rule.contentDescription }}</p>
-                <p>评分规则：{{ rule.scoreRule }}</p>
-              </template>
-              
-              <template v-if="form.completeCompetitionSetup.competitionType">
-                <p>团队参赛人数限制：{{ rule.teamNumLimit || '不限制' }}</p>
-                <p>团队成绩计算方式：{{ teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod) && teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod).name }}</p>
-              </template>
-              <p>阶段比赛结束后{{ rule.resultAnnouncementTime }}小时，公布阶段比赛成绩。</p>
-              <div v-if="form.rule === 1" class="flex">
-                <p>晋级规则：</p>
-                <div>
-                  <p v-if="rule.peopleLimit">本阶段成绩排名前{{ rule.peopleLimit }}队，可晋级下一阶段比赛</p>
-                  <p v-if="rule.percentageLimit">本阶段成绩排名前{{ rule.percentageLimit }}%，可晋级下一阶段比赛</p>
-                  <p v-if="rule.scoreLimit">本阶段成绩{{ rule.scoreLimit }}分，可晋级下一阶段比赛</p>
-                </div>
-              </div>
-            </div>
-          </template>
-
-          <!-- 进展 -->
-          <div class="l-title" id="part2"><img src="@/assets/img/label.png" alt=""> 竞赛进展</div>
-          <ul class="progress" v-if="progress.length">
-              <li v-for="(item,index) in progress" :key="index" :class="item.status == 0 ? 'not' : (item.status == 1 ? 'ing' : 'done')">
-                  <i class="dot"></i>
-                  <p class="name">{{item.title}}</p>
-                  <p class="desc">{{item.description}}</p>
-              </li>
-              <img class="rocket" src="@/assets/img/rocket.png" alt="">
-          </ul>
-          <template v-else>
-              <div class="empty">
-                  <div>
-                      <img src="@/assets/img/none.png" alt="">
-                      <p>暂无数据</p>
+                  <div class="info">
+                    <h6 class="title">{{ form.projectName }}</h6>
+                    <div class="meta">最近编辑时间：{{ form.updateTime }}</div>
                   </div>
-              </div>
-          </template>
-          
-          <!-- 公告 -->
-          <div class="l-title" id="part3"><img src="@/assets/img/label.png" alt=""> 通知公告</div>
-          <ul class="notice-list" v-if="notices.length">
-            <li v-for="(item, i) in notices" :key="i" @click="toNotice(item)">
-              <h6>{{ item.announcementTitle }}</h6>
-              <p class="meta">{{ item.updateTime }}</p>
-              <div class="des" v-html="item.announcementText"></div>
-            </li>
-          </ul>
-          <template v-else>
-              <div class="empty">
-                  <div>
-                      <img src="@/assets/img/none.png" alt="">
-                      <p>暂无通知公告</p>
+                  
+                  <div v-show="curType < 4">
+                    <div class="l-title" id="part1"><img src="@/assets/img/label.png" alt=""> 项目信息</div>
+                    <div v-if="form.projectDescribe" class="texts ql-editor" v-html="form.projectDescribe"></div>
+                    <template v-if="form.activityFileList">
+                      <h6 class="p-title">附件下载</h6>
+                      <ul class="files">
+                        <li v-for="(item, i) in form.activityFileList" :key="i">
+                          <el-link v-if="item.canPreview" class="m-r-10" type="primary" @click="preview(item)">{{ item.fileName }}</el-link>
+                          <span v-else class="fileName">{{ item.fileName }}</span>
+                          <el-link type="primary" :underline="false" @click="download(item)">下载</el-link>
+                        </li>
+                      </ul>
+                    </template>
+                    
+                    <!-- 进展 -->
+                    <div class="l-title" id="part2"><img src="@/assets/img/label.png" alt=""> 项目进展</div>
+                    <ul class="progress" v-if="progress.length">
+                        <li v-for="(item,index) in progress" :key="index" :class="item.status == 0 ? 'not' : (item.status == 1 ? 'ing' : 'done')">
+                            <i class="dot"></i>
+                            <p class="name">{{item.title}}</p>
+                            <p class="desc">{{item.description}}</p>
+                        </li>
+                        <img class="rocket" src="@/assets/img/rocket.png" alt="">
+                    </ul>
+                    <template v-else>
+                        <div class="empty">
+                            <div>
+                                <img src="@/assets/img/none.png" alt="">
+                                <p>暂无数据</p>
+                            </div>
+                        </div>
+                    </template>
+                    
+                    <!-- 公告 -->
+                    <div class="l-title" id="part3"><img src="@/assets/img/label.png" alt=""> 通知公告</div>
+                    <ul class="notice-list" v-if="notices.length">
+                      <li v-for="(item, i) in notices" :key="i" @click="toNotice(item)">
+                        <h6>{{ item.announcementTitle }}</h6>
+                        <p class="meta">{{ item.updateTime }}</p>
+                        <div class="des" v-html="item.announcementText"></div>
+                      </li>
+                    </ul>
+                    <template v-else>
+                        <div class="empty">
+                            <div>
+                                <img src="@/assets/img/none.png" alt="">
+                                <p>暂无通知公告</p>
+                            </div>
+                        </div>
+                    </template>
                   </div>
               </div>
-          </template>
+          </div>
         </div>
-      </div>
     </div>
 </template>
 
 <script>
-import util from "@/libs/util";
 import breadcrumb from '@/components/breadcrumb'
-import Const from '@/const/activity'
+import util from '@/libs/util'
+import Setting from "@/setting"
 export default {
     data() {
         return {
-          rules: Const.rules,
-          methods: Const.methods,
-          teamCalculationMethods: Const.teamCalculationMethods,
-          curType: '1',
-          typeList: [
-              {
-                  id: '1',
-                  name: '竞赛信息'
-              },
-              {
-                  id: '2',
-                  name: '竞赛进展'
-              },
-              {
-                  id: '3',
-                  name: '通知公告'
-              }
-          ],
-          form: util.local.get('activity'),
-          progress: [],
-          notices: [],
+            form: util.local.get('activity'),
+            curType: '1',
+            typeList: [
+                {
+                    id: '1',
+                    name: '项目信息'
+                },
+                {
+                    id: '2',
+                    name: '项目进展'
+                },
+                {
+                    id: '3',
+                    name: '通知公告'
+                },
+            ],
+            progress: [],
+            timer: null,
+            notices: [],
         };
     },
     components: {
         breadcrumb
     },
     mounted() {
-      this.handleAnnex()
       if (this.form.id) {
         this.getProgress()
         this.getNotice()
       }
     },
     methods: {
-      // 处理附件
-      handleAnnex() {
-        const list = this.form.competitionAnnexList
-        if (list) {
-          list.map(e => {
-            const { filePath } = e
-            e.canPreview = util.canPreview(filePath.substr(filePath.lastIndexOf('.') + 1)) // 判断是否能够预览
-          })
-          this.$forceUpdate()
-        }
-      },
-      getProgress() { // 获取竞赛进展
-          this.$get(this.api.getCompetitionProgress, {
-            competitionId: this.form.id
-          }).then(res => {
-              this.progress = res.competitionProgressList.reverse()
-          }).catch(err => {});
-      },
-      // 公告列表
-      getNotice() {
-        this.$post(`${this.api.queryAnnouncementByCompetitionId}?pageNum=1&pageSize=1000&competitionId=${this.form.id}`).then(({ data }) => {
-          const records = data.records.filter(e => e.status) // 只显示已发布的（status 0草稿 1为已发布）
-          records.map(e => {
-            e.announcementText = e.announcementText.replace(/<img.*?(?:>|\/>)/gi, '')
-          })
-          this.notices = records
-        }).catch(res => {})
-      },
-      // 预览附件
-      previewFile(item) {
-        const { filePath } = item
-        const suffix = filePath.substr(filePath.lastIndexOf('.') + 1)
-        window.open((util.isDoc(suffix) || suffix === 'pdf' ? 'https://view.officeapps.live.com/op/view.aspx?src=' : '') + item.filePath)
-      },
-      // 下载附件
-      download(item) {
-        util.downloadFile(item.fileName, item.filePath)
-      },
-      // tab切换
-      typeChange() {
-        document.querySelector(`#part${this.curType}`).scrollIntoView()
-      },
+        getProgress() { // 获取项目进展
+            this.$get(this.api.listActivityProgress, {
+              activityId: this.form.id
+            }).then(res => {
+                this.progress = res.activityProgressList.reverse()
+            }).catch(err => {});
+        },
+        // 公告列表
+        getNotice() {
+          this.$post(`${this.api.listActivityAnnouncement}?pageNum=1&pageSize=1000&competitionId=${this.form.id}`).then(({ data }) => {
+            const records = data.records.filter(e => e.status) // 只显示已发布的（status 0草稿 1为已发布）
+            records.map(e => {
+              e.announcementText = e.announcementText.replace(/<img.*?(?:>|\/>)/gi, '')
+            })
+            this.notices = records
+          }).catch(res => {})
+        },
+        // 预览附件
+        preview(item) {
+          const { filePath } = item
+          const suffix = filePath.substr(filePath.lastIndexOf('.') + 1)
+          window.open((util.isDoc(suffix) ? 'https://view.officeapps.live.com/op/view.aspx?src=' : '') + item.filePath)
+        },
+        // 下载附件
+        download(item) {
+          util.downloadFile(item.fileName, item.filePath)
+        },
+        // tab切换
+        typeChange() {
+          document.querySelector(`#part${type}`).scrollIntoView()
+        },
     }
 };
 </script>
 
 <style lang="scss" scoped>
-.activity {
-  padding-bottom: 20px;
-  background-color: #F3F6FA;
-  .banner{
+.banner{
     width: 100%;
     height: 350px;
+    padding: 120px 0 0 20%;
     color: #fff;
     background-size: 100% 350px;
     background-repeat: no-repeat;
-    box-sizing: border-box;
-  }
-  .center {
-    width: 1000px;
-    margin: 40px auto 0;
+}
+.l-title {
+  font-size: 18px;
+}
+.main .center-con {
+    background: url(../../../../assets/img/match-bg1.png) (0px 95px)/auto auto no-repeat,
+                url(../../../../assets/img/match-bg2.png) (98% 300px)/auto auto no-repeat;
+}
+.main .center-wrap {
+    margin-top: 30px;
+}
+.rule-title {
+  margin-bottom: 10px;
+  font-size: 16px;
+}
+.rule {
+  padding: 15px;
+  margin-bottom: 15px;
+  border: 1px solid #dfdfdf;
+  p {
+    font-size: 14px;
+    line-height: 30px;
+    color: #6e6e6e;
   }
-  .activity-inner {
-    min-height: calc(100vh - 465px);
-    padding: 30px 40px 20px;
+}
+/deep/.el-tabs__item {
+  box-shadow: none !important;
+}
+.content{
+    position: relative;
+    padding: 20px 40px;
+    margin-top: 30px;
     background-color: #fff;
-    box-sizing: border-box;
-  }
-  /deep/.el-tabs {
-    .el-tabs__item.is-active, .el-tabs__item:hover {
-      color: #007EFF;
+    .title{
+        width: 67%;
+        margin: 0 auto;
+        font-size: 28px;
+        text-align: center;
+        color: #0B1D30;
     }
-    .el-tabs__active-bar {
-      background-color: #007EFF;
+    .tool {
+      z-index: 100;
+      position: sticky;
+      top: 64px;
+      margin-bottom: 20px;
+      background-color: #fff;
     }
-  }
-  .p-title {
-    border-left-color: #007EFF;
-  }
-  .l-title{
-    display: flex;
-    align-items: center;
-    margin-bottom: 12px;
-    font-size: 18px;
-    color: #333;
-    img{
-      margin-right: 5px;
-    }
-  }
-  .status {
-      padding: 0 16px;
-      margin-left: 20px;
-      line-height: 34px;
-      font-size: 14px;
-      color: #fff;
-      background-color: #52C41A;
-      border-radius: 4px;
-      cursor: pointer;
-      &.wait {
-          background-color: #FAAD14;
-      }
-      &.signing {
-          background-color: #007EFF;
-      }
-      &.signed {
-          background-color: #52C41A;
-      }
-      &.finish {
-          background-color: #ccc;
-      }
-    }
-  .title{
-      width: 67%;
-      margin: 0 auto;
-      font-size: 28px;
-      text-align: center;
-      color: #0B1D30;
-  }
-  .info .meta{
-      padding: 16px 0;
-      font-size: 12px;
-      color: #999;
-      text-align: center;
-  }
-  .texts {
-    margin-bottom: 30px;
-    font-size: 14px;
-    line-height: 1.6;
-    text-indent: 2em;
-    overflow: hidden;
-    /deep/img{
-        max-width: 100%;
-    }
-  }
-  .files {
-    margin-bottom: 30px;
-    li {
-      display: flex;
-      align-items: center;
-      margin: 10px 0;
-    }
-    .file-name {
-      margin-right: 10px;
-      font-size: 12px;
+    .info .meta{
+        padding: 16px 0;
+        font-size: 12px;
+        color: #999;
+        text-align: center;
     }
-  }
-  .el-link.el-link--primary {
-    color: #007EFF !important;
-    &:after {
-      border-color: #007EFF;
+    .action {
+        display: inline-flex;
+        align-items: center;
     }
-  }
-}
-.progress{
-    position: relative;
-    width: 95%;
-    padding: 50px 0;
-    margin: 40px auto 80px;
-    text-align: left;
-    &:before{
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 50%;
-        width: 2px;
-        height: 100%;
-        background-color: #E1E6F2;
+    .status {
+        max-width: 120px;
+        padding: 0 16px;
+        margin-left: 20px;
+        line-height: 34px;
+        font-size: 14px;
+        color: #fff;
+        background-color: #52C41A;
+        border-radius: 4px;
+        cursor: pointer;
+        @include ellipsis();
+        &.wait {
+            background-color: #FAAD14;
+        }
+        &.signing {
+            background-color: $main-color;
+        }
+        &.signed {
+            background-color: #52C41A;
+        }
+        &.playing {
+            background-color: #f96d6d;
+        }
+        &.finish {
+            background-color: #ccc;
+        }
     }
-    &:after {
-        content: '';
-        position: absolute;
-        top: -10px;
-        left: 430px;
-        border: 8px solid transparent;
-        border-bottom-color: #E1E6F2;
+    .end-text {
+        font-size: 12px;
+        color: #666;
+        em {
+            font-style: normal;
+            color: #f00;
+        }
     }
-    .rocket {
-        position: absolute;
-        bottom: -50px;
-        left: 425px;
+    .texts{
+        margin: 20px 0 50px;
+        font-size: 14px;
+        line-height: 1.6;
+        text-indent: 2em;
+        overflow: hidden;
+        /deep/img{
+            max-width: 100%;
+        }
     }
-    li{
+    .progress{
         position: relative;
-        width: 400px;
-        margin-bottom: 42px;
-        .dot{
+        width: 95%;
+        padding: 50px 0;
+        margin: 40px auto 80px;
+        text-align: left;
+        &:before{
+            content: '';
             position: absolute;
-            top: 12px;
-            left: 431px;
-            width: 15px;
-            height: 15px;
-            background-color: #DCDCDC;
-            border-radius: 50%;
+            top: 0;
+            left: 50%;
+            width: 2px;
+            height: 100%;
+            background-color: #E1E6F2;
         }
-        .name{
-            display: inline-block;
-            padding: 0 19px;
-            margin-bottom: 16px;
-            line-height: 40px;
-            text-align: center;
-            font-size: 16px;
-            color: #fff;
-            border-radius: 20px;
-            background-color: #C4C4C4;
+        &:after {
+            content: '';
+            position: absolute;
+            top: -10px;
+            left: 430px;
+            border: 8px solid transparent;
+            border-bottom-color: #E1E6F2;
         }
-        .desc{
-            position: relative;
-            color: #333;
-            font-size: 14px;
+        .rocket {
+            position: absolute;
+            bottom: -50px;
+            left: 425px;
         }
-        &.ing, &.done {
-            .dot {
-                top: 8px;
-                background-color: #007EFF;
+        li{
+            position: relative;
+            width: 400px;
+            margin-bottom: 42px;
+            .dot{
+                position: absolute;
+                top: 12px;
+                left: 431px;
+                width: 15px;
+                height: 15px;
+                background-color: #DCDCDC;
+                border-radius: 50%;
             }
-            .name {
-                background-color: #007EFF;
+            .name{
+                display: inline-block;
+                padding: 0 19px;
+                margin-bottom: 16px;
+                line-height: 40px;
+                text-align: center;
+                font-size: 16px;
+                color: #fff;
+                border-radius: 20px;
+                background-color: #C4C4C4;
             }
-        }
-        &.ing {
-            .dot {
-                width: 27px;
-                height: 27px;
-                border: 6px solid #E2F1FB;
+            .desc{
+                position: relative;
+                color: #333;
+                font-size: 14px;
             }
-        }
-        &:nth-child(odd) {
-            text-align: right;
-            &.ing {
+            &.ing, &.done {
                 .dot {
-                    left: auto;
-                    right: -58px;
+                    top: 8px;
+                    background-color: #007EFF;
+                }
+                .name {
+                    background-color: #007EFF;
                 }
             }
-            .name {
-                &:before {
-                    content: '';
-                    z-index: 2;
-                    position: absolute;
-                    top: 14px;
-                    right: -35px;
-                    border: 18px solid transparent;
-                    border-top-width: 6px;
-                    border-bottom-width: 6px;
-                    border-left-color: #C4C4C4;
+            &.ing {
+                .dot {
+                    width: 27px;
+                    height: 27px;
+                    border: 6px solid #E2F1FB;
                 }
             }
-            .desc {
+            &:nth-child(odd) {
                 text-align: right;
-            }
-            &.ing, &.done {
+                &.ing {
+                    .dot {
+                        left: auto;
+                        right: -51px;
+                    }
+                }
                 .name {
                     &:before {
-                        border-left-color: #007EFF;
+                        content: '';
+                        z-index: 2;
+                        position: absolute;
+                        top: 14px;
+                        right: -35px;
+                        border: 18px solid transparent;
+                        border-top-width: 6px;
+                        border-bottom-width: 6px;
+                        border-left-color: #C4C4C4;
                     }
                 }
-            }
-        }
-        &:nth-child(even) {
-            margin-left: 482px;
-            .dot {
-                left: -51px;
-            }
-            &.ing {
-                .dot {
-                    left: -57px;
+                .desc {
+                    text-align: right;
                 }
-            }
-            .name {
-                text-align: left;
-                &:after {
-                    content: '';
-                    z-index: 2;
-                    position: absolute;
-                    top: 14px;
-                    left: -35px;
-                    border: 18px solid transparent;
-                    border-top-width: 6px;
-                    border-bottom-width: 6px;
-                    border-right-color: #C4C4C4;
+                &.ing, &.done {
+                    .name {
+                        &:before {
+                            border-left-color: #007EFF;
+                        }
+                    }
                 }
             }
-            .desc {
-                &:before {
-                    left: auto;
-                    right: -16px;
-                    border: 8px solid transparent;
-                    border-left-color: #fff;
+            &:nth-child(even) {
+                margin-left: 482px;
+                .dot {
+                    left: -51px;
                 }
-                &:after {
-                    left: auto;
-                    right: -18px;
-                    border: 9px solid transparent;
-                    border-left-color: #E6E6E6;
+                &.ing {
+                    .dot {
+                        left: -57px;
+                    }
                 }
-            }
-            
-            &.ing, &.done {
                 .name {
+                    text-align: left;
+                    &:after {
+                        content: '';
+                        z-index: 2;
+                        position: absolute;
+                        top: 14px;
+                        left: -35px;
+                        border: 18px solid transparent;
+                        border-top-width: 6px;
+                        border-bottom-width: 6px;
+                        border-right-color: #C4C4C4;
+                    }
+                }
+                .desc {
+                    &:before {
+                        left: auto;
+                        right: -16px;
+                        border: 8px solid transparent;
+                        border-left-color: #fff;
+                    }
                     &:after {
-                        border-right-color: #007EFF;
+                        left: auto;
+                        right: -18px;
+                        border: 9px solid transparent;
+                        border-left-color: #E6E6E6;
+                    }
+                }
+                
+                &.ing, &.done {
+                    .name {
+                        &:after {
+                            border-right-color: #007EFF;
+                        }
                     }
                 }
             }
-        }
-        &:last-child{
-            margin-bottom: 0;
+            &:last-child{
+                margin-bottom: 0;
+            }
         }
     }
 }
+.files {
+  margin-bottom: 30px;
+  li {
+    display: flex;
+    align-items: center;
+    margin: 10px 0;
+  }
+  .fileName {
+    margin-right: 10px;
+    font-size: 12px;
+  }
+}
 .notice-list {
   text-align: left;
   li {
@@ -501,33 +467,56 @@ export default {
     text-overflow: ellipsis;
   }
 }
-.empty{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 50px 0;
-  text-align: center;
-  img{
-    width: 471px;
+.table {
+  width: 100%;
+  border-collapse: collapse;
+  th, td {
+    padding: 12px;
+    border: 1px solid #ebeef5;
   }
-  p{
-    margin-top: 40px;
-    font-size: 18px;
-    color: rgba(0, 0, 0, 0.25);
+  &.tc {
+    text-align: center;
+  }
+  th {
+    text-align: center;
+    background-color: #f8faff;
+  }
+  .icon {
+    margin-right: 10px;
+    font-size: 16px;
+    color: #7a7a7a;
+    cursor: pointer;
+    &:hover {
+      color: #007EFF;
+    }
+  }
+  .plus {
+    margin-bottom: 10px;
+    text-align: right;
+  }
+  .line {
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+    .el-input {
+      margin-right: 15px;
+    }
   }
 }
-.rule-title {
-  margin-bottom: 10px;
-  font-size: 16px;
-}
-.rule {
-  padding: 15px;
+.flex-center {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
   margin-bottom: 15px;
-  border: 1px solid #dfdfdf;
-  p {
-    font-size: 14px;
-    line-height: 30px;
-    color: #6e6e6e;
+}
+/deep/.dia-form {
+  .w-100 {
+    width: 100%;
+  }
+  .tips {
+    display: flex;
+    justify-content: center;
+    align-items: center;
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/activity/noticeDetail/index.vue b/src/pages/activity/noticeDetail/index.vue
index 552f54a..4c586f4 100644
--- a/src/pages/activity/noticeDetail/index.vue
+++ b/src/pages/activity/noticeDetail/index.vue
@@ -55,7 +55,7 @@ export default {
             id: this.$route.query.matchId,
             end: this.$route.query.end,
             status: this.$route.query.status,
-            breadPath: ['全部赛事', this.$route.query.name],
+            breadPath: ['全部项目', this.$route.query.name],
             form: {
               id: this.$route.query.id,
               announcementText: '',
@@ -75,7 +75,7 @@ export default {
         // 公告详情
         getData() {
           this.loadIns = Loading.service()
-          this.$post(`${this.api.queryAnnouncementDetails}?id=${this.form.id}`).then(({ data }) => {
+          this.$post(`${this.api.findActivityAnnouncement}?id=${this.form.id}`).then(({ data }) => {
             this.form = data
             this.breadPath.push(data.announcementTitle)
             this.loadIns.close()
diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue
index af6e8be..bd609c5 100644
--- a/src/pages/screen/index.vue
+++ b/src/pages/screen/index.vue
@@ -724,7 +724,7 @@ export default {
           })
           const courseData = {}
           courseList.map(e => {
-            e.curriculumName = e.curriculumName.substring(0, 10)
+            // e.curriculumName = e.curriculumName.substring(0, 10)
             courseData[e.curriculumName] = []
           })
           this.$post(this.api.studentAssessSchievement, times).then(({ data }) => {
@@ -809,7 +809,7 @@ export default {
               ],
               grid: {
                 left: '30',
-                top: '32%',
+                top: '45%',
                 right: '10',
                 bottom: '5%',
                 containLabel: true
diff --git a/src/pages/station/list/index.vue b/src/pages/station/list/index.vue
index e995ffa..a84869e 100644
--- a/src/pages/station/list/index.vue
+++ b/src/pages/station/list/index.vue
@@ -19,7 +19,7 @@
                     <div class="item" :title="item.curriculumName" @click="goPreview(item)" :key="index" v-if="!keyword || item.curriculumName.includes(keyword)">
                         <img :src="item.coverUrl" alt="">
                         <div class="bottom">
-                            <p class="text"><span>{{ item.curriculumName }}</span></p>
+                            <p class="text"><span>{{ item.goodsName ||  item.curriculumName }}</span></p>
                             <a>进入实验</a>
                         </div>
                     </div>
@@ -74,7 +74,7 @@ export default {
             }).catch(err => {})
         },
         goPreview(item) {
-            this.$router.push(`/station/preview?courseId=${item.cid}&curriculumName=${item.curriculumName}`);
+            this.$router.push(`/station/preview?courseId=${item.cid}&curriculumName=${item.curriculumName}&mallId=${item.mallId || ''}`);
         },
         // tab切换
         tabChange(item) {
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index 88e2b27..914ba50 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -50,7 +50,7 @@
                     <h4 class="title">{{ courseName }}</h4>
                     <div>
                       <h6 class="pro-title">我的学习进度</h6>
-                      <el-progress :stroke-width="12" :percentage="schedule" :text-color="'#fff'"></el-progress>
+                      <el-progress :stroke-width="12" :percentage="schedule" :format="percentFormat" :text-color="'#fff'"></el-progress>
                     </div>
                     <div class="types">
                       <div :class="['item', { active: type === 1 }]" @click="typeChange(1)">
@@ -101,14 +101,14 @@
                     <img src="@/assets/img/course1.png" alt="">
                     课程简介
                 </h6>
-                <p class="intro">{{ briefIntroduction }}</p>
+                <p class="intro" v-html="briefIntroduction"></p>
             </div>
             <div class="page">
                 <h6 class="l-title">
                     <img src="@/assets/img/course2.png" alt="">
                     课程目标
                 </h6>
-                <p class="intro">{{ teachingObjectives }}</p>
+                <p class="intro" v-html="teachingObjectives"></p>
             </div>
           </template>
           <template v-if="active === 2">
@@ -252,6 +252,7 @@ export default {
     components: { pdf, breadcrumb, pdfDia, quill, Editor },
     data() {
         return {
+            mallId: this.$route.query.mallId,
             editorConfig,
             startTime: Date.now(), // 页面进来的时间
             systemIds: '',
@@ -312,6 +313,7 @@ export default {
             overdue: 0, //是否过期
             buyVisible: false,
             schedule: 0,
+            plan: '',
             noteKeyword: '',
             searchTimer: null,
             notes: [],
@@ -361,7 +363,6 @@ export default {
     mounted() {
         this.insertScript();
         this.getData();
-        this.getStatus()
         this.addRecord()
         this.getNote()
     },
@@ -378,13 +379,14 @@ export default {
             this.$router.push('/station')
         },
         async getData() {
-            let { data } = await this.$post(`${this.api.curriculumDetail}?cid=${this.courseId}`);
+            let { data } = await this.$post(`${this.api.curriculumDetail}?cid=${this.courseId}&mallId=${this.mallId}`);
             this.courseName = data.curriculumName;
             // this.coverUrl = data.coverUrl;
             this.briefIntroduction = data.briefIntroduction;
             this.teachingObjectives = data.teachingObjectives;
             this.assessmentList = data.assessmentConfig;
             this.systemIds = data.systemIds
+            this.getStatus()
         },
         // 记录最近使用
         addRecord() {
@@ -411,10 +413,15 @@ export default {
         },
         // 获取学习进度
         async getProgress() {
-            let res = await this.$post(`${this.api.courseLearningProgress}?courseId=${this.courseId}`);
+            let res = await this.$post(`${this.api.courseLearningProgress}?courseId=${this.courseId}&systemId=${this.systemIds}`);
             this.progressList = res.list
+            this.plan = res.plan
             this.schedule = +(res.schedule.replace('%', ''))
         },
+        // 进度数字自定义
+        percentFormat(val) {
+          return this.plan
+        },
         // 目录和进度切换
         typeChange(id) {
           this.getChapter()
diff --git a/src/router/modules/activity.js b/src/router/modules/activity.js
index dd228d6..53b2358 100644
--- a/src/router/modules/activity.js
+++ b/src/router/modules/activity.js
@@ -23,7 +23,7 @@ export default {
         },
         {
             path: `noticeDetail`,
-            component: () => import("@/pages/activity/noticeDetail"),
+            component: () => import("@/pages/activity/manage/manage/noticeDetail"),
         },
         {
             path: `manage`,
@@ -32,6 +32,18 @@ export default {
         {
             path: `add`,
             component: () => import("@/pages/activity/manage/add"),
+        },
+        {
+            path: `manageDetail`,
+            component: () => import("@/pages/activity/manage/manage"),
+        },
+        {
+            path: `preview`,
+            component: () => import("@/pages/activity/manage/preview"),
+        },
+        {
+            path: `notice`,
+            component: () => import("@/pages/activity/noticeDetail"),
         }
     ]
 };
\ No newline at end of file
diff --git a/src/setting.js b/src/setting.js
index e4142f4..49f31ad 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -28,7 +28,7 @@ if (isPro) {
     uploadURL = `http://121.37.12.51/`
     host = "http://121.37.12.51/"; // 测试服
     // host = 'https://www.occupationlab.com/' // 正式服
-    host = "http://192.168.31.151:9000/"; // 榕
+    // host = "http://192.168.31.151:9000/"; // 榕
     // host = "http://192.168.31.116:9000/"; // 赓
 }
 
diff --git a/src/store/modules/activity.js b/src/store/modules/activity.js
new file mode 100644
index 0000000..80d87ff
--- /dev/null
+++ b/src/store/modules/activity.js
@@ -0,0 +1,21 @@
+/**
+ * 赛事相关
+ * */
+export default {
+    namespaced: true,
+    state: {
+      page: 1,
+      cache: null
+    },
+    mutations: {
+      setPage: (state, page) => {
+        state.page = page
+      },
+      setCache: (state, cache) => {
+        state.cache = cache
+      }
+    },
+    actions: {
+      
+    }
+};
\ No newline at end of file
diff --git a/src/styles/page/station.scss b/src/styles/page/station.scss
index 27e0301..e3ac02f 100644
--- a/src/styles/page/station.scss
+++ b/src/styles/page/station.scss
@@ -99,7 +99,7 @@
   .sign {
       position: relative;
       display: inline-block;
-      margin-left: -12.5%;
+      margin-left: -14%;
       font-size: 14px;
       color: #9076FF;
   }