From a6749bcedb72924dc742ef71d9367b200c24b89c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Tue, 10 Mar 2026 11:22:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(order):=20=E4=BC=98=E5=8C=96=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
=?UTF-8?q?=E5=B9=B6=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
=?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修改送水订单跳转链接，添加tab参数支持
- 更新骑手端页面样式，添加业务渐变背景色
- 将骑手端"工资明细"改为"收入明细"
- 优化订单配送状态判断逻辑，支持配送未开始的订单修改取消
- 更新订单操作提示文案，从"待配送"改为"配送未开始"
- 实现页面tab参数解析，支持通过URL参数指定默认标签页
- 调整按钮文字顺序，将"订单修改/取消"改为"修改订单/取消订单"
- 更新服务器API地址配置，切换到新的生产环境域名
---
src/pages/index/index.tsx | 5 +++--
src/rider/index.tsx | 11 +++++++++--
src/user/ticket/index.tsx | 38 ++++++++++++++++++++++++++------------
src/utils/server.ts | 3 ++-
4 files changed, 40 insertions(+), 17 deletions(-)
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';
/**
* 保存用户信息到本地存储