v3.5.1 版本更新
CI / verify (pull_request) Has been cancelled

This commit is contained in:
2026-08-19 15:54:51 +08:00
parent 7dd5fdfb12
commit 233ed0af3b
103 changed files with 5764 additions and 185 deletions
+28 -1
View File
@@ -1,5 +1,6 @@
import { useCallback, useEffect, useState } from 'react';
import { View, Text, Image } from '@tarojs/components';
import '../../styles/order.css';
import Taro, { useDidShow, usePullDownRefresh, useRouter } from '@tarojs/taro';
import PageShell from '../../components/PageShell';
import SubPageHeader from '../../components/SubPageHeader';
@@ -7,7 +8,7 @@ import { request, toast } from '../../lib/api';
import { buildPayUrl } from '../../lib/checkout-nav';
import { usePageView } from '../../lib/usePageView';
import { ORDER_STATUS_LABELS } from '@dukang/shared-types';
import { ORDER_STATUS_LABELS, type InvoiceStatus } from '@dukang/shared-types';
const TABS = [
{ key: 'all', label: '全部订单' },
@@ -50,6 +51,7 @@ type OrderRow = {
isProxyOrder?: boolean;
proxyPartnerName?: string | null;
items?: OrderItem[];
invoiceStatus?: InvoiceStatus | null;
};
export default function OrdersPage() {
@@ -125,6 +127,9 @@ export default function OrdersPage() {
const qty = item?.quantity ?? o.quantity ?? o.qty ?? 1;
const unitPrice = Number(item?.unitPrice ?? 0);
const canPay = o.status === 'PENDING_PAY' && !o.originOrderId;
const invoiceBlocking = o.invoiceStatus === 'PENDING' || o.invoiceStatus === 'ISSUED';
const canInvoice = o.status === 'COMPLETED' && !o.originOrderId && !invoiceBlocking;
const invoicePending = o.status === 'COMPLETED' && o.invoiceStatus === 'PENDING';
const isProxy = o.isProxyOrder || o.orderType === 'PROXY';
return (
@@ -177,6 +182,28 @@ export default function OrdersPage() {
</View>
) : null}
{canInvoice ? (
<View
className="order-list-invoice-btn"
onClick={(e) => {
e.stopPropagation();
Taro.navigateTo({ url: `/pages/invoice-apply/index?orderId=${o.id}` });
}}
>
</View>
) : null}
{invoicePending ? (
<View
className="order-list-invoice-status"
onClick={(e) => {
e.stopPropagation();
Taro.navigateTo({ url: `/pages/invoice-apply/index?orderId=${o.id}` });
}}
>
</View>
) : null}
</View>
</View>
);