diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 355603e..3ef2ba4 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -226,8 +226,9 @@ function Home() { title: '送水订单', icon: , 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 }) }, }, { diff --git a/src/rider/index.tsx b/src/rider/index.tsx index a77aef6..744297d 100644 --- a/src/rider/index.tsx +++ b/src/rider/index.tsx @@ -74,7 +74,14 @@ const DealerIndex: React.FC = () => { {/*头部信息*/} {dealerUser && ( - + {/* 装饰性背景元素 - 小程序兼容版本 */} { - navigateToPage('/rider/withdraw/index')}> + navigateToPage('/rider/withdraw/index')}> diff --git a/src/user/ticket/index.tsx b/src/user/ticket/index.tsx index 9cccf18..e28b919 100644 --- a/src/user/ticket/index.tsx +++ b/src/user/ticket/index.tsx @@ -261,15 +261,18 @@ const UserTicketList = () => { return d.isValid() ? d.format('YYYY年MM月DD日') : v; }; + // 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 = order.deliveryStatus; - if (typeof ds === 'number') return ds === 10; - return !!order.riderId; + 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) => { @@ -278,7 +281,7 @@ const UserTicketList = () => { return; } if (!isTicketOrderPendingDelivery(order)) { - Taro.showToast({ title: '仅“待配送”订单可修改', icon: 'none' }); + Taro.showToast({ title: '仅配送未开始的订单可修改', icon: 'none' }); return; } Taro.navigateTo({ url: `/user/ticket/use?orderId=${order.id}` }); @@ -290,7 +293,7 @@ const UserTicketList = () => { return; } if (!isTicketOrderPendingDelivery(order)) { - Taro.showToast({ title: '仅“待配送”订单可取消', icon: 'none' }); + Taro.showToast({ title: '仅配送未开始的订单可取消', icon: 'none' }); return; } @@ -369,12 +372,23 @@ const UserTicketList = () => { } useDidShow(() => { - if (activeTab === 'ticket') { - reloadTickets(true).then(); - } else { - reloadOrders(true).then(); + 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') { + reloadTickets(true).then() + } else { + reloadOrders(true).then() + } + }) return ( @@ -564,7 +578,7 @@ const UserTicketList = () => { void handleOrderModify(item); }} > - 订单修改 + 修改订单 ) : null} diff --git a/src/utils/server.ts b/src/utils/server.ts index a3be738..4e1b410 100644 --- a/src/utils/server.ts +++ b/src/utils/server.ts @@ -4,7 +4,8 @@ import {User} from "@/api/system/user/model"; // 模版套餐ID - 请根据实际情况修改 export const TEMPLATE_ID = '10584'; // 服务接口 - 请根据实际情况修改 -export const SERVER_API_URL = 'https://glt-server.websoft.top/api'; +// 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'; /** * 保存用户信息到本地存储