新增营销系统、分销系统、会员功能、门店、提现功能

pages/shoppingCartJump/shoppingCart.vue

@@ -126,7 +126,7 @@
       </card>
     </uv-checkbox-group>
     <!-- bottom action row -->
-    <view class="screen action-bar ">
+    <view class="screen action-bar " :style="{paddingBottom:`${safeArea}px`}">
       <view class="action-info">
         <view class="action-checkbox">
           <uv-checkbox-group
@@ -170,7 +170,7 @@
   <!-- null data -->
   <CartEmpty v-else />
   <!-- 商品推荐 -->
-  <Recommend  />
+  <Recommend />
   <view class="action-height"></view>
   <view class="h5-tabbar-height"></view>
   <!-- sku select -->
@@ -178,8 +178,9 @@
       style="z-index: 999"
       :id="openSkuProductId"
       ref="goodsAttrSelectRef"
-      @close="handleCloseSkuSelect"
-      @submit="(e)=>handleSubmitSkuSelect(e, goodsAttrSelectRef,cartList,handleCartNumberInputChange,doGetCartList)
+      :goods-detail="openProductItem"
+      :sku-id="openSkuSkuId"
+      @select="(e)=>handleSubmitSkuSelect(e, goodsAttrSelectRef,cartList,handleCartNumberInputChange,doGetCartList)
 "
   />
   <!-- delete modal -->
@@ -196,11 +197,11 @@ import { ref } from 'vue'
 import Goods from "@/components/goodsComponents/Goods.vue";
 import GoodAttrSelect from "@/components/good-attr-select/good-attr-select.vue";
 import Modal from "@/components/Modal/index.vue"
-import { settleFields } from "@/pages/shoppingCart/index.data";
-import { useCartData, useCartNumber, useCartOption, useSku } from "@/pages/shoppingCart/index.utils";
-import CartEmpty from "@/pages/shoppingCart/components/CartEmpty.vue";
+import { settleFields } from "./index.data";
+import { useCartData, useCartNumber, useCartOption, useSku } from "./index.utils";
+import CartEmpty from "./components/CartEmpty.vue";
 import Header from "@/components/Header/index.vue"
-import { onHide, onPageScroll, onReachBottom } from "@dcloudio/uni-app";
+import { onHide } from "@dcloudio/uni-app";
 import Recommend from "@/components/Recommend/index.vue";
 import { useScroll } from "@/hooks/useScroll";
 import ReturnTop from "@/components/ReturnTop/index.vue"
@@ -230,6 +231,8 @@ const {
 } = useCartOption({cartList, doGetCartList})
 
 const {
+  openProductItem,
+  openSkuSkuId,
   openSkuProductId,
   handleOpenSkuSelect,
   handleCloseSkuSelect,
@@ -243,13 +246,16 @@ const {
 } = useCartNumber({afterChange: computeSelectInfoByShoppingSelect})
 
 
-
-
 onHide(() => {
   modalRef.value?.close()
   goodsAttrSelectRef.value?.close()
 })
-
+const safeArea=ref(0)
+uni.getSystemInfo({
+  success: res => {
+     safeArea.value = res.safeAreaInsets.bottom;
+  }
+})
 const {scrollTop} = useScroll()
 </script>
 
@@ -416,4 +422,7 @@ const {scrollTop} = useScroll()
     }
   }
 }
+.action-bar{
+  //padding-bottom: env(safe-area-inset-bottom);
+}
 </style>