From 8b902be603a4c67daef6e9a70b3b91c955a6e365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Wed, 11 Mar 2026 16:36:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(ticket):=20=E4=BF=AE=E5=A4=8D=E6=B0=B4?=
 =?UTF-8?q?=E7=A5=A8=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=92=8C=E4=BA=A4=E4=BA=92=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改订单取消后水票退回提示图标为无图标模式
- 注释掉暂无可用水票时的弹窗提示逻辑
- 调整空状态按钮点击事件，在编辑模式下关闭弹窗而非跳转购买
- 优化下单按钮显示逻辑，区分编辑模式和普通模式的不同行为
- 修复提交按钮文案显示问题，确保编辑模式下显示正确文字
---
 src/user/ticket/index.tsx |  2 +-
 src/user/ticket/use.tsx   | 55 +++++++++++++++++++++------------------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/user/ticket/index.tsx b/src/user/ticket/index.tsx
index 024811c..bc94a3e 100644
--- a/src/user/ticket/index.tsx
+++ b/src/user/ticket/index.tsx
@@ -460,7 +460,7 @@ const UserTicketList = () => {
       }
       try {
         await rollbackUserTicketAfterOrderCancel(order, beforeTicket);
-        Taro.showToast({ title: '订单已取消，水票已退回', icon: 'success' });
+        Taro.showToast({ title: '订单已取消，水票已退回', icon: 'none' });
       } catch (e) {
         console.error('取消订单后退回水票失败:', e);
         await Taro.showModal({
diff --git a/src/user/ticket/use.tsx b/src/user/ticket/use.tsx
index 8e5ca07..9708278 100644
--- a/src/user/ticket/use.tsx
+++ b/src/user/ticket/use.tsx
@@ -918,17 +918,17 @@ const OrderConfirm = () => {
     if (noTicketPromptedRef.current) return
     noTicketPromptedRef.current = true
 
-    ;(async () => {
-      const r = await Taro.showModal({
-        title: '暂无可用水票',
-        content: '您当前没有可用水票，购买后再来下单更方便。',
-        confirmText: '去购买',
-        cancelText: '暂不'
-      })
-      if (r.confirm) {
-        await goBuyTickets()
-      }
-    })()
+    // ;(async () => {
+    //   const r = await Taro.showModal({
+    //     title: '暂无可用水票',
+    //     content: '您当前没有可用水票，购买后再来下单更方便。',
+    //     confirmText: '去购买',
+    //     cancelText: '暂不'
+    //   })
+    //   if (r.confirm) {
+    //     await goBuyTickets()
+    //   }
+    // })()
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [noUsableTickets, isEditMode])
 
@@ -1185,7 +1185,10 @@ const OrderConfirm = () => {
                 <View className="py-10 text-center">
                   <Empty description="暂无可用水票" />
                   <View className="mt-4 flex justify-center">
-                    <Button type="primary" onClick={goBuyTickets}>
+                    <Button
+                      type="primary"
+                      onClick={isEditMode ? () => setTicketPopupVisible(false) : goBuyTickets}
+                    >
                       {isEditMode ? '确定修改' : '确定下单'}
                     </Button>
                   </View>
@@ -1268,25 +1271,25 @@ const OrderConfirm = () => {
             </View>
 	          </div>
 	          <div className={'buy-btn mx-4'}>
-	              {noUsableTickets ? (
+	              {noUsableTickets && !isEditMode ? (
 	                <Button type="primary" size="large" onClick={goBuyTickets}>
 	                  {isEditMode ? '确定修改' : '确定下单'}
 	                </Button>
 	              ) : (
 		                <Button
 		                  type="success"
-	                  size="large"
+		                  size="large"
 	                  loading={submitLoading || deliveryRangeChecking}
 	                  disabled={
 	                    deliveryRangeChecking ||
                       !address?.id ||
                       !addressHasCoords ||
-	                    (deliveryRangeCheckedAddressId === address?.id && inDeliveryRange === false) ||
-	                    availableTicketTotal <= 0 ||
-	                    !canStartOrder
-	                  }
-	                  onClick={onSubmit}
-	                >
+		                    (deliveryRangeCheckedAddressId === address?.id && inDeliveryRange === false) ||
+		                    (!isEditMode && availableTicketTotal <= 0) ||
+		                    !canStartOrder
+		                  }
+		                  onClick={onSubmit}
+		                >
                   {deliveryRangeChecking
                     ? '校验配送范围...'
                     : (!address?.id
@@ -1295,12 +1298,12 @@ const OrderConfirm = () => {
                         ? '地址缺少定位'
                         : ((deliveryRangeCheckedAddressId === address?.id && inDeliveryRange === false)
                           ? '不在配送范围'
-                          : (submitLoading ? '提交中...' : '立即提交')
-                        )
-                      )
-                    )
-                  }
-                </Button>
+		                          : (submitLoading ? '提交中...' : (isEditMode ? '确定修改' : '立即提交'))
+		                        )
+		                      )
+		                    )
+		                  }
+		                </Button>
               )}
 	          </div>
 	        </View>