From 24354a38c5d4795f81b6a106efd299b56b237607 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, 5 Feb 2026 12:03:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(tickets):=20=E4=BC=98=E5=8C=96=E6=B0=B4?=
 =?UTF-8?q?=E7=A5=A8=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=92=8C=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 集成 dayjs 库用于时间格式化
- 将下单时间格式化为 YYYY年MM月DD日 HH:mm:ss 格式
- 重新设计水票数量展示布局，突出显示可用、已用和剩余赠票
- 更新核销记录标题为票号显示
- 修改二维码扫描页面显示票号而非模板名称
- 添加订单完成状态判断函数
- 在待发货和待收货状态中排除已完成订单
- 移除已完成订单状态下的操作按钮
---
 src/user/order/components/OrderList.tsx | 25 +++-----------
 src/user/ticket/index.tsx               | 46 ++++++++++---------------
 2 files changed, 22 insertions(+), 49 deletions(-)

diff --git a/src/user/order/components/OrderList.tsx b/src/user/order/components/OrderList.tsx
index e5110aa..de553ee 100644
--- a/src/user/order/components/OrderList.tsx
+++ b/src/user/order/components/OrderList.tsx
@@ -149,6 +149,8 @@ function OrderList(props: OrderListProps) {
     return '未知状态';
   };
 
+  const isOrderCompleted = (order: ShopOrder) => order.orderStatus === 1 || order.formId === 10074;
+
   // 获取订单状态颜色
   const getOrderStatusColor = (order: ShopOrder) => {
     // 优先检查订单状态
@@ -812,7 +814,7 @@ function OrderList(props: OrderListProps) {
                         )}
 
                         {/* 待发货状态：显示申请退款 */}
-                        {item.payStatus && item.deliveryStatus === 10 && item.orderStatus !== 2 && item.orderStatus !== 4 && (
+                        {item.payStatus && item.deliveryStatus === 10 && item.orderStatus !== 2 && item.orderStatus !== 4 && !isOrderCompleted(item) && (
                           <Button size={'small'} onClick={(e) => {
                             e.stopPropagation();
                             applyRefund(item);
@@ -820,7 +822,7 @@ function OrderList(props: OrderListProps) {
                         )}
 
                         {/* 待收货状态：显示查看物流和确认收货 */}
-                        {item.deliveryStatus === 20 && (!item.riderId || !!item.sendEndTime) && item.orderStatus !== 2 && item.orderStatus !== 6 && (
+                        {item.deliveryStatus === 20 && (!item.riderId || !!item.sendEndTime) && item.orderStatus !== 2 && item.orderStatus !== 6 && !isOrderCompleted(item) && (
                           <Space>
                             {/*<Button size={'small'} onClick={(e) => {*/}
                             {/*  e.stopPropagation();*/}
@@ -833,25 +835,6 @@ function OrderList(props: OrderListProps) {
                           </Space>
                         )}
 
-                        {/* 已完成状态：显示再次购买、评价商品、申请退款 */}
-                        {item.orderStatus === 1 && (
-                          <Space>
-                            <Button size={'small'} onClick={(e) => {
-                              e.stopPropagation();
-                              buyAgain(item);
-                            }}>再次购买</Button>
-                            {/*<Button size={'small'} onClick={(e) => {*/}
-                            {/*  e.stopPropagation();*/}
-                            {/*  evaluateGoods(item);*/}
-                            {/*}}>评价商品</Button>*/}
-
-                            <Button size={'small'} onClick={(e) => {
-                              e.stopPropagation();
-                              applyRefund(item);
-                            }}>申请退款</Button>
-                          </Space>
-                        )}
-
                         {/* 退款/售后状态：显示查看进度和撤销申请 */}
                         {(item.orderStatus === 4 || item.orderStatus === 7) && (
                           <Space>
diff --git a/src/user/ticket/index.tsx b/src/user/ticket/index.tsx
index 0f1dedb..caad438 100644
--- a/src/user/ticket/index.tsx
+++ b/src/user/ticket/index.tsx
@@ -19,6 +19,7 @@ import type { GltUserTicket } from '@/api/glt/gltUserTicket/model';
 import { pageGltUserTicketLog } from '@/api/glt/gltUserTicketLog';
 import type { GltUserTicketLog } from '@/api/glt/gltUserTicketLog/model';
 import { BaseUrl } from '@/config/app';
+import dayjs from "dayjs";
 
 const PAGE_SIZE = 10;
 
@@ -99,11 +100,11 @@ const UserTicketList = () => {
     lines.push(`冻结：${ticket.frozenQty ?? 0}`);
     lines.push(`已释放：${ticket.releasedQty ?? 0}`);
     if (ticket.orderNo) lines.push(`订单号：${ticket.orderNo}`);
-    Taro.showModal({
-      title: '水票详情',
-      content: lines.join('\n'),
-      showCancel: false
-    });
+    // Taro.showModal({
+    //   title: '水票详情',
+    //   content: lines.join('\n'),
+    //   showCancel: false
+    // });
   };
 
   const reloadTickets = async (isRefresh = true, keywords?: string) => {
@@ -348,7 +349,7 @@ const UserTicketList = () => {
                         )}
                         {item.createTime && (
                           <View className="mt-1">
-                            <Text className="text-xs text-gray-400">下单时间：{item.createTime}</Text>
+                            <Text className="text-xs text-gray-400">下单时间：{dayjs(item.createTime).format('YYYY年MM月DD日 HH:mm:ss')}</Text>
                           </View>
                         )}
                       </View>
@@ -372,28 +373,17 @@ const UserTicketList = () => {
                     </View>
 
                     <View className="mt-3 flex justify-between">
-                      <View className="flex flex-col">
-                        <Text className="text-xs text-gray-500">可用</Text>
-                        <Text className="text-lg font-bold text-blue-600">{item.availableQty ?? 0}</Text>
+                      <View className="flex flex-col items-center">
+                        <Text className="text-lg font-bold text-blue-600 text-center">{item.availableQty ?? 0}</Text>
+                        <Text className="text-xs text-gray-500">可用水票</Text>
                       </View>
                       <View className="flex flex-col items-center">
-                        <Text className="text-xs text-gray-500">总量</Text>
-                        <Text className="text-sm text-gray-900">{item.totalQty ?? 0}</Text>
+                        <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-end">
-                        <Text className="text-xs text-gray-500">已用</Text>
-                        <Text className="text-sm text-gray-900">{item.usedQty ?? 0}</Text>
-                      </View>
-                    </View>
-
-                    <View className="mt-2 flex justify-between">
-                      <View className="flex flex-col">
-                        <Text className="text-xs text-gray-500">冻结</Text>
-                        <Text className="text-sm text-gray-900">{item.frozenQty ?? 0}</Text>
-                      </View>
-                      <View className="flex flex-col items-end">
-                        <Text className="text-xs text-gray-500">已释放</Text>
-                        <Text className="text-sm text-gray-900">{item.releasedQty ?? 0}</Text>
+                      <View className="flex flex-col items-center">
+                        <Text className="text-lg text-gray-900 text-center">{item.frozenQty ?? 0}</Text>
+                        <Text className="text-xs text-gray-500">剩余赠票</Text>
                       </View>
                     </View>
                   </View>
@@ -426,7 +416,7 @@ const UserTicketList = () => {
                     <View className="flex items-start justify-between">
                       <View className="flex-1 pr-3">
                         <Text className="text-base font-semibold text-gray-900">
-                          核销记录
+                          票号：{item.userTicketId}
                         </Text>
                         {item.createTime && (
                           <View className="mt-1">
@@ -500,8 +490,8 @@ const UserTicketList = () => {
           {qrTicket && (
             <View className="bg-gray-50 rounded-lg p-3 mb-4">
               <View className="flex justify-between mb-2">
-                <Text className="text-sm text-gray-600">水票</Text>
-                <Text className="text-sm text-gray-900">{qrTicket.templateName || '水票'}</Text>
+                <Text className="text-sm text-gray-600">票号</Text>
+                <Text className="text-sm text-gray-900">{qrTicket.id}</Text>
               </View>
               <View className="flex justify-between">
                 <Text className="text-sm text-gray-600">可用次数</Text>