diff --git a/.env b/.env index add2994..f660ced 100644 --- a/.env +++ b/.env @@ -35,15 +35,15 @@ VITE_OAUTH2_SOCIAL_CLIENT='social:social' # 是否开启websocket 消息接受, VITE_WEBSOCKET_ENABLE = true # --------------------------- start 开发环境 start ---------------------------------- -# VITE_APP_DEV_SERVICE = https://www.zianxin.com/api -VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc +VITE_APP_DEV_SERVICE = https://www.zianxin.com/api +# VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # VITE_APP_DEV_SERVICE = https://www.zianxin.com/api # VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 -# VITE_IMAGE_DEV_PATH = https://www.zianxin.com/api -VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc +VITE_IMAGE_DEV_PATH = https://www.zianxin.com/api +# VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc # VITE_IMAGE_DEV_PATH = http://127.0.0.1:9999 # VITE_IMAGE_DEV_PATH = https://www.zianxin.com/api # VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc diff --git a/src/i18n/pages/order/en.ts b/src/i18n/pages/order/en.ts index 1efeaed..67ccba1 100644 --- a/src/i18n/pages/order/en.ts +++ b/src/i18n/pages/order/en.ts @@ -1,6 +1,100 @@ export default { mobile: { order: { + wardMenu: { + myTitle: "My Meals", + wardTitle: "Ward's Meals", + mapMyTitle: "My Meal Map", + mapWardTitle: "Ward's Meal Map", + mapEntry: "Meal Map", + subtitleDaily: "Daily dining records", + subtitleMap: "Daily dining overview", + userSwitchAria: "Switch dining person", + userRefreshAria: "Refresh menu", + pickerTitle: "Select dining person", + selfLabel: "Self", + relationFallback: "Related person", + wardFallback: "Ward", + defaultSubtitle: "Upcoming unverified reservations", + queryRelationsFail: "Failed to query related users", + overviewTitle: "Dining Overview", + updating: "Updating", + totalDays: "{count} day(s) in total", + dailyTitle: "Daily Dining", + orderCount: "{count} order(s)", + summaryReserve: "Reserved", + summaryOthers: "Others", + summaryDays: "Days", + summaryAmount: "Amount", + legendPending: "Pending", + legendVerified: "Verified", + legendOffline: "Offline etc.", + legendNone: "No records", + prevMonthAria: "Previous month", + nextMonthAria: "Next month", + mapLoadingAria: "Meal map loading", + mapLoadFail: "Failed to load meal map", + checkNetworkReload: "Check your network and try again", + checkNetworkOrRelation: "Check your network or guardianship and try again", + reload: "Reload", + cellAria: "{date}, {pending} pending, {verified} verified, {offline} offline, tap to view daily details", + pillPending: "P", + pillVerified: "V", + pillOffline: "O", + monthTotalPendingPrefix: "Pending this month:", + monthTotalVerifiedPrefix: "Verified:", + monthTotalOfflinePrefix: "Offline etc.:", + monthTotalSuffix: "order(s)", + monthEmpty: "No dining records this month", + dayLoadingAria: "Daily details loading", + dayLoading: "Loading daily details", + dayLoadFail: "Failed to load daily details", + dayEmpty: "No dining records on this day", + queryMapFail: "Failed to query meal map", + queryDayFail: "Failed to query daily details", + ordersLoadingAria: "Dining records loading", + ordersLoadFail: "Failed to load dining records", + emptyDescSelf: "No dining records in the recent 15 days", + emptyDescWard: "This ward has no dining records in the recent 15 days", + emptyTitle: "No dining records", + swipeHint: "Swipe or tap a date above to switch", + queryOrdersFail: "Failed to query dining records", + daySummaryPortions: "Portions", + reserveGroupTitle: "Reserved · {count} order(s)", + otherGroupTitle: "Other spending · {count} order(s)", + verifiedBadge: "Verified", + completedBadge: "Completed", + merchantFallback: "Canteen merchant", + productFallback: "Unnamed item", + productAria: "View the order details of {name}", + perPortion: "/ portion", + originalPortions: "Bought {count}", + refundedPortions: "Refunded {count}", + noProducts: "No item details", + paidAt: "Paid at {time}", + totalPortions: "{count} portion(s) in total", + orderTotal: "Total ¥{amount}", + missingOrderInfo: "Order info missing, details unavailable", + apptTimeFallback: "Time subject to reservation", + unsureDate: "Date to be confirmed", + apptDateUnsure: "Reservation date to be confirmed", + todayLabel: "Today", + tomorrowLabel: "Tomorrow", + pendingShort: "TBD", + weekdayShort: "Sun,Mon,Tue,Wed,Thu,Fri,Sat", + weekdayFull: "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday", + mapWeekdayHeaders: "Su,Mo,Tu,We,Th,Fr,Sa", + kindOffline: "Offline spending", + kindMachine: "Payment terminal", + kindTakeout: "Takeout", + kindMall: "Mall", + kindOther: "Other spending", + mealBreakfast: "Breakfast", + mealLunch: "Lunch", + mealDinner: "Dinner", + mealNight: "Late-night", + mealFallback: "Reserved meal", + }, title: "Meals", filter: "Filter", filterAria: "Open filter", diff --git a/src/i18n/pages/order/zh-cn.ts b/src/i18n/pages/order/zh-cn.ts index 60d8217..f57fba0 100644 --- a/src/i18n/pages/order/zh-cn.ts +++ b/src/i18n/pages/order/zh-cn.ts @@ -1,6 +1,100 @@ export default { mobile: { order: { + wardMenu: { + myTitle: "我的用餐", + wardTitle: "被监护人用餐", + mapMyTitle: "我的用餐地图", + mapWardTitle: "被监护人用餐地图", + mapEntry: "用餐地图", + subtitleDaily: "每日用餐记录", + subtitleMap: "每日用餐总览", + userSwitchAria: "切换查看对象", + userRefreshAria: "刷新菜谱", + pickerTitle: "选择查看对象", + selfLabel: "本人", + relationFallback: "关系人", + wardFallback: "被监护人", + defaultSubtitle: "未来未核销预约菜谱", + queryRelationsFail: "查询关系人失败", + overviewTitle: "用餐概览", + updating: "更新中", + totalDays: "共 {count} 天", + dailyTitle: "每日用餐", + orderCount: "{count} 笔", + summaryReserve: "预约", + summaryOthers: "其他", + summaryDays: "天数", + summaryAmount: "金额", + legendPending: "待核销", + legendVerified: "已核销", + legendOffline: "线下等", + legendNone: "无记录", + prevMonthAria: "上一个月", + nextMonthAria: "下一个月", + mapLoadingAria: "预约地图加载中", + mapLoadFail: "预约地图加载失败", + checkNetworkReload: "请检查网络后重新加载", + checkNetworkOrRelation: "请检查网络或监护关系后重新加载", + reload: "重新加载", + cellAria: "{date},待核销 {pending} 单,已核销 {verified} 单,线下等 {offline} 单,点击查看当日明细", + pillPending: "待", + pillVerified: "已", + pillOffline: "线", + monthTotalPendingPrefix: "本月待核销", + monthTotalVerifiedPrefix: "已核销", + monthTotalOfflinePrefix: "线下等", + monthTotalSuffix: "单", + monthEmpty: "本月暂无用餐记录", + dayLoadingAria: "当日明细加载中", + dayLoading: "正在加载当日明细", + dayLoadFail: "当日明细加载失败", + dayEmpty: "这一天暂无用餐记录", + queryMapFail: "查询用餐地图失败", + queryDayFail: "查询当日明细失败", + ordersLoadingAria: "用餐记录加载中", + ordersLoadFail: "用餐记录加载失败", + emptyDescSelf: "您近期(前后 15 天)暂无用餐记录", + emptyDescWard: "该被监护人近期(前后 15 天)暂无用餐记录", + emptyTitle: "暂无用餐记录", + swipeHint: "左右滑动或点击上方日期切换", + queryOrdersFail: "查询用餐记录失败", + daySummaryPortions: "份数", + reserveGroupTitle: "预约订单 · {count} 笔", + otherGroupTitle: "其他消费 · {count} 笔", + verifiedBadge: "已核销", + completedBadge: "已完成", + merchantFallback: "食堂商户", + productFallback: "未命名菜品", + productAria: "查看{name}所属订单详情", + perPortion: "/ 份", + originalPortions: "原购 {count} 份", + refundedPortions: "已退款 {count} 份", + noProducts: "暂无菜品明细", + paidAt: "{time} 支付", + totalPortions: "共 {count} 份", + orderTotal: "合计 ¥{amount}", + missingOrderInfo: "订单信息缺失,暂时无法查看详情", + apptTimeFallback: "时间以预约为准", + unsureDate: "日期待确认", + apptDateUnsure: "预约日期待确认", + todayLabel: "今天", + tomorrowLabel: "明天", + pendingShort: "待定", + weekdayShort: "周日,周一,周二,周三,周四,周五,周六", + weekdayFull: "星期日,星期一,星期二,星期三,星期四,星期五,星期六", + mapWeekdayHeaders: "日,一,二,三,四,五,六", + kindOffline: "线下消费", + kindMachine: "消费机", + kindTakeout: "外卖", + kindMall: "商城", + kindOther: "其他消费", + mealBreakfast: "早餐", + mealLunch: "午餐", + mealDinner: "晚餐", + mealNight: "宵夜", + mealFallback: "预约餐段", + }, title: "订餐", filter: "筛选", filterAria: "打开筛选", diff --git a/src/i18n/pages/order/zh-hk.ts b/src/i18n/pages/order/zh-hk.ts index 7891a23..f7d64c7 100644 --- a/src/i18n/pages/order/zh-hk.ts +++ b/src/i18n/pages/order/zh-hk.ts @@ -1,6 +1,100 @@ export default { mobile: { order: { + wardMenu: { + myTitle: "我的用餐", + wardTitle: "被監護人用餐", + mapMyTitle: "我的用餐地圖", + mapWardTitle: "被監護人用餐地圖", + mapEntry: "用餐地圖", + subtitleDaily: "每日用餐記錄", + subtitleMap: "每日用餐總覽", + userSwitchAria: "切換查看對象", + userRefreshAria: "刷新菜譜", + pickerTitle: "選擇查看對象", + selfLabel: "本人", + relationFallback: "關係人", + wardFallback: "被監護人", + defaultSubtitle: "未來未核銷預約菜譜", + queryRelationsFail: "查詢關係人失敗", + overviewTitle: "用餐概覽", + updating: "更新中", + totalDays: "共 {count} 天", + dailyTitle: "每日用餐", + orderCount: "{count} 筆", + summaryReserve: "預約", + summaryOthers: "其他", + summaryDays: "天數", + summaryAmount: "金額", + legendPending: "待核銷", + legendVerified: "已核銷", + legendOffline: "線下等", + legendNone: "無記錄", + prevMonthAria: "上一個月", + nextMonthAria: "下一個月", + mapLoadingAria: "預約地圖載入中", + mapLoadFail: "預約地圖載入失敗", + checkNetworkReload: "請檢查網絡後重新載入", + checkNetworkOrRelation: "請檢查網絡或監護關係後重新載入", + reload: "重新載入", + cellAria: "{date},待核銷 {pending} 單,已核銷 {verified} 單,線下等 {offline} 單,點擊查看當日明細", + pillPending: "待", + pillVerified: "已", + pillOffline: "線", + monthTotalPendingPrefix: "本月待核銷", + monthTotalVerifiedPrefix: "已核銷", + monthTotalOfflinePrefix: "線下等", + monthTotalSuffix: "單", + monthEmpty: "本月暫無用餐記錄", + dayLoadingAria: "當日明細載入中", + dayLoading: "正在載入當日明細", + dayLoadFail: "當日明細載入失敗", + dayEmpty: "這一天暫無用餐記錄", + queryMapFail: "查詢用餐地圖失敗", + queryDayFail: "查詢當日明細失敗", + ordersLoadingAria: "用餐記錄載入中", + ordersLoadFail: "用餐記錄載入失敗", + emptyDescSelf: "您近期(前後 15 天)暫無用餐記錄", + emptyDescWard: "該被監護人近期(前後 15 天)暫無用餐記錄", + emptyTitle: "暫無用餐記錄", + swipeHint: "左右滑動或點擊上方日期切換", + queryOrdersFail: "查詢用餐記錄失敗", + daySummaryPortions: "份數", + reserveGroupTitle: "預約訂單 · {count} 筆", + otherGroupTitle: "其他消費 · {count} 筆", + verifiedBadge: "已核銷", + completedBadge: "已完成", + merchantFallback: "食堂商戶", + productFallback: "未命名菜品", + productAria: "查看{name}所屬訂單詳情", + perPortion: "/ 份", + originalPortions: "原購 {count} 份", + refundedPortions: "已退款 {count} 份", + noProducts: "暫無菜品明細", + paidAt: "{time} 支付", + totalPortions: "共 {count} 份", + orderTotal: "合計 ¥{amount}", + missingOrderInfo: "訂單信息缺失,暫時無法查看詳情", + apptTimeFallback: "時間以預約為準", + unsureDate: "日期待確認", + apptDateUnsure: "預約日期待確認", + todayLabel: "今天", + tomorrowLabel: "明天", + pendingShort: "待定", + weekdayShort: "週日,週一,週二,週三,週四,週五,週六", + weekdayFull: "星期日,星期一,星期二,星期三,星期四,星期五,星期六", + mapWeekdayHeaders: "日,一,二,三,四,五,六", + kindOffline: "線下消費", + kindMachine: "消費機", + kindTakeout: "外賣", + kindMall: "商城", + kindOther: "其他消費", + mealBreakfast: "早餐", + mealLunch: "午餐", + mealDinner: "晚餐", + mealNight: "宵夜", + mealFallback: "預約餐段", + }, title: "訂餐", filter: "篩選", filterAria: "打開篩選", diff --git a/src/i18n/pages/wallet/en.ts b/src/i18n/pages/wallet/en.ts index 7a36bbb..77c36f4 100644 --- a/src/i18n/pages/wallet/en.ts +++ b/src/i18n/pages/wallet/en.ts @@ -8,6 +8,32 @@ export default { detailTitle: "Meal Card", + userCardSubtitle: "Wallet overview", + + relationListTitle: "{name}'s Wallets", + + queryWardCardFail: "Failed to load meal card", + + wardCardFallback: "Meal card", + + wardNoCard: "No meal card", + + wardNoCardDesc: "This person has not opened a meal card yet", + + viewTransactions: "Transactions", + + wardCardInactive: "Inactive", + + wardCardActive: "Active", + + wardCardLost: "Lost", + + wardCardLocked: "Locked", + + wardCardCancelled: "Cancelled", + + wardCardUnknown: "Unknown", + guardianRechargeTitle: "Recharge for ward", currentBalance: "Current balance", @@ -244,6 +270,8 @@ export default { txTransferRefund: "Transfer refund", + txSysRemarkLabel: "System note", + txRemarkLabel: "Remark", txRemarkExpand: "View remark", diff --git a/src/i18n/pages/wallet/zh-cn.ts b/src/i18n/pages/wallet/zh-cn.ts index c1d8c34..5c90c93 100644 --- a/src/i18n/pages/wallet/zh-cn.ts +++ b/src/i18n/pages/wallet/zh-cn.ts @@ -8,6 +8,32 @@ export default { detailTitle: "饭卡", + userCardSubtitle: "钱包总览", + + relationListTitle: "{name}的钱包", + + queryWardCardFail: "查询饭卡信息失败", + + wardCardFallback: "饭卡", + + wardNoCard: "未开通饭卡", + + wardNoCardDesc: "该对象尚未开通饭卡,暂无钱包信息", + + viewTransactions: "查看流水", + + wardCardInactive: "未激活", + + wardCardActive: "已激活", + + wardCardLost: "已挂失", + + wardCardLocked: "已锁卡", + + wardCardCancelled: "已销卡", + + wardCardUnknown: "状态异常", + guardianRechargeTitle: "为被监护人充值", currentBalance: "当前余额", @@ -244,6 +270,8 @@ export default { txTransferRefund: "转账退款", + txSysRemarkLabel: "系统备注", + txRemarkLabel: "备注", txRemarkExpand: "查看备注", diff --git a/src/i18n/pages/wallet/zh-hk.ts b/src/i18n/pages/wallet/zh-hk.ts index 93bbfc5..9c04c5b 100644 --- a/src/i18n/pages/wallet/zh-hk.ts +++ b/src/i18n/pages/wallet/zh-hk.ts @@ -8,6 +8,32 @@ export default { detailTitle: "飯卡", + userCardSubtitle: "錢包總覽", + + relationListTitle: "{name}的錢包", + + queryWardCardFail: "查詢飯卡信息失敗", + + wardCardFallback: "飯卡", + + wardNoCard: "未開通飯卡", + + wardNoCardDesc: "該對象尚未開通飯卡,暫無錢包信息", + + viewTransactions: "查看流水", + + wardCardInactive: "未激活", + + wardCardActive: "已激活", + + wardCardLost: "已掛失", + + wardCardLocked: "已鎖卡", + + wardCardCancelled: "已銷卡", + + wardCardUnknown: "狀態異常", + guardianRechargeTitle: "為被監護人充值", currentBalance: "當前餘額", @@ -244,6 +270,8 @@ export default { txTransferRefund: "轉賬退款", + txSysRemarkLabel: "系統備註", + txRemarkLabel: "備註", txRemarkExpand: "查看備註", diff --git a/src/pages/order/guardian-ward-menu.vue b/src/pages/order/guardian-ward-menu.vue index 961cafa..ba54365 100644 --- a/src/pages/order/guardian-ward-menu.vue +++ b/src/pages/order/guardian-ward-menu.vue @@ -1,15 +1,15 @@