From 700f9d0da314a4ea701fe9f68d305b67d72ec5fb Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 08 七月 2026 15:08:37 +0800
Subject: [PATCH] 各类修复fix
---
yuyueMiniProgram/src/pages/reviewList/index.vue | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/yuyueMiniProgram/src/pages/reviewList/index.vue b/yuyueMiniProgram/src/pages/reviewList/index.vue
index 54461e7..2d16654 100644
--- a/yuyueMiniProgram/src/pages/reviewList/index.vue
+++ b/yuyueMiniProgram/src/pages/reviewList/index.vue
@@ -29,7 +29,6 @@
orderUuid: string
}
-const router = useRouter()
const sysInfo = uni.getSystemInfoSync()
const statusBarHeight = sysInfo.statusBarHeight || 0
const navBarHeight = 44
@@ -62,8 +61,27 @@
const dateColumns = ref<string[][]>([[], [], []])
const datePickerIndex = ref([0, 0, 0])
+function backOrHome() {
+ const pages = getCurrentPages()
+ if (pages.length > 1) {
+ uni.navigateBack({
+ delta: 1,
+ fail: () => {
+ uni.switchTab({ url: '/pages/index/index' })
+ },
+ })
+ return
+ }
+ uni.switchTab({
+ url: '/pages/index/index',
+ fail: () => {
+ uni.reLaunch({ url: '/pages/index/index' })
+ },
+ })
+}
+
function handleBack() {
- router.back()
+ backOrHome()
}
function getCurrentDate() {
@@ -94,6 +112,15 @@
months.findIndex(item => item === selectedMonth.toString()),
days.findIndex(item => item === selectedDay.toString()),
]
+}
+
+function formatVisitReasonDisplay(reasonText?: string | null, reasonCode?: string | null) {
+ const normalizedText = normalizeVisitReasonText(reasonText)
+ const code = (reasonCode || '').trim().toUpperCase()
+ if (code === 'OTHER' || normalizedText === '其他') {
+ return '其他'
+ }
+ return normalizedText || code || '-'
}
function handleDateChange(e: any) {
@@ -135,7 +162,7 @@
nodeText: item.nodeName || '待审核',
orderNo: item.orderNo,
time: normalizeVisitTimeText(item.visitTimeText || `${item.visitStartDate || '-'}${item.visitEndDate && item.visitEndDate !== item.visitStartDate ? ` 至 ${item.visitEndDate}` : ''}`),
- reasonText: normalizeVisitReasonText(item.visitReasonText) || item.visitReasonCode || '-',
+ reasonText: formatVisitReasonDisplay(item.visitReasonText, item.visitReasonCode),
reasonOtherText: (item.visitReasonOther || '').trim() || '-',
createTime: item.createTime,
taskId: item.taskId,
@@ -174,7 +201,7 @@
nodeText,
orderNo: item.orderNo,
time: normalizeVisitTimeText(item.visitTimeText),
- reasonText: normalizeVisitReasonText(item.visitReasonText) || item.visitReasonCode || '-',
+ reasonText: formatVisitReasonDisplay(item.visitReasonText, item.visitReasonCode),
reasonOtherText: (item.visitReasonOther || '').trim() || '-',
createTime: item.createTime,
orderId: item.id,
@@ -192,7 +219,7 @@
nodeText: item.nodeText || (item.statusText || '已处理'),
orderNo: item.orderNo,
time: normalizeVisitTimeText(item.visitTimeText || '-'),
- reasonText: normalizeVisitReasonText(item.visitReasonText) || item.visitReasonCode || '-',
+ reasonText: formatVisitReasonDisplay(item.visitReasonText, item.visitReasonCode),
reasonOtherText: (item.visitReasonOther || '').trim() || '-',
createTime: item.createTime,
taskId: item.taskId || undefined,
--
Gitblit v1.7.1