diff --git a/src/api/index.js b/src/api/index.js
index 5a9747a..15761b2 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -230,6 +230,7 @@ export default {
   batchDeleteApplicants: `competition/competition/registration/batchDeleteApplicants`,
   deleteAllData: `competition/competition/registration/deleteAllData`,
   whetherThereIsReport: `competition/competitionAutomaticAllocationRecord/whetherThereIsReport`,
+  closePopup: `competition/competitionAutomaticAllocationRecord/closePopup`,
   competionPersonTemplate: `https://huoran.oss-cn-shenzhen.aliyuncs.com/%E6%95%99%E5%B8%88%E7%AB%AF%E4%B8%AA%E4%BA%BA%E8%B5%9B%E6%8A%A5%E5%90%8D%E4%BA%BA%E5%91%98%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx`, // 教师端个人报名人员模板
   competionTeamTemplate: `https://huoran.oss-cn-shenzhen.aliyuncs.com/%E6%95%99%E5%B8%88%E7%AB%AF%E5%9B%A2%E9%98%9F%E8%B5%9B%E6%8A%A5%E5%90%8D%E4%BA%BA%E5%91%98%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx`, // 教师端团队报名人员导入模板
   exportAbnormalData: `${host}competition/teamAbnormalInformation/exportAbnormalData`,
diff --git a/src/pages/match/add/step3.vue b/src/pages/match/add/step3.vue
index 395d227..f89698f 100644
--- a/src/pages/match/add/step3.vue
+++ b/src/pages/match/add/step3.vue
@@ -85,6 +85,16 @@
     </div>
 
     <set v-if="setVisible" :form.sync="form[curStep]" :step1.sync="step1" @hideSet="hideSet" />
+
+    <el-dialog title="提示" :visible.sync="tipsVisible" width="500px" :close-on-click-modal="false">
+      <p style="margin-bottom: 15px;line-height: 1.6">
+        团队赛发布成功，若有修改报名时间、赛程与规则，修改不会影响已经分配的阶段参赛人员，但后面加入报名的将不再自动分配，如需将已分配的重新分配和新加入报名的进行分配，请前往报名人员列表设置全部重新分配</p>
+      <el-checkbox v-model="closeStatus">不再提示</el-checkbox>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="closePopup">关闭</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -139,6 +149,9 @@ export default {
       curStep: 0,
       pass: 0,
       curOriginForm: {},
+
+      closeStatus: false,
+      tipsVisible: false,
     };
   },
   components: {
@@ -300,6 +313,12 @@ export default {
     publish () {
       this.competitionId && this.$post(`${this.api.publishCompetition}?competitionId=${this.competitionId}&publishStatus=1`).then(res => { }).catch(err => { })
     },
+
+    // 关闭编辑的提示弹框
+    async closePopup () {
+      if (this.closeStatus) await this.$post(`${this.api.closePopup}?competitionId=${this.competitionId}`)
+      this.$emit('next', 0)
+    },
     // 自动分配人员
     async automaticAllocation (assignOrNot, next) {
       await this.$post(this.api.updateEventAllocationRecord, {
@@ -310,41 +329,40 @@ export default {
     },
     // 自动分配人员弹框
     async autoAllocationConfirm (next) {
+      // 查询是否有分配信息
       const { data } = await this.$post(`${this.api.viewEventAllocationInformation}?competitionId=${this.competitionId}`)
       if (!data || data.assignOrNot === undefined || !this.form[0].contentId) {
         // 首次发布 or 新增 才需要弹框
-        this.$confirm('<p>团队赛发布成功，是否要自动分配阶段参赛人员？</p><p style="margin-top: 10px;color: #a9a9a9;">（点击“是”将会在报名结束后给报名的团队自动分配阶段参赛人员</p>', '提示', {
-          confirmButtonText: '是',
-          cancelButtonText: '否',
-          type: 'success',
-          closeOnClickModal: false,
-          dangerouslyUseHTMLString: true,
-        }).then(() => {
-          this.automaticAllocation(1, next)
-        }).catch(() => {
-          this.automaticAllocation(0, next)
-        })
-      } else {
-        // 查询是否需要弹框
-        const res = await this.$post(`${this.api.editWhetherPopUpsAppear}?competitionId=${this.competitionId}`)
-        if (res.popupState) {
-          this.$confirm('<p>团队赛发布成功，是否要重新自动分配阶段参赛人员？</p><p style="margin-top: 10px;color: #a9a9a9;">（点击“是”将会<span style="color: #f00;">立即</span>给报名的团队自动分配阶段参赛人员</p>', '提示', {
+        const now = await Util.getNow()
+        // 报名结束时间还没到
+        if (new Date(this.$parent.$refs.step1.form.signUpEndTime) > now) {
+          this.$confirm('<p>团队赛发布成功，是否要自动分配阶段参赛人员？</p><p style="margin-top: 10px;color: #a9a9a9;">（点击“是”将会在报名结束后给报名的团队自动分配阶段参赛人员</p>', '提示', {
             confirmButtonText: '是',
             cancelButtonText: '否',
             type: 'success',
             closeOnClickModal: false,
-            showClose: false,
             dangerouslyUseHTMLString: true,
-          }).then(async () => {
-            await this.$post(`${this.api.automaticAllocation}?competitionId=${this.id}`) // 立马分配
-            this.$emit('next', next)
+          }).then(() => {
+            this.automaticAllocation(1, next)
           }).catch(() => {
             this.automaticAllocation(0, next)
           })
         } else {
-          // 无需弹框
-          this.$emit('next', next)
+          this.$confirm('团队赛发布成功，由于您设置的报名时间已结束，如需自动分配阶段参赛人员，请前往报名人员列表进行设置', '提示', {
+            confirmButtonText: '关闭',
+            type: 'success',
+            closeOnClickModal: false,
+            dangerouslyUseHTMLString: true,
+            showClose: false,
+          }).then(() => {
+            this.$emit('next', next)
+          }).catch(() => { })
         }
+      } else if (data.whetherToHidePopUps) {
+        // 编辑的提示弹框如果没勾选不再提示，则弹框提示
+        this.tipsVisible = true
+      } else {
+        this.$emit('next', next)
       }
     },
     // 提交
diff --git a/src/pages/match/manage/matchSignup.vue b/src/pages/match/manage/matchSignup.vue
index 2b512a1..66976bd 100644
--- a/src/pages/match/manage/matchSignup.vue
+++ b/src/pages/match/manage/matchSignup.vue
@@ -20,7 +20,7 @@
         <el-button v-if="loaded && info.completeCompetitionSetup.competitionType" type="primary" round
           :disabled="hasReport" :loading="allocating" @click="autoAllocationConfirm">{{ !notBeginSign && allocated ?
             '取消' : ''
-          }}自动分配阶段成员</el-button>
+          }}重新自动分配阶段成员</el-button>
         <el-button type="primary" round @click="batchImport">导入</el-button>
         <el-button type="primary" round @click="add" v-auth="'/match/list:管理:报名人员:新增'">新增</el-button>
         <el-button type="primary" round :loading="exporting" @click="exportAll"
@@ -397,16 +397,17 @@ export default {
     async autoAllocationConfirm () {
       // 报名结束后
       if (this.notBeginSign) {
-        this.$confirm('确定立即给所有报名的团队自动分配阶段成员？', '提示', {
+        this.$confirm('确定立即给所有报名的团队重新自动分配阶段成员？', '提示', {
           type: 'success',
           closeOnClickModal: false,
         }).then(async () => {
           await this.$post(`${this.api.automaticAllocation}?competitionId=${this.id}`) // 立马分配
         }).catch(() => { })
       } else {
-        this.$confirm(this.allocated ? '确定取消自动分配阶段成员？' : '确定开启自动分配阶段成员？开启后，将在报名结束后给所有报名的团队自动分配阶段参赛人员', {
+        this.$confirm(this.allocated ? '确定取消重新自动分配阶段成员？' : '<p style="margin-bottom: 5px;font-size: 16px;color: #f00;">确定开启重新自动分配阶段成员？</p><p>开启后，将在报名结束后给所有报名的团队重新自动分配阶段参赛人员</p>', {
           type: 'success',
           closeOnClickModal: false,
+          dangerouslyUseHTMLString: true,
         }).then(async () => {
           this.allocating = true
           this.automaticAllocation(this.allocated ? 0 : 1)