diff --git a/src/layout/index.vue b/src/layout/index.vue index 386052f..7f2b3b9 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -37,8 +37,10 @@ import myAside from "./myAside.vue"; .el-main { background-color: #f5f5f5; width: calc(100vw - 100px); - min-height: calc(100vh - 60px); + height: calc(100vh - 60px); border-radius: 2rem 0 0 0; + overflow-y: scroll; + .my-main { height: 100%; width: 100%; diff --git a/src/views/order/index.vue b/src/views/order/index.vue index cdece31..4dd9c98 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -24,6 +24,22 @@ const getOrderList = () => { getOrderList() +const prevClick = (e) => { + where.value.page = e; + getOrderList(); +} + +const nextClick = (e) => { + where.value.page = e; + getOrderList(); +} + +const currentChange = (e) => { + where.value.page = e; + getOrderList(); +} + + @@ -54,6 +73,7 @@ getOrderList() border-radius: 1.2rem; box-sizing: border-box; padding: 1rem; + overflow-y: scroll; } /* 修改滚动条的样式 */ ::-webkit-scrollbar {