From d3d0b4dbb4f1f8c4784c834e0a39feba8aa5afa5 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 02 七月 2025 10:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/tabbar/cart/cartList.vue | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index 03b59ee..f1dfa7f 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -6,7 +6,7 @@
</div>
</u-navbar>
<!-- 绌虹櫧椤�-->
- <view v-if="!loading && (cartDetail.cartList == '' || cartDetail.cartList == [] || !cartDetail)" class="empty">
+ <view v-if="!loading && (cartDetail.cartList == '' || cartDetail.cartList == [] || !cartDetail)" class="empty" :style="{height: windowHeight - marginBottom - 50 + 'px'}">
<image src="/static/emptyCart.png" mode="aspectFit"></image>
<view class="empty-tips">
绌虹┖濡備篃
@@ -14,7 +14,7 @@
</view>
</view>
<!-- 搴楅摵鍟嗗搧淇℃伅 -->
- <div class="content">
+ <div class="content" :style="{height: windowHeight - marginBottom - 50 + 'px'}">
<div class="box box2" :class="{ invalid: isInvalid(item) }" v-for="(item, index) in cartDetail.cartList"
:key="index">
<view class="tab">
@@ -68,7 +68,12 @@
</u-checkbox-group>
<span class="invalid" v-else style="font-size: 24rpx">澶辨晥</span>
</view>
- <u-image border-radius="10" :fade="true" @click="navigateToGoods(skuItem)" width="160rpx" height="160rpx"
+<!-- <video border-radius="10" :fade="true" @click="navigateToGoods(skuItem)"
+ v-if="skuItem.goodsSku.goodsVideo" :src="skuItem.goodsSku.goodsVideo"
+ style="width: 160rpx;height: 160rpx;"
+ :initial-time="0"
+ :controls="false" object-fit="contain" :show-play-btn="false" :show-center-play-btn="false"/> -->
+ <u-image border-radius="10" :fade="true" @click="navigateToGoods(skuItem)" width="160rpx" height="160rpx"
:src="skuItem.goodsSku.thumbnail" />
</view>
<view class="goods-content">
@@ -121,7 +126,7 @@
<u-modal v-model="deleteShow" :confirm-style="{'color':lightColor}" @confirm="deleteConfirm" show-cancel-button
:content="deleteContent" :async-close="true"></u-modal>
<!-- 缁撹处 -->
- <div class="box box6">
+ <div class="box box6" :style="{bottom: marginBottom + 50 + 'px'}">
<view class="navL">
<u-checkbox shape="circle" :active-color="lightColor" v-model="checkout" @change="checkOut()" label-size="24">鍏ㄩ��
</u-checkbox>
@@ -180,21 +185,11 @@
</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 '@/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,UNavbar,UCheckboxGroup,UCheckbox,USwipeAction,UImage,UIcon,UPopup,UCountDown,UModal,UToast}, // 鏁伴噺鍔犲噺缁勪欢
data() {
return {
loading:false,
@@ -224,10 +219,14 @@
isEdit: false, // 鏄惁鏄紪杈�
checkout: false, //鍏ㄩ�夋寜閽�
WEIXIN_num: "", //璐墿杞﹀吋瀹瑰井淇℃杩涘櫒
+ marginBottom: 0 ,// 搴曢儴瀹夊叏鍖哄煙
+ windowHeight: 0 // 鍙娇鐢ㄥ睆骞曢珮搴�
};
},
mounted() {
+ this.marginBottom = uni.getSystemInfoSync().safeAreaInsets.bottom
+ this.windowHeight = uni.getSystemInfoSync().windowHeight
// #ifdef MP-WEIXIN
// 灏忕▼搴忛粯璁ゅ垎浜�
uni.showShareMenu({ withShareTicket: true });
--
Gitblit v1.8.0