From 9753a1077a3d26bc350b2e91d0e2e8f090d83aad Mon Sep 17 00:00:00 2001
From: buffeyu <yeqingyu@dimine.net>
Date: Thu, 27 Jan 2022 11:14:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cart/index.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index 58d90cd..3791221 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -82,9 +82,9 @@
       </view>
       <uni-popup ref="popup" type="center" :mask-click="false">
         <view class="popup-box">
-          <view class="tip-title">{{ allSelected ? '确定将购物车纸品删除吗？' : '确定将当前纸品删除吗？' }}</view>
+          <view class="tip-title">{{ onlyQuantity ? '确定将当前纸品删除吗？' : (allSelected ? '确定将购物车纸品删除吗？' : '确定将当前纸品删除吗？') }}</view>
           <view class="operation-row">
-            <view class="cancel-text" @tap="cancelTap">取消</view>
+            <view class="cancel-text" @tap="cancelTap">{{onlyQuantity ? '我在想想' : '取消'}}</view>
             <view class="line"></view>
             <view class="confirm-text" @tap="confirmTap">确定</view>
           </view>
@@ -123,7 +123,8 @@ export default {
       },
       checked: false,
       list: [],
-      idList: []
+      idList: [],
+	  onlyQuantity: false,
     }
   },
   created() {
@@ -305,9 +306,11 @@ export default {
     delTap() {
       // idList
       this.idList = []
+	  let quantity = 0
       this.list.forEach((el) => {
         el.carItemList.forEach((good) => {
           if (good.checked) {
+			quantity = good.quantity
             this.idList.push(good.id)
           }
         })
@@ -319,6 +322,12 @@ export default {
         })
         return
       }
+	  // 单一纸品删除，数量为0时，提示用户确认后删除纸品
+	  if(this.idList.length == 1 && quantity == 0) {
+		  this.onlyQuantity = true
+	  }else {
+		  this.onlyQuantity = false
+	  }
       this.$refs.popup.open('center')
     },
     confirmTap() {