diff --git a/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue b/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue index eb54efa..5bdd4e2 100644 --- a/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue +++ b/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue @@ -86,10 +86,10 @@ 结算 - + + @@ -117,7 +117,7 @@ let isAll = ref(false); let data = ref([]); let page = reactive({ current: 1, - size: 100, + size: 20, }); let ids = ref([]); @@ -161,6 +161,14 @@ onMounted(() => { }); }); +const pagination = (value) => { + page.current = value; + shoppingCart(page).then((res) => { + data.value = res.data.records; + addIsCheckProperty(data); + }); +}; + function addIsCheckProperty(data) { if (Array.isArray(data)) { data.forEach((item) => { @@ -411,6 +419,7 @@ function removeCheckedItems(data) { background: $color-fff; } .fix-top { + z-index: 999; top: 0; display: inline-flex; justify-content: space-between; @@ -461,8 +470,8 @@ function removeCheckedItems(data) { bottom: 38px; } .fix-bottom { - // bottom: 30px; - bottom: 0; + bottom: 30px; + // bottom: 0; display: inline-flex; justify-content: space-between; width: 100%; diff --git a/sub-operation-service/src/views/shoppingCarts/sureOrders.vue b/sub-operation-service/src/views/shoppingCarts/sureOrders.vue index b291c56..24b6e2a 100644 --- a/sub-operation-service/src/views/shoppingCarts/sureOrders.vue +++ b/sub-operation-service/src/views/shoppingCarts/sureOrders.vue @@ -40,6 +40,7 @@ +
确认订单信息
diff --git a/sub-operation-service/src/views/userCenter/orderDetails.vue b/sub-operation-service/src/views/userCenter/orderDetails.vue index bd124f0..cd691cd 100644 --- a/sub-operation-service/src/views/userCenter/orderDetails.vue +++ b/sub-operation-service/src/views/userCenter/orderDetails.vue @@ -341,6 +341,9 @@ const back = () => { .order-list-warp-left { width: 55%; height: 70vh; + overflow: hidden; + overflow-y: scroll; + scrollbar-width: none; .order-list-warp-left-title { margin-top: 20px; font-size: 18px;