From f9dcaa9ce91a01daa57bdefa6fef2d01ac3d64e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 26 Feb 2026 01:25:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(order):=20=E4=BF=AE=E5=A4=8D=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E6=97=B6=E9=97=B4=E6=88=AA=E5=8D=95=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=B9=B6=E7=A7=BB=E9=99=A4=E5=BE=AE=E4=BF=A1=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加当日21点截单时间控制，超过时间下单最早配送日顺延到次日
- 在订单确认页面实现截单时间校验和自动调整配送时间
- 移除用户地址管理中的获取微信地址功能相关代码
- 修复地址表单中CellGroup组件嵌套结构问题
- 更新配送时间选择器的起始日期计算逻辑
---
 src/shop/orderConfirm/index.tsx | 35 +++++++++++++++++++++++++++++----
 src/user/address/add.tsx        |  4 +++-
 src/user/address/index.tsx      | 34 ++++++++++++++++----------------
 3 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/src/shop/orderConfirm/index.tsx b/src/shop/orderConfirm/index.tsx
index 422c754..44b4d3e 100644
--- a/src/shop/orderConfirm/index.tsx
+++ b/src/shop/orderConfirm/index.tsx
@@ -58,7 +58,16 @@ const OrderConfirm = () => {
   const [error, setError] = useState<string>('')
   const [payLoading, setPayLoading] = useState<boolean>(false)
   // 配送时间（仅水票套票商品需要）
-  const [sendTime, setSendTime] = useState<Date>(() => dayjs().startOf('day').toDate())
+  // 当日截单时间：超过该时间下单，最早配送日顺延到次日（避免 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)
 
   // 水票套票活动（若存在则按规则限制最小购买量等）
@@ -446,6 +455,17 @@ const OrderConfirm = () => {
         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) {
@@ -716,7 +736,7 @@ const OrderConfirm = () => {
   useEffect(() => {
     // 切换商品时重置配送时间，避免沿用上一次选择
     if (!isLoggedIn()) return
-    setSendTime(dayjs().startOf('day').toDate())
+    setSendTime(getMinSendDate().toDate())
     setSendTimePickerVisible(false)
     loadAllData()
   }, [goodsId]);
@@ -786,7 +806,14 @@ const OrderConfirm = () => {
                 <ArrowRight className={'text-gray-400'} size={14}/>
               </View>
             )}
-            onClick={() => setSendTimePickerVisible(true)}
+            onClick={() => {
+              // 若页面停留跨过截单时间，打开选择器前再校正一次最早可选日期
+              const min = getMinSendDate()
+              if (dayjs(sendTime).isBefore(min, 'day')) {
+                setSendTime(min.toDate())
+              }
+              setSendTimePickerVisible(true)
+            }}
           />
         </CellGroup>
       )}
@@ -1087,7 +1114,7 @@ const OrderConfirm = () => {
         visible={sendTimePickerVisible}
         title="选择配送时间"
         type="date"
-        startDate={dayjs().startOf('day').toDate()}
+        startDate={getMinSendDate().toDate()}
         endDate={dayjs().add(30, 'day').toDate()}
         value={sendTime}
         onClose={() => setSendTimePickerVisible(false)}
diff --git a/src/user/address/add.tsx b/src/user/address/add.tsx
index 54b87de..99c9420 100644
--- a/src/user/address/add.tsx
+++ b/src/user/address/add.tsx
@@ -589,11 +589,13 @@ const AddUserAddress = () => {
           <Form.Item name="address" label="收货地址" initialValue={FormData.address} required>
             <TextArea maxLength={50} placeholder="请输入详细收货地址"/>
           </Form.Item>
+        </CellGroup>
+        <CellGroup>
           <Cell
             title="选择定位"
             description={
               selectedLocation?.address ||
-              (selectedLocation ? `经纬度：${selectedLocation.lng}, ${selectedLocation.lat}` : '')
+              (selectedLocation ? `经纬度：${selectedLocation.lng}, ${selectedLocation.lat}` : '用于计算是否超出配送范围')
             }
             extra={(
               <div className={'flex items-center gap-2'}>
diff --git a/src/user/address/index.tsx b/src/user/address/index.tsx
index 3ea67eb..52c6f34 100644
--- a/src/user/address/index.tsx
+++ b/src/user/address/index.tsx
@@ -1,7 +1,7 @@
 import {useState} from "react";
 import Taro, {useDidShow} from '@tarojs/taro'
-import {Button, Cell, CellGroup, Space, Empty, ConfigProvider, Divider} from '@nutui/nutui-react-taro'
-import {Dongdong, ArrowRight, CheckNormal, Checked} from '@nutui/icons-react-taro'
+import {Button, Cell, Space, Empty, ConfigProvider, Divider} from '@nutui/nutui-react-taro'
+import {CheckNormal, Checked} from '@nutui/icons-react-taro'
 import {View} from '@tarojs/components'
 import {ShopUserAddress} from "@/api/shop/shopUserAddress/model";
 import {listShopUserAddress, removeShopUserAddress, updateShopUserAddress} from "@/api/shop/shopUserAddress";
@@ -144,8 +144,8 @@ const Address = () => {
           />
           <Space>
             <Button onClick={() => Taro.navigateTo({url: '/user/address/add'})}>新增地址</Button>
-            <Button type="success" fill="dashed"
-                    onClick={() => Taro.navigateTo({url: '/user/address/wxAddress'})}>获取微信地址</Button>
+            {/*<Button type="success" fill="dashed"*/}
+            {/*        onClick={() => Taro.navigateTo({url: '/user/address/wxAddress'})}>获取微信地址</Button>*/}
           </Space>
         </div>
       </ConfigProvider>
@@ -154,19 +154,19 @@ const Address = () => {
 
   return (
     <>
-      <CellGroup>
-        <Cell
-          onClick={() => Taro.navigateTo({url: '/user/address/wxAddress'})}
-        >
-          <div className={'flex justify-between items-center w-full'}>
-            <div className={'flex items-center gap-3'}>
-              <Dongdong className={'text-green-600'}/>
-              <div>获取微信地址</div>
-            </div>
-            <ArrowRight className={'text-gray-400'}/>
-          </div>
-        </Cell>
-      </CellGroup>
+      {/*<CellGroup>*/}
+      {/*  <Cell*/}
+      {/*    onClick={() => Taro.navigateTo({url: '/user/address/wxAddress'})}*/}
+      {/*  >*/}
+      {/*    <div className={'flex justify-between items-center w-full'}>*/}
+      {/*      <div className={'flex items-center gap-3'}>*/}
+      {/*        <Dongdong className={'text-green-600'}/>*/}
+      {/*        <div>获取微信地址</div>*/}
+      {/*      </div>*/}
+      {/*      <ArrowRight className={'text-gray-400'}/>*/}
+      {/*    </div>*/}
+      {/*  </Cell>*/}
+      {/*</CellGroup>*/}
       {list.map((item, _) => (
         <Cell.Group>
           <Cell className={'flex flex-col gap-1'} onClick={() => selectAddress(item)}>