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 |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index 999f74a..f1dfa7f 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -1,12 +1,12 @@
 <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>
       </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>
@@ -175,14 +180,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,
@@ -212,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 });
@@ -623,7 +634,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 +699,7 @@
 }
 
 .wrapper {
-  height: 100%;
+  height: calc(100% - 50px);;
 }
 
 /deep/ .u-col {
@@ -774,7 +785,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