From b32c0de3e1341ec7f3bf093da5883864ff30256b Mon Sep 17 00:00:00 2001 From: "luoJunYong.123" Date: Thu, 9 Dec 2021 17:06:41 +0800 Subject: [PATCH] update --- src/pages/match/manage/matchDetail.vue | 13 ++++++++----- src/pages/project/list/index.vue | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/pages/match/manage/matchDetail.vue b/src/pages/match/manage/matchDetail.vue index 8aec9c1..bc5dee8 100644 --- a/src/pages/match/manage/matchDetail.vue +++ b/src/pages/match/manage/matchDetail.vue @@ -171,7 +171,6 @@ export default { test() { this.$store.commit("match/setWait", 0); // console.log(this.$store.state.match.waitIndex) - console.log('testClick') }, ...mapActions("match", [ "setMatchId" @@ -182,7 +181,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - this.save(1) + this.save(1, false) EventBus.$emit('tabChangeWait', this.$store.state.match.waitIndex) }).catch(() => { this.$message({ @@ -193,7 +192,7 @@ export default { }); }, - save(status) { + save(status, judge=true) { this.touchTime = 0 this.sponsor = this.sponsorList.filter(d => d).join(); this.undertaker = this.undertakerList.filter(d => d).join(); @@ -228,13 +227,17 @@ export default { if (this.id) { this.$put(this.api.editContest, data).then(res => { util.successMsg("修改成功"); - this.$router.back(); + if(judge) { + this.$router.back(); + } }).catch(err => { }); } else { this.$post(this.api.addContest, data).then(res => { util.successMsg("创建成功"); - this.$router.back(); + if(judge) { + this.$router.back(); + } }).catch(err => { }); } diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue index 5e351fa..d42a9e9 100644 --- a/src/pages/project/list/index.vue +++ b/src/pages/project/list/index.vue @@ -167,6 +167,10 @@ export default { 2: "竞赛" }, founderList: [ + { + value: 2, + label: "全部" + }, { value: 0, label: "系统" @@ -174,10 +178,6 @@ export default { { value: 1, label: "老师" - }, - { - value: 2, - label: "全部" } ], founderKeys: {