feat(order): 增加订单确认页面数量步长控制功能

- 在订单确认页面实现商品购买数量的步长控制机制
- 添加了商品模型中的step字段支持，用于定义购买步长
- 实现了水票套票模板的step配置和最小购买数量逻辑
- 优化了订单参数解析逻辑，支持orderData模式下的商品规格信息传递
- 更新了API基础URL配置，切换到新的测试服务器地址
- 在下单接口中增加了skuId和specInfo参数传递支持
- 完善了数量变更时的价格计算和库存限制逻辑

config/env.ts

@@ -2,21 +2,21 @@
 export const ENV_CONFIG = {
   // 开发环境
   development: {
-    // API_BASE_URL: 'http://127.0.0.1:9200/api',
-    API_BASE_URL: 'https://glt-api.websoft.top/api',
+    API_BASE_URL: 'http://127.0.0.1:9200/api',
+    // API_BASE_URL: 'https://glt-api2.websoft.top/api',
     APP_NAME: '开发环境',
     DEBUG: 'true',
   },
   // 生产环境
   production: {
-    API_BASE_URL: 'https://glt-api.websoft.top/api',
+    API_BASE_URL: 'https://glt-api2.websoft.top/api',
     APP_NAME: '桂乐淘',
     DEBUG: 'false',
   },
   // 测试环境
   test: {
     // API_BASE_URL: 'http://127.0.0.1:9200/api',
-    API_BASE_URL: 'https://glt-api.websoft.top/api',
+    API_BASE_URL: 'https://glt-api2.websoft.top/api',
     APP_NAME: '测试环境',
     DEBUG: 'true',
   }

src/api/glt/gltTicketTemplate/model/index.ts

@@ -16,6 +16,8 @@ export interface GltTicketTemplate {
   unitName?: string;
   // 最小购买数量
   minBuyQty?: number;
+  // 购买步长（如：5 的倍数）
+  step?: number;
   // 起始发送数量
   startSendQty?: number;
   // 买赠：买1送4 => gift_multiplier=4

src/api/glt/gltUserTicketRelease/index.ts

@@ -8,9 +8,7 @@ import type { GltUserTicketRelease, GltUserTicketReleaseParam } from './model';
 export async function pageGltUserTicketRelease(params: GltUserTicketReleaseParam) {
   const res = await request.get<ApiResult<PageResult<GltUserTicketRelease>>>(
     '/glt/glt-user-ticket-release/page',
-    {
     params
-    }
   );
   if (res.code === 0) {
     return res.data;
@@ -24,9 +22,7 @@ export async function pageGltUserTicketRelease(params: GltUserTicketReleaseParam
 export async function listGltUserTicketRelease(params?: GltUserTicketReleaseParam) {
   const res = await request.get<ApiResult<GltUserTicketRelease[]>>(
     '/glt/glt-user-ticket-release',
-    {
     params
-    }
   );
   if (res.code === 0 && res.data) {
     return res.data;

src/api/shop/shopGoods/model/index.ts

@@ -81,6 +81,8 @@ export interface ShopGoods {
   isNew?: number;
   // 库存
   stock?: number;
+  // 步长
+  step?: number;
   // 商品重量
   goodsWeight?: number;
   // 消费赚取积分

src/app.config.ts

@@ -56,6 +56,7 @@ export default {
         "points/points",
         "ticket/index",
         "ticket/use",
+        "ticket/release/index",
         "ticket/orders/index",
         // "gift/index",
         // "gift/redeem",

src/dealer/withdraw/index.tsx

@@ -491,7 +491,7 @@ const DealerWithdraw: React.FC = () => {
           <Form.Item name="amount" label="提现金额">
             <Input
               placeholder="请输入提现金额"
-              type="number"
+              type="digit"
             />
           </Form.Item>
 

src/pages/index/index.tsx

@@ -217,8 +217,8 @@ function Home() {
         title: '立即送水',
         icon: <Cart size={30} />,
         onClick: () => {
-          if (!ensureLoggedIn('/user/ticket/use?goodsId=10074')) return
-          Taro.navigateTo({ url: '/user/ticket/use?goodsId=10074' })
+          if (!ensureLoggedIn('/user/ticket/use')) return
+          Taro.navigateTo({ url: '/user/ticket/use' })
         },
       },
       {
@@ -226,8 +226,9 @@ function Home() {
         title: '送水订单',
         icon: <Agenda size={30} />,
         onClick: () => {
-          if (!ensureLoggedIn('/user/ticket/index')) return
-          Taro.navigateTo({ url: '/user/ticket/index' })
+          const url = '/user/ticket/index?tab=order'
+          if (!ensureLoggedIn(url)) return
+          Taro.navigateTo({ url })
         },
       },
       {

src/rider/index.tsx

@@ -74,7 +74,14 @@ const DealerIndex: React.FC = () => {
       <View>
         {/*头部信息*/}
         {dealerUser && (
-          <View className="px-4 py-6 relative overflow-hidden" style={themeStyles.primaryBackground}>
+          <View
+            className="px-4 py-6 relative overflow-hidden"
+            style={{
+              ...themeStyles.primaryBackground,
+              background: businessGradients.order.processing,
+              color: '#ffffff'
+            }}
+          >
             {/* 装饰性背景元素 - 小程序兼容版本 */}
             <View className="absolute w-32 h-32 rounded-full" style={{
               backgroundColor: 'rgba(255, 255, 255, 0.1)',
@@ -218,7 +225,7 @@ const DealerIndex: React.FC = () => {
                 </View>
               </Grid.Item>
 
-              <Grid.Item text={'工资明细'} onClick={() => navigateToPage('/rider/withdraw/index')}>
+              <Grid.Item text={'收入明细'} onClick={() => navigateToPage('/rider/withdraw/index')}>
                 <View className="text-center">
                   <View className="w-12 h-12 bg-green-50 rounded-xl flex items-center justify-center mx-auto mb-2">
                     <Purse color="#10b981" size="20"/>

src/shop/orderConfirm/index.tsx

@@ -9,7 +9,6 @@ import {
   ActionSheet,
   Popup,
   InputNumber,
-  DatePicker,
   ConfigProvider
 } from '@nutui/nutui-react-taro'
 import {Location, ArrowRight} from '@nutui/icons-react-taro'
@@ -39,7 +38,6 @@ import {
   filterUsableCoupons,
   filterUnusableCoupons
 } from "@/utils/couponUtils";
-import dayjs from 'dayjs'
 import type {ShopStore} from "@/api/shop/shopStore/model";
 import {getShopStore, listShopStore} from "@/api/shop/shopStore";
 import {getSelectedStoreFromStorage, saveSelectedStoreToStorage} from "@/utils/storeSelection";
@@ -57,18 +55,6 @@ const OrderConfirm = () => {
   const [loading, setLoading] = useState<boolean>(true)
   const [error, setError] = useState<string>('')
   const [payLoading, setPayLoading] = useState<boolean>(false)
-  // 配送时间（仅水票套票商品需要）
-  // 当日截单时间：超过该时间下单，最早配送日顺延到次日（避免 21:00 下单仍显示“当天配送”）
-  const DELIVERY_CUTOFF_HOUR = 21
-  const getMinSendDate = () => {
-    const now = dayjs()
-    const cutoff = now.hour(DELIVERY_CUTOFF_HOUR).minute(0).second(0).millisecond(0)
-    const startOfToday = now.startOf('day')
-    // >= 截单时间则最早只能选次日
-    return now.isSame(cutoff) || now.isAfter(cutoff) ? startOfToday.add(1, 'day') : startOfToday
-  }
-  const [sendTime, setSendTime] = useState<Date>(() => getMinSendDate().toDate())
-  const [sendTimePickerVisible, setSendTimePickerVisible] = useState(false)
 
   // 水票套票活动（若存在则按规则限制最小购买量等）
   const [ticketTemplate, setTicketTemplate] = useState<GltTicketTemplate | null>(null)
@@ -96,17 +82,62 @@ const OrderConfirm = () => {
   const [selectedStore, setSelectedStore] = useState<ShopStore | null>(getSelectedStoreFromStorage())
 
   const router = Taro.getCurrentInstance().router;
-  const goodsId = router?.params?.goodsId;
+  const params = router?.params || ({} as Record<string, any>)
+  const goodsIdParam = params?.goodsId
+  const orderDataRaw = params?.orderData
+
+  type OrderDataParam = {
+    goodsId?: number | string
+    skuId?: number | string
+    quantity?: number | string
+    price?: number | string
+    specInfo?: string
+  }
+
+  const orderDataParam: OrderDataParam | null = useMemo(() => {
+    if (!orderDataRaw) return null
+    const rawText = String(orderDataRaw)
+    try {
+      return JSON.parse(decodeURIComponent(rawText)) as OrderDataParam
+    } catch (_e1) {
+      try {
+        return JSON.parse(rawText) as OrderDataParam
+      } catch (_e2) {
+        console.error('orderData 参数解析失败:', orderDataRaw)
+        return null
+      }
+    }
+  }, [orderDataRaw])
+
+  const resolvedGoodsId = (() => {
+    const id1 = Number(goodsIdParam)
+    if (Number.isFinite(id1) && id1 > 0) return id1
+    const id2 = Number(orderDataParam?.goodsId)
+    if (Number.isFinite(id2) && id2 > 0) return id2
+    return undefined
+  })()
+
+  const resolvedSkuId = (() => {
+    const n = Number(orderDataParam?.skuId)
+    return Number.isFinite(n) && n > 0 ? n : undefined
+  })()
+
+  const quantityFromParam = (() => {
+    const n = Number(orderDataParam?.quantity)
+    return Number.isFinite(n) && n > 0 ? Math.floor(n) : undefined
+  })()
 
   // 页面级兜底：未登录直接进入下单页时，引导去注册/登录并回跳
   useEffect(() => {
-    if (!goodsId) {
-      // 也可能是 orderData 模式；这里只做最小兜底
-      if (!ensureLoggedIn('/shop/orderConfirm/index')) return
-      return
-    }
-    if (!ensureLoggedIn(`/shop/orderConfirm/index?goodsId=${goodsId}`)) return
-  }, [goodsId])
+    // 兼容 goodsId / orderData 两种进入方式（goodsDetail 有规格时会走 orderData）
+    const backUrl =
+      orderDataRaw
+        ? `/shop/orderConfirm/index?orderData=${orderDataRaw}`
+        : resolvedGoodsId
+          ? `/shop/orderConfirm/index?goodsId=${resolvedGoodsId}`
+          : '/shop/orderConfirm/index'
+    if (!ensureLoggedIn(backUrl)) return
+  }, [resolvedGoodsId, orderDataRaw])
 
   const isTicketTemplateActive =
     !!ticketTemplate &&
@@ -122,10 +153,6 @@ const OrderConfirm = () => {
   })()
   const minBuyQty = isTicketTemplateActive ? ticketMinBuyQty : 1
 
-  const sendTimeText = useMemo(() => {
-    return dayjs(sendTime).format('YYYY-MM-DD')
-  }, [sendTime])
-
   const getGiftTicketQty = (buyQty: number) => {
     if (!isTicketTemplateActive) return 0
     const multiplier = Number(ticketTemplate?.giftMultiplier || 0)
@@ -160,7 +187,9 @@ const OrderConfirm = () => {
   // 计算商品总价
   const getGoodsTotal = () => {
     if (!goods) return 0
-    const price = parseFloat(goods.price || '0')
+    const rawPrice = String(orderDataParam?.price ?? goods.price ?? '0')
+    const priceNum = parseFloat(rawPrice)
+    const price = Number.isFinite(priceNum) ? priceNum : 0
     // const total = price * quantity
 
     // 🔍 详细日志，用于排查数值精度问题
@@ -201,12 +230,21 @@ const OrderConfirm = () => {
   const handleQuantityChange = (value: string | number) => {
     const fallback = isTicketTemplateActive ? minBuyQty : 1
     const newQuantity = typeof value === 'string' ? parseInt(value, 10) || fallback : value
-    const finalQuantity = Math.max(fallback, Math.min(newQuantity, goods?.stock || 999))
+    const step = goods?.step || 1
+    const stockMax = goods?.stock ?? 999
+    const maxMultiple = step > 1 ? Math.floor(stockMax / step) * step : stockMax
+    const maxAllowed = maxMultiple > 0 ? maxMultiple : stockMax
+    const effectiveMin = Math.min(fallback, maxAllowed)
+    const clamped = Math.max(effectiveMin, Math.min(Number(newQuantity) || fallback, maxAllowed))
+    const snapped = step > 1 ? Math.ceil(clamped / step) * step : clamped
+    const finalQuantity = Math.max(effectiveMin, Math.min(snapped, maxAllowed))
     setQuantity(finalQuantity)
 
     // 数量变化时，重新排序优惠券并检查当前选中的优惠券是否还可用
     if (availableCoupons.length > 0) {
-      const newTotal = parseFloat(goods?.price || '0') * finalQuantity
+      const priceNum = parseFloat(String(orderDataParam?.price ?? goods?.price ?? '0'))
+      const unitPrice = Number.isFinite(priceNum) ? priceNum : 0
+      const newTotal = unitPrice * finalQuantity
       const sortedCoupons = sortCoupons(availableCoupons, newTotal)
       const usableCoupons = filterUsableCoupons(sortedCoupons, newTotal)
       setAvailableCoupons(sortedCoupons)
@@ -451,22 +489,7 @@ const OrderConfirm = () => {
         return;
       }
 
-      // 水票套票商品：保存配送时间到 ShopOrder.sendStartTime
-      if (hasTicketTemplate && !sendTime) {
-        Taro.showToast({ title: '请选择配送时间', icon: 'none' })
-        return
-      }
-      if (hasTicketTemplate) {
-        const min = getMinSendDate()
-        if (dayjs(sendTime).isBefore(min, 'day')) {
-          setSendTime(min.toDate())
-          Taro.showToast({
-            title: `已过当日${DELIVERY_CUTOFF_HOUR}点截单，最早配送：${min.format('YYYY-MM-DD')}`,
-            icon: 'none'
-          })
-          return
-        }
-      }
+      // 购买水票（囤券预付费）与水票核销（下单履约）为两个独立动作：下单页不再选择配送时间。
 
       // 水票套票活动：最小购买量校验
       if (isTicketTemplateActive && quantity < minBuyQty) {
@@ -530,17 +553,41 @@ const OrderConfirm = () => {
                   comments: goods.name,
                   deliveryType: 0,
                   buyerRemarks: orderRemark,
-                  sendStartTime: hasTicketTemplate
-                    ? dayjs(sendTime).startOf('day').format('YYYY-MM-DD HH:mm:ss')
-                    : undefined,
-                  couponId: parseInt(String(bestCoupon.id), 10)
+                  couponId: parseInt(String(bestCoupon.id), 10),
+                  skuId: resolvedSkuId,
+                  specInfo: orderDataParam?.specInfo
                 }
               );
 
               console.log('🎯 使用推荐优惠券的订单数据:', updatedOrderData);
 
               // 执行支付
-              await PaymentHandler.pay(updatedOrderData, currentPaymentType);
+              await PaymentHandler.pay(updatedOrderData, currentPaymentType, hasTicketTemplate ? {
+                onSuccess: async () => {
+                  const id = goods.goodsId
+                  const ticketIndexUrl = `/user/ticket/index?fromPayAt=${Date.now()}`
+                  try {
+                    const res = await Taro.showModal({
+                      title: '提示',
+                      content: '是否立刻送水？',
+                      confirmText: '立刻送水',
+                      cancelText: '稍后'
+                    })
+                    if (res?.confirm) {
+                      if (id) {
+                        await Taro.redirectTo({ url: `/user/ticket/use?goodsId=${id}` })
+                      } else {
+                        await Taro.redirectTo({ url: ticketIndexUrl })
+                      }
+                    } else {
+                      await Taro.redirectTo({ url: ticketIndexUrl })
+                    }
+                  } catch (_e) {
+                    await Taro.redirectTo({ url: ticketIndexUrl })
+                  }
+                  return false
+                }
+              } : undefined);
               return; // 提前返回，避免重复执行支付
             } else {
               // 用户选择不使用优惠券，继续支付
@@ -558,11 +605,10 @@ const OrderConfirm = () => {
           comments: '桂乐淘',
           deliveryType: 0,
           buyerRemarks: orderRemark,
-          sendStartTime: hasTicketTemplate
-            ? dayjs(sendTime).startOf('day').format('YYYY-MM-DD HH:mm:ss')
-            : undefined,
           // 🔧 确保 couponId 是正确的数字类型，且不传递 undefined
-          couponId: selectedCoupon ? parseInt(String(selectedCoupon.id), 10) : undefined
+          couponId: selectedCoupon ? parseInt(String(selectedCoupon.id), 10) : undefined,
+          skuId: resolvedSkuId,
+          specInfo: orderDataParam?.specInfo
         }
       );
 
@@ -595,7 +641,32 @@ const OrderConfirm = () => {
       });
 
       // 执行支付 - 移除这里的成功提示，让PaymentHandler统一处理
-      await PaymentHandler.pay(orderData, paymentType);
+      await PaymentHandler.pay(orderData, paymentType, hasTicketTemplate ? {
+        onSuccess: async () => {
+          const id = goods.goodsId
+          const ticketIndexUrl = `/user/ticket/index?fromPayAt=${Date.now()}`
+          try {
+            const res = await Taro.showModal({
+              title: '提示',
+              content: '是否立刻送水？',
+              confirmText: '立刻送水',
+              cancelText: '稍后'
+            })
+            if (res?.confirm) {
+              if (id) {
+                await Taro.redirectTo({ url: `/user/ticket/use?goodsId=${id}` })
+              } else {
+                await Taro.redirectTo({ url: ticketIndexUrl })
+              }
+            } else {
+              await Taro.redirectTo({ url: ticketIndexUrl })
+            }
+          } catch (_e) {
+            await Taro.redirectTo({ url: ticketIndexUrl })
+          }
+          return false
+        }
+      } : undefined);
 
       // ✅ 移除双重成功提示 - PaymentHandler会处理成功提示
       // Taro.showToast({
@@ -673,8 +744,8 @@ const OrderConfirm = () => {
 
       // 分别加载数据，避免类型推断问题
       let goodsRes: ShopGoods | null = null
-      if (goodsId) {
-        goodsRes = await getShopGoods(Number(goodsId))
+      if (resolvedGoodsId) {
+        goodsRes = await getShopGoods(resolvedGoodsId)
       }
 
       const [addressRes, paymentRes] = await Promise.all([
@@ -685,9 +756,9 @@ const OrderConfirm = () => {
       // 设置商品信息
       // 查询当前商品是否存在水票套票活动（失败/无数据时不影响正常下单）
       let tpl: GltTicketTemplate | null = null
-      if (goodsId) {
+      if (resolvedGoodsId) {
         try {
-          tpl = await getGltTicketTemplateByGoodsId(Number(goodsId))
+          tpl = await getGltTicketTemplateByGoodsId(resolvedGoodsId)
         } catch (e) {
           tpl = null
         }
@@ -703,18 +774,41 @@ const OrderConfirm = () => {
         const n = Number(tpl?.minBuyQty)
         return Number.isFinite(n) && n > 0 ? Math.floor(n) : 1
       })()
+      const tplStep = (() => {
+        const n = Number(tpl?.step)
+        return Number.isFinite(n) && n > 0 ? Math.floor(n) : undefined
+      })()
 
       // 设置商品信息（若存在套票模板，则默认 canBuyNumber 使用模板最小购买量）
       if (goodsRes) {
         const patchedGoods: ShopGoods = { ...goodsRes }
+        // 兜底：确保 step 为合法正整数；若存在套票模板则优先使用模板 step
+        const goodsStepNum = Number((patchedGoods as any)?.step)
+        const goodsStep = Number.isFinite(goodsStepNum) && goodsStepNum > 0 ? Math.floor(goodsStepNum) : 1
+        patchedGoods.step = tplActive && tplStep ? tplStep : goodsStep
+
+        // 规格商品（orderData 模式）下单时，用 sku 价格覆盖展示与计算金额
+        if (orderDataParam?.price !== undefined && orderDataParam?.price !== null && orderDataParam?.price !== '') {
+          patchedGoods.price = String(orderDataParam.price)
+        }
+
         if (tplActive && ((patchedGoods.canBuyNumber ?? 0) === 0)) {
           patchedGoods.canBuyNumber = tplMinBuyQty
         }
         setGoods(patchedGoods)
 
-        // 设置默认购买数量：优先使用 canBuyNumber，否则使用 1
-        const initQty = (patchedGoods.canBuyNumber ?? 0) > 0 ? (patchedGoods.canBuyNumber as number) : 1
-        setQuantity(initQty)
+        // 设置默认购买数量：优先使用 canBuyNumber，其次使用路由参数 quantity，否则使用 1
+        const fixedQty = (patchedGoods.canBuyNumber ?? 0) > 0 ? Number(patchedGoods.canBuyNumber) : undefined
+        const rawQty = fixedQty ?? quantityFromParam ?? 1
+        const minQty = tplActive ? tplMinBuyQty : 1
+        const step = patchedGoods.step || 1
+        const stockMax = patchedGoods.stock ?? 999
+        const maxMultiple = step > 1 ? Math.floor(stockMax / step) * step : stockMax
+        const maxAllowed = maxMultiple > 0 ? maxMultiple : stockMax
+        const effectiveMin = Math.min(minQty, maxAllowed)
+        const clamped = Math.max(effectiveMin, Math.min(Math.floor(rawQty), maxAllowed))
+        const stepped = step > 1 ? Math.ceil(clamped / step) * step : clamped
+        setQuantity(Math.min(maxAllowed, Math.max(effectiveMin, stepped)))
       }
 
       setTicketTemplate(tpl)
@@ -739,9 +833,20 @@ const OrderConfirm = () => {
           const n = Number(goodsRes?.canBuyNumber)
           if (Number.isFinite(n) && n > 0) return Math.floor(n)
           if (tplActive) return tplMinBuyQty
-          return 1
+          return quantityFromParam || 1
         })()
-        const total = parseFloat(goodsRes.price || '0') * initQty
+        const stepForInit = tplActive && tplStep ? tplStep : (() => {
+          const n = Number((goodsRes as any)?.step)
+          return Number.isFinite(n) && n > 0 ? Math.floor(n) : 1
+        })()
+        const stockMax = goodsRes.stock ?? 999
+        const maxMultiple = stepForInit > 1 ? Math.floor(stockMax / stepForInit) * stepForInit : stockMax
+        const maxAllowed = maxMultiple > 0 ? maxMultiple : stockMax
+        const initQtySnapped = stepForInit > 1 ? Math.ceil(initQty / stepForInit) * stepForInit : initQty
+        const effectiveMin = Math.min(tplActive ? tplMinBuyQty : 1, maxAllowed)
+        const safeInitQty = Math.max(effectiveMin, Math.min(initQtySnapped, maxAllowed))
+        const unitPrice = parseFloat(String(orderDataParam?.price ?? goodsRes.price ?? '0'))
+        const total = unitPrice * safeInitQty
         await loadUserCoupons(total)
       }
     } catch (err) {
@@ -760,12 +865,9 @@ const OrderConfirm = () => {
   })
 
   useEffect(() => {
-    // 切换商品时重置配送时间，避免沿用上一次选择
     if (!isLoggedIn()) return
-    setSendTime(getMinSendDate().toDate())
-    setSendTimePickerVisible(false)
     loadAllData()
-  }, [goodsId]);
+  }, [resolvedGoodsId, orderDataRaw]);
 
   // 重新加载数据
   const handleRetry = () => {
@@ -822,28 +924,6 @@ const OrderConfirm = () => {
         )}
       </CellGroup>
 
-      {hasTicketTemplate && (
-        <CellGroup>
-          <Cell
-            title={'配送时间'}
-            extra={(
-              <View className={'flex items-center gap-2'}>
-                <View className={'text-gray-900'}>{sendTimeText}</View>
-                <ArrowRight className={'text-gray-400'} size={14}/>
-              </View>
-            )}
-            onClick={() => {
-              // 若页面停留跨过截单时间，打开选择器前再校正一次最早可选日期
-              const min = getMinSendDate()
-              if (dayjs(sendTime).isBefore(min, 'day')) {
-                setSendTime(min.toDate())
-              }
-              setSendTimePickerVisible(true)
-            }}
-          />
-        </CellGroup>
-      )}
-
       {/*<CellGroup>*/}
       {/*  <Cell*/}
       {/*    title={(*/}
@@ -877,14 +957,14 @@ const OrderConfirm = () => {
               <Text className={'font-medium w-full'}>{goods.name}</Text>
               {/*<Text className={'number text-gray-400 text-sm py-2'}>80g/袋</Text>*/}
               <View className={'flex justify-between items-center'}>
-                <Text className={'text-red-500'}>￥{goods.price}</Text>
+                <Text className={'text-red-500'}>￥{goods.price}*{goods.step}</Text>
                 <View className={'flex flex-col items-end gap-1'}>
 	                  <ConfigProvider theme={customTheme}>
 	                    <InputNumber
 	                      value={quantity}
 	                      min={isTicketTemplateActive ? minBuyQty : 1}
 	                      max={goods.stock || 999}
-	                      step={minBuyQty === 1 ? 1 : 10}
+	                      step={goods.step || 1}
 	                      readOnly
                         disabled={((goods.canBuyNumber ?? 0) !== 0) && !isTicketTemplateActive}
 	                      onChange={handleQuantityChange}
@@ -1138,23 +1218,6 @@ const OrderConfirm = () => {
 
       <Gap height={50}/>
 
-      <DatePicker
-        visible={sendTimePickerVisible}
-        title="选择配送时间"
-        type="date"
-        startDate={getMinSendDate().toDate()}
-        endDate={dayjs().add(30, 'day').toDate()}
-        value={sendTime}
-        onClose={() => setSendTimePickerVisible(false)}
-        onCancel={() => setSendTimePickerVisible(false)}
-        onConfirm={(_options, selectedValue) => {
-          const [y, m, d] = (selectedValue || []).map(v => Number(v))
-          const next = new Date(y, (m || 1) - 1, d || 1, 0, 0, 0)
-          setSendTime(next)
-          setSendTimePickerVisible(false)
-        }}
-      />
-
       <div className={'fixed z-50 bg-white w-full bottom-0 left-0 pt-4 pb-10 border-t border-gray-200'}>
         <View className={'btn-bar flex justify-between items-center'}>
           <div className={'flex flex-col justify-center items-start mx-4'}>

src/shop/orderDetail/index.tsx

@@ -8,6 +8,7 @@ import {listShopOrderGoods} from "@/api/shop/shopOrderGoods";
 import {ShopOrderGoods} from "@/api/shop/shopOrderGoods/model";
 import dayjs from "dayjs";
 import PaymentCountdown from "@/components/PaymentCountdown";
+import {getShopOrderStatusText} from "@/utils/shopOrderStatus";
 import './index.scss'
 
 // 申请退款：支付成功后仅允许在指定时间窗内发起（前端展示层限制，后端仍应校验）
@@ -114,37 +115,6 @@ const OrderDetail = () => {
     }
   }
 
-  const getOrderStatusText = (order: ShopOrder) => {
-    // 优先检查订单状态
-    if (order.orderStatus === 2) return '已取消';
-    if (order.orderStatus === 3) return '取消中';
-    if (order.orderStatus === 4) return '退款申请中';
-    if (order.orderStatus === 5) return '退款被拒绝';
-    if (order.orderStatus === 6) return '退款成功';
-    if (order.orderStatus === 7) return '客户端申请退款';
-
-    // 检查支付状态 (payStatus为boolean类型)
-    if (!order.payStatus) return '待付款';
-
-    // 已付款后检查发货状态
-    if (order.deliveryStatus === 10) return '待发货';
-    if (order.deliveryStatus === 20) {
-      // 若订单有配送员，则以配送员送达时间作为“可确认收货”的依据
-      if (order.riderId) {
-        if (order.sendEndTime && order.orderStatus !== 1) return '待确认收货';
-        return '配送中';
-      }
-      return '待收货';
-    }
-    if (order.deliveryStatus === 30) return '部分发货';
-
-    // 最后检查订单完成状态
-    if (order.orderStatus === 1) return '已完成';
-    if (order.orderStatus === 0) return '未使用';
-
-    return '未知状态';
-  };
-
   const getPayTypeText = (payType?: number) => {
     switch (payType) {
       case 0:
@@ -194,7 +164,7 @@ const OrderDetail = () => {
     order.payStatus &&
     order.orderStatus !== 1 &&
     order.deliveryStatus === 20 &&
-    (!order.riderId || !!order.sendEndTime)
+    (!order.riderId || Number(order.riderId) === 0 || !!order.sendEndTime)
 
   return (
     <div className={'order-detail-page'}>
@@ -232,7 +202,7 @@ const OrderDetail = () => {
       <CellGroup>
         <Cell title="订单编号" description={order.orderNo}/>
         <Cell title="下单时间" description={dayjs(order.createTime).format('YYYY-MM-DD HH:mm:ss')}/>
-        <Cell title="订单状态" description={getOrderStatusText(order)}/>
+        <Cell title="订单状态" description={getShopOrderStatusText(order)}/>
       </CellGroup>
 
       <CellGroup>

src/user/order/components/OrderList.tsx

@@ -16,6 +16,7 @@ import {copyText} from "@/utils/common";
 import PaymentCountdown from "@/components/PaymentCountdown";
 import {PaymentType} from "@/utils/payment";
 import {ErrorType, RequestError} from "@/utils/request";
+import {getShopOrderStatusColor, getShopOrderStatusText, isShopOrderCompleted} from "@/utils/shopOrderStatus";
 
 // 判断订单是否支付已过期
 const isPaymentExpired = (createTime: string, timeoutHours: number = 24): boolean => {
@@ -165,68 +166,11 @@ function OrderList(props: OrderListProps) {
   };
 
   // “已完成”应以订单状态为准；不要用商品ID等字段推断完成态，否则会造成 Tab(待发货/待收货) 与状态文案不同步
-  const isOrderCompleted = (order: ShopOrder) => toNum(order.orderStatus) === 1;
+  const isOrderCompleted = (order: ShopOrder) => isShopOrderCompleted(order);
 
-  // 获取订单状态文本
-  const getOrderStatusText = (order: ShopOrder) => {
-    const orderStatus = toNum(order.orderStatus);
-    const deliveryStatus = toNum(order.deliveryStatus);
+  const getOrderStatusText = (order: ShopOrder) => getShopOrderStatusText(order);
 
-    // 优先检查订单状态
-    if (orderStatus === 2) return '已取消';
-    if (orderStatus === 4) return '退款申请中';
-    if (orderStatus === 5) return '退款被拒绝';
-    if (orderStatus === 6) return '退款成功';
-    if (orderStatus === 7) return '客户端申请退款';
-    if (isOrderCompleted(order)) return '已完成';
-
-    // 检查支付状态 (payStatus为boolean类型，false/0表示未付款，true/1表示已付款)
-    if (!order.payStatus) return '等待买家付款';
-
-    // 已付款后检查发货状态
-    if (deliveryStatus === 10) return '待发货';
-    if (deliveryStatus === 20) {
-      // 若订单没有配送员，沿用原“待收货”语义
-      if (!order.riderId || Number(order.riderId) === 0) return '待收货';
-      // 配送员确认送达后（sendEndTime有值），才进入“待确认收货”
-      if (order.sendEndTime && !isOrderCompleted(order)) return '待确认收货';
-      return '配送中';
-    }
-    if (deliveryStatus === 30) return '部分发货';
-
-    if (orderStatus === 0) return '未使用';
-
-    return '未知状态';
-  };
-
-  // 获取订单状态颜色
-  const getOrderStatusColor = (order: ShopOrder) => {
-    const orderStatus = toNum(order.orderStatus);
-    const deliveryStatus = toNum(order.deliveryStatus);
-    // 优先检查订单状态
-    if (orderStatus === 2) return 'text-gray-500'; // 已取消
-    if (orderStatus === 4) return 'text-orange-500'; // 退款申请中
-    if (orderStatus === 5) return 'text-red-500'; // 退款被拒绝
-    if (orderStatus === 6) return 'text-green-500'; // 退款成功
-    if (orderStatus === 7) return 'text-orange-500'; // 客户端申请退款
-    if (isOrderCompleted(order)) return 'text-green-600'; // 已完成
-
-    // 检查支付状态
-    if (!order.payStatus) return 'text-orange-500'; // 等待买家付款
-
-    // 已付款后检查发货状态
-    if (deliveryStatus === 10) return 'text-blue-500'; // 待发货
-    if (deliveryStatus === 20) {
-      if (!order.riderId || Number(order.riderId) === 0) return 'text-purple-500'; // 待收货
-      if (order.sendEndTime && !isOrderCompleted(order)) return 'text-purple-500'; // 待确认收货
-      return 'text-blue-500'; // 配送中
-    }
-    if (deliveryStatus === 30) return 'text-blue-500'; // 部分发货
-
-    if (orderStatus === 0) return 'text-gray-500'; // 未使用
-
-    return 'text-gray-600'; // 默认颜色
-  };
+  const getOrderStatusColor = (order: ShopOrder) => getShopOrderStatusColor(order);
 
   // 使用后端统一的 statusFilter 进行筛选
   const getOrderStatusParams = (index: string | number) => {

src/user/ticket/index.tsx

@@ -14,15 +14,16 @@ import {
   Tag
 } from '@nutui/nutui-react-taro';
 import { View, Text, Image } from '@tarojs/components';
-import { pageGltUserTicket } from '@/api/glt/gltUserTicket';
+import { getGltUserTicket, pageGltUserTicket, updateGltUserTicket } from '@/api/glt/gltUserTicket';
 import type { GltUserTicket } from '@/api/glt/gltUserTicket/model';
-import { pageGltTicketOrder, updateGltTicketOrder } from '@/api/glt/gltTicketOrder';
+import { pageGltTicketOrder, removeGltTicketOrder, updateGltTicketOrder } from '@/api/glt/gltTicketOrder';
 import type { GltTicketOrder } from '@/api/glt/gltTicketOrder/model';
-import { getShopUserAddress } from '@/api/shop/shopUserAddress';
 import { BaseUrl } from '@/config/app';
 import dayjs from "dayjs";
+import { ensureLoggedIn } from '@/utils/auth';
 
 const PAGE_SIZE = 10;
+const PAY_REFRESH_HANDLED_KEY = 'user_ticket_from_pay_at_handled';
 
 const UserTicketList = () => {
   const [ticketList, setTicketList] = useState<GltUserTicket[]>([]);
@@ -37,6 +38,7 @@ const UserTicketList = () => {
   const [orderHasMore, setOrderHasMore] = useState(true);
   const [orderPage, setOrderPage] = useState(1);
   const [orderTotal, setOrderTotal] = useState(0);
+  const [orderCancelLoadingById, setOrderCancelLoadingById] = useState<Record<number, boolean>>({});
 
   const [activeTab, setActiveTab] = useState<'ticket' | 'order'>(() => {
     const tab = Taro.getCurrentInstance().router?.params?.tab
@@ -46,8 +48,25 @@ const UserTicketList = () => {
   const [qrVisible, setQrVisible] = useState(false);
   const [qrTicket, setQrTicket] = useState<GltUserTicket | null>(null);
   const [qrImageUrl, setQrImageUrl] = useState('');
+  const payAutoRefreshRunningRef = useRef(false);
 
-  const addressCacheRef = useRef<Record<number, { lng: number; lat: number; fullAddress?: string } | null>>({});
+  const sleep = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
+
+  const parsePositiveNumberParam = (v: unknown) => {
+    const n = Number(v);
+    return Number.isFinite(n) && n > 0 ? n : undefined;
+  };
+
+  const getFromPayAtParam = () => {
+    const params = Taro.getCurrentInstance().router?.params;
+    return parsePositiveNumberParam((params as any)?.fromPayAt);
+  };
+
+  const shouldAutoRefreshAfterPay = (fromPayAt?: number) => {
+    if (!fromPayAt) return false;
+    const handled = parsePositiveNumberParam(Taro.getStorageSync(PAY_REFRESH_HANDLED_KEY)) || 0;
+    return handled !== fromPayAt;
+  };
 
   const getUserId = () => {
     const raw = Taro.getStorageSync('UserId');
@@ -97,6 +116,41 @@ const UserTicketList = () => {
     setQrVisible(true);
   };
 
+  const goSendWater = async (ticket: GltUserTicket) => {
+    if (!ticket?.id) {
+      Taro.showToast({ title: '水票信息不完整', icon: 'none' });
+      return;
+    }
+    if (Number(ticket.status) === 1) {
+      Taro.showToast({ title: '该水票已冻结，无法下单', icon: 'none' });
+      return;
+    }
+    const avail = Number(ticket.availableQty ?? 0);
+    if (!Number.isFinite(avail) || avail <= 0) {
+      Taro.showToast({ title: '可用次数不足', icon: 'none' });
+      return;
+    }
+    const gid = Number(ticket.goodsId);
+    const url =
+      Number.isFinite(gid) && gid > 0 ? `/user/ticket/use?goodsId=${gid}` : '/user/ticket/use';
+    if (!ensureLoggedIn(url)) return;
+    await Taro.navigateTo({ url });
+  };
+
+  const goReleasePlanDetail = async (ticket: GltUserTicket) => {
+    if (!ticket?.id) {
+      Taro.showToast({ title: '水票信息不完整', icon: 'none' });
+      return;
+    }
+    const url = `/user/ticket/release/index?userTicketId=${encodeURIComponent(String(ticket.id))}&templateName=${encodeURIComponent(
+      String(ticket.templateName ?? '')
+    )}&frozenQty=${encodeURIComponent(String(ticket.frozenQty ?? 0))}&releasedQty=${encodeURIComponent(
+      String(ticket.releasedQty ?? 0)
+    )}`;
+    if (!ensureLoggedIn(url)) return;
+    await Taro.navigateTo({ url });
+  };
+
   const showTicketDetail = (ticket: GltUserTicket) => {
     const lines: string[] = [];
     if (ticket.templateName) lines.push(`水票：${ticket.templateName}`);
@@ -188,17 +242,16 @@ const UserTicketList = () => {
       });
 
       const resList = res?.list || [];
-      const nextList = isRefresh ? resList : [...orderList, ...resList];
+      const safeList = resList.filter((o) => Number((o as any)?.deleted) !== 1);
+      const nextList = isRefresh ? safeList : [...orderList, ...safeList];
       setOrderList(nextList);
-      const count = typeof res?.count === 'number' ? res.count : nextList.length;
-      setOrderTotal(count);
-      setOrderHasMore(nextList.length < count);
+      const serverCount = typeof res?.count === 'number' ? res.count : undefined;
+      const total = typeof serverCount === 'number' ? serverCount : nextList.length;
+      setOrderTotal(total);
+      setOrderHasMore(typeof serverCount === 'number' ? nextList.length < serverCount : resList.length >= PAGE_SIZE);
 
-      if (resList.length > 0) {
-        setOrderPage(currentPage + 1);
-      } else {
-        setOrderHasMore(false);
-      }
+      if (resList.length > 0) setOrderPage(currentPage + 1);
+      else setOrderHasMore(false);
     } catch (error) {
       console.error('获取送水订单失败:', error);
       Taro.showToast({ title: '获取送水订单失败', icon: 'error' });
@@ -265,78 +318,184 @@ const UserTicketList = () => {
     return d.isValid() ? d.format('YYYY年MM月DD日') : v;
   };
 
-  const parseLatLng = (latRaw?: unknown, lngRaw?: unknown) => {
-    const lat = typeof latRaw === 'number' ? latRaw : parseFloat(String(latRaw ?? ''));
-    const lng = typeof lngRaw === 'number' ? lngRaw : parseFloat(String(lngRaw ?? ''));
-    if (!Number.isFinite(lat) || !Number.isFinite(lng)) return null;
-    if (Math.abs(lat) > 90 || Math.abs(lng) > 180) return null;
-    return { lat, lng };
+  const getTicketAvailableQty = (t?: Partial<GltUserTicket> | null) => {
+    if (!t) return 0;
+    const anyT: any = t;
+    const raw =
+      anyT.availableQty ??
+      anyT.availableNum ??
+      anyT.availableCount ??
+      anyT.remainQty ??
+      anyT.remainNum ??
+      anyT.remainCount;
+    const n = Number(raw);
+    if (Number.isFinite(n)) return n;
+
+    const total = Number(anyT.totalQty ?? anyT.totalNum ?? anyT.totalCount ?? 0);
+    const used = Number(anyT.usedQty ?? anyT.usedNum ?? anyT.usedCount ?? 0);
+    const frozen = Number(anyT.frozenQty ?? anyT.frozenNum ?? anyT.frozenCount ?? 0);
+    const computed =
+      (Number.isFinite(total) ? total : 0) -
+      (Number.isFinite(used) ? used : 0) -
+      (Number.isFinite(frozen) ? frozen : 0);
+    return Number.isFinite(computed) ? computed : 0;
   };
 
-  const handleNavigateToAddress = async (order: GltTicketOrder) => {
-    try {
-      // Prefer coordinates from backend if present (non-typed fields), otherwise fetch by addressId.
-      const anyOrder = order as any;
-      const direct =
-        parseLatLng(anyOrder?.addressLat ?? anyOrder?.lat, anyOrder?.addressLng ?? anyOrder?.lng) ||
-        parseLatLng(anyOrder?.receiverLat, anyOrder?.receiverLng);
+  const getTicketUsedQty = (t?: Partial<GltUserTicket> | null) => {
+    if (!t) return 0;
+    const anyT: any = t;
+    const raw = anyT.usedQty ?? anyT.usedNum ?? anyT.usedCount;
+    const n = Number(raw);
+    return Number.isFinite(n) ? n : 0;
+  };
 
-      let coords = direct;
-      let fullAddress: string | undefined = order.address || undefined;
+  const rollbackUserTicketAfterOrderCancel = async (order: GltTicketOrder, before?: GltUserTicket | null) => {
+    const orderId = Number(order?.id);
+    const ticketId = Number(order?.userTicketId);
+    const qty = Math.max(0, Math.floor(Number((order as any)?.totalNum ?? 0)));
+    if (!Number.isFinite(orderId) || orderId <= 0) return;
+    if (!Number.isFinite(ticketId) || ticketId <= 0) return;
+    if (!Number.isFinite(qty) || qty <= 0) return;
 
-      if (!coords && order.addressId) {
-        const cached = addressCacheRef.current[order.addressId];
-        if (cached) {
-          coords = { lat: cached.lat, lng: cached.lng };
-          fullAddress = fullAddress || cached.fullAddress;
-        } else if (cached === null) {
-          coords = null;
-        } else {
-          const addr = await getShopUserAddress(order.addressId);
-          const parsed = parseLatLng(addr?.lat, addr?.lng);
-          if (parsed) {
-            coords = parsed;
-            fullAddress = fullAddress || addr?.fullAddress || addr?.address || undefined;
-            addressCacheRef.current[order.addressId] = { ...parsed, fullAddress };
-          } else {
-            addressCacheRef.current[order.addressId] = null;
+    const rollbackKey = `glt_ticket_order_rollback:${orderId}`;
+    if (Taro.getStorageSync(rollbackKey)) return;
+
+    const after = await getGltUserTicket(ticketId);
+    if (!after?.id) return;
+
+    const beforeAvail = before ? getTicketAvailableQty(before) : undefined;
+    const afterAvail = getTicketAvailableQty(after);
+    const beforeUsed = before ? getTicketUsedQty(before) : undefined;
+    const afterUsed = getTicketUsedQty(after);
+
+    let needAvail = qty;
+    if (typeof beforeAvail === 'number') {
+      const delta = afterAvail - beforeAvail;
+      if (delta >= qty) {
+        Taro.setStorageSync(rollbackKey, Date.now());
+        return; // backend already rolled back
       }
+      if (delta > 0) needAvail = Math.max(0, qty - delta);
+    }
+    let needUsed = qty;
+    if (typeof beforeUsed === 'number') {
+      const delta = beforeUsed - afterUsed;
+      if (delta >= qty) {
+        needUsed = 0; // backend already rolled back used qty
+      } else if (delta > 0) {
+        needUsed = Math.max(0, qty - delta);
       }
     }
 
-      if (!coords) {
-        if (fullAddress) {
-          await Taro.setClipboardData({ data: fullAddress });
-          Taro.showToast({ title: '未配置定位，地址已复制', icon: 'none' });
-        } else {
-          Taro.showToast({ title: '暂无可导航的地址', icon: 'none' });
-        }
+    if (needAvail <= 0 && needUsed <= 0) {
+      Taro.setStorageSync(rollbackKey, Date.now());
       return;
     }
 
-      Taro.openLocation({
-        latitude: coords.lat,
-        longitude: coords.lng,
-        name: '收货地址',
-        address: fullAddress || ''
+    const currentAvailRaw = Number((after as any)?.availableQty);
+    const baseAvail = Number.isFinite(currentAvailRaw) ? currentAvailRaw : afterAvail;
+    const safeBaseAvail = Number.isFinite(baseAvail) ? baseAvail : 0;
+
+    const totalRaw = Number((after as any)?.totalQty ?? 0);
+    const total = Number.isFinite(totalRaw) ? totalRaw : undefined;
+    const frozenRaw = Number((after as any)?.frozenQty ?? 0);
+    const frozen = Number.isFinite(frozenRaw) ? frozenRaw : 0;
+
+    const currentUsedRaw = Number((after as any)?.usedQty);
+    const baseUsed = Number.isFinite(currentUsedRaw) ? currentUsedRaw : afterUsed;
+    const safeBaseUsed = Number.isFinite(baseUsed) ? baseUsed : 0;
+    let nextUsed = safeBaseUsed - needUsed;
+    if (nextUsed < 0) nextUsed = 0;
+
+    const maxAvail = typeof total === 'number' ? Math.max(0, total - frozen - nextUsed) : undefined;
+
+    let nextAvail = safeBaseAvail + needAvail;
+    if (typeof maxAvail === 'number' && Number.isFinite(maxAvail) && nextAvail > maxAvail) nextAvail = maxAvail;
+    if (nextAvail < 0) nextAvail = 0;
+
+    await updateGltUserTicket({
+      ...after,
+      availableQty: nextAvail,
+      usedQty: nextUsed
     });
-    } catch (e) {
-      console.error('一键导航失败:', e);
-      Taro.showToast({ title: '导航失败，请重试', icon: 'none' });
-    }
+
+    Taro.setStorageSync(rollbackKey, Date.now());
   };
 
-  const handleOneClickCall = async (order: GltTicketOrder) => {
-    const phone = (order.riderPhone || order.storePhone || '').trim();
-    if (!phone) {
-      Taro.showToast({ title: '暂无可呼叫的电话', icon: 'none' });
+  // Allow users to modify/cancel before delivery starts (e.g. 待派单 / 待配送).
+  const isTicketOrderPendingDelivery = (order: GltTicketOrder) => {
+    if (!order?.id) return false;
+    if (Number(order.status) === 1) return false;
+    if (Number((order as any)?.deleted) === 1) return false;
+    if (order.receiveConfirmTime || order.sendEndTime || order.sendStartTime) return false;
+
+    const ds = Number((order as any)?.deliveryStatus);
+    // If backend didn't set deliveryStatus yet, treat it as pending.
+    if (!Number.isFinite(ds)) return true;
+    // 0/10: before delivery starts
+    return ds === 0 || ds === 10;
+  };
+
+  const handleOrderModify = async (order: GltTicketOrder) => {
+    if (!order?.id) {
+      Taro.showToast({ title: '订单信息不完整', icon: 'none' });
       return;
     }
+    if (!isTicketOrderPendingDelivery(order)) {
+      Taro.showToast({ title: '仅配送未开始的订单可修改', icon: 'none' });
+      return;
+    }
+    Taro.navigateTo({ url: `/user/ticket/use?orderId=${order.id}` });
+  };
+
+  const handleOrderCancel = async (order: GltTicketOrder) => {
+    if (!order?.id) {
+      Taro.showToast({ title: '订单信息不完整', icon: 'none' });
+      return;
+    }
+    if (!isTicketOrderPendingDelivery(order)) {
+      Taro.showToast({ title: '仅配送未开始的订单可取消', icon: 'none' });
+      return;
+    }
+    if (orderCancelLoadingById[order.id]) return;
+
+    const modal = await Taro.showModal({
+      title: '取消订单',
+      content: '确定要取消该订单吗？取消后无法恢复。',
+      confirmText: '确认取消'
+    });
+    if (!modal.confirm) return;
+
     try {
-      await Taro.makePhoneCall({ phoneNumber: phone });
+      setOrderCancelLoadingById((prev) => ({ ...prev, [order.id as number]: true }));
+      Taro.showLoading({ title: '取消中...' });
+      let beforeTicket: GltUserTicket | null = null;
+      if (order.userTicketId) {
+        beforeTicket = await getGltUserTicket(Number(order.userTicketId)).catch(() => null);
+      }
+      try {
+        await updateGltTicketOrder({ id: order.id, deleted: 1 });
       } catch (e) {
-      console.error('一键呼叫失败:', e);
-      Taro.showToast({ title: '呼叫失败，请手动拨打', icon: 'none' });
+        await removeGltTicketOrder(order.id);
+      }
+      try {
+        await rollbackUserTicketAfterOrderCancel(order, beforeTicket);
+        Taro.showToast({ title: '订单已取消，水票已退回', icon: 'none' });
+      } catch (e) {
+        console.error('取消订单后退回水票失败:', e);
+        await Taro.showModal({
+          title: '取消成功',
+          content: '订单已取消，但水票退回失败，请稍后刷新“我的水票”确认，或联系客服处理。',
+          showCancel: false
+        });
+      }
+      await reloadOrders(true);
+    } catch (e) {
+      console.error('取消送水订单失败:', e);
+      Taro.showToast({ title: '取消失败，请重试', icon: 'none' });
+    } finally {
+      Taro.hideLoading();
+      setOrderCancelLoadingById((prev) => ({ ...prev, [order.id as number]: false }));
     }
   };
 
@@ -391,12 +550,37 @@ const UserTicketList = () => {
   }
 
   useDidShow(() => {
-    if (activeTab === 'ticket') {
-      reloadTickets(true).then();
-    } else {
-      reloadOrders(true).then();
+    void (async () => {
+      const tabParam = Taro.getCurrentInstance().router?.params?.tab;
+      const nextTab = tabParam === 'ticket' || tabParam === 'order' ? tabParam : undefined;
+
+      if (nextTab && nextTab !== activeTab) {
+        setActiveTab(nextTab);
       }
-  });
+
+      const tabToLoad = nextTab || activeTab;
+      if (tabToLoad === 'ticket') {
+        await reloadTickets(true);
+
+        const fromPayAt = getFromPayAtParam();
+        if (shouldAutoRefreshAfterPay(fromPayAt) && !payAutoRefreshRunningRef.current) {
+          payAutoRefreshRunningRef.current = true;
+          try {
+            Taro.setStorageSync(PAY_REFRESH_HANDLED_KEY, fromPayAt);
+            // 支付后水票可能异步入账：自动再刷新几次，避免用户手动下拉刷新。
+            for (const delayMs of [800, 1500, 2500]) {
+              await sleep(delayMs);
+              await reloadTickets(true);
+            }
+          } finally {
+            payAutoRefreshRunningRef.current = false;
+          }
+        }
+      } else {
+        await reloadOrders(true);
+      }
+    })();
+  })
 
   return (
     <ConfigProvider>
@@ -479,6 +663,9 @@ const UserTicketList = () => {
                         <Text className="text-base font-semibold text-gray-900">
                           票号：{item.id}
                         </Text>
+                        <View className="mt-1">
+                          <Text className="text-xs text-gray-500">套票名称：{item.templateName}</Text>
+                        </View>
                         {item.orderNo && (
                           <View className="mt-1">
                             <Text className="text-xs text-gray-500">订单编号：{item.orderNo}</Text>
@@ -490,13 +677,25 @@ const UserTicketList = () => {
                           </View>
                         )}
                       </View>
-                      <View className="flex flex-col items-end gap-2 hidden">
+                      <View className="flex flex-col items-end gap-2">
+                        <Button
+                          size="small"
+                          type="primary"
+                          disabled={(item.availableQty ?? 0) <= 0 || item.status === 1}
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            void goSendWater(item);
+                          }}
+                        >
+                          立即送水
+                        </Button>
                         {/*<Tag type={item.status === 1 ? 'danger' : 'success'}>*/}
                         {/*  {item.status === 1 ? '冻结' : '正常'}*/}
                         {/*</Tag>*/}
                         <Button
                           size="small"
                           type="primary"
+                          style={{ display: 'none'}}
                           disabled={(item.availableQty ?? 0) <= 0 || item.status === 1}
                           onClick={(e) => {
                             // Avoid triggering card click.
@@ -518,7 +717,14 @@ const UserTicketList = () => {
                         <Text className="text-lg text-gray-900 text-center">{item.usedQty ?? 0}</Text>
                         <Text className="text-xs text-gray-500">已用水票</Text>
                       </View>
-                      <View className="flex flex-col items-center">
+                      <View
+                        className="flex flex-col items-center"
+                        hoverClass="opacity-70"
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          void goReleasePlanDetail(item);
+                        }}
+                      >
                         <Text className="text-lg text-gray-900 text-center">{item.frozenQty ?? 0}</Text>
                         <Text className="text-xs text-gray-500">剩余赠票</Text>
                       </View>
@@ -576,32 +782,6 @@ const UserTicketList = () => {
                     <View className="mt-1">
                       <Text className="text-xs text-gray-500">下单时间：{formatDateTime(item.createTime)}</Text>
                     </View>
-                    {(!!item.addressId || !!item.address || !!item.riderPhone || !!item.storePhone) ? (
-                      <View className="mt-3 flex justify-end gap-2">
-                        {(!!item.addressId || !!item.address) ? (
-                          <Button
-                            size="small"
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              void handleNavigateToAddress(item);
-                            }}
-                          >
-                            一键导航
-                          </Button>
-                        ) : null}
-                        {(!!item.riderPhone || !!item.storePhone) ? (
-                          <Button
-                            size="small"
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              void handleOneClickCall(item);
-                            }}
-                          >
-                            一键呼叫
-                          </Button>
-                        ) : null}
-                      </View>
-                    ) : null}
                     {/*{item.storeName ? (*/}
                     {/*  <View className="mt-1 text-xs text-gray-500">*/}
                     {/*    <Text>门店：{item.storeName}</Text>*/}
@@ -638,6 +818,38 @@ const UserTicketList = () => {
                         </Button>
                       </View>
                     ) : null}
+
+                    {item.id ? (
+                      <View className="mt-3 flex justify-end gap-2">
+                        <Button
+                          size="small"
+                          disabled={
+                            !isTicketOrderPendingDelivery(item) ||
+                            !!orderCancelLoadingById[item.id as number]
+                          }
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            void handleOrderModify(item);
+                          }}
+                        >
+                          修改订单
+                        </Button>
+                        <Button
+                          size="small"
+                          type="danger"
+                          disabled={
+                            !isTicketOrderPendingDelivery(item) ||
+                            !!orderCancelLoadingById[item.id as number]
+                          }
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            void handleOrderCancel(item);
+                          }}
+                        >
+                          取消订单
+                        </Button>
+                      </View>
+                    ) : null}
                   </View>
                 ))}
               </View>

src/user/ticket/release/index.config.ts

@@ -0,0 +1,6 @@
+export default definePageConfig({
+  navigationBarTitleText: '释放计划',
+  navigationBarTextStyle: 'black',
+  navigationBarBackgroundColor: '#ffffff'
+})
+

src/user/ticket/release/index.tsx

@@ -0,0 +1,245 @@
+import { useState } from 'react'
+import Taro, { useDidShow } from '@tarojs/taro'
+import { View, Text } from '@tarojs/components'
+import { ConfigProvider, Empty, InfiniteLoading, Loading, PullToRefresh, Tag } from '@nutui/nutui-react-taro'
+import dayjs from 'dayjs'
+
+import { pageGltUserTicketRelease } from '@/api/glt/gltUserTicketRelease'
+import type { GltUserTicketRelease } from '@/api/glt/gltUserTicketRelease/model'
+import { ensureLoggedIn } from '@/utils/auth'
+
+const PAGE_SIZE = 10
+const MAX_FETCH_ROUNDS = 10
+
+export default function TicketReleasePlanPage() {
+  const [list, setList] = useState<GltUserTicketRelease[]>([])
+  const [loading, setLoading] = useState(false)
+  const [hasMore, setHasMore] = useState(true)
+  const [page, setPage] = useState(1)
+  const [total, setTotal] = useState<number | undefined>(undefined)
+
+  const router = Taro.getCurrentInstance().router
+  const userTicketId = String(router?.params?.userTicketId || '').trim()
+  const templateName = (() => {
+    const raw = String(router?.params?.templateName || '')
+    try {
+      return decodeURIComponent(raw)
+    } catch {
+      return raw
+    }
+  })()
+  const frozenQtyText = router?.params?.frozenQty !== undefined ? String(router?.params?.frozenQty) : undefined
+  const releasedQtyText = router?.params?.releasedQty !== undefined ? String(router?.params?.releasedQty) : undefined
+
+  const getUserId = () => {
+    const raw = Taro.getStorageSync('UserId')
+    const id = Number(raw)
+    return Number.isFinite(id) && id > 0 ? id : undefined
+  }
+
+  const getStatusMeta = (item: GltUserTicketRelease) => {
+    const status = Number(item.status)
+    if (status === 1) return { text: '已释放', type: 'success' as const }
+    if (status === 0) return { text: '待释放', type: 'warning' as const }
+    return { text: `状态${Number.isFinite(status) ? status : '-'}`, type: 'primary' as const }
+  }
+
+  const formatDateTime = (v?: string) => {
+    if (!v) return '-'
+    const d = dayjs(v)
+    return d.isValid() ? d.format('YYYY年MM月DD日 HH:mm:ss') : v
+  }
+
+  const reload = async (isRefresh = true) => {
+    if (loading) return
+
+    const uid = getUserId()
+    if (!uid) {
+      setList([])
+      setHasMore(false)
+      setTotal(0)
+      return
+    }
+    if (!userTicketId) {
+      setList([])
+      setHasMore(false)
+      setTotal(0)
+      return
+    }
+
+    if (isRefresh) {
+      setPage(1)
+      setList([])
+      setHasMore(true)
+    }
+
+    setLoading(true)
+    try {
+      const baseList = isRefresh ? [] : list
+      const seen = new Set(baseList.map(r => String(r.id ?? `${r.userTicketId ?? ''}:${r.periodNo ?? ''}:${r.releaseTime ?? ''}`)))
+
+      let nextPage = isRefresh ? 1 : page
+      let serverHasMore = true
+      let added = 0
+      let nextList = baseList.slice()
+
+      for (let round = 0; round < MAX_FETCH_ROUNDS; round++) {
+        if (!serverHasMore) break
+
+        // Only query by current logged-in userId; userTicketId is filtered on the client.
+        const res = await pageGltUserTicketRelease({
+          page: nextPage,
+          limit: PAGE_SIZE,
+          userId: uid
+        } as any)
+
+        const incoming = Array.isArray(res?.list) ? res.list : []
+        const safe = incoming
+          .filter(r => Number((r as any)?.deleted) !== 1)
+          .filter(r => !userTicketId || String(r.userTicketId || '') === userTicketId)
+          .filter(r => {
+            const k = String(r.id ?? `${r.userTicketId ?? ''}:${r.periodNo ?? ''}:${r.releaseTime ?? ''}`)
+            if (seen.has(k)) return false
+            seen.add(k)
+            return true
+          })
+
+        if (safe.length) {
+          nextList = nextList.concat(safe)
+          added += safe.length
+        }
+
+        serverHasMore = incoming.length >= PAGE_SIZE
+        if (!serverHasMore) break
+        nextPage += 1
+
+        // Stop early once we got something to render for this ticket.
+        if (added > 0) break
+      }
+
+      nextList.sort((a, b) => {
+        const at = dayjs(a.releaseTime || a.createTime || 0).valueOf()
+        const bt = dayjs(b.releaseTime || b.createTime || 0).valueOf()
+        return bt - at
+      })
+
+      setList(nextList)
+      setTotal(nextList.length)
+      setHasMore(serverHasMore)
+      setPage(nextPage)
+    } catch (e) {
+      console.error('加载释放计划失败:', e)
+      Taro.showToast({ title: '加载失败', icon: 'none' })
+      setHasMore(false)
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  useDidShow(() => {
+    const redirect = userTicketId
+      ? `/user/ticket/release/index?userTicketId=${encodeURIComponent(userTicketId)}`
+      : '/user/ticket/index'
+    if (!ensureLoggedIn(redirect)) return
+    void reload(true)
+  })
+
+  const handleRefresh = async () => {
+    await reload(true)
+  }
+
+  const loadMore = async () => {
+    if (!loading && hasMore) await reload(false)
+  }
+
+  return (
+    <ConfigProvider>
+      <PullToRefresh onRefresh={handleRefresh} headHeight={60}>
+        <View style={{ height: 'calc(100vh)', overflowY: 'auto' }} id="ticket-release-scroll">
+          <View className="px-4 py-3">
+            <View className="bg-white rounded-xl p-4 mb-3">
+              <View className="flex items-center justify-between">
+                <Text className="text-base font-semibold text-gray-900">释放计划明细</Text>
+                {typeof total === 'number' ? (
+                  <Text className="text-xs text-gray-400">共 {total} 条</Text>
+                ) : null}
+              </View>
+              <View className="mt-2 text-xs text-gray-500">
+                <Text>票号：{userTicketId || '-'}</Text>
+              </View>
+              {templateName ? (
+                <View className="mt-1 text-xs text-gray-500">
+                  <Text>套票名称：{templateName}</Text>
+                </View>
+              ) : null}
+              {frozenQtyText !== undefined || releasedQtyText !== undefined ? (
+                <View className="mt-2 flex gap-4">
+                  {frozenQtyText !== undefined ? (
+                    <View>
+                      <Text className="text-xs text-gray-500">剩余赠票：{frozenQtyText}</Text>
+                    </View>
+                  ) : null}
+                  {releasedQtyText !== undefined ? (
+                    <View>
+                      <Text className="text-xs text-gray-500">已释放：{releasedQtyText}</Text>
+                    </View>
+                  ) : null}
+                </View>
+              ) : null}
+            </View>
+
+            {list.length === 0 && !loading && !hasMore ? (
+              <View className="flex flex-col justify-center items-center" style={{ height: 'calc(100vh - 220px)' }}>
+                <Empty description="暂无释放计划" style={{ backgroundColor: 'transparent' }} />
+              </View>
+            ) : (
+              <InfiniteLoading
+                target="ticket-release-scroll"
+                hasMore={hasMore}
+                onLoadMore={loadMore}
+                loadingText={
+                  <View className="flex justify-center items-center py-4">
+                    <Loading />
+                    <View className="ml-2">加载中...</View>
+                  </View>
+                }
+                loadMoreText={
+                  <View className="text-center py-4 text-gray-500">
+                    {list.length === 0 ? '暂无数据' : '没有更多了'}
+                  </View>
+                }
+              >
+                <View>
+                  {list.map((item, index) => {
+                    const meta = getStatusMeta(item)
+                    return (
+                      <View
+                        key={String(item.id ?? `${item.userTicketId ?? 't'}-${index}`)}
+                        className="bg-white rounded-xl p-4 mb-3"
+                      >
+                        <View className="flex items-start justify-between">
+                          <View className="flex-1 pr-3">
+                            <Text className="text-sm font-semibold text-gray-900">
+                              周期：{item.periodNo ?? '-'}
+                            </Text>
+                            <View className="mt-1 text-xs text-gray-500">
+                              <Text>释放数量：{item.releaseQty ?? 0}</Text>
+                            </View>
+                            <View className="mt-1 text-xs text-gray-500">
+                              <Text>释放时间：{formatDateTime(item.releaseTime)}</Text>
+                            </View>
+                          </View>
+                          <Tag type={meta.type}>{meta.text}</Tag>
+                        </View>
+                      </View>
+                    )
+                  })}
+                </View>
+              </InfiniteLoading>
+            )}
+          </View>
+        </View>
+      </PullToRefresh>
+    </ConfigProvider>
+  )
+}

src/user/ticket/use.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from 'react'
 import Taro, { useDidShow } from '@tarojs/taro'
-import { View, Text } from '@tarojs/components'
+import { View, Text, Picker } from '@tarojs/components'
 import {
   Button,
   Cell,
@@ -13,7 +13,7 @@ import {
   Space
 } from '@nutui/nutui-react-taro'
 import { ArrowRight, Location, Ticket } from '@nutui/icons-react-taro'
-import dayjs from 'dayjs'
+import dayjs, { type Dayjs } from 'dayjs'
 import type { ShopGoods } from '@/api/shop/shopGoods/model'
 import { getShopGoods } from '@/api/shop/shopGoods'
 import { getShopUserAddress, listShopUserAddress } from '@/api/shop/shopUserAddress'
@@ -25,9 +25,9 @@ import type {ShopStore} from "@/api/shop/shopStore/model";
 import {getShopStore, listShopStore} from "@/api/shop/shopStore";
 import {getSelectedStoreFromStorage, saveSelectedStoreToStorage} from "@/utils/storeSelection";
 import type { GltUserTicket } from '@/api/glt/gltUserTicket/model'
-import { listGltUserTicket } from '@/api/glt/gltUserTicket'
-import { addGltTicketOrder } from '@/api/glt/gltTicketOrder'
-import { pageGltTicketOrder } from '@/api/glt/gltTicketOrder'
+import { getGltUserTicket, listGltUserTicket } from '@/api/glt/gltUserTicket'
+import { getGltTicketTemplate, getGltTicketTemplateByGoodsId } from '@/api/glt/gltTicketTemplate'
+import { addGltTicketOrder, getGltTicketOrder, updateGltTicketOrder } from '@/api/glt/gltTicketOrder'
 import type { GltTicketOrder } from '@/api/glt/gltTicketOrder/model'
 import type { ShopStoreRider } from '@/api/shop/shopStoreRider/model'
 import { listShopStoreRider } from '@/api/shop/shopStoreRider'
@@ -35,16 +35,16 @@ import type { ShopStoreFence } from '@/api/shop/shopStoreFence/model'
 import { listShopStoreFence } from '@/api/shop/shopStoreFence'
 import { parseFencePoints, parseLngLatFromText, pointInAnyPolygon, pointInPolygon } from '@/utils/geofence'
 
-const MIN_START_QTY = 10
-const ADDRESS_CHANGE_COOLDOWN_DAYS = 30
+const DEFAULT_MIN_START_QTY = 10
 
 const OrderConfirm = () => {
   const [goods, setGoods] = useState<ShopGoods | null>(null);
   const [address, setAddress] = useState<ShopUserAddress>()
-  const [quantity, setQuantity] = useState<number>(MIN_START_QTY)
+  const [minStartQty, setMinStartQty] = useState<number>(DEFAULT_MIN_START_QTY)
+  const [quantity, setQuantity] = useState<number>(DEFAULT_MIN_START_QTY)
   const [orderRemark, setOrderRemark] = useState<string>('')
   // Delivery date only (no hour/min selection).
-  const [sendTime] = useState<Date>(() => dayjs().startOf('day').toDate())
+  const [sendTime, setSendTime] = useState<Date>(() => dayjs().startOf('day').toDate())
   const [loading, setLoading] = useState<boolean>(true)
   const [error, setError] = useState<string>('')
   const [submitLoading, setSubmitLoading] = useState<boolean>(false)
@@ -75,6 +75,8 @@ const OrderConfirm = () => {
   const [ticketLoading, setTicketLoading] = useState(false)
   const [ticketLoaded, setTicketLoaded] = useState(false)
   const noTicketPromptedRef = useRef(false)
+  const ticketAutoRetryCountRef = useRef(0)
+  const ticketAutoRetryTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
 
   // Delivery range (geofence): block ordering if address/current location is outside.
   const [fences, setFences] = useState<ShopStoreFence[]>([])
@@ -89,29 +91,27 @@ const OrderConfirm = () => {
 
   const router = Taro.getCurrentInstance().router;
   const goodsId = router?.params?.goodsId;
+  const orderId = router?.params?.orderId;
   const numericGoodsId = useMemo(() => {
     const n = goodsId ? Number(goodsId) : undefined
     return typeof n === 'number' && Number.isFinite(n) ? n : undefined
   }, [goodsId])
 
+  const numericOrderId = useMemo(() => {
+    const n = orderId ? Number(orderId) : undefined
+    return typeof n === 'number' && Number.isFinite(n) && n > 0 ? n : undefined
+  }, [orderId])
+
+  const isEditMode = !!numericOrderId
+  const [editingOrder, setEditingOrder] = useState<GltTicketOrder | null>(null)
+  const editingInitRef = useRef(false)
+
   const userId = useMemo(() => {
     const raw = Taro.getStorageSync('UserId')
     const id = Number(raw)
     return Number.isFinite(id) && id > 0 ? id : undefined
   }, [])
 
-  type TicketAddressModifyLimit = {
-    loaded: boolean
-    canModify: boolean
-    nextAllowedText?: string
-    lockedAddressId?: number
-  }
-  const [ticketAddressModifyLimit, setTicketAddressModifyLimit] = useState<TicketAddressModifyLimit>({
-    loaded: false,
-    canModify: true,
-  })
-  const ticketAddressModifyLimitPromiseRef = useRef<Promise<TicketAddressModifyLimit> | null>(null)
-
   const parseTime = (raw?: unknown) => {
     if (raw === undefined || raw === null || raw === '') return null
     // Compatible with seconds/milliseconds timestamps.
@@ -124,111 +124,22 @@ const OrderConfirm = () => {
     return d.isValid() ? d : null
   }
 
-  const getOrderTime = (o?: Partial<GltTicketOrder> | null) => {
-    return parseTime(o?.createTime) || parseTime(o?.updateTime)
+  const clampSendDateToToday = (d: Dayjs) => {
+    const today = dayjs().startOf('day')
+    if (!d.isValid()) return today
+    return d.isBefore(today, 'day') ? today : d.startOf('day')
   }
 
-  const getOrderAddressKey = (o?: Partial<GltTicketOrder> | null) => {
-    const id = Number(o?.addressId)
-    if (Number.isFinite(id) && id > 0) return `id:${id}`
-    const txt = String(o?.address || '').trim()
-    if (txt) return `txt:${txt}`
-    return ''
-  }
-
-  const loadTicketAddressModifyLimit = async (): Promise<TicketAddressModifyLimit> => {
-    if (ticketAddressModifyLimitPromiseRef.current) return ticketAddressModifyLimitPromiseRef.current
-
-    ticketAddressModifyLimitPromiseRef.current = (async () => {
-      if (!userId) return { loaded: true, canModify: true }
-
-      const now = dayjs()
-      const pageSize = 20
-      let page = 1
-      const all: GltTicketOrder[] = []
-
-      let latestKey = ''
-      let latestAddressId: number | undefined = undefined
-
-      while (true) {
-        const res = await pageGltTicketOrder({ page, limit: pageSize, userId })
-        const list = Array.isArray(res?.list) ? res.list : []
-        if (page === 1) {
-          const first = list[0]
-          latestKey = getOrderAddressKey(first)
-          const id = Number(first?.addressId)
-          latestAddressId = Number.isFinite(id) && id > 0 ? id : undefined
-        }
-
-        if (!list.length) break
-        all.push(...list)
-
-        // Find the oldest order in the newest contiguous block of the latest address key.
-        // That order's time represents the last time user "set/changed" the ticket delivery address.
-        const currentKey = latestKey
-        if (!currentKey) {
-          return { loaded: true, canModify: true }
-        }
-
-        let lastSameIndex = 0
-        let foundDifferent = false
-        for (let i = 1; i < all.length; i++) {
-          const k = getOrderAddressKey(all[i])
-          if (!k) continue
-          if (k === currentKey) {
-            lastSameIndex = i
-            continue
-          }
-          foundDifferent = true
-          break
-        }
-
-        if (foundDifferent) {
-          const lastSetAt = getOrderTime(all[lastSameIndex])
-          if (!lastSetAt) return { loaded: true, canModify: true, lockedAddressId: latestAddressId }
-          const nextAllowed = lastSetAt.add(ADDRESS_CHANGE_COOLDOWN_DAYS, 'day')
-          const canModify = now.isAfter(nextAllowed)
-          return {
-            loaded: true,
-            canModify,
-            nextAllowedText: nextAllowed.format('YYYY-MM-DD'),
-            lockedAddressId: latestAddressId,
-          }
-        }
-
-        const oldest = getOrderTime(all[all.length - 1])
-        if (oldest && now.diff(oldest, 'day') >= ADDRESS_CHANGE_COOLDOWN_DAYS) {
-          // We have enough history beyond the cooldown window, and still no different address found.
-          return { loaded: true, canModify: true, lockedAddressId: latestAddressId }
-        }
-
-        const totalCount = typeof (res as any)?.count === 'number' ? Number((res as any).count) : undefined
-        if (totalCount !== undefined && all.length >= totalCount) break
-        if (list.length < pageSize) break
-
-        page += 1
-        if (page > 10) break // safety: avoid excessive paging
-      }
-
-      if (!all.length) return { loaded: true, canModify: true }
-
-      // If we can't prove the last-set time is older than the cooldown window, be conservative and lock.
-      const lastSetAt = getOrderTime(all[all.length - 1])
-      if (!lastSetAt) return { loaded: true, canModify: true, lockedAddressId: latestAddressId }
-      const nextAllowed = lastSetAt.add(ADDRESS_CHANGE_COOLDOWN_DAYS, 'day')
-      const canModify = now.isAfter(nextAllowed)
-      return {
-        loaded: true,
-        canModify,
-        nextAllowedText: nextAllowed.format('YYYY-MM-DD'),
-        lockedAddressId: latestAddressId,
-      }
-    })()
-      .finally(() => {
-        ticketAddressModifyLimitPromiseRef.current = null
-      })
-
-    return ticketAddressModifyLimitPromiseRef.current
+  const isPendingDeliveryOrder = (o?: Partial<GltTicketOrder> | null) => {
+    if (!o) return false
+    const ds = (o as any)?.deliveryStatus
+    const hasProgress = !!o.sendStartTime || !!o.sendEndTime || !!o.receiveConfirmTime
+    return (
+      Number((o as any)?.deleted) !== 1 &&
+      Number(o.status) !== 1 &&
+      !hasProgress &&
+      (ds === 10 || (typeof ds !== 'number' && !!o.riderId))
+    )
   }
 
   const getTicketAvailableQty = (t?: Partial<GltUserTicket> | null) => {
@@ -298,19 +209,63 @@ const OrderConfirm = () => {
     return !!userId && ticketLoaded && !ticketLoading && usableTickets.length === 0
   }, [ticketLoaded, ticketLoading, usableTickets.length, userId])
 
+  // After buying tickets and redirecting here, some backends may issue tickets asynchronously.
+  // If opened with a `goodsId`, retry a few times to refresh tickets.
+  useEffect(() => {
+    if (isEditMode) return
+    if (!numericGoodsId) return
+    if (!ticketLoaded || ticketLoading) return
+
+    if (usableTickets.length > 0) {
+      ticketAutoRetryCountRef.current = 0
+      return
+    }
+
+    if (ticketAutoRetryCountRef.current >= 4) return
+    if (ticketAutoRetryTimerRef.current) return
+
+    const delays = [800, 1500, 2500, 4000]
+    const delay = delays[ticketAutoRetryCountRef.current] ?? 2500
+    ticketAutoRetryCountRef.current += 1
+    ticketAutoRetryTimerRef.current = setTimeout(async () => {
+      ticketAutoRetryTimerRef.current = null
+      await loadUserTickets()
+    }, delay)
+  }, [isEditMode, numericGoodsId, ticketLoaded, ticketLoading, usableTickets.length])
+
+  useEffect(() => {
+    return () => {
+      if (ticketAutoRetryTimerRef.current) {
+        clearTimeout(ticketAutoRetryTimerRef.current)
+        ticketAutoRetryTimerRef.current = null
+      }
+    }
+  }, [])
+
   const maxQuantity = useMemo(() => {
     const stockMax = goods?.stock ?? 999
-    return Math.max(0, Math.min(stockMax, availableTicketTotal))
-  }, [availableTicketTotal, goods?.stock])
+    if (!isEditMode) return Math.max(0, Math.min(stockMax, availableTicketTotal))
+
+    const original = Number(editingOrder?.totalNum ?? 0)
+    const originalSafe = Number.isFinite(original) ? original : 0
+    const ticketId = Number(editingOrder?.userTicketId ?? 0)
+    const ticketIdSafe = Number.isFinite(ticketId) && ticketId > 0 ? ticketId : undefined
+    const rawTicket = ticketIdSafe ? (tickets || []).find(t => Number(t?.id) === ticketIdSafe) : undefined
+    if (!rawTicket) return Math.max(0, Math.min(stockMax, originalSafe))
+
+    const avail = getTicketAvailableQty(rawTicket)
+    const upper = Math.max(0, avail + originalSafe)
+    return Math.max(0, Math.min(stockMax, upper))
+  }, [availableTicketTotal, editingOrder?.totalNum, editingOrder?.userTicketId, goods?.stock, isEditMode, tickets])
 
   const canStartOrder = useMemo(() => {
-    return maxQuantity >= MIN_START_QTY
-  }, [maxQuantity])
+    return maxQuantity >= minStartQty
+  }, [maxQuantity, minStartQty])
 
   const displayQty = useMemo(() => {
     if (!canStartOrder) return 0
-    return Math.max(MIN_START_QTY, Math.min(quantity, maxQuantity))
-  }, [quantity, maxQuantity, canStartOrder])
+    return Math.max(minStartQty, Math.min(quantity, maxQuantity))
+  }, [quantity, maxQuantity, canStartOrder, minStartQty])
 
   const sendTimeText = useMemo(() => {
     return dayjs(sendTime).format('YYYY-MM-DD')
@@ -334,18 +289,16 @@ const OrderConfirm = () => {
   }
 
   const openAddressPage = async () => {
-    const limit = ticketAddressModifyLimit.loaded
-      ? ticketAddressModifyLimit
-      : await loadTicketAddressModifyLimit().catch(() => ({ loaded: true, canModify: true } as TicketAddressModifyLimit))
-    if (!ticketAddressModifyLimit.loaded) setTicketAddressModifyLimit(limit)
-
-    if (!limit.canModify) {
-      Taro.showToast({
-        title: `送水地址每${ADDRESS_CHANGE_COOLDOWN_DAYS}天可修改一次${limit.nextAllowedText ? '，' + limit.nextAllowedText + ' 后可修改' : ''}`,
-        icon: 'none',
-      })
+    if (isEditMode) {
+      if (!editingOrder?.id) {
+        Taro.showToast({ title: '订单信息加载中，请稍后重试', icon: 'none' })
         return
       }
+      if (!isPendingDeliveryOrder(editingOrder)) {
+        Taro.showToast({ title: '该订单当前不可修改', icon: 'none' })
+        return
+      }
+    }
     Taro.navigateTo({ url: '/user/address/index' })
   }
 
@@ -579,7 +532,7 @@ const OrderConfirm = () => {
       setQuantity(0)
       return
     }
-    setQuantity(Math.max(MIN_START_QTY, Math.min(newQuantity || MIN_START_QTY, upper)))
+    setQuantity(Math.max(minStartQty, Math.min(newQuantity || minStartQty, upper)))
   }
 
   const loadUserTickets = async () => {
@@ -623,34 +576,22 @@ const OrderConfirm = () => {
   const onSubmit = async () => {
     if (submitLoading) return
     if (deliveryRangeCheckingRef.current) return
-    if (!goods?.goodsId) return
 
     // 基础校验
     if (!userId) {
       Taro.showToast({ title: '请先登录', icon: 'none' })
       return
     }
-    if (!address?.id) {
-      Taro.showToast({ title: '请选择收货地址', icon: 'none' })
+    if (isEditMode && !editingOrder?.id) {
+      Taro.showToast({ title: '订单信息加载中，请稍后重试', icon: 'none' })
       return
     }
-
-    // Ticket delivery address is based on order snapshot. Enforce "once per 30 days" by latest ticket-order history.
-    const limit = ticketAddressModifyLimit.loaded
-      ? ticketAddressModifyLimit
-      : await loadTicketAddressModifyLimit().catch(() => ({ loaded: true, canModify: true } as TicketAddressModifyLimit))
-    if (!ticketAddressModifyLimit.loaded) setTicketAddressModifyLimit(limit)
-    if (!limit.canModify && limit.lockedAddressId && address.id !== limit.lockedAddressId) {
-      Taro.showToast({
-        title: `送水地址每${ADDRESS_CHANGE_COOLDOWN_DAYS}天可修改一次，请使用上次下单地址${limit.nextAllowedText ? '（' + limit.nextAllowedText + ' 后可修改）' : ''}`,
-        icon: 'none',
-      })
-      try {
-        const locked = await getShopUserAddress(limit.lockedAddressId)
-        if (locked?.id) setAddress(locked)
-      } catch (_e) {
-        // ignore: keep current address, but still block submission
+    if (isEditMode && !isPendingDeliveryOrder(editingOrder)) {
+      Taro.showToast({ title: '该订单当前不可修改', icon: 'none' })
+      return
     }
+    if (!address?.id) {
+      Taro.showToast({ title: '请选择收货地址', icon: 'none' })
       return
     }
     if (!addressHasCoords) {
@@ -672,7 +613,7 @@ const OrderConfirm = () => {
       Taro.showToast({ title: '未找到可配送门店，请先在首页选择门店或联系管理员配置门店坐标', icon: 'none' })
       return
     }
-    if (availableTicketTotal <= 0) {
+    if (!isEditMode && availableTicketTotal <= 0) {
       Taro.showToast({ title: '暂无可用水票', icon: 'none' })
       return
     }
@@ -682,30 +623,41 @@ const OrderConfirm = () => {
       Taro.showToast({ title: '请选择送水数量', icon: 'none' })
       return
     }
-    if (finalQty > availableTicketTotal) {
+    if (!isEditMode && finalQty > availableTicketTotal) {
       Taro.showToast({ title: '水票可用次数不足', icon: 'none' })
       return
     }
-    if (goods.stock !== undefined && finalQty > goods.stock) {
+    if (isEditMode && finalQty > maxQuantity) {
+      Taro.showToast({ title: '水票可用次数不足', icon: 'none' })
+      return
+    }
+    if (goods?.stock !== undefined && finalQty > goods.stock) {
       Taro.showToast({ title: '商品库存不足', icon: 'none' })
       return
     }
-    if (finalQty < MIN_START_QTY) {
-      Taro.showToast({ title: `最低起送 ${MIN_START_QTY} 桶`, icon: 'none' })
+    if (finalQty < minStartQty) {
+      Taro.showToast({ title: `最低起送 ${minStartQty} 桶`, icon: 'none' })
       return
     }
     if (!sendTime) {
       Taro.showToast({ title: '请选择配送时间', icon: 'none' })
       return
     }
+    if (dayjs(sendTime).isBefore(dayjs().startOf('day'), 'day')) {
+      Taro.showToast({ title: '配送时间不能早于今天', icon: 'none' })
+      setSendTime(dayjs().startOf('day').toDate())
+      return
+    }
 
     // 配送范围校验（电子围栏）
     const ok = await ensureInDeliveryRange()
     if (!ok) return
 
     const confirmRes = await Taro.showModal({
-      title: '确认下单',
-      content: `配送时间：${sendTimeText}\n将使用 ${finalQty} 张水票下单（优先使用可用数量少的水票），送水 ${finalQty} 桶，是否确认？`
+      title: isEditMode ? '确认修改' : '确认下单',
+      content: isEditMode
+        ? `配送时间：${sendTimeText}\n送水数量：${finalQty} 桶\n是否确认修改？`
+        : `配送时间：${sendTimeText}\n将使用 ${finalQty} 张水票下单（优先使用可用数量少的水票），送水 ${finalQty} 桶，是否确认？`
     })
     if (!confirmRes.confirm) return
 
@@ -713,13 +665,21 @@ const OrderConfirm = () => {
       setSubmitLoading(true)
       Taro.showLoading({ title: '提交中...' })
 
+      if (isEditMode) {
+        await updateGltTicketOrder({
+          id: editingOrder?.id,
+          addressId: address.id,
+          totalNum: finalQty,
+          buyerRemarks: orderRemark,
+          sendTime: dayjs(sendTime).startOf('day').format('YYYY-MM-DD HH:mm:ss')
+        })
+      } else {
         // Best-effort auto dispatch rider. If it fails, backend/manual dispatch can still handle it.
         const autoRider = storeForOrder.id ? await resolveAutoRiderForStore(storeForOrder.id) : null
 
         // Split this "delivery" into multiple ticket orders (backend order model binds to one userTicketId).
         // Consume tickets with smaller available qty first.
         let remain = finalQty
-      let created = 0
         for (const t of ticketsToConsume) {
           if (remain <= 0) break
           const avail = getTicketAvailableQty(t)
@@ -737,27 +697,27 @@ const OrderConfirm = () => {
             riderId: Number.isFinite(Number(autoRider?.userId)) ? Number(autoRider?.userId) : undefined,
             riderName: autoRider?.realName,
             riderPhone: autoRider?.mobile,
-          comments: goods.name ? `立即送水：${goods.name}` : '立即送水'
+            comments: goods?.name ? `立即送水：${goods.name}` : '立即送水'
           })
           remain -= useQty
-        created += 1
         }
 
         if (remain > 0) {
           // Ticket counts might have changed between loading and submission.
           throw new Error('水票可用次数不足，请刷新后重试')
         }
+      }
 
       await loadUserTickets()
 
-      Taro.showToast({ title: created > 1 ? '下单成功（已拆分多张水票）' : '下单成功', icon: 'success' })
+      Taro.showToast({ title: isEditMode ? '修改成功' : '下单成功', icon: 'success' })
       setTimeout(() => {
         // 跳转到“我的送水订单”
         Taro.redirectTo({ url: '/user/ticket/index?tab=order' })
       }, 800)
     } catch (e: any) {
-      console.error('水票下单失败:', e)
-      Taro.showToast({ title: e?.message || '下单失败', icon: 'none' })
+      console.error(isEditMode ? '送水订单修改失败:' : '水票下单失败:', e)
+      Taro.showToast({ title: e?.message || (isEditMode ? '修改失败' : '下单失败'), icon: 'none' })
     } finally {
       Taro.hideLoading()
       setSubmitLoading(false)
@@ -772,11 +732,28 @@ const OrderConfirm = () => {
       if (!opts?.silent) setLoading(true)
       setError('')
 
-      const [goodsRes, addressRes] = await Promise.all([
-        numericGoodsId ? getShopGoods(numericGoodsId) : Promise.resolve(null),
-        listShopUserAddress({ isDefault: true })
+      const [addressRes, editingOrderRes, goodsByParam] = await Promise.all([
+        listShopUserAddress({ isDefault: true }),
+        numericOrderId ? getGltTicketOrder(numericOrderId) : Promise.resolve(null),
+        numericGoodsId ? getShopGoods(numericGoodsId) : Promise.resolve(null)
       ])
 
+      let goodsRes = goodsByParam
+      if (!goodsRes && editingOrderRes?.userTicketId) {
+        const ticketId = Number(editingOrderRes.userTicketId)
+        if (Number.isFinite(ticketId) && ticketId > 0) {
+          try {
+            const ticket = await getGltUserTicket(ticketId)
+            const gid = Number((ticket as any)?.goodsId)
+            if (Number.isFinite(gid) && gid > 0) {
+              goodsRes = await getShopGoods(gid)
+            }
+          } catch (e) {
+            console.error('加载订单关联商品失败:', e)
+          }
+        }
+      }
+
       // 设置商品信息
       if (goodsRes) {
         setGoods(goodsRes)
@@ -788,18 +765,41 @@ const OrderConfirm = () => {
         setAddress(addressRes[0])
       }
 
-      // Load ticket-order history to enforce "address can be modified once per 30 days".
-      // If currently locked, force using last ticket-order address (snapshot) to avoid getting stuck with a new default address.
-      try {
-        const limit = await loadTicketAddressModifyLimit()
-        setTicketAddressModifyLimit(limit)
-        if (!limit.canModify && limit.lockedAddressId) {
-          const locked = await getShopUserAddress(limit.lockedAddressId)
-          if (locked?.id) setAddress(locked)
+      if (numericOrderId && editingOrderRes && !editingInitRef.current) {
+        editingInitRef.current = true
+        setEditingOrder(editingOrderRes)
+        Taro.setNavigationBarTitle({ title: '订单确认' })
+
+        const isPending = isPendingDeliveryOrder(editingOrderRes)
+        if (!isPending) {
+          Taro.showToast({ title: '该订单当前不可修改', icon: 'none' })
+          setTimeout(() => {
+            Taro.navigateBack()
+          }, 600)
+          return
         }
+
+        const initQty = Number(editingOrderRes.totalNum ?? minStartQty)
+        setQuantity(Number.isFinite(initQty) && initQty > 0 ? initQty : minStartQty)
+        setOrderRemark(String(editingOrderRes.buyerRemarks || ''))
+        const st = parseTime(editingOrderRes.sendTime)
+        if (st) setSendTime(clampSendDateToToday(st).toDate())
+
+        const addrId = Number(editingOrderRes.addressId)
+        const addrIdSafe = Number.isFinite(addrId) && addrId > 0 ? addrId : undefined
+        if (addrIdSafe) {
+          const hit = addressRes?.find(a => Number(a?.id) === addrIdSafe)
+          if (hit?.id) {
+            setAddress(hit)
+          } else {
+            try {
+              const addr = await getShopUserAddress(addrIdSafe)
+              if (addr?.id) setAddress(addr)
             } catch (e) {
-        console.error('加载送水地址修改限制失败:', e)
-        setTicketAddressModifyLimit({ loaded: true, canModify: true })
+              console.error('加载订单收货地址失败:', e)
+            }
+          }
+        }
       }
       // Tickets are non-blocking for first paint; load in background.
       loadUserTickets()
@@ -819,6 +819,11 @@ const OrderConfirm = () => {
   useDidShow(() => {
     // 返回/切换到该页面时，刷新一下当前已选门店
     setSelectedStore(getSelectedStoreFromStorage())
+    ticketAutoRetryCountRef.current = 0
+    if (ticketAutoRetryTimerRef.current) {
+      clearTimeout(ticketAutoRetryTimerRef.current)
+      ticketAutoRetryTimerRef.current = null
+    }
     loadAllData({ silent: hasInitialLoadedRef.current })
   })
 
@@ -878,10 +883,6 @@ const OrderConfirm = () => {
   // When user changes the delivery address to an out-of-fence one, prompt immediately (once per address).
   const outOfRangePromptedAddressIdRef = useRef<number | undefined>(undefined)
   useEffect(() => {
-    // Only prompt when user is allowed to change the ticket delivery address.
-    // Otherwise this toast is noisy (they can't fix it within the cooldown window).
-    if (!ticketAddressModifyLimit.loaded) return
-    if (!ticketAddressModifyLimit.canModify) return
     const id = address?.id
     if (!id) return
     if (deliveryRangeCheckedAddressId !== id) return
@@ -893,40 +894,83 @@ const OrderConfirm = () => {
     address?.id,
     addressHasCoords,
     deliveryRangeCheckedAddressId,
-    inDeliveryRange,
-    ticketAddressModifyLimit.loaded,
-    ticketAddressModifyLimit.canModify
+    inDeliveryRange
   ])
 
   // When tickets/stock change, clamp quantity into [0..maxQuantity].
   useEffect(() => {
     setQuantity(prev => {
       if (maxQuantity <= 0) return 0
-      if (maxQuantity < MIN_START_QTY) return 0
-      if (!prev || prev < MIN_START_QTY) return MIN_START_QTY
+      if (maxQuantity < minStartQty) return 0
+      if (!prev || prev < minStartQty) return minStartQty
       return Math.min(prev, maxQuantity)
     })
-  }, [maxQuantity])
+  }, [maxQuantity, minStartQty])
+
+  const minStartQtyKey = useMemo(() => {
+    const gid = Number(goods?.goodsId)
+    if (Number.isFinite(gid) && gid > 0) return `g:${gid}`
+
+    // If there is exactly one ticket template available, infer min start qty from it (covers "稍后再送" without goodsId).
+    const ids = Array.from(
+      new Set(
+        (usableTickets || [])
+          .map(t => Number(t?.templateId))
+          .filter(id => Number.isFinite(id) && id > 0)
+      )
+    )
+    if (ids.length === 1) return `t:${ids[0]}`
+    return ''
+  }, [goods?.goodsId, usableTickets])
+
+  // Use configured min start-send qty from ticket template (by goodsId or by user's unique templateId).
+  useEffect(() => {
+    let cancelled = false
+    ;(async () => {
+      try {
+        if (!minStartQtyKey) {
+          setMinStartQty(DEFAULT_MIN_START_QTY)
+          return
+        }
+        const [kind, rawId] = minStartQtyKey.split(':')
+        const id = Number(rawId)
+        const tpl =
+          kind === 'g'
+            ? await getGltTicketTemplateByGoodsId(id)
+            : await getGltTicketTemplate(id)
+        const n = Number(tpl?.startSendQty)
+        const safe = Number.isFinite(n) && n > 0 ? n : DEFAULT_MIN_START_QTY
+        if (!cancelled) setMinStartQty(safe)
+      } catch (_e) {
+        if (!cancelled) setMinStartQty(DEFAULT_MIN_START_QTY)
+      }
+    })()
+    return () => {
+      cancelled = true
+    }
+  }, [minStartQtyKey])
 
   // If user has no usable tickets, proactively guide them to purchase (only once per page lifecycle).
   useEffect(() => {
     if (!noUsableTickets) return
+    // Editing an existing order: don't interrupt with "no tickets" prompt.
+    if (isEditMode) return
     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])
+  }, [noUsableTickets, isEditMode])
 
   // 重新加载数据
   const handleRetry = () => {
@@ -946,7 +990,7 @@ const OrderConfirm = () => {
   }
 
   // 加载状态
-  if (loading || !goods) {
+  if (loading) {
     return <OrderConfirmSkeleton/>
   }
 
@@ -991,12 +1035,6 @@ const OrderConfirm = () => {
                   </Space>
 	                  <View className={'pt-1 pb-3'}>
 	                    <View className={'text-gray-500'}>{address.name} {address.phone}</View>
-	                    {ticketAddressModifyLimit.loaded && !ticketAddressModifyLimit.canModify && (
-	                      <View className={'pt-1 text-xs text-orange-500 hidden'}>
-	                        送水地址每{ADDRESS_CHANGE_COOLDOWN_DAYS}天可修改一次
-	                        {ticketAddressModifyLimit.nextAllowedText ? `，${ticketAddressModifyLimit.nextAllowedText} 后可修改` : ''}
-	                      </View>
-	                    )}
 	                  </View>
 	                </View>
 	              </Space>
@@ -1017,9 +1055,27 @@ const OrderConfirm = () => {
         <Cell
           title={'配送时间'}
           extra={(
+            <Picker
+              mode="date"
+              start={dayjs().format('YYYY-MM-DD')}
+              value={dayjs(sendTime).format('YYYY-MM-DD')}
+              onChange={(e) => {
+                const v = (e as any)?.detail?.value
+                const d = dayjs(v)
+                if (!d.isValid()) return
+                if (d.isBefore(dayjs().startOf('day'), 'day')) {
+                  Taro.showToast({ title: '配送时间不能早于今天', icon: 'none' })
+                  setSendTime(dayjs().startOf('day').toDate())
+                  return
+                }
+                setSendTime(d.startOf('day').toDate())
+              }}
+            >
               <View className={'flex items-center gap-2'}>
                 <View className={'text-gray-900'}>{sendTimeText}</View>
+                <ArrowRight className={'text-gray-400'} size={14} />
               </View>
+            </Picker>
           )}
         />
       </CellGroup>
@@ -1029,16 +1085,16 @@ const OrderConfirm = () => {
           title={'送水数量'}
           description={
             canStartOrder
-              ? `最低起送 ${MIN_START_QTY} 桶`
-              : `最低起送 ${MIN_START_QTY} 桶（当前最多 ${maxQuantity} 桶）`
+              ? `最低起送 ${minStartQty} 桶`
+              : `最低起送 ${minStartQty} 桶（当前最多 ${maxQuantity} 桶）`
           }
           extra={(
 	            <ConfigProvider theme={customTheme}>
 	              <InputNumber
 	                value={displayQty}
-	                min={canStartOrder ? MIN_START_QTY : 0}
+	                min={canStartOrder ? minStartQty : 0}
 	                max={canStartOrder ? maxQuantity : 0}
-	                step={10}
+	                step={minStartQty >= 10 ? 10 : 1}
                   readOnly
 	                disabled={!canStartOrder}
 	                onChange={handleQuantityChange}
@@ -1080,7 +1136,7 @@ const OrderConfirm = () => {
 	                await loadUserTickets()
 	                return
 	              }
-	              if (noUsableTickets) {
+	              if (noUsableTickets && !isEditMode) {
 	                const r = await Taro.showModal({
 	                  title: '暂无可用水票',
 	                  content: '您还没有可用水票，是否前往购买？',
@@ -1093,7 +1149,7 @@ const OrderConfirm = () => {
 	              setTicketPopupVisible(true)
 	            }}
 	        />
-          {noUsableTickets && (
+          {(noUsableTickets && !isEditMode) && (
             <Cell
               title={<Text className="text-gray-500">还没有购买水票</Text>}
               description="购买水票后即可在这里直接下单送水"
@@ -1169,8 +1225,11 @@ 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>
                 </View>
@@ -1252,9 +1311,9 @@ const OrderConfirm = () => {
             </View>
 	          </div>
 	          <div className={'buy-btn mx-4'}>
-              {noUsableTickets ? (
+	              {noUsableTickets && !isEditMode ? (
 	                <Button type="primary" size="large" onClick={goBuyTickets}>
-                  去购买水票
+	                  {isEditMode ? '确定修改' : '确定下单'}
 	                </Button>
 	              ) : (
 		                <Button
@@ -1266,7 +1325,7 @@ const OrderConfirm = () => {
                       !address?.id ||
                       !addressHasCoords ||
 		                    (deliveryRangeCheckedAddressId === address?.id && inDeliveryRange === false) ||
-	                    availableTicketTotal <= 0 ||
+		                    (!isEditMode && availableTicketTotal <= 0) ||
 		                    !canStartOrder
 		                  }
 		                  onClick={onSubmit}
@@ -1279,7 +1338,7 @@ const OrderConfirm = () => {
                         ? '地址缺少定位'
                         : ((deliveryRangeCheckedAddressId === address?.id && inDeliveryRange === false)
                           ? '不在配送范围'
-                          : (submitLoading ? '提交中...' : '立即提交')
+		                          : (submitLoading ? '提交中...' : (isEditMode ? '确定修改' : '立即提交'))
 		                        )
 		                      )
 		                    )

src/utils/payment.ts

@@ -19,7 +19,8 @@ export enum PaymentType {
  * 支付结果回调
  */
 export interface PaymentCallback {
-  onSuccess?: () => void;
+  // Return `false` to skip default "支付成功" toast + redirect.
+  onSuccess?: () => void | boolean | Promise<void | boolean>;
   onError?: (error: string) => void;
   onComplete?: () => void;
 }
@@ -118,17 +119,27 @@ export class PaymentHandler {
       if (paymentSuccess) {
         console.log('支付成功，订单号:', result.orderNo);
 
+        // 先收起 loading，避免遮挡 modal/toast
+        try {
+          Taro.hideLoading();
+        } catch (_e) {
+          // ignore
+        }
+
+        const onSuccessResult = await callback?.onSuccess?.();
+        const skipDefaultSuccessBehavior = onSuccessResult === false;
+
+        if (!skipDefaultSuccessBehavior) {
           Taro.showToast({
             title: '支付成功',
             icon: 'success'
           });
 
-        callback?.onSuccess?.();
-
           // 跳转到订单页面
           setTimeout(() => {
             Taro.navigateTo({ url: '/user/order/order' });
           }, 2000);
+        }
       } else {
         throw new Error('支付未完成');
       }

src/utils/server.ts

@@ -5,6 +5,7 @@ import {User} from "@/api/system/user/model";
 export const TEMPLATE_ID = '10584';
 // 服务接口 - 请根据实际情况修改
 export const SERVER_API_URL = 'https://glt-server.websoft.top/api';
+// export const SERVER_API_URL = 'https://server.websoft.top/api';
 // export const SERVER_API_URL = 'http://127.0.0.1:8000/api';
 /**
  * 保存用户信息到本地存储

src/utils/shopOrderStatus.ts

@@ -0,0 +1,65 @@
+import type { ShopOrder } from '@/api/shop/shopOrder/model';
+
+const toNum = (value: unknown): number | undefined => {
+  if (value === null || value === undefined || value === '') return undefined;
+  const n = Number(value);
+  return Number.isFinite(n) ? n : undefined;
+};
+
+export const isShopOrderCompleted = (order: Pick<ShopOrder, 'orderStatus'>): boolean =>
+  toNum(order?.orderStatus) === 1;
+
+export const getShopOrderStatusText = (order: ShopOrder): string => {
+  const orderStatus = toNum(order?.orderStatus);
+  const deliveryStatus = toNum(order?.deliveryStatus);
+  const riderId = toNum(order?.riderId);
+
+  if (orderStatus === 2) return '已取消';
+  if (orderStatus === 3) return '取消中';
+  if (orderStatus === 4) return '退款申请中';
+  if (orderStatus === 5) return '退款被拒绝';
+  if (orderStatus === 6) return '退款成功';
+  if (orderStatus === 7) return '客户端申请退款';
+  if (orderStatus === 1) return '已完成';
+
+  if (!order?.payStatus) return '等待买家付款';
+
+  if (deliveryStatus === 10) return '待发货';
+  if (deliveryStatus === 20) {
+    if (!riderId || riderId === 0) return '待收货';
+    if (order?.sendEndTime) return '待确认收货';
+    return '配送中';
+  }
+  if (deliveryStatus === 30) return '部分发货';
+
+  if (orderStatus === 0) return '未使用';
+  return '未知状态';
+};
+
+export const getShopOrderStatusColor = (order: ShopOrder): string => {
+  const orderStatus = toNum(order?.orderStatus);
+  const deliveryStatus = toNum(order?.deliveryStatus);
+  const riderId = toNum(order?.riderId);
+
+  if (orderStatus === 2) return 'text-gray-500'; // 已取消
+  if (orderStatus === 3) return 'text-orange-500'; // 取消中
+  if (orderStatus === 4) return 'text-orange-500'; // 退款申请中
+  if (orderStatus === 5) return 'text-red-500'; // 退款被拒绝
+  if (orderStatus === 6) return 'text-green-500'; // 退款成功
+  if (orderStatus === 7) return 'text-orange-500'; // 客户端申请退款
+  if (orderStatus === 1) return 'text-green-600'; // 已完成
+
+  if (!order?.payStatus) return 'text-orange-500'; // 等待买家付款
+
+  if (deliveryStatus === 10) return 'text-blue-500'; // 待发货
+  if (deliveryStatus === 20) {
+    if (!riderId || riderId === 0) return 'text-purple-500'; // 待收货
+    if (order?.sendEndTime) return 'text-purple-500'; // 待确认收货
+    return 'text-blue-500'; // 配送中
+  }
+  if (deliveryStatus === 30) return 'text-blue-500'; // 部分发货
+
+  if (orderStatus === 0) return 'text-gray-500'; // 未使用
+  return 'text-gray-600';
+};
+