From bbb11e67c445742b0683198d236e8658e104af30 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 28 Jun 2022 11:17:43 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                       |   2 +-
 src/pages/account/login/index.vue      |  15 +-
 src/pages/index/list/index.vue         |   3 +-
 src/pages/match/details/index.vue      | 174 +++++++++--------
 src/pages/match/list/index.vue         | 248 +++++++++---------------
 src/pages/match/noticeDetail/index.vue |   3 +-
 src/pages/touristMatch/list/index.vue  | 258 ++++++++++---------------
 src/setting.js                         |   4 +-
 src/store/modules/match.js             |  19 +-
 src/store/modules/user.js              |   1 -
 10 files changed, 313 insertions(+), 414 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index dc71550..1f80ebc 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -73,7 +73,7 @@ export default {
 
     // 线上赛事
     contestPageConditionQueryByOccupationlabStu: `occupationlab/enterprise/match/contest/contestPageConditionQueryByOccupationlabStu`,
-    contestPageConditionQueryByOccupationlab: `occupationlab/enterprise/match/contest/contestPageConditionQueryByOccupationlab`,
+    contestPageConditionQueryByOccupationlab: `occupationlab/enterprise/match/contest/onlineCompetitionByStudent`,
     listOfRegisteredEvents: `occupationlab/enterprise/match/contest/listOfRegisteredEvents`,
     addApplicant: `occupationlab/enterprise/match/applicant/addApplicant`, // 添加报名人员
     getContestProgress: `occupationlab/enterprise/match/contest-progress/getContestProgress`, // 根据赛事id查询竞赛进展
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 63c36cf..8944540 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -144,7 +144,7 @@
 
 <script>
 import vFooter from "@/layouts/footer";
-import { mapMutations, mapActions } from "vuex";
+import { mapState, mapMutations, mapActions } from "vuex";
 import util from "@/libs/util";
 import Setting from "@/setting";
 import axios from "axios"
@@ -206,6 +206,11 @@ export default {
             infos: []
         };
     },
+    computed: {
+        ...mapState('match', [
+          'toMatch'
+        ])
+    },
     components: {
         vFooter
     },
@@ -287,11 +292,13 @@ export default {
         },
         // 申请试用
         toTrial() {
-          window.open('https://www.wjx.cn/vm/wB0RcMm.aspx')
+          // window.open('https://www.wjx.cn/vm/wB0RcMm.aspx')
         },
         // 刷新官网
         reloadIndex() {
-          window.opener && window.opener.location.reload()
+          try {
+            window.opener && window.opener.location.reload()
+          } catch(e) {}
         },
         // 选择用户回调
         chooseUser(user) {
@@ -322,7 +329,7 @@ export default {
             util.cookies.remove('serverLogin')
             this.reloadIndex()
             util.successMsg('登录成功')
-            this.$router.replace('/station')
+            this.$router.replace(this.toMatch ? '/touristMatch' : '/station')
         },
         // 提交登录
         submit() {
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index 0ce3738..efce16d 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -200,7 +200,7 @@
                   <img class="icon" src="@/assets/img/index/tel-2.png" alt="">
                 </div>
                 <div class="text">
-                  <p class="title">联系销售</p>
+                  <p class="title">售前咨询</p>
                   <p class="tel-num" style="margin-bottom: 5px">刘兰</p>
                   <p class="tel-num">18019930142</p>
                 </div>
@@ -811,6 +811,7 @@ export default {
     }
     .des {
       font-size: 12px;
+      color: #686868;
     }
   }
 }
diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue
index 4fd3e04..13e62bb 100644
--- a/src/pages/match/details/index.vue
+++ b/src/pages/match/details/index.vue
@@ -1,74 +1,76 @@
 <template>
     <div class="wrap index">
-        <div class="banner" :style="{backgroundImage: coverUrlComputed}"></div>
-        <div class="center-wrap">
-            <breadcrumb ref="breadcrumb" :data="'全部赛事/' + form.name"></breadcrumb>
-            <div class="content">
-                <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="action">
-                        <p class="end-text" v-if="status != 5">
-                            距离{{ endList[status] }}还有<em>{{ end }}</em>天
-                        </p>
-                        <a class="status" :class="{wait: status == 0 || status == 4,signing: status == 2,signed: status == 1,finish: status == 3 || status == 5}" @click.stop="signup">{{ statusList[status] }}</a>
-                    </div>
-                </div>
-                <div class="info">
-                  <h6 class="title">{{ form.name }}</h6>
-                  <div class="meta">最近编辑时间：{{ form.updateTime }}</div>
-                </div>
+        <div class="banner" :style="{backgroundImage: 'url(' + (form.carouselUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220613/png/1536269450851409920.png') + ')'}"></div>
+        <div class="center">
+          <div class="center-wrap">
+              <breadcrumb ref="breadcrumb" :data="'全部赛事/' + form.name"></breadcrumb>
+              <div class="content">
+                  <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="action">
+                          <p class="end-text" v-if="status != 5">
+                              距离{{ endList[status] }}还有<em>{{ end }}</em>
+                          </p>
+                          <a class="status" :class="{wait: status == 0 || status == 4,signing: status == 2,signed: status == 1,finish: status == 3 || status == 5}" @click.stop="signup">{{ statusList[status] }}</a>
+                      </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.contestAnnexList">
-                  <h6 class="p-title">附件下载</h6>
-                  <ul class="files">
-                    <li v-for="(item, i) in form.contestAnnexList" :key="i">
-                      <el-link class="m-r-10" type="primary" @click="preview(item)">{{ item.fileName }}</el-link>
-                      <el-link type="primary" :underline="false" @click="download(item)">下载</el-link>
-                    </li>
+                  <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.contestAnnexList">
+                    <h6 class="p-title">附件下载</h6>
+                    <ul class="files">
+                      <li v-for="(item, i) in form.contestAnnexList" :key="i">
+                        <el-link class="m-r-10" type="primary" @click="preview(item)">{{ item.fileName }}</el-link>
+                        <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>
-                
-                <!-- 进展 -->
-                <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>
+                  <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>
-                    <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>
+                  </ul>
+                  <template v-else>
+                      <div class="empty">
+                          <div>
+                              <img src="@/assets/img/none.png" alt="">
+                              <p>暂无通知公告</p>
+                          </div>
+                      </div>
+                  </template>
+              </div>
+          </div>
         </div>
     </div>
 </template>
@@ -76,11 +78,12 @@
 <script>
 import breadcrumb from '@/components/breadcrumb'
 import util from '@/libs/util'
+import Setting from "@/setting"
 export default {
     name: 'matchdetail',
     data() {
         return {
-            id: this.$store.state.match.matchId,
+            id: this.$route.query.id,
             end: this.$route.query.end,
             status: this.$route.query.status,
             statusList: ["等待报名", "已报名", "立即报名", "报名截止", "比赛中", "已结束"],
@@ -188,11 +191,6 @@ export default {
             }
         }
     },
-    computed: {
-        coverUrlComputed() {
-            return this.form.carouselUrl? 'url(' + this.form.carouselUrl +  ')' : "url('../../../assets/img/info-banner.png')"
-        }
-    },
     mounted() {
         this.getData()
         this.getProgress()
@@ -234,18 +232,28 @@ export default {
         },
         // 跳转公告详情
         toNotice(item) {
-          this.$router.push(`noticeDetail?id=${item.id}&name=${this.form.name}&end=${this.end}&status=${this.status}`)
+          this.$router.push(`noticeDetail?id=${item.id}&matchId=${this.id}&name=${this.form.name}&end=${this.end}&status=${this.status}`)
         },
-        signup(){ // 立即报名
+        // 立即报名
+        signup(){
+          if (util.local.get(Setting.tokenKey)) {
             if (this.status == 2) {
-                let data = {
-                    contestId: this.id
-                }
-                this.$post(this.api.addApplicant,data).then(res => {
-                    this.$message.success('报名成功')
-                    this.status = 1;
-                }).catch(res => {})
+              let data = {
+                  contestId: this.id
+              }
+              this.$post(this.api.addApplicant,data).then(res => {
+                  this.$message.success('报名成功')
+                  this.status = 1;
+              }).catch(res => {})
             }
+          } else {
+            this.$confirm('请先登录，是否直接前往登录？', "提示", {
+              type: 'success'
+            }).then(() => {
+              this.$router.push('/login')  
+            }).catch(() => {})
+          }
+            
         }
     }
 };
@@ -268,6 +276,10 @@ export default {
       line-height: 30px;
     }
 }
+.main .center {
+    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;
 }
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index 5308447..81492d2 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -19,7 +19,7 @@
                     <template v-if="way === 1 || (way === 2 && form.competitionScope === 2)">
                       <div class="select-wrap">
                         <span class="label">省份</span>
-                        <el-select size="small" v-model="form.provinceId" @change="getCity">
+                        <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"
@@ -31,7 +31,7 @@
                       </div>
                       <div class="select-wrap">
                         <span class="label">城市</span>
-                        <el-select size="small" v-model="form.cityId" @change="initData">
+                        <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"
@@ -63,7 +63,7 @@
                                 <li v-for="(item,index) in listData" :key="index" @click="toDetail(item)">
                                     <div class="left">
                                         <div class="cover">
-                                            <img :src="item.coverUrl" alt="">
+                                            <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>
@@ -110,8 +110,7 @@
                                         @click.stop="signup(item)">{{ statusList[item.status] }}</p>
                                         <p class="end-text" v-if="item.status != 5">
                                             距离{{ endList[item.status] }}还有
-                                            <template v-if="item.end > 0"><em>{{ item.end }}</em> 天</template>
-                                            <em v-else v-countdown="index">{{ item.end }}</em>
+                                            <em>{{ item.end }}</em>
                                         </p>
                                     </div>
                                 </li>
@@ -149,6 +148,7 @@ export default {
     name: "match",
     data() {
         return {
+            timer: null,
             token: util.local.get(Setting.tokenKey),
             way: 0,
             apis: ['contestPageConditionQueryByOccupationlab', 'contestPageConditionQueryByOccupationlabStu', 'listOfRegisteredEvents'], // 左边筛选分3个接口
@@ -174,9 +174,13 @@ export default {
               provinceId: '',
               cityId: '',
               sequence: '',
-              competitionScope: 1, // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
+              competitionScope: 0, // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
             },
             scopes: [
+              {
+                id: 0,
+                name: '本校内'
+              },
               {
                 id: 1,
                 name: '全平台'
@@ -207,81 +211,8 @@ export default {
             loadIns: null,
             contestIds: [],
             timerList: [],
-            defaultBanner:'../../../assets/img/info-banner.png',
         };
     },
-    directives: {
-        countdown: {
-            bind: function(el, binding, vnode) {
-                let that = vnode.context;
-                let item = that.listData[binding.value];
-                let time = "";
-
-                let second = 1000;
-                let minute = second * 60;
-                let hour = minute * 60;
-                let now = new Date().getTime();
-                let signUpStartTime = new Date(that.core.dateCompatible(item.signUpStartTime)).getTime(); // 报名开始时间
-                let signUpEndTime = new Date(that.core.dateCompatible(item.signUpEndTime)).getTime(); // 报名结束时间
-                let playStartTime = new Date(that.core.dateCompatible(item.playStartTime)).getTime(); // 比赛开始时间
-                let playEndTime = new Date(that.core.dateCompatible(item.playEndTime)).getTime(); // 比赛结束时间
-                switch (item.status) {
-                    // status每个值的解释请看getData方法
-                    case 0:
-                        if (now > signUpStartTime) {
-                            item.status = 1;
-                        } else {
-                            time = signUpStartTime - now;
-                        }
-                        break;
-                    case 1:
-                        if (now > signUpEndTime) {
-                            item.status = 3;
-                        } else {
-                            time = signUpEndTime - now;
-                        }
-                        break;
-                    case 2:
-                        if (now > signUpEndTime) {
-                            item.status = 3;
-                        } else {
-                            time = signUpEndTime - now;
-                        }
-                        break;
-                    case 3:
-                        if (now > playStartTime) {
-                            item.status = 4;
-                        } else {
-                            time = playStartTime - now;
-                        }
-                        break;
-                    case 4:
-                        if (now > playEndTime) {
-                            item.status = 5;
-                        } else {
-                            time = playEndTime - now;
-                        }
-                        break;
-                }
-                time = `${Math.floor(time / hour)}:${Math.floor(time % hour / minute)}:${Math.floor(time % hour % minute / second)}`;
-                let timer = setInterval(() => {
-                    let timeList = time.split(":");
-                    let total = Number.parseInt(timeList[0] * 60 * 60) + Number.parseInt(timeList[1] * 60) + Number.parseInt(timeList[2]);
-                    if (total > 0) {
-                        --total;
-                        let hours = Math.floor(total / (60 * 60));
-                        let minutes = Math.floor(total % (60 * 60) / 60);
-                        let seconds = Math.floor(total % (60 * 60) % 60);
-                        time = `${that.core.formateTime(hours)}:${that.core.formateTime(minutes)}:${that.core.formateTime(seconds)}`;
-                    } else {
-                        clearInterval(timer);
-                    }
-                    el.innerHTML = time;
-                }, 1000);
-                that.timerList.push(timer);
-            }
-        }
-    },
     watch: {
         keyword: function(val) {
             clearTimeout(this.searchTimer);
@@ -293,74 +224,83 @@ export default {
     mounted() {
         this.getProvince()
         this.getData()
-        this.$once("hook:beforeDestroy", function() {
-            this.timerList.forEach((n, k) => {
-                clearInterval(n);
-            });
-            this.timerList = [];
-        });
+        this.$once('hook:beforeDestroy', function() {
+          clearInterval(this.timer)
+        })
     },
     methods: {
-        ...mapActions("match", [
-            "setMatchId", "setMatchSignupStatus"
-        ]),
-        async getData() {
-            this.loadIns = Loading.service()
-            const { form } = this
-            this.$post(this.api[this.apis[this.way]], {
-              pageNum: this.page,
-              pageSize: this.pageSize,
-              platformSource: 1, // 大赛来源(0中台，1职站)
-              cityId: form.cityId || null,
-              provinceId: form.provinceId || null,
-              sequence: form.sequence || null,
-              competitionScope: this.way === 2 ? form.competitionScope : null,
-              keyWord: this.keyword
-            }).then(({ data }) => {
-              this.listData = data.records
-              this.totals = data.total
-              let time = 60 * 60 * 1000 * 24;
-              this.listData.forEach((n, k) => {
-                // 报名时间、比赛时间处理
-                let now = new Date().getTime();
-                let signUpStartTime = new Date(this.core.dateCompatible(n.signUpStartTime)).getTime(); // 报名开始时间
-                let signUpEndTime = new Date(this.core.dateCompatible(n.signUpEndTime)).getTime(); // 报名结束时间
-                let playStartTime = new Date(this.core.dateCompatible(n.playStartTime)).getTime(); // 比赛开始时间
-                let playEndTime = new Date(this.core.dateCompatible(n.playEndTime)).getTime(); // 比赛结束时间
-
-                // whetherToSignUp 0已报名，1未报名
-                if (now < signUpStartTime) { // 报名没开始
-                    n.status = 0;
-                    n.end = Math.floor((signUpStartTime - now) / time);
-                } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
-                    n.status = n.whetherToSignUp ? 2 : 1 // 1已报名，2立即报名
-                    n.end = Math.floor((signUpEndTime - now) / time);
-                } else if (now > signUpEndTime && now < playStartTime) { // 报名结束了,但比赛没开始
-                    n.status = 3;
-                    n.end = Math.floor((playStartTime - now) / time);
-                } else if (now > playStartTime && now < playEndTime) { // 比赛进行中
-                    n.status = 4;
-                    n.end = Math.floor((playEndTime - now) / time);
-                } else if (now > playEndTime) { // 比赛结束
-                    n.status = 5;
-                }
+        getList() {
+          const { form } = this
+          this.$post(this.api[this.apis[this.way]], {
+            pageNum: this.page,
+            pageSize: this.pageSize,
+            platformSource: 1, // 大赛来源(0中台，1职站)
+            cityId: form.cityId || null,
+            provinceId: form.provinceId || null,
+            sequence: form.sequence || null,
+            competitionScope: this.way === 2 ? form.competitionScope : null,
+            keyWord: this.keyword
+          }).then(({ data }) => {
+            this.listData = data.records
+            this.totals = data.total
+            const second = 1000;
+            const minute = second * 60;
+            const hour = minute * 60;
+            this.listData.forEach((n, k) => {
+              // 报名时间、比赛时间处理
+              let now = new Date().getTime();
+              let signUpStartTime = new Date(this.core.dateCompatible(n.signUpStartTime)).getTime(); // 报名开始时间
+              let signUpEndTime = new Date(this.core.dateCompatible(n.signUpEndTime)).getTime(); // 报名结束时间
+              let playStartTime = new Date(this.core.dateCompatible(n.playStartTime)).getTime(); // 比赛开始时间
+              let playEndTime = new Date(this.core.dateCompatible(n.playEndTime)).getTime(); // 比赛结束时间
+              let total = 0
+              // whetherToSignUp 0已报名，1未报名
+              if (now < signUpStartTime) { // 报名没开始
+                  n.status = 0;
+                  total = signUpStartTime - now
+              } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
+                  n.status = n.whetherToSignUp ? 2 : 1 // 1已报名，2立即报名
+                  total = signUpEndTime - now
+              } else if (now > signUpEndTime && now < playStartTime) { // 报名结束了,但比赛没开始
+                  n.status = 3;
+                  total = playStartTime - now
+              } else if (now > playStartTime && now < playEndTime) { // 比赛进行中
+                  n.status = 4;
+                  total = playEndTime - now
+              } else if (now > playEndTime) { // 比赛结束
+                  n.status = 5;
+              }
+              
+              if (total > 0) {
+                  const day = Math.floor(total / (60 * 60 * 1000 * 24))
+                  const time = `${this.core.formateTime(Math.floor(total / hour))}:${this.core.formateTime(Math.floor(total % hour / minute))}:${this.core.formateTime(Math.floor(total % hour % minute / second))}`
+                  n.end = day ? day + '天' : time
+              }
 
-                // 比赛范围
-                const list = n.contestRangeRespList
-                if (list) {
-                  const range = []
-                  list.map(e => {
-                    range.push(e.type ? (e.provinceName || e.cityName) : e.schoolName)
-                  })
-                  n.ranges = `${n.range}（${range.join('，')}）`
-                } else {
-                  n.ranges = n.range
-                }
-              });
-              this.loadIns.close();
-            }).catch(res => {
-              this.loadIns.close()
-            })
+              // 比赛范围
+              const list = n.contestRangeRespList
+              if (list) {
+                const range = []
+                list.map(e => {
+                  range.push(e.type ? (e.provinceName || e.cityName) : e.schoolName)
+                })
+                n.ranges = `${n.range}（${range.join('，')}）`
+              } else {
+                n.ranges = n.range
+              }
+            });
+            this.loadIns.close();
+          }).catch(res => {
+            this.loadIns.close()
+          })
+        },
+        getData() {
+          this.loadIns = Loading.service()
+          this.getList()
+          if (!Setting.isDev) {
+            clearInterval(this.timer)
+            this.timer = setInterval(this.getList, 1000)
+          }
         },
         initData() {
             this.page = 1
@@ -376,12 +316,14 @@ export default {
         getCity() {
           const { form } = this
           form.cityId = ''
-          this.$get(this.api.queryCity, {
-            provinceId: form.provinceId
-          }).then(({ list }) => {
-            this.cities = list
+          form.provinceId ?
+            this.$get(this.api.queryCity, {
+              provinceId: form.provinceId
+            }).then(({ list }) => {
+              this.cities = list
+              this.initData()
+            }).catch(res => {}) :
             this.initData()
-          }).catch(res => {})
         },
         changeType(type) {
             this.way = type;
@@ -398,10 +340,7 @@ export default {
             this.initData()
         },
         toDetail(item) {
-            let status = item.status == 1 ? (item.signup ? true : false) : "hide";
-            this.setMatchId(item.id);
-            this.setMatchSignupStatus(status);
-            this.$router.push(`/match/details?status=${item.status}&end=${item.end}`);
+            this.$router.push(`/match/details?id=${item.id}&status=${item.status}&end=${item.end}`);
         },
         handleCurrentChange(val) {
             this.page = val;
@@ -492,6 +431,9 @@ export default {
       .label {
         margin-right: 10px;
       }
+      .el-select {
+        width: 130px;
+      }
     }
     .list-inner {
         display: flex;
diff --git a/src/pages/match/noticeDetail/index.vue b/src/pages/match/noticeDetail/index.vue
index 4f2561f..aba1445 100644
--- a/src/pages/match/noticeDetail/index.vue
+++ b/src/pages/match/noticeDetail/index.vue
@@ -11,7 +11,7 @@
                 </el-breadcrumb-item>
                 <el-breadcrumb-item
                 v-else-if="breadPath.length > 2 && i === 1"
-                :to="{ path: 'details', query: { end, status } }"
+                :to="{ path: 'details', query: { end, status, id } }"
                 :key="i">
                 {{item}}
                 </el-breadcrumb-item>
@@ -52,6 +52,7 @@ import util from '@/libs/util'
 export default {
     data() {
         return {
+            id: this.$route.query.matchId,
             end: this.$route.query.end,
             status: this.$route.query.status,
             breadPath: ['全部赛事', this.$route.query.name],
diff --git a/src/pages/touristMatch/list/index.vue b/src/pages/touristMatch/list/index.vue
index 220bbd4..e7e74db 100644
--- a/src/pages/touristMatch/list/index.vue
+++ b/src/pages/touristMatch/list/index.vue
@@ -17,7 +17,7 @@
                     <template v-if="form.competitionScope === 2">
                       <div class="select-wrap">
                         <span class="label">省份</span>
-                        <el-select size="small" v-model="form.provinceId" @change="getCity">
+                        <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"
@@ -29,7 +29,7 @@
                       </div>
                       <div class="select-wrap">
                         <span class="label">城市</span>
-                        <el-select size="small" v-model="form.cityId" @change="initData">
+                        <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"
@@ -57,7 +57,7 @@
                                 <li v-for="(item,index) in listData" :key="index" @click="toDetail(item)">
                                     <div class="left">
                                         <div class="cover">
-                                            <img :src="item.coverUrl" alt="">
+                                            <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>
@@ -100,8 +100,7 @@
                                         @click.stop="signup(item)">{{ statusList[item.status] }}</p>
                                         <p class="end-text" v-if="item.status != 5">
                                             距离{{ endList[item.status] }}还有
-                                            <template v-if="item.end > 0"><em>{{ item.end }}</em> 天</template>
-                                            <em v-else v-countdown="index">{{ item.end }}</em>
+                                            <em>{{ item.end }}</em>
                                         </p>
                                     </div>
                                 </li>
@@ -129,9 +128,8 @@
 </template>
 
 <script>
-import { mapActions } from "vuex";
+import { mapMutations } from "vuex";
 import { Loading } from "element-ui";
-import bus from "@/libs/bus";
 import Setting from "@/setting"
 import util from "@/libs/util"
 
@@ -139,6 +137,7 @@ export default {
     name: "match",
     data() {
         return {
+            timer: null,
             token: util.local.get(Setting.tokenKey),
             way: 2,
             statusList: ["等待报名", "已报名", "立即报名", "报名截止", "比赛中", "已结束"],
@@ -163,9 +162,13 @@ export default {
               provinceId: '',
               cityId: '',
               sequence: '',
-              competitionScope: 1, // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
+              competitionScope: '', // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
             },
             scopes: [
+              {
+                id: '',
+                name: '不限'
+              },
               {
                 id: 1,
                 name: '全平台'
@@ -197,81 +200,8 @@ export default {
             contestIds: [],
             isFirst: true,
             timerList: [],
-            defaultBanner:'../../../assets/img/info-banner.png',
         };
     },
-    directives: {
-        countdown: {
-            bind: function(el, binding, vnode) {
-                let that = vnode.context;
-                let item = that.listData[binding.value];
-                let time = "";
-
-                let second = 1000;
-                let minute = second * 60;
-                let hour = minute * 60;
-                let now = new Date().getTime();
-                let signUpStartTime = new Date(that.core.dateCompatible(item.signUpStartTime)).getTime(); // 报名开始时间
-                let signUpEndTime = new Date(that.core.dateCompatible(item.signUpEndTime)).getTime(); // 报名结束时间
-                let playStartTime = new Date(that.core.dateCompatible(item.playStartTime)).getTime(); // 比赛开始时间
-                let playEndTime = new Date(that.core.dateCompatible(item.playEndTime)).getTime(); // 比赛结束时间
-                switch (item.status) {
-                    // status每个值的解释请看getData方法
-                    case 0:
-                        if (now > signUpStartTime) {
-                            item.status = 1;
-                        } else {
-                            time = signUpStartTime - now;
-                        }
-                        break;
-                    case 1:
-                        if (now > signUpEndTime) {
-                            item.status = 3;
-                        } else {
-                            time = signUpEndTime - now;
-                        }
-                        break;
-                    case 2:
-                        if (now > signUpEndTime) {
-                            item.status = 3;
-                        } else {
-                            time = signUpEndTime - now;
-                        }
-                        break;
-                    case 3:
-                        if (now > playStartTime) {
-                            item.status = 4;
-                        } else {
-                            time = playStartTime - now;
-                        }
-                        break;
-                    case 4:
-                        if (now > playEndTime) {
-                            item.status = 5;
-                        } else {
-                            time = playEndTime - now;
-                        }
-                        break;
-                }
-                time = `${Math.floor(time / hour)}:${Math.floor(time % hour / minute)}:${Math.floor(time % hour % minute / second)}`;
-                let timer = setInterval(() => {
-                    let timeList = time.split(":");
-                    let total = Number.parseInt(timeList[0] * 60 * 60) + Number.parseInt(timeList[1] * 60) + Number.parseInt(timeList[2]);
-                    if (total > 0) {
-                        --total;
-                        let hours = Math.floor(total / (60 * 60));
-                        let minutes = Math.floor(total % (60 * 60) / 60);
-                        let seconds = Math.floor(total % (60 * 60) % 60);
-                        time = `${that.core.formateTime(hours)}:${that.core.formateTime(minutes)}:${that.core.formateTime(seconds)}`;
-                    } else {
-                        clearInterval(timer);
-                    }
-                    el.innerHTML = time;
-                }, 1000);
-                that.timerList.push(timer);
-            }
-        }
-    },
     watch: {
         keyword: function(val) {
             clearTimeout(this.searchTimer);
@@ -283,75 +213,88 @@ export default {
     mounted() {
         this.getProvince()
         this.getData()
-        this.$once("hook:beforeDestroy", function() {
-            this.timerList.forEach((n, k) => {
-                clearInterval(n);
-            });
-            this.timerList = [];
-        });
+        this.$once('hook:beforeDestroy', function() {
+          clearInterval(this.timer)
+        })
     },
     methods: {
-        ...mapActions("match", [
-            "setMatchId", "setMatchSignupStatus"
+        ...mapMutations('match', [
+          'SET_SOURCE'
         ]),
-        async getData() {
-            this.loadIns = Loading.service()
-            const { token, form } = this
-            const scope = form.competitionScope
-            this.$post(this.api.contestPageConditionQueryByOccupationlabStu, {
-              pageNum: this.page,
-              pageSize: this.pageSize,
-              platformSource: 1, // 大赛来源(0中台，1职站)
-              competitionScope: scope,
-              cityId: scope === 2 ? (form.cityId || null) : null, // 选择了全平台则不用传省市id
-              provinceId: scope === 2 ? (form.provinceId || null) : null,
-              sequence: form.sequence || null,
-              keyWord: this.keyword
-            }).then(({ data }) => {
-              this.listData = data.records
-              this.totals = data.total
-              let time = 60 * 60 * 1000 * 24;
-              this.listData.forEach((n, k) => {
-                // 报名时间、比赛时间处理
-                let now = new Date().getTime();
-                let signUpStartTime = new Date(this.core.dateCompatible(n.signUpStartTime)).getTime(); // 报名开始时间
-                let signUpEndTime = new Date(this.core.dateCompatible(n.signUpEndTime)).getTime(); // 报名结束时间
-                let playStartTime = new Date(this.core.dateCompatible(n.playStartTime)).getTime(); // 比赛开始时间
-                let playEndTime = new Date(this.core.dateCompatible(n.playEndTime)).getTime(); // 比赛结束时间
-
-                // whetherToSignUp 0已报名，1未报名
-                if (now < signUpStartTime) { // 报名没开始
-                    n.status = 0;
-                    n.end = Math.floor((signUpStartTime - now) / time);
-                } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
-                    n.status = (!token || n.whetherToSignUp) ? 2 : 1 // 1已报名，2立即报名(未登录，或者whetherToSignUp=1，则显示立即报名)
-                    n.end = Math.floor((signUpEndTime - now) / time);
-                } else if (now > signUpEndTime && now < playStartTime) { // 报名结束了,但比赛没开始
-                    n.status = 3;
-                    n.end = Math.floor((playStartTime - now) / time);
-                } else if (now > playStartTime && now < playEndTime) { // 比赛进行中
-                    n.status = 4;
-                    n.end = Math.floor((playEndTime - now) / time);
-                } else if (now > playEndTime) { // 比赛结束
-                    n.status = 5;
-                }
+        getList() {
+          const { form } = this
+          const scope = form.competitionScope
+          const data = {
+            pageNum: this.page,
+            pageSize: this.pageSize,
+            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
+          }
+          if (scope) data.competitionScope = scope
+          this.$post(this.api.contestPageConditionQueryByOccupationlabStu, data).then(({ data }) => {
+            this.listData = data.records
+            this.totals = data.total
+            const second = 1000;
+            const minute = second * 60;
+            const hour = minute * 60;
+            this.listData.forEach((n, k) => {
+              // 报名时间、比赛时间处理
+              let now = new Date().getTime();
+              let signUpStartTime = new Date(this.core.dateCompatible(n.signUpStartTime)).getTime(); // 报名开始时间
+              let signUpEndTime = new Date(this.core.dateCompatible(n.signUpEndTime)).getTime(); // 报名结束时间
+              let playStartTime = new Date(this.core.dateCompatible(n.playStartTime)).getTime(); // 比赛开始时间
+              let playEndTime = new Date(this.core.dateCompatible(n.playEndTime)).getTime(); // 比赛结束时间
+              let total = 0
+              // whetherToSignUp 0已报名，1未报名
+              if (now < signUpStartTime) { // 报名没开始
+                  n.status = 0;
+                  total = signUpStartTime - now
+              } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
+                  n.status = n.whetherToSignUp ? 2 : 1 // 1已报名，2立即报名
+                  total = signUpEndTime - now
+              } else if (now > signUpEndTime && now < playStartTime) { // 报名结束了,但比赛没开始
+                  n.status = 3;
+                  total = playStartTime - now
+              } else if (now > playStartTime && now < playEndTime) { // 比赛进行中
+                  n.status = 4;
+                  total = playEndTime - now
+              } else if (now > playEndTime) { // 比赛结束
+                  n.status = 5;
+              }
+              
+              if (total > 0) {
+                  const day = Math.floor(total / (60 * 60 * 1000 * 24))
+                  const time = `${this.core.formateTime(Math.floor(total / hour))}:${this.core.formateTime(Math.floor(total % hour / minute))}:${this.core.formateTime(Math.floor(total % hour % minute / second))}`
+                  n.end = day ? day + '天' : time
+              }
 
-                // 比赛范围
-                const list = n.contestRangeRespList
-                if (list) {
-                  const range = []
-                  list.map(e => {
-                    range.push(e.type ? (e.provinceName || e.cityName) : e.schoolName)
-                  })
-                  n.ranges = `${n.range}（${range.join('，')}）`
-                } else {
-                  n.ranges = n.range
-                }
-              });
-              this.loadIns.close()
-            }).catch(res => {
-              this.loadIns.close()
-            })
+              // 比赛范围
+              const list = n.contestRangeRespList
+              if (list) {
+                const range = []
+                list.map(e => {
+                  range.push(e.type ? (e.provinceName || e.cityName) : e.schoolName)
+                })
+                n.ranges = `${n.range}（${range.join('，')}）`
+              } else {
+                n.ranges = n.range
+              }
+            });
+            this.loadIns.close()
+          }).catch(res => {
+            this.loadIns.close()
+          })
+        },
+        getData() {
+          this.loadIns = Loading.service()
+          this.getList()
+          if (!Setting.isDev) {
+            clearInterval(this.timer)
+            this.timer = setInterval(this.getList, 1000)
+          }
         },
         initData() {
             this.page = 1
@@ -367,12 +310,14 @@ export default {
         getCity() {
           const { form } = this
           form.cityId = ''
-          this.$get(this.api.queryCity, {
-            provinceId: form.provinceId
-          }).then(({ list }) => {
-            this.cities = list
+          form.provinceId ?
+            this.$get(this.api.queryCity, {
+              provinceId: form.provinceId
+            }).then(({ list }) => {
+              this.cities = list
+              this.initData()
+            }).catch(res => {}) :
             this.initData()
-          }).catch(res => {})
         },
         changeType(type) {
             this.way = type;
@@ -389,10 +334,7 @@ export default {
             this.initData()
         },
         toDetail(item) {
-            let status = item.status == 1 ? (item.signup ? true : false) : "hide";
-            this.setMatchId(item.id);
-            this.setMatchSignupStatus(status);
-            this.$router.push(`/touristMatch/details?status=${item.status}&end=${item.end}`);
+            this.$router.push(`/touristMatch/details?id=${item.id}&status=${item.status}&end=${item.end}`);
         },
         handleCurrentChange(val) {
             this.page = val;
@@ -401,7 +343,7 @@ export default {
         signup(item) {
           // 如果没登录，提示去登录
           if (item.status == 2) {
-            if (this.token) {
+            if (util.local.get(Setting.tokenKey)) {
               this.$post(this.api.addApplicant, {
                 contestId: item.id
               }).then(res => {
@@ -412,6 +354,7 @@ export default {
               this.$confirm('请先登录，是否直接前往登录？', "提示", {
                 type: 'success'
               }).then(() => {
+                this.SET_SOURCE()
                 this.$router.push('/login')  
               }).catch(() => {})
             }
@@ -492,6 +435,9 @@ export default {
       .label {
         margin-right: 10px;
       }
+      .el-select {
+        width: 130px;
+      }
     }
     .list-inner {
         display: flex;
diff --git a/src/setting.js b/src/setting.js
index c570bbd..54942b1 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -30,8 +30,8 @@ if (isHh) {
 } else if (isDev) {
     // 本地
     systemPath = `http://${location.hostname}:8093/#/`
-    // host = "http://121.37.12.51:9000/"; // 中台测试服
-    host = "http://192.168.31.151:9000/"; // 榕
+    host = "http://121.37.12.51:9000/"; // 中台测试服
+    // host = "http://192.168.31.151:9000/"; // 榕
     // host = "http://192.168.31.137:9000/"; // 赓
 }
 
diff --git a/src/store/modules/match.js b/src/store/modules/match.js
index ae7f238..4606b44 100644
--- a/src/store/modules/match.js
+++ b/src/store/modules/match.js
@@ -4,23 +4,14 @@
 export default {
     namespaced: true,
     state: {
-        matchId: "",
-        matchSignupStatus: false
+      toMatch: false
     },
     mutations: {
-        SET_MATCH_ID: (state, id) => {
-            state.matchId = id;
-        },
-        SET_MATCH_SIGNUP_STATUS: (state, value) => {
-            state.matchSignupStatus = value;
-        }
+      SET_SOURCE: state => {
+        state.toMatch = true
+      }
     },
     actions: {
-        setMatchId({ state, commit }, id) {
-            commit("SET_MATCH_ID", id);
-        },
-        setMatchSignupStatus({ state, commit }, value) {
-            commit("SET_MATCH_SIGNUP_STATUS", value);
-        }
+      
     }
 };
\ No newline at end of file
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1a1bb7b..5549770 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -2,7 +2,6 @@ import Setting from "@/setting";
 import util from "@/libs/util";
 import { post, get, del, put } from "@/plugins/requests/index.js";
 import api from "@/api";
-import addRoutes from "@/libs/route/addRoutes";
 /**
  * 用户信息
  * */