Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
aixianling
2021-12-24 20:19:31 +08:00

View File

@@ -98,7 +98,7 @@
</div>
</div>
<div class="fixedBtns" v-if="this.current == 0 && detail.status == 0 && this.createUserId == this.user.id" @click="toAdd">编辑活动</div>
<div class="fixedBtns" v-if="this.current == 0 && detail.status != 0 && this.createUserId == this.user.id" @click="toAdd">编辑活动</div>
</div>
<AiFixedBtn v-if="this.createUserId == this.user.id && this.timeNow * 1 - this.timeEnd * 1 < 24 * 60 * 60 * 1000">