From c9928dd4f6d25e2339ea1400f59ec58674a927a7 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/tabbar/cart/cartList.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index 999f74a..d15dfdc 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -1,5 +1,5 @@
<template>
- <div class="wrapper">
+ <view class="wrapper">
<u-navbar :is-back="false" title="璐墿杞�">
<div slot="right">
<div class="light-color edit" @click="isEdit = !isEdit">{{ !isEdit ? '缂栬緫' : '瀹屾垚'}}</div>
@@ -175,14 +175,16 @@
</view>
</div>
<u-toast ref="uToast" />
- </div>
+ <custom-tabbar bgColor="#ffffff" selected="buyCar"></custom-tabbar>
+ </view>
</template>
<script>
+
+import '@/components/uview-components/uview-ui';
import * as API_Trade from "@/api/trade";
import { debounce } from "@/utils/tools.js";
-import uniNumberBox from '@/components/uni-number-box'
+// import uniNumberBox from '@/components/uni-number-box'
export default {
- components:{uniNumberBox}, // 鏁伴噺鍔犲噺缁勪欢
data() {
return {
loading:false,
@@ -623,7 +625,7 @@
left: 0;
top: 0;
width: 100%;
- height: 100vh;
+ height: calc(100vh - 50px);
z-index: 99;
padding-bottom: var(--window-bottom);
display: flex;
@@ -688,7 +690,7 @@
}
.wrapper {
- height: 100%;
+ height: calc(100% - 50px);;
}
/deep/ .u-col {
@@ -774,7 +776,7 @@
justify-content: space-between;
position: fixed;
// #ifdef APP-PLUS || MP-WEIXIN
- bottom: 0;
+ bottom: 50px;
// #endif
// #ifdef H5
bottom: var(--window-bottom);
--
Gitblit v1.8.0