diff --git a/src/api/index.js b/src/api/index.js
index 3313d89..403493a 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -143,6 +143,8 @@ export default {
     stageTeamScoreDetails: `competition/competition/rank/stageTeamScoreDetails`,
     getRedisCacheCompetition: `competition/competition/management/getRedisCache`,
     getCompetitionStageRankingTime: `competition/competitionReleaseTime/getCompetitionStageRankingTime`,
+    cCompetitionStageFileSave: `competition/cCompetitionStageFile/save`,
+    cCompetitionStageFileDel: `competition/cCompetitionStageFile/batchDeletion`,
     
     // 创业活动
     activityList: `occupationlab/occupationlab/activity/activityList`,
diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue
index 6b500d0..38d37dd 100644
--- a/src/pages/match/details/index.vue
+++ b/src/pages/match/details/index.vue
@@ -616,6 +616,58 @@
                    @click="memberVisible = false">确定</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog title="阶段赛名称"
+               :visible.sync="stageVisible"
+               :close-on-click-modal="false"
+               width="600px">
+      <template v-if="curStage && curStage.competitionStageContentSetting">
+        <el-button v-if="curStage.competitionStageContentSetting.systemLink"
+                   type="text"
+                   style="font-size: 13px"
+                   @click="toOffline">进入{{ curStage.stageName }}</el-button>
+        <div v-if="curStage.competitionStageContentSetting.fileUrl"
+             class="flex a-center m-b-10">
+          <p class="m-r-10"
+             style="font-size: 13px">文件下载：{{ curStage.competitionStageContentSetting.fileName }}</p>
+          <el-button type="text"
+                     style="font-size: 13px"
+                     @click="download({fileName: curStage.competitionStageContentSetting.fileName, filePath: curStage.competitionStageContentSetting.fileUrl})">点击下载</el-button>
+        </div>
+
+        <div class="flex m-b-20">
+          <span style="font-size: 12px">文件上传：</span>
+          <el-upload :before-upload="beforeUpload"
+                     :on-remove="handleRemove"
+                     :on-error="uploadError"
+                     :on-success="uploadSuccess"
+                     :before-remove="beforeRemove"
+                     :limit="1"
+                     :on-exceed="handleExceed"
+                     :action="api.fileUploadNakadai"
+                     :headers="headers"
+                     name="file">
+            <el-button size="small"
+                       type="primary">上传试卷</el-button>
+            <div slot="tip"
+                 class="el-upload__tip">
+              <p>请上传大小1G以内的文件，支持常见文件格式。</p>
+              <p>只允许上传一个文件，如有多个文件则需打包再上传。</p>
+            </div>
+          </el-upload>
+        </div>
+
+        <div>说明：{{ curStage.competitionStageContentSetting.stageExplain }}</div>
+      </template>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="small"
+                   type="primary"
+                   @click="stageSubmit">提交</el-button>
+        <el-button size="small"
+                   @click="stageVisible = false">取消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -629,6 +681,9 @@ export default {
   name: 'matchdetail',
   data () {
     return {
+      headers: {
+        token: util.local.get(Setting.tokenKey)
+      },
       token: util.local.get(Setting.tokenKey),
       id: +this.$route.query.id,
       end: '',
@@ -733,6 +788,10 @@ export default {
       peopleSignupForm: {
         registrationInvitationCode: ''
       },
+      submiting: false,
+
+      stageVisible: false,
+      filesResult: {}
     };
   },
   computed: {
@@ -815,99 +874,105 @@ export default {
       let signUpEndTime = new Date(this.core.dateCompatible(form.signUpEndTime)) // 报名结束时间
       let playStartTime = new Date(this.core.dateCompatible(form.playStartTime)) // 比赛开始时间
       let playEndTime = new Date(this.core.dateCompatible(form.playEndTime)) // 比赛结束时间
-      this.timer = setInterval(() => {
-        const now = new Date()
-        if (now < signUpStartTime) { // 报名没开始
-          status = 0
-          total = signUpStartTime - now
-        } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
-          // 1已报名，2立即报名(没登录的情况下，直接显示立即报名，登录了则取报名信息，有则已报名，无则立即报名)
-          status = this.token ?
-            (form.competitionRegistration ?
-              1 :
-              2) :
-            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.isLink(e))) 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 || this.isLink(e))) { // 阶段比赛进行中，显示进入比赛按钮
-                  if (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
-                    }
-                  } else {
+      // this.timer = setInterval(() => {
+      const now = new Date()
+      if (now < signUpStartTime) { // 报名没开始
+        status = 0
+        total = signUpStartTime - now
+      } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
+        // 1已报名，2立即报名(没登录的情况下，直接显示立即报名，登录了则取报名信息，有则已报名，无则立即报名)
+        status = this.token ?
+          (form.competitionRegistration ?
+            1 :
+            2) :
+          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.offlineCanEntry(e))) 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)
+              console.log("🚀 ~ file: index.vue:901 ~ //this.timer=setInterval ~ form.competitionRegistration:", stages, startTime, endTime, now >= startTime && now <= endTime)
+              if (now < startTime) { // 阶段比赛未开始，不显示进入比赛按钮
+                endText = '阶段开始'
+                total = startTime - now
+                break
+              } else if (now >= startTime && now <= endTime) { // 阶段比赛进行中，显示进入比赛按钮
+                // 非线下赛事
+                if (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
+                } else if (this.offlineCanEntry(e)) { // 线下(输入了系统链接或者上传文件选择了是，才需要显示进入按钮)
+                  // 当系统链接为空，且上传文件为否时，无需展示入口
+                  // 当系统链接不为空，且上传文件为否时，点击入口，直接跳转到链接页面，无需弹窗
+                  // 当上传文件为是时，点击入口需弹窗，共两种样式
+                  this.statusList[4] = '进入' + e.stageName
+                  console.log("🚀 ~ file: index.vue:924 ~ //this.timer=setInterval ~ e:", e, this.playingStages)
+                  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
+            this.endList[4] = endText
           }
-          status = 4
-        } else if (now > playEndTime) { // 比赛结束
-          status = 5
-        }
-        this.status = status
-        total = total / 1000
-        --total
-        if (total > 86400) { // 超过一天则显示天数
-          // clearInterval(this.timer)
-          this.end = Math.floor(total / 86400) + '天'
-        } else if (total > 0) { // 一天之内，显示时分秒
-          let hours = Math.floor(total / (60 * 60))
-          let minutes = Math.floor(total % (60 * 60) / 60)
-          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) { // 竞赛结束，清除定时器
-          clearInterval(this.timer)
+          this.curStage = curStage
+        } else { // 仅发布信息
+          total = playEndTime - now
         }
-      }, 1000)
+        status = 4
+      } else if (now > playEndTime) { // 比赛结束
+        status = 5
+      }
+      this.status = status
+      total = total / 1000
+      --total
+      if (total > 86400) { // 超过一天则显示天数
+        // clearInterval(this.timer)
+        this.end = Math.floor(total / 86400) + '天'
+      } else if (total > 0) { // 一天之内，显示时分秒
+        let hours = Math.floor(total / (60 * 60))
+        let minutes = Math.floor(total % (60 * 60) / 60)
+        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) { // 竞赛结束，清除定时器
+        clearInterval(this.timer)
+      }
+      // }, 1000)
     },
-    isLink (stage) {
-      console.log("🚀 ~ file: index.vue:904 ~ isLink ~ stage:", stage)
-      return stage.method === 2 && /[a-zA-Z\d]+\.[a-zA-Z]+/.test(stage.offlineAddress)
+    // 该阶段是否符合线下能进入比赛的条件
+    offlineCanEntry (stage) {
+      return stage.method === 2 && stage.competitionStageContentSetting && !!(stage.competitionStageContentSetting.systemLink || stage.competitionStageContentSetting.whetherToUploadFiles)
     },
     // 获取竞赛信息
     getInfo () {
@@ -1066,7 +1131,7 @@ export default {
     },
     // 定时调获取排名接口
     intervalRank () {
-      this.rankTimer = setInterval(this.getRank, 1000)
+      // this.rankTimer = setInterval(this.getRank, 1000)
     },
 
     // 删除指导老师
@@ -1348,6 +1413,56 @@ export default {
       }
     },
 
+
+    // 附件上传前
+    beforeUpload (file) {
+      const oversize = file.size / 1024 / 1024 < 1000
+      if (!oversize) util.warningMsg('请上传小于1GB的附件！')
+      if (oversize) {
+        return true
+      } else {
+        return false
+      }
+    },
+    uploadError (err, file, fileList) {
+      this.$message({
+        message: "上传出错，请重试！",
+        type: "error",
+        center: true
+      })
+    },
+    beforeRemove (file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    handleExceed (files, fileList) {
+      util.warningMsg(`当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`);
+    },
+    handleRemove (file, fileList) { },
+    uploadSuccess (res) {
+      this.filesResult = res.filesResult
+    },
+    // 提交阶段内容
+    stageSubmit () {
+      if (this.submiting) return false
+      this.submiting = true
+      // 有上传记录，则删除上次的文件
+      this.curStage.competitionStageFile && this.$post(this.api.cCompetitionStageFileDel, [this.curStage.competitionStageFile.id]).then(res => { }).catch(res => { })
+      this.$post(this.api.cCompetitionStageFileSave, {
+        competitionId: this.id,
+        fileFormat: this.filesResult.fileType,
+        fileName: this.filesResult.originalFileName,
+        filePath: this.filesResult.fileUrl,
+        fileSize: this.filesResult.fileSize,
+        ossFileName: this.filesResult.ossFileName,
+        stageId: this.curStage.stageId,
+        teamId: this.form.competitionRegistration.teamId
+      }).then(res => {
+        util.successMsg('提交成功！')
+        this.stageVisible = false
+        this.submiting = false
+      }).catch(res => { })
+    },
+
     // 选择要进入的阶段
     chooseStage (e) {
       this.curStage = e
@@ -1376,9 +1491,15 @@ export default {
       if (util.local.get(Setting.tokenKey)) {
         const { competitionType } = form.completeCompetitionSetup
         if (status == 4) { // 进入比赛
-          // 线下
+          // 线下(规则见handleStatus方法)
           if (this.curStage.method == 2) {
-            window.open(this.curStage.offlineAddress)
+            // 直接打开系统链接
+            if (!this.curStage.competitionStageContentSetting.whetherToUploadFiles) {
+              window.open(this.curStage.competitionStageContentSetting.systemLink)
+            } else { // 显示上传文件弹框
+              this.stageVisible = true
+              console.log("🚀 ~ file: index.vue:1499 ~ signup ~ this.curStage:", this.curStage)
+            }
           } else {
             // 参加过比赛不让参加
             if (this.curStage && this.curStage.count) return util.errorMsg('您已经参加过该阶段竞赛！')
@@ -1435,7 +1556,7 @@ export default {
     },
     // 线下比赛方式点击进入跳转<比赛地点>
     toOffline () {
-      window.open(this.curStage.offlineAddress)
+      window.open(this.curStage.competitionStageContentSetting.systemLink)
     },
     // 进入python系统
     toPython () {
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index f7a6dbe..81cfcd9 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -263,6 +263,58 @@
                    @click="teamVisible = false">取消</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog title="阶段赛名称"
+               :visible.sync="stageVisible"
+               :close-on-click-modal="false"
+               width="600px">
+      <template v-if="curStageItem && curStageItem.competitionStageContentSetting">
+        <el-button v-if="curStageItem.competitionStageContentSetting.systemLink"
+                   type="text"
+                   style="font-size: 13px"
+                   @click="toOffline">进入{{ curStageItem.stageName }}</el-button>
+        <div v-if="curStageItem.competitionStageContentSetting.fileUrl"
+             class="flex a-center m-b-10">
+          <p class="m-r-10"
+             style="font-size: 13px">文件下载：{{ curStageItem.competitionStageContentSetting.fileName }}</p>
+          <el-button type="text"
+                     style="font-size: 13px"
+                     @click="download({fileName: curStageItem.competitionStageContentSetting.fileName, filePath: curStageItem.competitionStageContentSetting.fileUrl})">点击下载</el-button>
+        </div>
+
+        <div class="flex m-b-20">
+          <span style="font-size: 12px">文件上传：</span>
+          <el-upload :before-upload="beforeUpload"
+                     :on-remove="handleRemove"
+                     :on-error="uploadError"
+                     :on-success="uploadSuccess"
+                     :before-remove="beforeRemove"
+                     :limit="1"
+                     :on-exceed="handleExceed"
+                     :action="api.fileUploadNakadai"
+                     :headers="headers"
+                     name="file">
+            <el-button size="small"
+                       type="primary">上传试卷</el-button>
+            <div slot="tip"
+                 class="el-upload__tip">
+              <p>请上传大小1G以内的文件，支持常见文件格式。</p>
+              <p>只允许上传一个文件，如有多个文件则需打包再上传。</p>
+            </div>
+          </el-upload>
+        </div>
+
+        <div>说明：{{ curStageItem.competitionStageContentSetting.stageExplain }}</div>
+      </template>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="small"
+                   type="primary"
+                   @click="stageSubmit">提交</el-button>
+        <el-button size="small"
+                   @click="stageVisible = false">取消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -276,6 +328,9 @@ export default {
   name: "match",
   data () {
     return {
+      headers: {
+        token: util.local.get(Setting.tokenKey)
+      },
       timer: null,
       token: util.local.get(Setting.tokenKey),
       statusList: ["待报名", "取消报名", "马上报名", "报名截止", "进入初赛", "已结束"],
@@ -384,7 +439,12 @@ export default {
       peopleSignupForm: {
         registrationInvitationCode: ''
       },
-      curRow: {}
+      curRow: {},
+      submiting: false,
+
+      stageVisible: false,
+      filesResult: {},
+      curStageItem: {}
     };
   },
   computed: {
@@ -494,7 +554,7 @@ export default {
                   item.playingStages = []
                   // 报了名才算作可以进入的阶段
                   item.whetherToSignUp === 0 && stages.forEach(e => {
-                    if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && (e.method !== 2 || this.isLink(e))) item.playingStages.push(e)
+                    if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && (e.method !== 2 || this.offlineCanEntry(e))) item.playingStages.push(e)
                   })
                   for (const i in stages) {
                     const e = stages[i]
@@ -506,7 +566,7 @@ export default {
                       total = startTime - now
                       break
                     } else if (now >= startTime && now <= endTime) { // 阶段比赛进行中，显示进入比赛按钮
-                      if (item.whetherToSignUp === 0 && (e.method !== 2 || this.isLink(e))) this.$set(item, 'stageName', (!this.isLink(e) && e.count) ? '已提交' : '进入' + e.stageName) // 报名了并且没参加比赛才能进入比赛
+                      if (item.whetherToSignUp === 0 && (e.method !== 2 || this.offlineCanEntry(e))) this.$set(item, 'stageName', (!this.offlineCanEntry(e) && e.count) ? '已提交' : '进入' + e.stageName) // 报名了并且没参加比赛才能进入比赛
                       this.$set(item, 'endText', '阶段结束')
                       curStage = e
                       total = endTime - now
@@ -553,9 +613,6 @@ export default {
         }
       })
     },
-    isLink (stage) {
-      return stage.method === 2 && /[a-zA-Z\d]+\.[a-zA-Z]+/.test(stage.offlineAddress)
-    },
     // 清除定时器
     clearTimer () {
       this.timerList.forEach(n => {
@@ -679,6 +736,71 @@ export default {
         util.successMsg('报名成功！')
       }).catch(res => { })
     },
+
+
+
+
+    // 该阶段是否符合线下能进入比赛的条件
+    offlineCanEntry (stage) {
+      return stage.method === 2 && stage.competitionStageContentSetting && !!(stage.competitionStageContentSetting.systemLink || stage.competitionStageContentSetting.whetherToUploadFiles)
+    },
+    // 附件上传前
+    beforeUpload (file) {
+      const oversize = file.size / 1024 / 1024 < 1000
+      if (!oversize) util.warningMsg('请上传小于1GB的附件！')
+      if (oversize) {
+        return true
+      } else {
+        return false
+      }
+    },
+    uploadError (err, file, fileList) {
+      this.$message({
+        message: "上传出错，请重试！",
+        type: "error",
+        center: true
+      })
+    },
+    beforeRemove (file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    handleExceed (files, fileList) {
+      util.warningMsg(`当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`);
+    },
+    handleRemove (file, fileList) { },
+    uploadSuccess (res) {
+      this.filesResult = res.filesResult
+    },
+    // 提交阶段内容
+    stageSubmit () {
+      if (this.submiting) return false
+      this.submiting = true
+      // 有上传记录，则删除上次的文件
+      this.curStageItem.competitionStageFile && this.$post(this.api.cCompetitionStageFileDel, [this.curStageItem.competitionStageFile.id]).then(res => { }).catch(res => { })
+      this.$post(this.api.cCompetitionStageFileSave, {
+        competitionId: this.curItem.id,
+        fileFormat: this.filesResult.fileType,
+        fileName: this.filesResult.originalFileName,
+        filePath: this.filesResult.fileUrl,
+        fileSize: this.filesResult.fileSize,
+        ossFileName: this.filesResult.ossFileName,
+        stageId: this.curStageItem.stageId,
+        teamId: this.curItem.teamId
+      }).then(res => {
+        util.successMsg('提交成功！')
+        this.stageVisible = false
+        this.submiting = false
+      }).catch(res => { })
+    },
+    // 下载附件
+    download (item) {
+      util.downloadFile(item.fileName, item.filePath)
+    },
+    // 线下比赛方式点击进入跳转<比赛地点>
+    toOffline () {
+      window.open(this.curStageItem.competitionStageContentSetting.systemLink)
+    },
+
     stageClick (e) { },
     // 选择要进入的阶段
     chooseStage (e, item) {
@@ -709,9 +831,16 @@ export default {
       if (util.local.get(Setting.tokenKey)) {
         this.curItem = item
         if (status == 4) { // 进入比赛
-          // 线下
+          // 线下(规则见handleStatus方法)
           if (item.curStage.method == 2) {
-            window.open(item.curStage.offlineAddress)
+            // 直接打开系统链接
+            if (!item.curStage.competitionStageContentSetting.whetherToUploadFiles) {
+              window.open(item.curStage.competitionStageContentSetting.systemLink)
+            } else { // 显示上传文件弹框
+              this.curStageItem = item.curStage
+              this.stageVisible = true
+              console.log("🚀 ~ file: index.vue:830 ~ signup ~ this.curItem:", this.curItem.curStage.competitionStageContentSetting.systemLink)
+            }
           } else {
             // 参加过比赛不让参加
             if (item.curStage.count) return util.errorMsg('您已经参加过该阶段竞赛！')
diff --git a/src/pages/station/list/index.vue b/src/pages/station/list/index.vue
index 9ac9a30..a9f275a 100644
--- a/src/pages/station/list/index.vue
+++ b/src/pages/station/list/index.vue
@@ -24,10 +24,10 @@
           <template v-if="curriculumList.length">
             <template v-for="(item,i) in curriculumList">
               <div class="item"
-                   :title="item.curriculumName"
+                   :title="item.goodsName"
                    @click="goPreview(item)"
                    :key="i"
-                   v-if="!keyword || item.curriculumName.includes(keyword)">
+                   v-if="!keyword || item.goodsName.includes(keyword)">
                 <div v-if="isZj || isSq"
                      class="cover"
                      :style="{backgroundImage: 'url(/images/' + i + '.png)'}"></div>
@@ -79,16 +79,6 @@ export default {
     }
   },
   mounted () {
-
-    axios.get(`https://www.occupationlab.com/users/users/userInfo/getUserInfo`, {
-      headers: {
-        token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjk5NDE3OTMzLCJleHAiOjE2OTk0NjExMzMsImFjY291bnRJZCI6IjMwIn0.UeUcT8K5t6o5_Vsr58v9-P6KiOmf44TLJwXU61GzZ4Y'
-      }
-    }).then(({ data }) => {
-
-    }).catch(res => { })
-
-
     this.getschoolCourse();
   },
   methods: {
diff --git a/src/pages/touristMatch/list/index.vue b/src/pages/touristMatch/list/index.vue
index 1dfb37d..9751643 100644
--- a/src/pages/touristMatch/list/index.vue
+++ b/src/pages/touristMatch/list/index.vue
@@ -1,184 +1,252 @@
 <template>
-    <div class="wrap index">
-        <div class="search">
-            <h6>赛事竞技，精彩纷呈</h6>
-            <div class="input">
-                <img src="@/assets/img/search.png" alt="">
-                <input type="text" placeholder="请输入关键词" v-model="keyword">
-            </div>
-        </div>
+  <div class="wrap index">
+    <div class="search">
+      <h6>赛事竞技，精彩纷呈</h6>
+      <div class="input">
+        <img src="@/assets/img/search.png"
+             alt="">
+        <input type="text"
+               placeholder="请输入关键词"
+               v-model="keyword">
+      </div>
+    </div>
 
-        <!-- 课程筛选 -->
-        <div class="filter">
-            <div class="center-wrap" style="padding: 0;margin: 0 auto;">
-                <dl>
-                    <dt>比赛范围：</dt>
-                    <dd v-for="(item, i) in scopes" :key="i" :class="{active: form.competitionScope == item.id}" @click="changeScope(item.id)">{{ item.name }}</dd>
-                    <template v-if="form.competitionScope === 2">
-                      <div class="select-wrap">
-                        <span class="label">省份</span>
-                        <el-select size="small" v-model="form.provinceId" clearable @change="getCity">
-                          <el-option label="请选择" value=""></el-option>
-                          <el-option
-                              v-for="(item,index) in provinces"
-                              :key="index"
-                              :label="item.provinceName"
-                              :value="item.provinceId"
-                          ></el-option>
-                        </el-select>
-                      </div>
-                      <div class="select-wrap">
-                        <span class="label">城市</span>
-                        <el-select size="small" v-model="form.cityId" clearable @change="initData">
-                          <el-option label="请选择" value=""></el-option>
-                          <el-option
-                              v-for="(item,index) in cities"
-                              :key="index"
-                              :label="item.cityName"
-                              :value="item.cityId"
-                          ></el-option>
-                        </el-select>
-                      </div>
-                    </template>
-                </dl>
-                <dl>
-                    <dt>筛选排序：</dt>
-                    <dd v-for="(item, i) in sorts" :key="i" :class="{active: form.sequence == item.id}" @click="changeSort(item.id)">{{ item.name }}</dd>
-                </dl>
+    <!-- 课程筛选 -->
+    <div class="filter">
+      <div class="center-wrap"
+           style="padding: 0;margin: 0 auto;">
+        <dl>
+          <dt>比赛范围：</dt>
+          <dd v-for="(item, i) in scopes"
+              :key="i"
+              :class="{active: form.competitionScope == item.id}"
+              @click="changeScope(item.id)">{{ item.name }}</dd>
+          <template v-if="form.competitionScope === 2">
+            <div class="select-wrap">
+              <span class="label">省份</span>
+              <el-select size="small"
+                         v-model="form.provinceId"
+                         clearable
+                         @change="getCity">
+                <el-option label="请选择"
+                           value=""></el-option>
+                <el-option v-for="(item,index) in provinces"
+                           :key="index"
+                           :label="item.provinceName"
+                           :value="item.provinceId"></el-option>
+              </el-select>
             </div>
-        </div>
+            <div class="select-wrap">
+              <span class="label">城市</span>
+              <el-select size="small"
+                         v-model="form.cityId"
+                         clearable
+                         @change="initData">
+                <el-option label="请选择"
+                           value=""></el-option>
+                <el-option v-for="(item,index) in cities"
+                           :key="index"
+                           :label="item.cityName"
+                           :value="item.cityId"></el-option>
+              </el-select>
+            </div>
+          </template>
+        </dl>
+        <dl>
+          <dt>筛选排序：</dt>
+          <dd v-for="(item, i) in sorts"
+              :key="i"
+              :class="{active: form.sequence == item.id}"
+              @click="changeSort(item.id)">{{ item.name }}</dd>
+        </dl>
+      </div>
+    </div>
 
-        <div class="main">
-            <div class="center-wrap list-inner">
-                <div class="list-wrap">
-                    <div class="list">
-                        <template v-if="listData.length">
-                            <ul>
-                                <li v-for="(item,index) in listData" :key="index" :id="item.id" @click="toDetail(item)">
-                                    <div class="left">
-                                        <el-button v-if="item.status === 2 || item.curStage" :class="['stage-label', {playing: item.curStage}]" type="primary">{{ 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="">
-                                        </div>
-                                        <div class="info">
-                                            <div class="title">{{ item.competitionName }}</div>
-                                            <div class="metas">
-                                                <div :class="{'flex-top': item.sponsor.split(',').length > 1}">
-                                                    <span class="label">主办方：&emsp;</span>
-                                                    <span class="val">{{ item.sponsor }}</span>
-                                                </div>
-                                                <div>
-                                                    <span class="label">报名时间：</span><span class="val">{{ item.signUpStartTime}} ~ {{ item.signUpEndTime }}</span>
-                                                </div>
-                                                <div>
-                                                    <span class="label">比赛时间：</span><span class="val">{{ item.playStartTime}} ~ {{ item.playEndTime }}</span>
-                                                </div>
-                                                <div :title="item.ranges">
-                                                    <span class="label">比赛范围：</span><span class="val">{{ item.ranges }}</span>
-                                                </div>
-                                                <div>
-                                                    <span class="label">比赛类型：</span><span class="val">{{ item.setup.competitionType ? '团体赛' : '个人赛' }}</span>
-                                                </div>
-                                                <div v-if="item.curStage">
-                                                    <span class="label">当前阶段：</span><span class="val">{{ item.curStage.stageName }}</span>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="right">
-                                        <el-dropdown v-if="item.playingStages && item.playingStages.length > 1" class="m-l-10" @command="e => chooseStage(e, item)">
-                                          <el-button type="primary" style="background-color: #f96d6d;border: 0;">
-                                            选择竞赛<i class="el-icon-arrow-down el-icon--right"></i>
-                                          </el-button>
-                                          <el-dropdown-menu slot="dropdown">
-                                            <el-dropdown-item v-for="(stage, i) in item.playingStages" :key="i" :command="stage">进入{{ stage.stageName }}</el-dropdown-item>
-                                          </el-dropdown-menu>
-                                        </el-dropdown>
-                                        <p class="status"
-                                        v-else-if="item.status != 4 || (item.status == 4 && item.curStage)"
-                                        :class="{wait: item.status == 0,signing: item.status == 2,signed: item.status == 1,playing: item.status == 4 && item.curStage,finish: item.status == 3 || item.status == 5}" :title="item.status == 4 ? item.stageName : statusList[item.status]"
-                                        @click.stop="signup(item)">{{ item.status == 4 ? item.stageName : statusList[item.status] }}</p>
-                                        <p class="end-text" v-if="item.end">
-                                            距离{{ item.status == 4 ? item.endText : endList[item.status] }}还有
-                                            <em >{{ item.end }}</em>
-                                        </p>
-                                    </div>
-                                </li>
-                            </ul>
-                            <div class="pagination">
-                                <el-pagination background layout="total, prev, pager, next" :total="totals"
-                                            @current-change="handleCurrentChange"
-                                            :current-page="page">
-                                </el-pagination>
-                            </div>
-                        </template>
-                        <template v-else>
-                            <div class="empty">
-                                <div>
-                                    <img src="@/assets/img/none.png" alt="">
-                                    <p>暂无赛事</p>
-                                </div>
-                            </div>
-                        </template>
+    <div class="main">
+      <div class="center-wrap list-inner">
+        <div class="list-wrap">
+          <div class="list">
+            <template v-if="listData.length">
+              <ul>
+                <li v-for="(item,index) in listData"
+                    :key="index"
+                    :id="item.id"
+                    @click="toDetail(item)">
+                  <div class="left">
+                    <el-button v-if="item.status === 2 || item.curStage"
+                               :class="['stage-label', {playing: item.curStage}]"
+                               type="primary">{{ 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="">
+                    </div>
+                    <div class="info">
+                      <div class="title">{{ item.competitionName }}</div>
+                      <div class="metas">
+                        <div :class="{'flex-top': item.sponsor.split(',').length > 1}">
+                          <span class="label">主办方：&emsp;</span>
+                          <span class="val">{{ item.sponsor }}</span>
+                        </div>
+                        <div>
+                          <span class="label">报名时间：</span><span class="val">{{ item.signUpStartTime}} ~ {{ item.signUpEndTime }}</span>
+                        </div>
+                        <div>
+                          <span class="label">比赛时间：</span><span class="val">{{ item.playStartTime}} ~ {{ item.playEndTime }}</span>
+                        </div>
+                        <div :title="item.ranges">
+                          <span class="label">比赛范围：</span><span class="val">{{ item.ranges }}</span>
+                        </div>
+                        <div>
+                          <span class="label">比赛类型：</span><span class="val">{{ item.setup.competitionType ? '团体赛' : '个人赛' }}</span>
+                        </div>
+                        <div v-if="item.curStage">
+                          <span class="label">当前阶段：</span><span class="val">{{ item.curStage.stageName }}</span>
+                        </div>
+                      </div>
                     </div>
+                  </div>
+                  <div class="right">
+                    <el-dropdown v-if="item.playingStages && item.playingStages.length > 1"
+                                 class="m-l-10"
+                                 @command="e => chooseStage(e, item)">
+                      <el-button type="primary"
+                                 style="background-color: #f96d6d;border: 0;">
+                        选择竞赛<i class="el-icon-arrow-down el-icon--right"></i>
+                      </el-button>
+                      <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item v-for="(stage, i) in item.playingStages"
+                                          :key="i"
+                                          :command="stage">进入{{ stage.stageName }}</el-dropdown-item>
+                      </el-dropdown-menu>
+                    </el-dropdown>
+                    <p class="status"
+                       v-else-if="item.status != 4 || (item.status == 4 && item.curStage)"
+                       :class="{wait: item.status == 0,signing: item.status == 2,signed: item.status == 1,playing: item.status == 4 && item.curStage,finish: item.status == 3 || item.status == 5}"
+                       :title="item.status == 4 ? item.stageName : statusList[item.status]"
+                       @click.stop="signup(item)">{{ item.status == 4 ? item.stageName : statusList[item.status] }}</p>
+                    <p class="end-text"
+                       v-if="item.end">
+                      距离{{ item.status == 4 ? item.endText : endList[item.status] }}还有
+                      <em>{{ item.end }}</em>
+                    </p>
+                  </div>
+                </li>
+              </ul>
+              <div class="pagination">
+                <el-pagination background
+                               layout="total, prev, pager, next"
+                               :total="totals"
+                               @current-change="handleCurrentChange"
+                               :current-page="page">
+                </el-pagination>
+              </div>
+            </template>
+            <template v-else>
+              <div class="empty">
+                <div>
+                  <img src="@/assets/img/none.png"
+                       alt="">
+                  <p>暂无赛事</p>
                 </div>
-            </div>
+              </div>
+            </template>
+          </div>
         </div>
-
-        
-        
-        <el-dialog title="报名" :visible.sync="peopleSignupVisible" :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-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>
-          </span>
-        </el-dialog>
-        <el-dialog title="报名" :visible.sync="enterVisible" :close-on-click-modal="false" width="300px">
-          <el-form class="dia-form">
-            <p style="margin-bottom: 5px">请选择要加入的团队</p>
-            <el-form-item>
-              <el-select class="w-100" v-model="enterForm.teamId" filterable>
-                <el-option v-for="(item, i) in teams" :key="i" :label="item.teamName" :value="item.teamId"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-input placeholder="请输入6位数团队邀请码" maxlength="6" v-model="enterForm.invitationCode"></el-input>
-            </el-form-item>
-            <el-form-item v-if="curItem.setup.isNeedCode">
-              <el-input placeholder="请输入4位数大赛邀请码" maxlength="4" v-model="enterForm.registrationInvitationCode"></el-input>
-            </el-form-item>
-            <p class="tips">
-              查找不到团队？点击 <el-link :underline="false" type="primary" @click="toTeam">创建团队</el-link>
-            </p>
-          </el-form>
-          <span slot="footer" class="dialog-footer">
-            <el-button size="small" type="primary" @click="enterSubmit">报名</el-button>
-            <el-button size="small" @click="enterVisible = false">取消</el-button>
-          </span>
-        </el-dialog>
-        <el-dialog title="创建团队" :visible.sync="teamVisible" :close-on-click-modal="false" width="300px">
-          <el-form class="dia-form">
-            <el-form-item>
-              <el-input placeholder="请输入团队名称" maxlength="10" v-model="teamForm.teamName"></el-input>
-            </el-form-item>
-            <el-form-item>
-              <el-input placeholder="请输入6位数团队邀请码" maxlength="6" v-model="teamForm.invitationCode"></el-input>
-            </el-form-item>
-            <el-form-item v-if="curItem.setup.isNeedCode">
-              <el-input placeholder="请输入4位数大赛邀请码" maxlength="4" v-model="teamForm.registrationInvitationCode"></el-input>
-            </el-form-item>
-          </el-form>
-          <span slot="footer" class="dialog-footer">
-            <el-button size="small" type="primary" @click="teamSubmit">创建并报名</el-button>
-            <el-button size="small" @click="teamVisible = false">取消</el-button>
-          </span>
-        </el-dialog>
+      </div>
     </div>
+
+    <el-dialog title="报名"
+               :visible.sync="peopleSignupVisible"
+               :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-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>
+      </span>
+    </el-dialog>
+    <el-dialog title="报名"
+               :visible.sync="enterVisible"
+               :close-on-click-modal="false"
+               width="300px">
+      <el-form class="dia-form">
+        <p style="margin-bottom: 5px">请选择要加入的团队</p>
+        <el-form-item>
+          <el-select class="w-100"
+                     v-model="enterForm.teamId"
+                     filterable>
+            <el-option v-for="(item, i) in teams"
+                       :key="i"
+                       :label="item.teamName"
+                       :value="item.teamId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="请输入6位数团队邀请码"
+                    maxlength="6"
+                    v-model="enterForm.invitationCode"></el-input>
+        </el-form-item>
+        <el-form-item v-if="curItem.setup.isNeedCode">
+          <el-input placeholder="请输入4位数大赛邀请码"
+                    maxlength="4"
+                    v-model="enterForm.registrationInvitationCode"></el-input>
+        </el-form-item>
+        <p class="tips">
+          查找不到团队？点击 <el-link :underline="false"
+                   type="primary"
+                   @click="toTeam">创建团队</el-link>
+        </p>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="small"
+                   type="primary"
+                   @click="enterSubmit">报名</el-button>
+        <el-button size="small"
+                   @click="enterVisible = false">取消</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog title="创建团队"
+               :visible.sync="teamVisible"
+               :close-on-click-modal="false"
+               width="300px">
+      <el-form class="dia-form">
+        <el-form-item>
+          <el-input placeholder="请输入团队名称"
+                    maxlength="10"
+                    v-model="teamForm.teamName"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="请输入6位数团队邀请码"
+                    maxlength="6"
+                    v-model="teamForm.invitationCode"></el-input>
+        </el-form-item>
+        <el-form-item v-if="curItem.setup.isNeedCode">
+          <el-input placeholder="请输入4位数大赛邀请码"
+                    maxlength="4"
+                    v-model="teamForm.registrationInvitationCode"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="small"
+                   type="primary"
+                   @click="teamSubmit">创建并报名</el-button>
+        <el-button size="small"
+                   @click="teamVisible = false">取消</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -188,497 +256,502 @@ import Setting from "@/setting"
 import util from "@/libs/util"
 
 export default {
-    name: "match",
-    data() {
-        return {
-            timer: null,
-            token: util.local.get(Setting.tokenKey),
-            way: 2,
-            statusList: ["待报名", "取消报名", "马上报名", "报名截止", "进入初赛", "已结束"],
-            endList: ["报名开始", "报名截止", "报名截止", "竞赛开始", "竞赛结束", ""],
-            typeList: [
-                {
-                    id: 1,
-                    name: "本校赛事"
-                },
-                {
-                    id: 2,
-                    name: "赛事广场"
-                },
-                {
-                    id: 3,
-                    name: "已报名"
-                }
-            ],
-            provinces: [],
-            cities: [],
-            form: {
-              provinceId: '',
-              cityId: '',
-              sequence: 2,
-              competitionScope: 3, // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
-            },
-            scopes: [
-              {
-                id: 3,
-                name: '不限'
-              },
-              {
-                id: 1,
-                name: '全平台'
-              },
-              {
-                id: 2,
-                name: '指定区域/院校'
-              }
-            ],
-            sorts: [
-              {
-                id: 2,
-                name: '最近更新'
-              },
-              {
-                id: 1,
-                name: '近期报名'
-              }
-            ],
-            sort: 1,
-            keyword: "",
-            searchTimer: null,
-            page: 1,
-            pageSize: 10,
-            totals: 0,
-            listData: [],
-            covers: [],
-            loadIns: null,
-            contestIds: [],
-            isFirst: true,
-            timerList: [],
-            
-            enterVisible: false,
-            enterForm: {
-              competitionId: '',
-              teamId: '',
-              invitationCode: '',
-              registrationInvitationCode: ''
-            },
-            
-            teamVisible: false,
-            teams: [],
-            teamNameRepeat: false,
-            teamForm: {
-              competitionId: '',
-              registrationInvitationCode: '',
-              teamName: '',
-              invitationCode: '',
-              whetherSignUp: 1
-            },
-            curItem: {
-              setup: {}
-            },
-            peopleSignupVisible: false,
-            peopleSignupForm: {
-              registrationInvitationCode: ''
-            },
-            curRow: {}
-        };
-    },
-    computed: {
-        ...mapState('match', [
-          'toMatch'
-        ])
-    },
-    watch: {
-        keyword: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.initData();
-            }, 500);
+  name: "match",
+  data () {
+    return {
+      timer: null,
+      token: util.local.get(Setting.tokenKey),
+      way: 2,
+      statusList: ["待报名", "取消报名", "马上报名", "报名截止", "进入初赛", "已结束"],
+      endList: ["报名开始", "报名截止", "报名截止", "竞赛开始", "竞赛结束", ""],
+      typeList: [
+        {
+          id: 1,
+          name: "本校赛事"
+        },
+        {
+          id: 2,
+          name: "赛事广场"
+        },
+        {
+          id: 3,
+          name: "已报名"
         }
-    },
-    mounted() {
-      this.getProvince()
-      this.getData()
-      this.$once('hook:beforeDestroy', this.clearTimer)
-    },
-    methods: {
-        ...mapMutations('match', [
-          'SET_SOURCE'
-        ]),
-        getList() {
-          this.clearTimer()
-          const { form } = this
-          const scope = form.competitionScope
-          const data = {
-            eventType: 2,
-            pageNum: this.page,
-            pageSize: this.pageSize,
-            competitionScope: scope,
-            platformSource: 1, // 大赛来源(0中台，1职站)
-            cityId: scope === 2 ? (form.cityId || null) : null, // 选择了全平台则不用传省市id
-            provinceId: scope === 2 ? (form.provinceId || null) : null,
-            sequence: form.sequence || null,
-            keyWord: this.keyword
-          }
-          this.$post(this.api[util.local.get(Setting.tokenKey) ? 'competitionAfterLogin' : 'notLoggedInBeforeStudentEvents'], data).then(({ data }) => {
-            const { records } = data
-            const { token } = this
-            records.forEach((n, k) => {
-              n.invitationCode = n.setup.invitationCode
-              // 比赛范围
-              const list = n.contestRangeRespList
-              if (list) {
-                const range = []
-                list.map(e => {
-                  range.push(e.type ? (e.provinceName || e.cityName) : e.schoolName) // type 1：省市，0：学校
-                })
-                n.ranges = `${n.range}（${range.join('，')}）`
-              } else {
-                n.ranges = n.range
-              }
-            })
-            this.listData = records
-            this.totals = data.total
-            this.handleStatus()
-            this.loadIns.close()
-          }).catch(res => {
-            this.loadIns.close()
-          })
+      ],
+      provinces: [],
+      cities: [],
+      form: {
+        provinceId: '',
+        cityId: '',
+        sequence: 2,
+        competitionScope: 3, // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
+      },
+      scopes: [
+        {
+          id: 3,
+          name: '不限'
         },
-        // 定时处理时间及状态
-        handleStatus() {
-          this.listData.map(item => {
-            if (item.signUpStartTime && item.signUpEndTime && item.playStartTime && item.playEndTime) {
-              let total = ''
-              let time = ''
-              let status = ''
-              let signUpStartTime = new Date(this.core.dateCompatible(item.signUpStartTime)) // 报名开始时间
-              let signUpEndTime = new Date(this.core.dateCompatible(item.signUpEndTime)) // 报名结束时间
-              let playStartTime = new Date(this.core.dateCompatible(item.playStartTime)) // 比赛开始时间
-              let playEndTime = new Date(this.core.dateCompatible(item.playEndTime)) // 比赛结束时间
-              let timer = setInterval(() => {
-                  const now = new Date()
-                  if (now < signUpStartTime) { // 报名没开始
-                    status = 0
-                    total = signUpStartTime - now
-                  } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
-                    // whetherToSignUp 0已报名，1未报名
-                    status = item.whetherToSignUp === 0 ? 1 : 2 // 1已报名，2立即报名
-                    total = signUpEndTime - now
-                  } else if (now > signUpEndTime && now < playStartTime) { // 报名结束了,但比赛没开始
-                    status = 3
-                    total = playStartTime - now
-                  } else if (now > playStartTime && now < playEndTime) { // 比赛进行中
-                    // 如果是完整比赛
-                    if (item.releaseType) {
-                      // 进行中的赛事，则遍历每个阶段的开始结束时间，看阶段比赛是否开始
-                      let curStage = null
-                      const stages = item.competitionStageList
-                      if (stages) {
-                        item.playingStages = []
-                        item.whetherToSignUp === 0 && stages.forEach(e => {
-                          if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && e.method !== 2) item.playingStages.push(e)
-                        })
-                        for (const i in stages) {
-                          const e = stages[i]
-                          const startTime = new Date(e.startTime)
-                          const endTime = new Date(e.endTime)
-                          if (now < startTime) { // 阶段比赛未开始，不显示进入比赛按钮
-                            this.$set(item, 'stageName', '')
-                            this.$set(item, 'endText', '阶段开始')
-                            total = startTime - now
-                            break
-                          } else if (now >= startTime && now <= endTime) { // 阶段比赛进行中，显示进入比赛按钮
-                            if ((item.whetherToSignUp === 0 || !util.local.get(Setting.tokenKey)) && e.method !== 2) this.$set(item, 'stageName', e.count ? '已提交' : '进入' + e.stageName) // 报名了并且没参加比赛才能进入比赛
-                            this.$set(item, 'endText', '阶段结束')
-                            curStage = e
-                            total = endTime - now
-                            break
-                          } else if (stages[i + 1] && now > endTime && now < new Date(stages[i + 1].startTime)) { // 过了该阶段的结束时间，但是没到下个阶段的开始时间，不显示进入比赛按钮
-                            this.$set(item, 'stageName', '')
-                            this.$set(item, 'endText', '阶段开始')
-                            total = new Date(stages[i + 1].startTime) - now
-                            break
-                          } else if (i === stages.length - 1) { // 当前时间在比赛开始结束时间之间，并且是最后一个阶段结束时间之后
-                            this.$set(item, 'stageName', '')
-                            this.$set(item, 'endText', '竞赛结束')
-                            total = playEndTime - now
-                            break
-                          }
-                        }
-                      }
-                      item.curStage = curStage
-                    } else { // 仅发布信息
+        {
+          id: 1,
+          name: '全平台'
+        },
+        {
+          id: 2,
+          name: '指定区域/院校'
+        }
+      ],
+      sorts: [
+        {
+          id: 2,
+          name: '最近更新'
+        },
+        {
+          id: 1,
+          name: '近期报名'
+        }
+      ],
+      sort: 1,
+      keyword: "",
+      searchTimer: null,
+      page: 1,
+      pageSize: 10,
+      totals: 0,
+      listData: [],
+      covers: [],
+      loadIns: null,
+      contestIds: [],
+      isFirst: true,
+      timerList: [],
+
+      enterVisible: false,
+      enterForm: {
+        competitionId: '',
+        teamId: '',
+        invitationCode: '',
+        registrationInvitationCode: ''
+      },
+
+      teamVisible: false,
+      teams: [],
+      teamNameRepeat: false,
+      teamForm: {
+        competitionId: '',
+        registrationInvitationCode: '',
+        teamName: '',
+        invitationCode: '',
+        whetherSignUp: 1
+      },
+      curItem: {
+        setup: {}
+      },
+      peopleSignupVisible: false,
+      peopleSignupForm: {
+        registrationInvitationCode: ''
+      },
+      curRow: {}
+    };
+  },
+  computed: {
+    ...mapState('match', [
+      'toMatch'
+    ])
+  },
+  watch: {
+    keyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initData();
+      }, 500);
+    }
+  },
+  mounted () {
+    this.getProvince()
+    this.getData()
+    this.$once('hook:beforeDestroy', this.clearTimer)
+  },
+  methods: {
+    ...mapMutations('match', [
+      'SET_SOURCE'
+    ]),
+    getList () {
+      this.clearTimer()
+      const { form } = this
+      const scope = form.competitionScope
+      const data = {
+        eventType: 2,
+        pageNum: this.page,
+        pageSize: this.pageSize,
+        competitionScope: scope,
+        platformSource: 1, // 大赛来源(0中台，1职站)
+        cityId: scope === 2 ? (form.cityId || null) : null, // 选择了全平台则不用传省市id
+        provinceId: scope === 2 ? (form.provinceId || null) : null,
+        sequence: form.sequence || null,
+        keyWord: this.keyword
+      }
+      this.$post(this.api[util.local.get(Setting.tokenKey) ? 'competitionAfterLogin' : 'notLoggedInBeforeStudentEvents'], data).then(({ data }) => {
+        const { records } = data
+        const { token } = this
+        records.forEach((n, k) => {
+          n.invitationCode = n.setup.invitationCode
+          // 比赛范围
+          const list = n.contestRangeRespList
+          if (list) {
+            const range = []
+            list.map(e => {
+              range.push(e.type ? (e.provinceName || e.cityName) : e.schoolName) // type 1：省市，0：学校
+            })
+            n.ranges = `${n.range}（${range.join('，')}）`
+          } else {
+            n.ranges = n.range
+          }
+        })
+        this.listData = records
+        this.totals = data.total
+        this.handleStatus()
+        this.loadIns.close()
+      }).catch(res => {
+        this.loadIns.close()
+      })
+    },
+    // 定时处理时间及状态
+    handleStatus () {
+      this.listData.map(item => {
+        if (item.signUpStartTime && item.signUpEndTime && item.playStartTime && item.playEndTime) {
+          let total = ''
+          let time = ''
+          let status = ''
+          let signUpStartTime = new Date(this.core.dateCompatible(item.signUpStartTime)) // 报名开始时间
+          let signUpEndTime = new Date(this.core.dateCompatible(item.signUpEndTime)) // 报名结束时间
+          let playStartTime = new Date(this.core.dateCompatible(item.playStartTime)) // 比赛开始时间
+          let playEndTime = new Date(this.core.dateCompatible(item.playEndTime)) // 比赛结束时间
+          let timer = setInterval(() => {
+            const now = new Date()
+            if (now < signUpStartTime) { // 报名没开始
+              status = 0
+              total = signUpStartTime - now
+            } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
+              // whetherToSignUp 0已报名，1未报名
+              status = item.whetherToSignUp === 0 ? 1 : 2 // 1已报名，2立即报名
+              total = signUpEndTime - now
+            } else if (now > signUpEndTime && now < playStartTime) { // 报名结束了,但比赛没开始
+              status = 3
+              total = playStartTime - now
+            } else if (now > playStartTime && now < playEndTime) { // 比赛进行中
+              // 如果是完整比赛
+              if (item.releaseType) {
+                // 进行中的赛事，则遍历每个阶段的开始结束时间，看阶段比赛是否开始
+                let curStage = null
+                const stages = item.competitionStageList
+                if (stages) {
+                  item.playingStages = []
+                  item.whetherToSignUp === 0 && stages.forEach(e => {
+                    if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && (e.method !== 2 || this.offlineCanEntry(e))) item.playingStages.push(e)
+
+                  })
+                  for (const i in stages) {
+                    const e = stages[i]
+                    const startTime = new Date(e.startTime)
+                    const endTime = new Date(e.endTime)
+                    if (now < startTime) { // 阶段比赛未开始，不显示进入比赛按钮
+                      this.$set(item, 'stageName', '')
+                      this.$set(item, 'endText', '阶段开始')
+                      total = startTime - now
+                      break
+                    } else if (now >= startTime && now <= endTime) { // 阶段比赛进行中，显示进入比赛按钮
+                      if ((item.whetherToSignUp === 0 || !util.local.get(Setting.tokenKey)) && (e.method !== 2 || this.offlineCanEntry(e))) this.$set(item, 'stageName', e.count ? '已提交' : '进入' + e.stageName) // 报名了并且没参加比赛才能进入比赛
+                      this.$set(item, 'endText', '阶段结束')
+                      curStage = e
+                      total = endTime - now
+                      break
+                    } else if (stages[i + 1] && now > endTime && now < new Date(stages[i + 1].startTime)) { // 过了该阶段的结束时间，但是没到下个阶段的开始时间，不显示进入比赛按钮
+                      this.$set(item, 'stageName', '')
+                      this.$set(item, 'endText', '阶段开始')
+                      total = new Date(stages[i + 1].startTime) - now
+                      break
+                    } else if (i === stages.length - 1) { // 当前时间在比赛开始结束时间之间，并且是最后一个阶段结束时间之后
+                      this.$set(item, 'stageName', '')
                       this.$set(item, 'endText', '竞赛结束')
                       total = playEndTime - now
+                      break
                     }
-                    status = 4
-                  } else if (now > playEndTime) { // 比赛结束
-                    status = 5
                   }
-                  this.$set(item, 'status', status)
-                  total = total / 1000
-                  --total
-                  if (total > 86400) { // 超过一天则显示天数
-                    // clearInterval(timer)
-                    this.$set(item, 'end', Math.floor(total / 86400) + '天')
-                  } else if (total > 0) { // 一天之内，显示时分秒
-                      let hours = Math.floor(total / (60 * 60))
-                      let minutes = Math.floor(total % (60 * 60) / 60)
-                      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.$set(item, 'end', time)
-                  } else if (item.status === 5) { // 竞赛结束，清除定时器
-                      clearInterval(timer)
-                  }
-              }, 1000)
-              this.timerList.push(timer)
+                }
+                item.curStage = curStage
+              } else { // 仅发布信息
+                this.$set(item, 'endText', '竞赛结束')
+                total = playEndTime - now
+              }
+              status = 4
+            } else if (now > playEndTime) { // 比赛结束
+              status = 5
             }
-          })
-        },
-        // 清除定时器
-        clearTimer() {
-          this.timerList.forEach(n => {
-            clearInterval(n)
-          })
-          this.timerList = []
-        },
-        getData() {
-          this.loadIns = Loading.service()
-          this.getList()
-        },
-        initData() {
-            this.page = 1
-            this.getData()
-        },
-        // 获取省份
-        getProvince() {
-          this.$get(this.api.queryProvince).then(({ list }) => {
-            this.provinces = list
-          }).catch(res => {})
-        },
-        // 获取城市
-        getCity() {
-          const { form } = this
-          form.cityId = ''
-          form.provinceId ?
-            this.$get(this.api.queryCity, {
-              provinceId: form.provinceId
-            }).then(({ list }) => {
-              this.cities = list
-              this.initData()
-            }).catch(res => {}) :
-            this.initData()
-        },
-        // 筛选范围
-        changeScope(type) {
-            this.form.competitionScope = type
-            this.initData()
-        },
-        // 筛选排序
-        changeSort(type) {
-            this.form.sequence = type
-            this.initData()
-        },
-        toDetail(item) {
-            this.$router.push(`/touristMatch/details?id=${item.id}`);
-        },
-        handleCurrentChange(val) {
-            this.page = val;
-            this.getData();
-        },
-        
-        // 个人报名提交
-        peopleSignupSubmit() {
-          this.$post(this.api.addCompetitionRegistration, {
-            competitionId: this.curRow.id,
-            registrationInvitationCode: this.peopleSignupForm.registrationInvitationCode
-          }).then(res => {
-            this.peopleSignupVisible = 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.curItem.setup.isNeedCode && !form.registrationInvitationCode) return util.errorMsg('请输入大赛邀请码')
-          this.$post(this.api.joinCompetitionTeam, form).then(res => {
-            this.enterVisible = false
-            this.getData()
-            util.successMsg('报名成功！')
-          }).catch(res => {})
-        },
+            this.$set(item, 'status', status)
+            total = total / 1000
+            --total
+            if (total > 86400) { // 超过一天则显示天数
+              // clearInterval(timer)
+              this.$set(item, 'end', Math.floor(total / 86400) + '天')
+            } else if (total > 0) { // 一天之内，显示时分秒
+              let hours = Math.floor(total / (60 * 60))
+              let minutes = Math.floor(total % (60 * 60) / 60)
+              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.$set(item, 'end', time)
+            } else if (item.status === 5) { // 竞赛结束，清除定时器
+              clearInterval(timer)
+            }
+          }, 1000)
+          this.timerList.push(timer)
+        }
+      })
+    },
+    // 清除定时器
+    clearTimer () {
+      this.timerList.forEach(n => {
+        clearInterval(n)
+      })
+      this.timerList = []
+    },
+    getData () {
+      this.loadIns = Loading.service()
+      this.getList()
+    },
+    initData () {
+      this.page = 1
+      this.getData()
+    },
+    // 获取省份
+    getProvince () {
+      this.$get(this.api.queryProvince).then(({ list }) => {
+        this.provinces = list
+      }).catch(res => { })
+    },
+    // 获取城市
+    getCity () {
+      const { form } = this
+      form.cityId = ''
+      form.provinceId ?
+        this.$get(this.api.queryCity, {
+          provinceId: form.provinceId
+        }).then(({ list }) => {
+          this.cities = list
+          this.initData()
+        }).catch(res => { }) :
+        this.initData()
+    },
+    // 筛选范围
+    changeScope (type) {
+      this.form.competitionScope = type
+      this.initData()
+    },
+    // 筛选排序
+    changeSort (type) {
+      this.form.sequence = type
+      this.initData()
+    },
+    toDetail (item) {
+      this.$router.push(`/touristMatch/details?id=${item.id}`);
+    },
+    handleCurrentChange (val) {
+      this.page = val;
+      this.getData();
+    },
 
-        
-        // 创建团队
-        toTeam() {
-          this.teamForm = {
-            competitionId: this.curItem.id,
-            teamName: '',
-            invitationCode: '',
-            registrationInvitationCode: '',
-            whetherSignUp: 1
-          }
-          this.teamVisible = true
-        },
-        // 获取团队列表
-        getTeam() {
-          this.$get(this.api.searchTeam, {
-            teamName: '',
-            competitionId: this.curItem.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.curItem.setup.isNeedCode && !form.registrationInvitationCode) return util.errorMsg('请输入大赛邀请码')
-          this.$post(this.api.addCompetitionTeam, form).then(res => {
-            this.teamVisible = false
-            this.enterVisible = false
-            this.getData()
-            util.successMsg('报名成功！')
-          }).catch(res => {})
-        },
-        // 选择要进入的阶段
-        chooseStage(e, item) {
-          item.curStage = e
-          this.signup(item)
-        },
-        // 判断是否能进赛事
-        getAllow(item) {
-          // 是否允许参加赛事（淘汰赛制）
-          if (item.rule === 1) {
-            this.$post(this.api.allowedParticipateCompetition, {
-              competitionId: item.id,
-              number: item.curStage.number,
+    // 个人报名提交
+    peopleSignupSubmit () {
+      this.$post(this.api.addCompetitionRegistration, {
+        competitionId: this.curRow.id,
+        registrationInvitationCode: this.peopleSignupForm.registrationInvitationCode
+      }).then(res => {
+        this.peopleSignupVisible = 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.curItem.setup.isNeedCode && !form.registrationInvitationCode) return util.errorMsg('请输入大赛邀请码')
+      this.$post(this.api.joinCompetitionTeam, form).then(res => {
+        this.enterVisible = false
+        this.getData()
+        util.successMsg('报名成功！')
+      }).catch(res => { })
+    },
+
+    // 该阶段是否符合线下能进入比赛的条件
+    offlineCanEntry (stage) {
+      return stage.method === 2 && stage.competitionStageContentSetting && !!(stage.competitionStageContentSetting.systemLink || stage.competitionStageContentSetting.whetherToUploadFiles)
+    },
+
+    // 创建团队
+    toTeam () {
+      this.teamForm = {
+        competitionId: this.curItem.id,
+        teamName: '',
+        invitationCode: '',
+        registrationInvitationCode: '',
+        whetherSignUp: 1
+      }
+      this.teamVisible = true
+    },
+    // 获取团队列表
+    getTeam () {
+      this.$get(this.api.searchTeam, {
+        teamName: '',
+        competitionId: this.curItem.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.curItem.setup.isNeedCode && !form.registrationInvitationCode) return util.errorMsg('请输入大赛邀请码')
+      this.$post(this.api.addCompetitionTeam, form).then(res => {
+        this.teamVisible = false
+        this.enterVisible = false
+        this.getData()
+        util.successMsg('报名成功！')
+      }).catch(res => { })
+    },
+    // 选择要进入的阶段
+    chooseStage (e, item) {
+      item.curStage = e
+      this.signup(item)
+    },
+    // 判断是否能进赛事
+    getAllow (item) {
+      // 是否允许参加赛事（淘汰赛制）
+      if (item.rule === 1) {
+        this.$post(this.api.allowedParticipateCompetition, {
+          competitionId: item.id,
+          number: item.curStage.number,
+          stageId: item.curStage.stageId,
+          teamId: item.teamId,
+        }).then(res => {
+          this.toSub()
+        }).catch(res => { })
+      } else {
+        this.toSub()
+      }
+    },
+    // 报名
+    signup (item) {
+      const { status, id } = item
+      const { competitionType } = item.setup
+      // 如果没登录，提示去登录
+      if (util.local.get(Setting.tokenKey)) {
+        this.curItem = item
+        if (status == 4) { // 进入比赛
+          // 参加过比赛不让参加
+          if (item.curStage.count) return util.errorMsg('您已经参加过该阶段竞赛！')
+          if (item.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛
+          // 团队赛，则判断是否为参赛人员
+          if (competitionType) {
+            this.$post(this.api.isParticipant, {
+              competitionId: id,
               stageId: item.curStage.stageId,
               teamId: item.teamId,
             }).then(res => {
-              this.toSub()
-            }).catch(res => {})
+              this.getAllow(item)
+            }).catch(res => { })
           } else {
-            this.toSub()
+            this.getAllow(item)
           }
-        },
-        // 报名
-        signup(item) {
-          const { status, id } = item
-          const { competitionType } = item.setup
-          // 如果没登录，提示去登录
-          if (util.local.get(Setting.tokenKey)) {
-            this.curItem = item
-            if (status == 4) { // 进入比赛
-              // 参加过比赛不让参加
-              if (item.curStage.count) return util.errorMsg('您已经参加过该阶段竞赛！')
-              if (item.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛
-              // 团队赛，则判断是否为参赛人员
-              if (competitionType) {
-                this.$post(this.api.isParticipant, {
-                  competitionId: id,
-                  stageId: item.curStage.stageId,
-                  teamId: item.teamId,
-                }).then(res => {
-                  this.getAllow(item)
-                }).catch(res => {})
-              } else {
-                this.getAllow(item)
-              }
-            } else if (status == 2) { // 报名
-              // 团队赛报名
-              if (item.setup.competitionType) {
-                this.getTeam()
-                this.enterForm = {
-                  competitionId: id,
-                  teamId: '',
-                  invitationCode: '',
-                  registrationInvitationCode: ''
-                }
-                this.enterVisible = true
-              } else { // 个人赛报名
-                if (item.setup.isNeedCode) {
-                  this.curRow = item
-                  this.peopleSignupForm.registrationInvitationCode = ''
-                  this.peopleSignupVisible = true
-                } else {
-                  this.$post(this.api.addCompetitionRegistration, {
-                    competitionId: 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=${item.id}`).then(res => {
-                  this.getData()
-                  this.$message.success('取消报名成功')
-                }).catch(res => {})
-              }).catch(() => {})
+        } else if (status == 2) { // 报名
+          // 团队赛报名
+          if (item.setup.competitionType) {
+            this.getTeam()
+            this.enterForm = {
+              competitionId: id,
+              teamId: '',
+              invitationCode: '',
+              registrationInvitationCode: ''
+            }
+            this.enterVisible = true
+          } else { // 个人赛报名
+            if (item.setup.isNeedCode) {
+              this.curRow = item
+              this.peopleSignupForm.registrationInvitationCode = ''
+              this.peopleSignupVisible = true
+            } else {
+              this.$post(this.api.addCompetitionRegistration, {
+                competitionId: id
+              }).then(res => {
+                this.getData()
+                this.$message.success('报名成功')
+              }).catch(res => { })
             }
-          } else {
-            this.$confirm('请先登录，是否直接前往登录？', "提示", {
-              type: 'success'
-            }).then(() => {
-              this.SET_SOURCE(item.id)
-              this.$router.push('/login')
-            }).catch(() => {})
-          }
-        },
-        // 进入python系统
-        toPython() {
-          const form = this.curItem.curStage
-          let token = util.local.get(Setting.tokenKey);
-          util.cookies.set('assessmentId', '', -1)
-          util.cookies.set('startTime', '', -1)
-          util.cookies.set('stopTime', '', -1)
-          util.cookies.set('projectId', form.projectId)
-          util.cookies.set('token', token)
-          util.cookies.set('courseId', form.cid)
-          util.cookies.set('curriculumName', escape(form.systemName))
-          util.cookies.set('systemId', form.systemId)
-          util.cookies.set('competitionId', this.curItem.id)
-          util.cookies.set('stageId', form.stageId)
-          util.cookies.set('teamId', this.curItem.teamId)
-          util.cookies.set('stopTime', form.endTime)
-          util.cookies.set('fromManager', '', -1)
-          // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
-          location.href = process.env.NODE_ENV === 'development' ?
-            `http://${location.hostname}:8085/#/` :
-            Setting.isPro ?
-              `https://${location.hostname}/pyTrials` :
-              `${location.origin}/pyTrials`
-        },
-        // 进入子系统
-        toSub() {
-          const form = this.curItem
-          const { systemId, projectId, cid, stageId } = form.curStage
-          const competitionId = form.id
-          const teamId = form.teamId
-          let token = util.local.get(Setting.tokenKey);
-          if (systemId == 11) {
-              // 银行系统
-              location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${cid}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true`
-          } else if (systemId == 12) {
-              // 众筹系统
-              window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}`);
-          } else {
-            // python系统
-            this.toPython(this.curProject)
           }
+        } else if (status == 1) {
+          // 已报名，点击取消报名
+          this.$confirm('是否要取消报名？', '提示', {
+            type: 'success'
+          }).then(() => {
+            this.$post(`${this.api.cancelRegistration}?competitionId=${item.id}`).then(res => {
+              this.getData()
+              this.$message.success('取消报名成功')
+            }).catch(res => { })
+          }).catch(() => { })
         }
+      } else {
+        this.$confirm('请先登录，是否直接前往登录？', "提示", {
+          type: 'success'
+        }).then(() => {
+          this.SET_SOURCE(item.id)
+          this.$router.push('/login')
+        }).catch(() => { })
+      }
+    },
+    // 进入python系统
+    toPython () {
+      const form = this.curItem.curStage
+      let token = util.local.get(Setting.tokenKey);
+      util.cookies.set('assessmentId', '', -1)
+      util.cookies.set('startTime', '', -1)
+      util.cookies.set('stopTime', '', -1)
+      util.cookies.set('projectId', form.projectId)
+      util.cookies.set('token', token)
+      util.cookies.set('courseId', form.cid)
+      util.cookies.set('curriculumName', escape(form.systemName))
+      util.cookies.set('systemId', form.systemId)
+      util.cookies.set('competitionId', this.curItem.id)
+      util.cookies.set('stageId', form.stageId)
+      util.cookies.set('teamId', this.curItem.teamId)
+      util.cookies.set('stopTime', form.endTime)
+      util.cookies.set('fromManager', '', -1)
+      // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
+      location.href = process.env.NODE_ENV === 'development' ?
+        `http://${location.hostname}:8085/#/` :
+        Setting.isPro ?
+          `https://${location.hostname}/pyTrials` :
+          `${location.origin}/pyTrials`
+    },
+    // 进入子系统
+    toSub () {
+      const form = this.curItem
+      const { systemId, projectId, cid, stageId } = form.curStage
+      const competitionId = form.id
+      const teamId = form.teamId
+      let token = util.local.get(Setting.tokenKey);
+      if (systemId == 11) {
+        // 银行系统
+        location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${cid}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true`
+      } else if (systemId == 12) {
+        // 众筹系统
+        window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}`);
+      } else {
+        // python系统
+        this.toPython(this.curProject)
+      }
     }
+  }
 };
 </script>
 
@@ -687,9 +760,8 @@ 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/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;
     h6 {
         margin-bottom: 25px;
         font-size: 26px;
@@ -717,9 +789,9 @@ export default {
         border-radius: 4px;
     }
 }
-.main{
-    background: url(../../../assets/img/match-bg1.png) (0px 95px)/auto auto no-repeat,
-                url(../../../assets/img/match-bg2.png) (98% bottom)/auto auto no-repeat;
+.main {
+    background: url(../../../assets/img/match-bg1.png) (0px 95px) / auto auto no-repeat,
+        url(../../../assets/img/match-bg2.png) (98% bottom) / auto auto no-repeat;
     .filter {
         width: 100%;
         background-color: #fff;
@@ -747,22 +819,22 @@ export default {
         }
     }
     .select-wrap {
-      display: inline-flex;
-      align-items: center;
-      margin: 0 20px;
-      .label {
-        margin-right: 10px;
-      }
-      .el-select {
-        width: 130px;
-      }
+        display: inline-flex;
+        align-items: center;
+        margin: 0 20px;
+        .label {
+            margin-right: 10px;
+        }
+        .el-select {
+            width: 130px;
+        }
     }
     .list-inner {
         display: flex;
         justify-content: center;
-        align-items:flex-start;
+        align-items: flex-start;
     }
-    .nav{
+    .nav {
         width: 156px;
         text-align: right;
         overflow: hidden;
@@ -821,11 +893,11 @@ export default {
                         font-size: 14px;
                         color: #fff;
                         white-space: nowrap;
-                        background-color: #52C41A;
+                        background-color: #52c41a;
                         border-radius: 4px;
                         @include ellipsis();
                         &.wait {
-                            background-color: #FAAD14;
+                            background-color: #faad14;
                         }
 
                         &.signing {
@@ -833,7 +905,7 @@ export default {
                         }
 
                         &.signed {
-                            background-color: #52C41A;
+                            background-color: #52c41a;
                         }
                         &.playing {
                             background-color: #f96d6d;
@@ -852,7 +924,7 @@ export default {
                         cursor: pointer;
 
                         &:hover {
-                            opacity: .9;
+                            opacity: 0.9;
                         }
 
                         &.disabled {
@@ -863,7 +935,7 @@ export default {
 
                     .end-text {
                         margin-top: 10px;
-                        color: rgba(0, 0, 0, .65);
+                        color: rgba(0, 0, 0, 0.65);
                         font-size: 12px;
                         white-space: nowrap;
 
@@ -888,14 +960,14 @@ export default {
                 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);
-                  }
+                    position: absolute;
+                    top: -16px;
+                    left: -16px;
+                    border: 0;
+                    background-color: rgb(101, 227, 181);
+                    &.playing {
+                        background-color: rgb(251, 174, 41);
+                    }
                 }
                 .cover {
                     img {
@@ -911,7 +983,7 @@ export default {
                         margin-bottom: 10px;
                         font-size: 20px;
                         font-weight: 500;
-                        color: #0B1D30;
+                        color: #0b1d30;
                         line-height: 1;
                     }
                     .metas {
@@ -927,7 +999,8 @@ export default {
                             }
                         }
 
-                        .label, .val {
+                        .label,
+                        .val {
                             font-size: 14px;
                             color: #666;
                             white-space: nowrap;
@@ -953,13 +1026,13 @@ export default {
     }
 }
 /deep/.dia-form {
-  .w-100 {
-    width: 100%;
-  }
-  .tips {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
+    .w-100 {
+        width: 100%;
+    }
+    .tips {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/setting.js b/src/setting.js
index a4ca449..d94aeec 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -32,7 +32,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.217:9000/"; // 榕
+    host = "http://192.168.31.217:9000/"; // 榕
     // host = "http://192.168.31.51:9000/"; // 赓
 } else if (isSq) {
 	zcPath = `10.20.100.204:8883`