Compare commits

..

No commits in common. "0fbc726e8e3f8e21a17a0111def1954d0eab9e4a" and "96d4801116dced25929b96da6e58420c61b3430a" have entirely different histories.

3 changed files with 6 additions and 19 deletions

View File

@ -86,10 +86,10 @@
<el-button :disabled="data.length == 0" :type="data.length != 0 ? 'primary' : 'info'" @click="toSettlement">结算</el-button> <el-button :disabled="data.length == 0" :type="data.length != 0 ? 'primary' : 'info'" @click="toSettlement">结算</el-button>
</div> </div>
</div> </div>
<div class="pagination"> <!-- <div class="pagination">
<div style="color: #999999; font-size: 15px">{{ data.total }}</div> <div style="color: #999999; font-size: 15px">{{ data.total }}</div>
<el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="data.total" @change="pagination" /> <el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="data.total" />
</div> </div> -->
</div> </div>
</div> </div>
</template> </template>
@ -117,7 +117,7 @@ let isAll = ref(false);
let data = ref([]); let data = ref([]);
let page = reactive({ let page = reactive({
current: 1, current: 1,
size: 20, size: 100,
}); });
let ids = ref([]); let ids = ref([]);
@ -161,14 +161,6 @@ onMounted(() => {
}); });
}); });
const pagination = (value) => {
page.current = value;
shoppingCart(page).then((res) => {
data.value = res.data.records;
addIsCheckProperty(data);
});
};
function addIsCheckProperty(data) { function addIsCheckProperty(data) {
if (Array.isArray(data)) { if (Array.isArray(data)) {
data.forEach((item) => { data.forEach((item) => {
@ -419,7 +411,6 @@ function removeCheckedItems(data) {
background: $color-fff; background: $color-fff;
} }
.fix-top { .fix-top {
z-index: 999;
top: 0; top: 0;
display: inline-flex; display: inline-flex;
justify-content: space-between; justify-content: space-between;
@ -470,8 +461,8 @@ function removeCheckedItems(data) {
bottom: 38px; bottom: 38px;
} }
.fix-bottom { .fix-bottom {
bottom: 30px; // bottom: 30px;
// bottom: 0; bottom: 0;
display: inline-flex; display: inline-flex;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;

View File

@ -40,7 +40,6 @@
</div> </div>
</el-scrollbar> </el-scrollbar>
</div> </div>
<!-- <div style="background-color: #fff; margin-bottom: 20px">订单备注</div> -->
<div class="order-info"> <div class="order-info">
<div class="order-info-top">确认订单信息</div> <div class="order-info-top">确认订单信息</div>

View File

@ -341,9 +341,6 @@ const back = () => {
.order-list-warp-left { .order-list-warp-left {
width: 55%; width: 55%;
height: 70vh; height: 70vh;
overflow: hidden;
overflow-y: scroll;
scrollbar-width: none;
.order-list-warp-left-title { .order-list-warp-left-title {
margin-top: 20px; margin-top: 20px;
font-size: 18px; font-size: 18px;