From ef26a207b07d96f66f56dd4fc64dd020fbc4e97b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 26 Feb 2026 12:30:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(goods):=20=E4=BF=AE=E5=A4=8D=E6=B0=B4?=
 =?UTF-8?q?=E7=A5=A8=E5=A5=97=E7=A5=A8=E5=95=86=E5=93=81=E7=9A=84=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E6=B5=81=E7=A8=8B=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加 ticketTemplateChecked 状态用于跟踪套票模板检查状态
- 在获取套票模板后正确设置 checked 状态避免重复检查
- 修复立即购买按钮样式在无购物车按钮时的显示问题
- 隐藏用户票券页面中的操作标签元素
---
 src/app.scss                   |  4 ++++
 src/shop/goodsDetail/index.tsx | 32 ++++++++++++++++++++++++--------
 src/user/ticket/index.tsx      |  2 +-
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/app.scss b/src/app.scss
index ae872ba..272310c 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -87,6 +87,10 @@ button[open-type="chooseAvatar"] {
     justify-content: center;
     height: 80px;
   }
+  .cart-buy-only{
+    border-radius: 20px;
+    flex: 1;
+  }
 }
 
 image {
diff --git a/src/shop/goodsDetail/index.tsx b/src/shop/goodsDetail/index.tsx
index 4c4fa19..c62b9a4 100644
--- a/src/shop/goodsDetail/index.tsx
+++ b/src/shop/goodsDetail/index.tsx
@@ -36,6 +36,7 @@ const GoodsDetail = () => {
   })
   // 水票套票模板：存在时该商品不允许加入购物车（购物车无法支付此类商品）
   const [ticketTemplate, setTicketTemplate] = useState<GltTicketTemplate | null>(null)
+  const [ticketTemplateChecked, setTicketTemplateChecked] = useState(false)
   // const [selectedSku, setSelectedSku] = useState<ShopGoodsSku | null>(null);
   const [loading, setLoading] = useState(false);
   const router = Taro.getCurrentInstance().router;
@@ -70,16 +71,20 @@ const GoodsDetail = () => {
     // 水票套票商品：不允许加入购物车（购物车无法支付）
     // 优先使用已加载的 ticketTemplate；若尚未加载则补一次查询
     let tpl = ticketTemplate
+    let checked = ticketTemplateChecked
     if (!tpl && goods?.goodsId) {
       try {
         tpl = await getGltTicketTemplateByGoodsId(Number(goods.goodsId))
         setTicketTemplate(tpl)
+        setTicketTemplateChecked(true)
+        checked = true
       } catch (_e) {
         tpl = null
+        setTicketTemplateChecked(true)
+        checked = true
       }
     }
-    if (tpl) {
-      Taro.showToast({title: '该商品为水票套票商品，请点击“立即购买”下单', icon: 'none'})
+    if (!checked || tpl) {
       return
     }
 
@@ -126,16 +131,20 @@ const GoodsDetail = () => {
     if (action === 'cart') {
       // 水票套票商品：不允许加入购物车（购物车无法支付）
       let tpl = ticketTemplate
+      let checked = ticketTemplateChecked
       if (!tpl && goods?.goodsId) {
         try {
           tpl = await getGltTicketTemplateByGoodsId(Number(goods.goodsId))
           setTicketTemplate(tpl)
+          setTicketTemplateChecked(true)
+          checked = true
         } catch (_e) {
           tpl = null
+          setTicketTemplateChecked(true)
+          checked = true
         }
       }
-      if (tpl) {
-        Taro.showToast({title: '该商品为水票套票商品，请点击“立即购买”下单', icon: 'none'})
+      if (!checked || tpl) {
         return
       }
 
@@ -190,6 +199,7 @@ const GoodsDetail = () => {
       setLoading(true);
       // 切换商品时先重置套票模板，避免复用上一个商品状态
       setTicketTemplate(null)
+      setTicketTemplateChecked(false)
 
       // 加载商品详情
       getShopGoods(Number(goodsId))
@@ -218,10 +228,12 @@ const GoodsDetail = () => {
         .then((tpl) => {
           if (!alive) return
           setTicketTemplate(tpl)
+          setTicketTemplateChecked(true)
         })
         .catch((_e) => {
           if (!alive) return
           setTicketTemplate(null)
+          setTicketTemplateChecked(true)
         })
 
       // 加载商品规格
@@ -284,6 +296,8 @@ const GoodsDetail = () => {
     return <View>加载中...</View>;
   }
 
+  const showAddToCart = ticketTemplateChecked && !ticketTemplate
+
   return (
     <View className={"py-0"}>
       <View
@@ -442,10 +456,12 @@ const GoodsDetail = () => {
             </button>
           </View>
           <View className={'buy-btn mx-4'}>
-            <View className={'cart-add px-4 text-sm'}
-                  onClick={() => handleAddToCart()}>加入购物车
-            </View>
-            <View className={'cart-buy pl-4 pr-5 text-sm'}
+            {showAddToCart && (
+              <View className={'cart-add px-4 text-sm'}
+                    onClick={() => handleAddToCart()}>加入购物车
+              </View>
+            )}
+            <View className={`cart-buy text-sm ${showAddToCart ? 'pl-4 pr-5' : 'cart-buy-only px-4'}`}
                   onClick={() => handleBuyNow()}>立即购买
             </View>
           </View>
diff --git a/src/user/ticket/index.tsx b/src/user/ticket/index.tsx
index 5608210..325bb6e 100644
--- a/src/user/ticket/index.tsx
+++ b/src/user/ticket/index.tsx
@@ -490,7 +490,7 @@ const UserTicketList = () => {
                           </View>
                         )}
                       </View>
-                      <View className="flex flex-col items-end gap-2">
+                      <View className="flex flex-col items-end gap-2 hidden">
                         {/*<Tag type={item.status === 1 ? 'danger' : 'success'}>*/}
                         {/*  {item.status === 1 ? '冻结' : '正常'}*/}
                         {/*</Tag>*/}