diff --git a/template/admin/src/pages/account/login/index.vue b/template/admin/src/pages/account/login/index.vue index 8aabea8f2..763ee3313 100644 --- a/template/admin/src/pages/account/login/index.vue +++ b/template/admin/src/pages/account/login/index.vue @@ -226,14 +226,14 @@ export default { if (data.queue === false) { this.$Notice.warning({ title: '温馨提示', - desc: '您的【消息队列】未开启,没有开启会导致异步任务无法执行。请尽快执行命令开启!!', + desc: '您的【消息队列】未开启,没有开启会导致异步任务无法执行。请尽快执行命令开启!!点击查看开启方法', duration: 30, }); } if (data.timer === false) { this.$Notice.warning({ title: '温馨提示', - desc: '您的【定时任务】未开启,没有开启会导致定时执行的任务无法执行。请尽快执行命令开启!!', + desc: '您的【定时任务】未开启,没有开启会导致定时执行的任务无法执行。请尽快执行命令开启!!点击查看开启方法', duration: 30, }); } @@ -267,7 +267,7 @@ export default { isNotice = true; this.$Notice.warning({ title: '温馨提示', - desc: '您的【长连接】未开启,没有开启会导致客服消息无法发送,后台订单通知无法收到。请尽快执行命令开启!!', + desc: '您的【长连接】未开启,没有开启会导致客服消息无法发送,后台订单通知无法收到。请尽快执行命令开启!!点击查看开启方法', duration: 30, }); } @@ -277,7 +277,7 @@ export default { isNotice = true; this.$Notice.warning({ title: '温馨提示', - desc: '您的【长连接】未开启,没有开启会导致客服消息无法发送,后台订单通知无法收到。请尽快执行命令开启!!', + desc: '您的【长连接】未开启,没有开启会导致客服消息无法发送,后台订单通知无法收到。请尽快执行命令开启!!点击查看开启方法', duration: 30, }); } diff --git a/template/admin/src/pages/finance/financialRecords/recharge/index.vue b/template/admin/src/pages/finance/financialRecords/recharge/index.vue index b536502f3..8259cc24e 100644 --- a/template/admin/src/pages/finance/financialRecords/recharge/index.vue +++ b/template/admin/src/pages/finance/financialRecords/recharge/index.vue @@ -75,7 +75,7 @@ no-filtered-data-text="暂无筛选结果" > diff --git a/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue b/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue index 3cf25f49e..12e27f208 100644 --- a/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue +++ b/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue @@ -56,14 +56,6 @@ - @@ -84,15 +76,6 @@ > - - - - - - - - - diff --git a/template/admin/src/pages/system/file/index.vue b/template/admin/src/pages/system/file/index.vue index e9a088fba..654117d67 100644 --- a/template/admin/src/pages/system/file/index.vue +++ b/template/admin/src/pages/system/file/index.vue @@ -23,17 +23,24 @@ export default { this.$nextTick(() => { let winwidth = this.$refs.picBox.clientWidth; - console.log(winwidth); + let winHeight = document.body.clientHeight - 170; + console.log(winwidth,winHeight); if (winwidth < 1018) { this.pageLimit = 18; + this.pageLimit = winHeight > 790 ? 24 : 18; + } else if (winwidth < 1185) { - this.pageLimit = 18; + this.pageLimit = winHeight > 790 ? 30 : 18; } else if (winwidth < 1222) { - this.pageLimit = 24; + this.pageLimit = 30; } else if (winwidth < 1327) { this.pageLimit = 32; - } else if (winwidth > 1483) { + } else if (winwidth < 1750) { this.pageLimit = 40; + } else if (winwidth < 2100) { + this.pageLimit = winHeight > 790 ? 60 : 48; + } else if (winwidth > 2100) { + this.pageLimit = winHeight > 790 ? 75 : 60; } this.uploadShow = true; }); @@ -50,4 +57,7 @@ export default { /deep/ .ivu-card-body{ min-height: 700px; } +/deep/ .conter .pictrueList{ + max-width 100% +}