From 4e745615fbedd831e478a018424f460f58ac3b79 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 16 May 2023 11:53:33 +0800
Subject: [PATCH] fix

---
 src/api/index.js                              |  13 +
 src/assets/img/activity-bg.jpg                | Bin 0 -> 63287 bytes
 src/pages/activity/details/index.vue          | 611 ++-----------
 src/pages/activity/list/index.vue             |  82 +-
 src/pages/activity/manage/add/index.vue       | 122 ++-
 src/pages/activity/manage/list/index.vue      |  36 +-
 src/pages/activity/manage/manage/index.vue    |  88 +-
 .../activity/manage/manage/matchProgress.vue  |  26 +-
 .../activity/manage/manage/matchSignup.vue    |   7 +-
 src/pages/activity/manage/manage/notice.vue   |  23 +-
 .../activity/manage/manage/noticeDetail.vue   |  19 +-
 src/pages/activity/manage/preview/index.vue   | 807 +++++++++---------
 src/pages/activity/noticeDetail/index.vue     |   4 +-
 src/pages/screen/index.vue                    |   4 +-
 src/pages/station/list/index.vue              |   4 +-
 src/pages/station/preview/index.vue           |  19 +-
 src/router/modules/activity.js                |  14 +-
 src/setting.js                                |   2 +-
 src/store/modules/activity.js                 |  21 +
 src/styles/page/station.scss                  |   2 +-
 20 files changed, 771 insertions(+), 1133 deletions(-)
 create mode 100644 src/assets/img/activity-bg.jpg
 create mode 100644 src/store/modules/activity.js

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 0000000000000000000000000000000000000000..dd97b20b6a00f174877a68192cdfb198b227dd45
GIT binary patch
literal 63287
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%0AN0!`W$$$@0u4{|3yvl^n6dJUB35j#9$2
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
N%bB=h6;XdC{|iCDHg5m`

literal 0
HcmV?d00001

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;
   }