Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-h5 into test

pages/shareArea/hiList.vue

@@ -196,13 +196,11 @@
 
     <!-- 购物车抽屉 -->
     <u-popup
-      v-if="showCartDrawer"
       :show="showCartDrawer"
       mode="bottom"
       border-radius="30"
       :closeable="true"
-      :overlay="false"
+      style="position: absolute; bottom: 0; left: 0; right: 0"
-      :zIndex="200"
       @close="showCartDrawer = false"
     >
       <view class="cart-drawer">
@@ -443,24 +441,25 @@ export default {
 
     // 从购物车删除商品
     removeFromCart(index) {
-      uni.showModal({
+      this.cartData[this.activeTab].splice(index, 1)
-        title: '提示',
+      if (this.cartTotalCount === 0) {
-        content: '确定要删除该商品吗？',
+        this.showCartDrawer = false
-        success: res => {
+      }
-          if (res.confirm) {
+      // uni.showModal({
-            this.cartData[this.activeTab].splice(index, 1)
+      //   title: '提示',
-            uni.showToast({
+      //   content: '确定要删除该商品吗？',
-              title: '删除成功',
+      //   success: res => {
-              icon: 'success',
+      //     if (res.confirm) {
-              duration: 1500,
+      //       this.cartData[this.activeTab].splice(index, 1)
-            })
+      //       uni.showToast({
-            if (this.cartTotalCount === 0) {
+      //         title: '删除成功',
-              this.showCartDrawer = false
+      //         icon: 'success',
-            }
+      //         duration: 1500,
-          }
+      //       })
-        },
+      //     }
-        zIndex: 99999999, // 确保层级高于抽屉
+      //   },
-      })
+      //   zIndex: 99999999, // 确保层级高于抽屉
+      // })
     },
 
     // 切换购物车抽屉