修复bug

pages/cart/cart.vue

@@ -1,5 +1,5 @@
 <template>
-  <view>
+  <view class="wrap">
     <up-navbar placeholder :autoBack="true">
       <template #center>
         <view style="display: flex;align-items: center;width: 100%;justify-content: flex-start;margin-left: 100rpx;">
@@ -14,13 +14,13 @@
     <swiper class="swiper-box" :current="swiperCurrent" @animationfinish="animationfinish">
       <swiper-item class="swiper-item">
         <scroll-view scroll-y style="height: 100%;width: 100%;">
-          <view class="page-box1">
+          <view class="page-box1" style="padding-top: 60rpx;">
             <view class="total">
               <view>共计<text style="color: #20B128;">{{cartList.length}}</text>件</view>
               <view v-if="!isAdmin" @click="isAdmin=true;">管理</view>
               <view v-else @click="isAdmin=false;">完成</view>
             </view>
-            <view v-if="cartList.length>0" class="list" style="margin-top: 80rpx;">
+            <view v-if="cartList.length>0" class="list">
               <view class="shop-item" v-for="(item, index) in cartList" :key="index" @click="openGoodPopup(item)">
                 <view class="shop-check" @click.stop="checkItem(item, !item.check)">
                   <image v-if="!item.check" src="@/static/icon/n-check.png"></image>
@@ -82,6 +82,8 @@
       </swiper-item>
     </swiper>
 
+    
+  </view>
   <up-transition :show="tabsActive==0">
     <view class="fiexd-btn-box cart-btn">
       <view class="cart-check" @click="changeAll(checkAll===cartInfo.count)">
@@ -110,7 +112,6 @@
     </view>
   </up-transition>
   <goodPopup ref="goodRef" :show="showGoodPopup" @close="showGoodPopup=false" @change="changeGood" />
-  </view>
 </template>
 
 <script setup>
@@ -273,18 +274,20 @@
     transition: 300ms;
   }
 
+  .wrap {
+    display: flex;
+    flex-direction: column;
+    height: calc(100vh - var(--window-top));
+    width: 100%;
+  }
+  
   .swiper-box {
     flex: 1;
-    height: calc(100vh - var(--window-top));
+  }
-    /* #ifdef H5 */
-    height: calc(100vh - 44px);
-    /* #endif */
-    width: 100%;
   
   .swiper-item {
     height: 100%;
   }
-  }
 
   .page-box1 {
     position: relative;

pagesOrder/order/order.vue

@@ -1,6 +1,6 @@
 <template>
-  <view>
+  <view class="wrap">
-    <up-navbar placeholder style="z-index: 10080;" @leftClick="navBack">
+    <up-navbar placeholder style="z-index: 100800;" @leftClick="navBack">
       <template #center>
         <view>订单</view>
       </template>
@@ -19,8 +19,8 @@
         <scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="loadMoreGood">
           <view class="page-box">
             <view v-if="list.length>0" class="list">
-              <good v-for="(item, index) in list" :datas="item" :key="index" :type="k" @cancleOrder="cancleOrder" @takeOrder="takeOrder"
+              <good v-for="(item, index) in list" :datas="item" :key="index" :type="k" @cancleOrder="cancleOrder"
-                @rePay="rePay" @purchaseAgain="purchaseAgain"></good>
+                @takeOrder="takeOrder" @rePay="rePay" @purchaseAgain="purchaseAgain"></good>
             </view>
             <view v-if="!where[k].loading&&list.length==0" style="padding-top: 100rpx;">
               <up-empty text="订单空空如也"
@@ -30,11 +30,12 @@
             <view v-else-if="where[k].loadend" style="padding-top: 100rpx;">
               <view style="text-align: center;color: #999;">没有更多了</view>
             </view>
-            <view v-if="where[k].loading" style="padding-top: 100rpx;display: flex;flex-direction: column;align-items: center;">
+            <view v-if="where[k].loading"
+              style="padding-top: 100rpx;display: flex;flex-direction: column;align-items: center;">
               <up-loading-icon mode="circle"></up-loading-icon>
               <view style="margin-top: 20rpx;color: #999;">加载中</view>
             </view>
-            <view style="width: 100%;height: 200rpx;"></view>
+            <view style="width: 100%;height: 300rpx;"></view>
           </view>
         </scroll-view>
       </swiper-item>
@@ -248,22 +249,22 @@
   onUnload(() => {
     uni.$off('reLoadOrderList', reloadAll)
   })
-  
 </script>
 
 <style lang="scss">
+  .wrap {
+    display: flex;
+    flex-direction: column;
+    height: calc(100vh - var(--window-top));
+    width: 100%;
+  }
+
   .swiper-box {
     flex: 1;
-    height: calc(100vh - var(--window-top) - 140rpx);
+  }
-    /* #ifdef H5 */
-    height: calc(100vh - 210rpx);
-    /* #endif */
-    width: 100%;
 
   .swiper-item {
     height: 100%;
-      // background-color: pink;
-    }
   }
 
   .page-box {