From 3b9fe3de0f57477959d4bfe2e06dc7b0cb6115b7 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 4 Jul 2022 17:50:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E4=BA=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                      |  2 +
 src/pages/match/details/index.vue     |  8 ----
 src/pages/match/list/index.vue        | 57 +++++++++++++++++++--------
 src/pages/touristMatch/list/index.vue | 23 ++++++-----
 4 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 1a98c4c..e1487ee 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -72,6 +72,7 @@ export default {
     secondaryColumnsByFirst: `occupationlab/occupationlab/enterprise/information/column/secondaryColumnsByFirst`,
 
     // 线上赛事
+    notLoggedInBeforeStudentEvents: `occupationlab/occupationlab/enterprise/match/contest/notLoggedInBeforeStudentEvents`,
     contestPageConditionQueryByOccupationlabStu: `occupationlab/occupationlab/enterprise/match/contest/contestPageConditionQueryByOccupationlabStu`,
     contestPageConditionQueryByOccupationlab: `occupationlab/occupationlab/enterprise/match/contest/onlineCompetitionByStudent`,
     listOfRegisteredEvents: `occupationlab/occupationlab/enterprise/match/contest/listOfRegisteredEvents`,
@@ -80,6 +81,7 @@ export default {
     getContest: `occupationlab/occupationlab/enterprise/match/contest/getContest`, // 根据id查询赛事
     queryAnnouncementByContestId: `occupationlab/occupationlab/contest/announcement/queryAnnouncementByContestId`,
     queryAnnouncementDetails: `occupationlab/occupationlab/contest/announcement/queryAnnouncementDetails`,
+    contestAfterLogin: `occupationlab/occupationlab/enterprise/match/contest/contestAfterLogin`,
 
     // 阿里云文件/视频管理
     fileDeletion: `${uploadURL}oss/manage/fileDeletion`, // 删除OSS文件
diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue
index 7332ba7..dc8cc4a 100644
--- a/src/pages/match/details/index.vue
+++ b/src/pages/match/details/index.vue
@@ -275,14 +275,6 @@ export default {
     color: #fff;
     background-size: 100% 350px;
     background-repeat: no-repeat;
-    h6 {
-      margin-bottom: 30px;
-      font-size: 42px;
-    }
-    .text {
-      font-size: 20px;
-      line-height: 30px;
-    }
 }
 .l-title {
   font-size: 18px;
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index 4c484e8..20137b3 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -11,12 +11,15 @@
         <!-- 课程筛选 -->
         <div class="filter">
             <div class="center-wrap" style="padding: 0;margin: 0 auto;">
-                <dl v-if="way">
+                <dl v-if="form.eventType !== 1">
                     <dt>比赛范围：</dt>
-                    <template v-if="way === 2">
+                    <template v-if="form.eventType === 2">
+                      <dd v-for="(item, i) in squareScopes" :key="i" :class="{active: form.competitionScope == item.id}" @click="changeScope(item.id)">{{ item.name }}</dd>
+                    </template>
+                    <template v-if="form.eventType === 3">
                       <dd v-for="(item, i) in scopes" :key="i" :class="{active: form.competitionScope == item.id}" @click="changeScope(item.id)">{{ item.name }}</dd>
                     </template>
-                    <template v-if="way === 1 || (way === 2 && form.competitionScope === 2)">
+                    <template v-if="form.eventType === 2 || (form.eventType === 3 && form.competitionScope === 2)">
                       <div class="select-wrap">
                         <span class="label">省份</span>
                         <el-select size="small" v-model="form.provinceId" clearable @change="getCity">
@@ -53,7 +56,7 @@
         <div class="main">
             <div class="center-wrap list-inner">
                 <ul v-if="token" class="nav">
-                    <li :class="{ active: way === item.id }" v-for="(item, index) in typeList" :key="index" @click="changeType(item.id)">{{ item.name }}
+                    <li :class="{ active: form.eventType === item.id }" v-for="(item, index) in typeList" :key="index" @click="changeType(item.id)">{{ item.name }}
                     </li>
                 </ul>
                 <div class="list-wrap">
@@ -106,7 +109,7 @@
                                     </div>
                                     <div class="right">
                                         <p class="status"
-                                        :class="{wait: item.status == 0 || item.status == 4,signing: item.status == 2,signed: item.status == 1,finish: item.status == 3 || item.status == 5}"
+                                        :class="{wait: item.status == 0,signing: item.status == 2,signed: item.status == 1,playing: item.status == 4,finish: item.status == 3 || item.status == 5}"
                                         @click.stop="signup(item)">{{ statusList[item.status] }}</p>
                                         <p class="end-text" v-if="item.status != 5">
                                             距离{{ endList[item.status] }}还有
@@ -138,9 +141,7 @@
 </template>
 
 <script>
-import { mapActions } from "vuex";
 import { Loading } from "element-ui";
-import bus from "@/libs/bus";
 import Setting from "@/setting"
 import util from "@/libs/util"
 
@@ -150,21 +151,20 @@ export default {
         return {
             timer: null,
             token: util.local.get(Setting.tokenKey),
-            way: 0,
             apis: ['contestPageConditionQueryByOccupationlab', 'contestPageConditionQueryByOccupationlabStu', 'listOfRegisteredEvents'], // 左边筛选分3个接口
             statusList: ["等待报名", "已报名", "立即报名", "报名截止", "比赛中", "已结束"],
             endList: ["报名开始", "报名截止", "报名截止", "竞赛开始", "竞赛结束", ""],
             typeList: [
                 {
-                    id: 0,
+                    id: 1,
                     name: "本校赛事"
                 },
                 {
-                    id: 1,
+                    id: 2,
                     name: "赛事广场"
                 },
                 {
-                    id: 2,
+                    id: 3,
                     name: "已报名"
                 }
             ],
@@ -173,10 +173,29 @@ export default {
             form: {
               provinceId: '',
               cityId: '',
-              sequence: 1,
-              competitionScope: 0, // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
+              sequence: 1, // 排序(1:近期排名 2.最近更新)
+              competitionScope: 3, // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
+              eventType: 1 // 赛事类型(1.本校赛事/2.赛事广场/3.已报名赛事)
             },
+            squareScopes: [
+              {
+                id: 3,
+                name: '不限'
+              },
+              {
+                id: 1,
+                name: '全平台'
+              },
+              {
+                id: 2,
+                name: '指定区域/院校'
+              }
+            ],
             scopes: [
+              {
+                id: 3,
+                name: '不限'
+              },
               {
                 id: 0,
                 name: '本校内'
@@ -231,14 +250,15 @@ export default {
     methods: {
         getList() {
           const { form } = this
-          this.$post(this.api[this.apis[this.way]], {
+          this.$post(this.api.contestAfterLogin, {
             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,
+            competitionScope: form.competitionScope,
+            eventType: form.eventType,
             keyWord: this.keyword
           }).then(({ data }) => {
             this.listData = data.records
@@ -282,7 +302,7 @@ export default {
               if (list) {
                 const range = []
                 list.map(e => {
-                  range.push(e.type ? (e.provinceName || e.cityName) : e.schoolName)
+                  range.push(e.type ? (e.provinceName || e.cityName) : e.schoolName) // type 1：省市，0：学校
                 })
                 n.ranges = `${n.range}（${range.join('，')}）`
               } else {
@@ -326,7 +346,7 @@ export default {
             this.initData()
         },
         changeType(type) {
-            this.way = type;
+            this.form.eventType = type
             this.initData()
         },
         // 筛选范围
@@ -510,6 +530,9 @@ export default {
                         &.signed {
                             background-color: #52C41A;
                         }
+                        &.playing {
+                            background-color: #32cf8b;
+                        }
 
                         &.finish {
                             background-color: #ccc;
diff --git a/src/pages/touristMatch/list/index.vue b/src/pages/touristMatch/list/index.vue
index 72e84a1..e8f5484 100644
--- a/src/pages/touristMatch/list/index.vue
+++ b/src/pages/touristMatch/list/index.vue
@@ -96,7 +96,7 @@
                                     </div>
                                     <div class="right">
                                         <p class="status"
-                                        :class="{wait: item.status == 0 || item.status == 4,signing: item.status == 2,signed: item.status == 1,finish: item.status == 3 || item.status == 5}"
+                                        :class="{wait: item.status == 0,signing: item.status == 2,signed: item.status == 1,playing: item.status == 4,finish: item.status == 3 || item.status == 5}"
                                         @click.stop="signup(item)">{{ statusList[item.status] }}</p>
                                         <p class="end-text" v-if="item.status != 5">
                                             距离{{ endList[item.status] }}还有
@@ -161,12 +161,12 @@ export default {
             form: {
               provinceId: '',
               cityId: '',
-              sequence: 1,
-              competitionScope: '不限', // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
+              sequence: 2,
+              competitionScope: 3, // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
             },
             scopes: [
               {
-                id: '不限',
+                id: 3,
                 name: '不限'
               },
               {
@@ -179,13 +179,13 @@ export default {
               }
             ],
             sorts: [
-              {
-                id: 1,
-                name: '近期报名'
-              },
               {
                 id: 2,
                 name: '最近更新'
+              },
+              {
+                id: 1,
+                name: '近期报名'
               }
             ],
             sort: 1,
@@ -239,7 +239,7 @@ export default {
             sequence: form.sequence || null,
             keyWord: this.keyword
           }
-          this.$post(this.api.contestPageConditionQueryByOccupationlabStu, data).then(({ data }) => {
+          this.$post(this.api.notLoggedInBeforeStudentEvents, data).then(({ data }) => {
             const { records } = data
             const second = 1000;
             const minute = second * 60;
@@ -280,7 +280,7 @@ export default {
               if (list) {
                 const range = []
                 list.map(e => {
-                  range.push(e.type ? (e.provinceName || e.cityName) : e.schoolName)
+                  range.push(e.type ? (e.provinceName || e.cityName) : e.schoolName) // type 1：省市，0：学校
                 })
                 n.ranges = `${n.range}（${range.join('，')}）`
               } else {
@@ -531,6 +531,9 @@ export default {
                         &.signed {
                             background-color: #52C41A;
                         }
+                        &.playing {
+                            background-color: #32cf8b;
+                        }
 
                         &.finish {
                             background-color: #ccc;