From 1eefd113e28e802348a9cae69a41945c1dc48b0f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 11 六月 2025 21:05:26 +0800
Subject: [PATCH] Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-wx into dev
---
pages/tabbar/cart/cartList.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index 999f74a..531d5e7 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,26 @@
</view>
</div>
<u-toast ref="uToast" />
- </div>
+ <custom-tabbar bgColor="#ffffff" selected="buyCar"></custom-tabbar>
+ </view>
</template>
<script>
+
+import UNavbar from '@/uview-components/uview-ui/components/u-navbar/u-navbar.vue';
+import UCheckboxGroup from '@/uview-components/uview-ui/components/u-checkbox-group/u-checkbox-group.vue';
+import UCheckbox from '@/uview-components/uview-ui/components/u-checkbox/u-checkbox.vue';
+import USwipeAction from '@/uview-components/uview-ui/components/u-swipe-action/u-swipe-action.vue';
+import UImage from '@/uview-components/uview-ui/components/u-image/u-image.vue';
+import UIcon from '@/uview-components/uview-ui/components/u-icon/u-icon.vue';
+import UPopup from '@/uview-components/uview-ui/components/u-popup/u-popup.vue';
+import UCountDown from '@/uview-components/uview-ui/components/u-count-down/u-count-down.vue';
+import UModal from '@/uview-components/uview-ui/components/u-modal/u-modal.vue';
+import UToast from '@/uview-components/uview-ui/components/u-toast/u-toast.vue';
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}, // 鏁伴噺鍔犲噺缁勪欢
+ components:{UNavbar,UCheckboxGroup,UCheckbox,USwipeAction,UImage,UIcon,UPopup,UCountDown,UModal,UToast}, // 鏁伴噺鍔犲噺缁勪欢
data() {
return {
loading:false,
@@ -623,7 +635,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 +700,7 @@
}
.wrapper {
- height: 100%;
+ height: calc(100% - 50px);;
}
/deep/ .u-col {
@@ -774,7 +786,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