From fc3b32215e6c828bee3d50469615e9f040da2d8b 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 Feb 2026 12:06:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(ui):=20=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=87=E9=A2=98=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将配送订单标题更改为送水订单
- 订单详情中显示票号而非订单ID
- 我的订单标题更新为商城订单
---
 src/pages/user/components/UserOrder.tsx | 2 +-
 src/rider/orders/index.config.ts        | 2 +-
 src/rider/orders/index.tsx              | 2 +-
 src/user/order/order.tsx                | 2 +-
 src/user/ticket/orders/index.config.ts  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/user/components/UserOrder.tsx b/src/pages/user/components/UserOrder.tsx
index 0a17847..56da5cd 100644
--- a/src/pages/user/components/UserOrder.tsx
+++ b/src/pages/user/components/UserOrder.tsx
@@ -26,7 +26,7 @@ function UserOrder() {
           }}
         >
           <View className={'title-bar flex justify-between pt-2'}>
-            <Text className={'title font-medium px-4'}>我的订单</Text>
+            <Text className={'title font-medium px-4'}>商城订单</Text>
             <View
               className={'more flex items-center px-2'}
               onClick={() => navTo('/user/order/order', true)}
diff --git a/src/rider/orders/index.config.ts b/src/rider/orders/index.config.ts
index 9606465..4a1a611 100644
--- a/src/rider/orders/index.config.ts
+++ b/src/rider/orders/index.config.ts
@@ -1,4 +1,4 @@
 export default {
-  navigationBarTitleText: '配送订单',
+  navigationBarTitleText: '送水订单',
   navigationBarTextStyle: 'black'
 }
diff --git a/src/rider/orders/index.tsx b/src/rider/orders/index.tsx
index 284d6b1..5ad11eb 100644
--- a/src/rider/orders/index.tsx
+++ b/src/rider/orders/index.tsx
@@ -388,7 +388,7 @@ export default function RiderOrders() {
                       <View className="w-full">
                         <View className="flex justify-between items-center">
                           <Text className="text-gray-800 font-bold text-sm">
-                            {o.id ? `送水订单#${o.id}` : '送水订单'}
+                            {o.userTicketId ? `票号#${o.userTicketId}` : '送水订单'}
                           </Text>
                           <Text className={`${getOrderStatusColor(o)} text-sm font-medium`}>{getOrderStatusText(o)}</Text>
                         </View>
diff --git a/src/user/order/order.tsx b/src/user/order/order.tsx
index d018696..66300ae 100644
--- a/src/user/order/order.tsx
+++ b/src/user/order/order.tsx
@@ -104,7 +104,7 @@ function Order() {
           </>
         }
       >
-        <span>我的订单</span>
+        <span>商城订单</span>
       </NavBar>
       {/* 搜索和筛选工具栏 */}
       <View className="bg-white px-4 py-3 flex justify-between items-center border-gray-100">
diff --git a/src/user/ticket/orders/index.config.ts b/src/user/ticket/orders/index.config.ts
index 1671edc..20a313a 100644
--- a/src/user/ticket/orders/index.config.ts
+++ b/src/user/ticket/orders/index.config.ts
@@ -1,5 +1,5 @@
 export default definePageConfig({
-  navigationBarTitleText: '配送订单',
+  navigationBarTitleText: '送水订单',
   navigationBarTextStyle: 'black',
   navigationBarBackgroundColor: '#ffffff'
 })