bug修复

src/pages/account/login/index.vue

@@ -148,6 +148,7 @@ import { mapState, mapMutations, mapActions } from "vuex";
 import util from "@/libs/util";
 import Setting from "@/setting";
 import axios from "axios"
+import { Loading } from 'element-ui'
 export default {
     data: function() {
         return {
@@ -323,7 +324,7 @@ export default {
             util.cookies.remove('serverLogin')
             this.reloadIndex()
             util.successMsg('登录成功')
-            this.$router.replace(this.toMatch ? '/touristMatch' : '/station')
+            this.$router.replace(this.toMatch ? `/touristMatch` : '/station')
         },
         // 提交登录
         submit() {

src/pages/match/details/index.vue

@@ -221,7 +221,7 @@ export default {
         // 公告列表
         getNotice() {
           this.$post(`${this.api.queryAnnouncementByContestId}?pageNum=1&pageSize=1000&contestId=${this.id}`).then(({ data }) => {
-            this.notices = data.records
+            this.notices = data.records.filter(e => e.status) // 只显示已发布的（status 0草稿 1为已发布）
           }).catch(res => {})
         },
         // 预览附件

src/pages/match/list/index.vue

@@ -173,7 +173,7 @@ export default {
             form: {
               provinceId: '',
               cityId: '',
-              sequence: 1, // 排序(1:近期排名 2.最近更新)
+              sequence: 2, // 排序(1:近期排名 2.最近更新)
               competitionScope: 3, // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
               eventType: 1 // 赛事类型(1.本校赛事/2.赛事广场/3.已报名赛事)
             },
@@ -210,13 +210,13 @@ export default {
               }
             ],
             sorts: [
-              {
-                id: 1,
-                name: '近期报名'
-              },
               {
                 id: 2,
                 name: '最近更新'
+              },
+              {
+                id: 1,
+                name: '近期报名'
               }
             ],
             sort: 1,
@@ -250,17 +250,20 @@ export default {
     methods: {
         getList() {
           const { form } = this
-          this.$post(this.api.contestAfterLogin, {
+          const { eventType, competitionScope } = form
+          const data = {
             pageNum: this.page,
             pageSize: this.pageSize,
             platformSource: 1, // 大赛来源(0中台，1职站)
             cityId: form.cityId || null,
             provinceId: form.provinceId || null,
             sequence: form.sequence || null,
-            competitionScope: form.competitionScope,
+            eventType,
-            eventType: form.eventType,
             keyWord: this.keyword
-          }).then(({ data }) => {
+          }
+          if (eventType === 2 && !competitionScope) form.competitionScope = 3 // 赛事广场下如果competitionScope=0，则传3，赛事广场没有本校内
+          if (eventType !== 1) data.competitionScope = form.competitionScope // 本校赛事不传范围
+          this.$post(this.api.contestAfterLogin, data).then(({ data }) => {
             this.listData = data.records
             this.totals = data.total
             const second = 1000;
@@ -531,7 +534,7 @@ export default {
                             background-color: #52C41A;
                         }
                         &.playing {
-                            background-color: #32cf8b;
+                            background-color: #f96d6d;
                         }
 
                         &.finish {

src/pages/touristMatch/list/index.vue

@@ -244,6 +244,7 @@ export default {
             const second = 1000;
             const minute = second * 60;
             const hour = minute * 60;
+            const { token } = this
             records.forEach((n, k) => {
               // 报名时间、比赛时间处理
               let now = new Date().getTime();
@@ -257,7 +258,7 @@ export default {
                   n.status = 0;
                   total = signUpStartTime - now
               } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
-                  n.status = n.whetherToSignUp ? 2 : 1 // 1已报名，2立即报名
+                  n.status = !token || n.whetherToSignUp ? 2 : 1 // 1已报名，2立即报名
                   total = signUpEndTime - now
               } else if (now > signUpEndTime && now < playStartTime) { // 报名结束了,但比赛没开始
                   n.status = 3;
@@ -291,10 +292,13 @@ export default {
             this.totals = data.total
             
             // 如果是登录前点报名去登录的，则跳转到该赛事，toMatch存的是点击的赛事id，通过scrollIntoView去跳到赛事的位置
-            if (this.toMatch) {
+            const id = this.toMatch
+            if (id) {
               this.$nextTick(() => {
-                document.getElementById(this.toMatch).scrollIntoView()
+                // document.getElementById(id).scrollIntoView()
                 this.SET_SOURCE('')
+                const item = records.find(e => e.id === id)
+                item && this.toDetail(item)
               })
             }
             this.loadIns.close()
@@ -333,10 +337,6 @@ export default {
             }).catch(res => {}) :
             this.initData()
         },
-        changeType(type) {
-            this.way = type;
-            this.initData()
-        },
         // 筛选范围
         changeScope(type) {
             this.form.competitionScope = type
@@ -355,9 +355,6 @@ export default {
             this.getData();
         },
         signup(item) {
-          this.SET_SOURCE(item.id)
-                this.$router.push('/login')
-                return
           // 如果没登录，提示去登录，status=2则是报名中
           if (item.status == 2) {
             if (util.local.get(Setting.tokenKey)) {
@@ -532,7 +529,7 @@ export default {
                             background-color: #52C41A;
                         }
                         &.playing {
-                            background-color: #32cf8b;
+                            background-color: #f96d6d;
                         }
 
                         &.finish {

src/setting.js

@@ -10,7 +10,7 @@ const isTest = url.includes('121.37.12.51'); //是否中台测试服
 
 let systemPath = `${location.origin}/banksystem`
 let host = `${location.origin}/`
-let uploadURL = `https://121.37.12.51/`
+let uploadURL = `http://121.37.12.51/`
 let title = (isHh || isCH) ? '学生端' : '职站'
 
 if (isPro) {
@@ -19,7 +19,7 @@ if (isPro) {
     systemPath = `https://www.huorantech.cn/banksystem`
 } else if (isDev) {
     // 本地
-    systemPath = `http://${location.hostname}:8093/#/`
+    systemPath = `http://${location.hostname}:8093`
     host = "http://121.37.12.51/"; // 中台测试服
     host = "http://192.168.31.151:9000/"; // 榕
     // host = "http://192.168.31.137:9000/"; // 赓