From ac36075e7b55daea88ca548a7c2433b36f575b94 Mon Sep 17 00:00:00 2001 From: web Date: Fri, 5 Sep 2025 08:50:57 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20Update=20order=5Fid=20to?= =?UTF-8?q?=20order=5Fno=20in=20BalanceLogPage=20and=20related=20typings;?= =?UTF-8?q?=20enhance=20timezone=20switch=20component=20with=20additional?= =?UTF-8?q?=20features=20and=20localization=20updates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/app/dashboard/log/balance/page.tsx | 6 +- apps/admin/components/timezone-switch.tsx | 262 ++++++++++++++---- apps/admin/locales/cs-CZ/log.json | 3 + apps/admin/locales/de-DE/log.json | 3 + apps/admin/locales/en-US/log.json | 3 + apps/admin/locales/es-ES/log.json | 3 + apps/admin/locales/es-MX/log.json | 3 + apps/admin/locales/fa-IR/log.json | 3 + apps/admin/locales/fi-FI/log.json | 3 + apps/admin/locales/fr-FR/log.json | 3 + apps/admin/locales/hi-IN/log.json | 3 + apps/admin/locales/hu-HU/log.json | 3 + apps/admin/locales/ja-JP/log.json | 3 + apps/admin/locales/ko-KR/log.json | 3 + apps/admin/locales/no-NO/log.json | 3 + apps/admin/locales/pl-PL/log.json | 3 + apps/admin/locales/pt-BR/log.json | 3 + apps/admin/locales/ro-RO/log.json | 3 + apps/admin/locales/ru-RU/log.json | 3 + apps/admin/locales/th-TH/log.json | 3 + apps/admin/locales/tr-TR/log.json | 3 + apps/admin/locales/uk-UA/log.json | 3 + apps/admin/locales/vi-VN/log.json | 3 + apps/admin/locales/zh-CN/log.json | 3 + apps/admin/locales/zh-HK/log.json | 3 + apps/admin/services/admin/index.ts | 2 +- apps/admin/services/admin/typings.d.ts | 2 +- apps/admin/services/common/index.ts | 2 +- apps/admin/services/common/typings.d.ts | 2 +- apps/user/services/common/index.ts | 2 +- apps/user/services/common/typings.d.ts | 2 +- apps/user/services/user/index.ts | 2 +- apps/user/services/user/typings.d.ts | 2 +- 33 files changed, 287 insertions(+), 66 deletions(-) diff --git a/apps/admin/app/dashboard/log/balance/page.tsx b/apps/admin/app/dashboard/log/balance/page.tsx index 4cd7f04..31241f5 100644 --- a/apps/admin/app/dashboard/log/balance/page.tsx +++ b/apps/admin/app/dashboard/log/balance/page.tsx @@ -44,9 +44,9 @@ export default function BalanceLogPage() { cell: ({ row }) => , }, { - accessorKey: 'order_id', - header: t('column.orderId'), - cell: ({ row }) => , + accessorKey: 'order_no', + header: t('column.orderNo'), + cell: ({ row }) => , }, { accessorKey: 'balance', diff --git a/apps/admin/components/timezone-switch.tsx b/apps/admin/components/timezone-switch.tsx index 81b1666..4a5613c 100644 --- a/apps/admin/components/timezone-switch.tsx +++ b/apps/admin/components/timezone-switch.tsx @@ -1,79 +1,156 @@ 'use client'; import { Button } from '@workspace/ui/components/button'; -import { Command, CommandInput, CommandItem, CommandList } from '@workspace/ui/components/command'; +import { + Command, + CommandGroup, + CommandInput, + CommandItem, + CommandList, +} from '@workspace/ui/components/command'; import { Popover, PopoverContent, PopoverTrigger } from '@workspace/ui/components/popover'; import { Icon } from '@workspace/ui/custom-components/icon'; -import { cn } from '@workspace/ui/lib/utils'; -import { useMemo, useState } from 'react'; +import { useLocale } from 'next-intl'; +import { useEffect, useMemo, useState } from 'react'; interface TimezoneOption { value: string; label: string; - offset: string; + timezone: string; } -function getAllTimezones(): TimezoneOption[] { +function getCurrentTime(timezone: string): string { + try { + const now = new Date(); + return now.toLocaleTimeString('en-US', { + timeZone: timezone, + hour12: false, + hour: '2-digit', + minute: '2-digit', + }); + } catch { + return '--:--'; + } +} + +function getAllTimezones(locale: string = 'en-US'): TimezoneOption[] { try { const timeZones = Intl.supportedValuesOf('timeZone'); - return [ - { - value: 'UTC', - label: 'UTC', - offset: '+00:00', - }, - ].concat( - timeZones - .map((tz) => { - const parts = tz.split('/'); - let label = tz; - - if (parts.length >= 2) { - const region = parts[0]; - const city = parts[1]?.replace(/_/g, ' ') || ''; - label = `${city} (${region})`; - } - + const processed = timeZones + .map((tz) => { + try { return { value: tz, - label: label, - offset: getTimezoneOffset(tz), + label: tz, + timezone: getTimezoneOffset(tz), }; - }) - .sort((a, b) => a.label.localeCompare(b.label)), - ); + } catch { + return { + value: tz, + label: tz, + timezone: 'UTC+00:00', + }; + } + }) + .filter(Boolean) + .sort((a, b) => a.label.localeCompare(b.label, locale)); + + const hasUTC = processed.some((tz) => tz.value === 'UTC'); + if (!hasUTC) { + processed.unshift({ + value: 'UTC', + label: 'UTC', + timezone: 'UTC+00:00', + }); + } + + return processed; } catch { return [ { value: 'UTC', label: 'UTC', - offset: '+00:00', + timezone: 'UTC+00:00', }, ]; } } +function getServerTimezones(): string[] { + return ['UTC']; +} + +function getRecommendedTimezones(): string[] { + try { + const browserTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone; + + if (browserTimezone.startsWith('Asia/')) { + return ['Asia/Shanghai', 'Asia/Tokyo', 'Asia/Kolkata', 'Asia/Singapore', 'Asia/Seoul']; + } else if (browserTimezone.startsWith('Europe/')) { + return ['Europe/London', 'Europe/Paris', 'Europe/Berlin', 'Europe/Rome', 'Europe/Madrid']; + } else if (browserTimezone.startsWith('America/')) { + return [ + 'America/New_York', + 'America/Los_Angeles', + 'America/Chicago', + 'America/Denver', + 'America/Toronto', + ]; + } else if (browserTimezone.startsWith('Australia/')) { + return ['Australia/Sydney', 'Australia/Melbourne', 'Australia/Perth', 'Australia/Brisbane']; + } else { + return [ + 'America/New_York', + 'Europe/London', + 'Asia/Shanghai', + 'Asia/Tokyo', + 'Australia/Sydney', + ]; + } + } catch { + return ['America/New_York', 'Europe/London', 'Asia/Shanghai', 'Asia/Tokyo', 'Australia/Sydney']; + } +} + function getTimezoneOffset(timezone: string): string { try { const now = new Date(); + const utc = new Date(now.getTime() + now.getTimezoneOffset() * 60000); const targetTime = new Date(utc.toLocaleString('en-US', { timeZone: timezone })); const offset = (targetTime.getTime() - utc.getTime()) / (1000 * 60 * 60); const sign = offset >= 0 ? '+' : '-'; const hours = Math.floor(Math.abs(offset)); const minutes = Math.floor((Math.abs(offset) - hours) * 60); - return `${sign}${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`; + + return `UTC${sign}${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`; } catch { - return '+00:00'; + return 'UTC+00:00'; } } export default function TimezoneSwitch() { + const locale = useLocale(); const [timezone, setTimezone] = useState('UTC'); const [open, setOpen] = useState(false); - const timezoneOptions = useMemo(() => getAllTimezones(), []); + const timezoneOptions = useMemo(() => getAllTimezones(locale), [locale]); + + useEffect(() => { + const savedTimezone = localStorage.getItem('timezone'); + if (savedTimezone) { + setTimezone(savedTimezone); + } else { + try { + const browserTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone; + setTimezone(browserTimezone); + localStorage.setItem('timezone', browserTimezone); + } catch { + setTimezone('UTC'); + } + } + }, []); const handleTimezoneChange = (newTimezone: string) => { setTimezone(newTimezone); @@ -86,6 +163,9 @@ export default function TimezoneSwitch() { }), ); }; + const serverTimezones = timezoneOptions.filter( + (option) => getServerTimezones().includes(option.value) && option.value !== timezone, + ); return ( @@ -98,29 +178,101 @@ export default function TimezoneSwitch() { - {timezoneOptions.map((option) => ( - handleTimezoneChange(option.value)} - > -
-
- {option.label} - - {option.value} • {option.offset} - -
- -
- - ))} + + {timezoneOptions + .filter((option) => option.value === timezone) + .map((option) => ( + handleTimezoneChange(option.value)} + className='bg-primary/10' + > +
+
+ {option.value} + + {option.timezone} • {getCurrentTime(option.value)} + +
+ +
+ + ))} + + {serverTimezones.length > 0 && ( + + {serverTimezones.map((option) => ( + handleTimezoneChange(option.value)} + > +
+
+ {option.value} + + {option.timezone} • {getCurrentTime(option.value)} + +
+ +
+ + ))} + + )} + + + {timezoneOptions + .filter( + (option) => + getRecommendedTimezones().includes(option.value) && option.value !== timezone, + ) + .map((option) => ( + handleTimezoneChange(option.value)} + > +
+
+ {option.value} + + {option.timezone} • {getCurrentTime(option.value)} + +
+ +
+ + ))} + + + + {timezoneOptions + .filter( + (option) => + !getServerTimezones().includes(option.value) && + !getRecommendedTimezones().includes(option.value) && + option.value !== timezone, + ) + .map((option) => ( + handleTimezoneChange(option.value)} + > +
+
+ {option.value} + + {option.timezone} • {getCurrentTime(option.value)} + +
+ +
+ + ))} + diff --git a/apps/admin/locales/cs-CZ/log.json b/apps/admin/locales/cs-CZ/log.json index 4f3a432..cd7df67 100644 --- a/apps/admin/locales/cs-CZ/log.json +++ b/apps/admin/locales/cs-CZ/log.json @@ -72,9 +72,12 @@ "323": "Platba", "324": "Vrácení", "325": "Odměna", + "326": "Úprava správce", "331": "Nákup", "332": "Obnovení", "333": "Vrácení", + "334": "Výběr", + "335": "Úprava správce", "341": "Zvýšení", "342": "Snížení" }, diff --git a/apps/admin/locales/de-DE/log.json b/apps/admin/locales/de-DE/log.json index 562e1d3..953b0b7 100644 --- a/apps/admin/locales/de-DE/log.json +++ b/apps/admin/locales/de-DE/log.json @@ -72,9 +72,12 @@ "323": "Zahlung", "324": "Rückerstattung", "325": "Belohnung", + "326": "Admin Anpassung", "331": "Kauf", "332": "Verlängerung", "333": "Rückerstattung", + "334": "Abheben", + "335": "Admin Anpassung", "341": "Erhöhen", "342": "Reduzieren" }, diff --git a/apps/admin/locales/en-US/log.json b/apps/admin/locales/en-US/log.json index 330ea66..c5981fb 100644 --- a/apps/admin/locales/en-US/log.json +++ b/apps/admin/locales/en-US/log.json @@ -72,9 +72,12 @@ "323": "Payment", "324": "Refund", "325": "Reward", + "326": "Admin Adjust", "331": "Purchase", "332": "Renewal", "333": "Refund", + "334": "Withdraw", + "335": "Admin Adjust", "341": "Increase", "342": "Reduce" }, diff --git a/apps/admin/locales/es-ES/log.json b/apps/admin/locales/es-ES/log.json index ae4eb2d..3fb68b9 100644 --- a/apps/admin/locales/es-ES/log.json +++ b/apps/admin/locales/es-ES/log.json @@ -72,9 +72,12 @@ "323": "Pago", "324": "Reembolso", "325": "Recompensa", + "326": "Ajuste de Administrador", "331": "Compra", "332": "Renovación", "333": "Reembolso", + "334": "Retiro", + "335": "Ajuste de Administrador", "341": "Aumentar", "342": "Reducir" }, diff --git a/apps/admin/locales/es-MX/log.json b/apps/admin/locales/es-MX/log.json index f22b107..85ab965 100644 --- a/apps/admin/locales/es-MX/log.json +++ b/apps/admin/locales/es-MX/log.json @@ -72,9 +72,12 @@ "323": "Pago", "324": "Reembolso", "325": "Recompensa", + "326": "Ajuste del administrador", "331": "Compra", "332": "Renovación", "333": "Reembolso", + "334": "Retiro", + "335": "Ajuste del administrador", "341": "Aumento", "342": "Reducción" }, diff --git a/apps/admin/locales/fa-IR/log.json b/apps/admin/locales/fa-IR/log.json index 9e2379e..4aab8b5 100644 --- a/apps/admin/locales/fa-IR/log.json +++ b/apps/admin/locales/fa-IR/log.json @@ -72,9 +72,12 @@ "323": "پرداخت", "324": "بازگشت", "325": "پاداش", + "326": "تنظیم مدیر", "331": "خرید", "332": "تمدید", "333": "بازگشت", + "334": "برداشت", + "335": "تنظیم مدیر", "341": "افزایش", "342": "کاهش" }, diff --git a/apps/admin/locales/fi-FI/log.json b/apps/admin/locales/fi-FI/log.json index 9ca3aea..a0d6933 100644 --- a/apps/admin/locales/fi-FI/log.json +++ b/apps/admin/locales/fi-FI/log.json @@ -72,9 +72,12 @@ "323": "Maksu", "324": "Hyvitys", "325": "Palkinto", + "326": "Ylläpitäjän säätö", "331": "Osto", "332": "Uusiminen", "333": "Hyvitys", + "334": "Nosto", + "335": "Ylläpitäjän säätö", "341": "Lisäys", "342": "Vähennys" }, diff --git a/apps/admin/locales/fr-FR/log.json b/apps/admin/locales/fr-FR/log.json index d709d38..1f9e2d1 100644 --- a/apps/admin/locales/fr-FR/log.json +++ b/apps/admin/locales/fr-FR/log.json @@ -72,9 +72,12 @@ "323": "Paiement", "324": "Remboursement", "325": "Récompense", + "326": "Ajustement Administrateur", "331": "Achat", "332": "Renouvellement", "333": "Remboursement", + "334": "Retrait", + "335": "Ajustement Administrateur", "341": "Augmenter", "342": "Réduire" }, diff --git a/apps/admin/locales/hi-IN/log.json b/apps/admin/locales/hi-IN/log.json index 9b4fff6..830bb06 100644 --- a/apps/admin/locales/hi-IN/log.json +++ b/apps/admin/locales/hi-IN/log.json @@ -72,9 +72,12 @@ "323": "भुगतान", "324": "वापसी", "325": "इनाम", + "326": "व्यवस्थापक समायोजन", "331": "खरीद", "332": "नवीनीकरण", "333": "वापसी", + "334": "निकासी", + "335": "व्यवस्थापक समायोजन", "341": "वृद्धि", "342": "कमी" }, diff --git a/apps/admin/locales/hu-HU/log.json b/apps/admin/locales/hu-HU/log.json index 92ec24d..7066360 100644 --- a/apps/admin/locales/hu-HU/log.json +++ b/apps/admin/locales/hu-HU/log.json @@ -72,9 +72,12 @@ "323": "Fizetés", "324": "Visszatérítés", "325": "Jutalom", + "326": "Adminisztrátori kiigazítás", "331": "Vásárlás", "332": "Megújítás", "333": "Visszatérítés", + "334": "Kivét", + "335": "Adminisztrátori kiigazítás", "341": "Növelés", "342": "Csökkentés" }, diff --git a/apps/admin/locales/ja-JP/log.json b/apps/admin/locales/ja-JP/log.json index 26a42f8..0835305 100644 --- a/apps/admin/locales/ja-JP/log.json +++ b/apps/admin/locales/ja-JP/log.json @@ -72,9 +72,12 @@ "323": "支払い", "324": "返金", "325": "報酬", + "326": "管理者調整", "331": "購入", "332": "更新", "333": "返金", + "334": "引き出し", + "335": "管理者調整", "341": "増加", "342": "減少" }, diff --git a/apps/admin/locales/ko-KR/log.json b/apps/admin/locales/ko-KR/log.json index aa253a7..20ff8dc 100644 --- a/apps/admin/locales/ko-KR/log.json +++ b/apps/admin/locales/ko-KR/log.json @@ -72,9 +72,12 @@ "323": "결제", "324": "환불", "325": "보상", + "326": "관리자 조정", "331": "구매", "332": "갱신", "333": "환불", + "334": "출금", + "335": "관리자 조정", "341": "증가", "342": "감소" }, diff --git a/apps/admin/locales/no-NO/log.json b/apps/admin/locales/no-NO/log.json index 084993a..a2b2693 100644 --- a/apps/admin/locales/no-NO/log.json +++ b/apps/admin/locales/no-NO/log.json @@ -72,9 +72,12 @@ "323": "Betaling", "324": "Refusjon", "325": "Belønning", + "326": "Administrator justering", "331": "Kjøp", "332": "Fornyelse", "333": "Refusjon", + "334": "Uttak", + "335": "Administrator justering", "341": "Økning", "342": "Reduksjon" }, diff --git a/apps/admin/locales/pl-PL/log.json b/apps/admin/locales/pl-PL/log.json index 81d0c37..8e3eff1 100644 --- a/apps/admin/locales/pl-PL/log.json +++ b/apps/admin/locales/pl-PL/log.json @@ -72,9 +72,12 @@ "323": "Płatność", "324": "Zwrot", "325": "Nagroda", + "326": "Korekta Administratora", "331": "Zakup", "332": "Odnowienie", "333": "Zwrot", + "334": "Wypłata", + "335": "Korekta Administratora", "341": "Zwiększenie", "342": "Zmniejszenie" }, diff --git a/apps/admin/locales/pt-BR/log.json b/apps/admin/locales/pt-BR/log.json index a85a2a6..2cb6eb4 100644 --- a/apps/admin/locales/pt-BR/log.json +++ b/apps/admin/locales/pt-BR/log.json @@ -72,9 +72,12 @@ "323": "Pagamento", "324": "Reembolso", "325": "Recompensa", + "326": "Ajuste do Administrador", "331": "Compra", "332": "Renovação", "333": "Reembolso", + "334": "Retirada", + "335": "Ajuste do Administrador", "341": "Aumentar", "342": "Reduzir" }, diff --git a/apps/admin/locales/ro-RO/log.json b/apps/admin/locales/ro-RO/log.json index 9e6b4e8..c811140 100644 --- a/apps/admin/locales/ro-RO/log.json +++ b/apps/admin/locales/ro-RO/log.json @@ -72,9 +72,12 @@ "323": "Plată", "324": "Rambursare", "325": "Recompensă", + "326": "Ajustare Administrator", "331": "Achiziție", "332": "Reînnoire", "333": "Rambursare", + "334": "Retragere", + "335": "Ajustare Administrator", "341": "Creștere", "342": "Scădere" }, diff --git a/apps/admin/locales/ru-RU/log.json b/apps/admin/locales/ru-RU/log.json index 9731a5c..141e55a 100644 --- a/apps/admin/locales/ru-RU/log.json +++ b/apps/admin/locales/ru-RU/log.json @@ -72,9 +72,12 @@ "323": "Платеж", "324": "Возврат", "325": "Награда", + "326": "Корректировка администратора", "331": "Покупка", "332": "Продление", "333": "Возврат", + "334": "Вывод", + "335": "Корректировка администратора", "341": "Увеличение", "342": "Уменьшение" }, diff --git a/apps/admin/locales/th-TH/log.json b/apps/admin/locales/th-TH/log.json index 3f749b9..886f41a 100644 --- a/apps/admin/locales/th-TH/log.json +++ b/apps/admin/locales/th-TH/log.json @@ -72,9 +72,12 @@ "323": "การชำระเงิน", "324": "คืนเงิน", "325": "รางวัล", + "326": "การปรับโดยผู้ดูแล", "331": "ซื้อ", "332": "ต่ออายุ", "333": "คืนเงิน", + "334": "ถอนเงิน", + "335": "การปรับโดยผู้ดูแล", "341": "เพิ่ม", "342": "ลด" }, diff --git a/apps/admin/locales/tr-TR/log.json b/apps/admin/locales/tr-TR/log.json index 05d3729..772ca00 100644 --- a/apps/admin/locales/tr-TR/log.json +++ b/apps/admin/locales/tr-TR/log.json @@ -72,9 +72,12 @@ "323": "Ödeme", "324": "İade", "325": "Ödül", + "326": "Yönetici Ayarı", "331": "Alım", "332": "Yenileme", "333": "İade", + "334": "Çekim", + "335": "Yönetici Ayarı", "341": "Artış", "342": "Azalış" }, diff --git a/apps/admin/locales/uk-UA/log.json b/apps/admin/locales/uk-UA/log.json index a07ce44..74567ed 100644 --- a/apps/admin/locales/uk-UA/log.json +++ b/apps/admin/locales/uk-UA/log.json @@ -72,9 +72,12 @@ "323": "Платіж", "324": "Повернення", "325": "Нагорода", + "326": "Коригування адміністратора", "331": "Покупка", "332": "Поновлення", "333": "Повернення", + "334": "Виведення", + "335": "Коригування адміністратора", "341": "Збільшення", "342": "Зменшення" }, diff --git a/apps/admin/locales/vi-VN/log.json b/apps/admin/locales/vi-VN/log.json index a94345f..41e6144 100644 --- a/apps/admin/locales/vi-VN/log.json +++ b/apps/admin/locales/vi-VN/log.json @@ -72,9 +72,12 @@ "323": "Thanh toán", "324": "Hoàn tiền", "325": "Phần thưởng", + "326": "Điều chỉnh Quản trị viên", "331": "Mua hàng", "332": "Gia hạn", "333": "Hoàn tiền", + "334": "Rút tiền", + "335": "Điều chỉnh Quản trị viên", "341": "Tăng", "342": "Giảm" }, diff --git a/apps/admin/locales/zh-CN/log.json b/apps/admin/locales/zh-CN/log.json index 05ba956..78f8487 100644 --- a/apps/admin/locales/zh-CN/log.json +++ b/apps/admin/locales/zh-CN/log.json @@ -72,9 +72,12 @@ "323": "支付", "324": "退款", "325": "奖励", + "326": "管理员调整", "331": "购买", "332": "续费", "333": "退款", + "334": "提现", + "335": "管理员调整", "341": "增加", "342": "减少" }, diff --git a/apps/admin/locales/zh-HK/log.json b/apps/admin/locales/zh-HK/log.json index 3b04a5d..367b8e0 100644 --- a/apps/admin/locales/zh-HK/log.json +++ b/apps/admin/locales/zh-HK/log.json @@ -72,9 +72,12 @@ "323": "付款", "324": "退款", "325": "獎勵", + "326": "管理員調整", "331": "購買", "332": "續費", "333": "退款", + "334": "提現", + "335": "管理員調整", "341": "增加", "342": "減少" }, diff --git a/apps/admin/services/admin/index.ts b/apps/admin/services/admin/index.ts index 4ebecd4..bdf189b 100644 --- a/apps/admin/services/admin/index.ts +++ b/apps/admin/services/admin/index.ts @@ -1,5 +1,5 @@ // @ts-ignore - + // API 更新时间： // API 唯一标识： import * as ads from './ads'; diff --git a/apps/admin/services/admin/typings.d.ts b/apps/admin/services/admin/typings.d.ts index c85a8a1..b24cc36 100644 --- a/apps/admin/services/admin/typings.d.ts +++ b/apps/admin/services/admin/typings.d.ts @@ -122,7 +122,7 @@ declare namespace API { type: number; user_id: number; amount: number; - order_id?: number; + order_no?: string; balance: number; timestamp: number; }; diff --git a/apps/admin/services/common/index.ts b/apps/admin/services/common/index.ts index 73b3bda..61ba129 100644 --- a/apps/admin/services/common/index.ts +++ b/apps/admin/services/common/index.ts @@ -1,5 +1,5 @@ // @ts-ignore - + // API 更新时间： // API 唯一标识： import * as auth from './auth'; diff --git a/apps/admin/services/common/typings.d.ts b/apps/admin/services/common/typings.d.ts index b16e030..3771430 100644 --- a/apps/admin/services/common/typings.d.ts +++ b/apps/admin/services/common/typings.d.ts @@ -128,7 +128,7 @@ declare namespace API { type: number; user_id: number; amount: number; - order_id?: number; + order_no?: string; balance: number; timestamp: number; }; diff --git a/apps/user/services/common/index.ts b/apps/user/services/common/index.ts index 73b3bda..61ba129 100644 --- a/apps/user/services/common/index.ts +++ b/apps/user/services/common/index.ts @@ -1,5 +1,5 @@ // @ts-ignore - + // API 更新时间： // API 唯一标识： import * as auth from './auth'; diff --git a/apps/user/services/common/typings.d.ts b/apps/user/services/common/typings.d.ts index b16e030..3771430 100644 --- a/apps/user/services/common/typings.d.ts +++ b/apps/user/services/common/typings.d.ts @@ -128,7 +128,7 @@ declare namespace API { type: number; user_id: number; amount: number; - order_id?: number; + order_no?: string; balance: number; timestamp: number; }; diff --git a/apps/user/services/user/index.ts b/apps/user/services/user/index.ts index f988131..12fe8d0 100644 --- a/apps/user/services/user/index.ts +++ b/apps/user/services/user/index.ts @@ -1,5 +1,5 @@ // @ts-ignore - + // API 更新时间： // API 唯一标识： import * as announcement from './announcement'; diff --git a/apps/user/services/user/typings.d.ts b/apps/user/services/user/typings.d.ts index 0e7658f..bde9cb3 100644 --- a/apps/user/services/user/typings.d.ts +++ b/apps/user/services/user/typings.d.ts @@ -122,7 +122,7 @@ declare namespace API { type: number; user_id: number; amount: number; - order_id?: number; + order_no?: string; balance: number; timestamp: number; };