diff --git a/.env b/.env index 935301e..90d6b23 100644 --- a/.env +++ b/.env @@ -33,18 +33,18 @@ 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://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 = 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://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 +VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc # VITE_IMAGE_DEV_PATH = http://127.0.0.1:9999 # ----------------------------- end 开发环境 end ------------------------------------ diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 7a65f03..df6b57a 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -26,7 +26,7 @@ "type" : "uniCloud" }, { - "customPlaygroundType" : "device", + "customPlaygroundType" : "local", "openVueDevtools" : true, "playground" : "custom", "type" : "uni-app:app-ios" diff --git a/src/manifest.json b/src/manifest.json index db9c0e6..444fadd 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,8 +2,8 @@ "name" : "资安信", "appid" : "__UNI__1BFE88F", "description" : "资安信后勤管理系统", - "versionName" : "1.5.12", - "versionCode" : 1512, + "versionName" : "1.5.13", + "versionCode" : 1513, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/src/pages.json b/src/pages.json index c3aba2b..04c5908 100644 --- a/src/pages.json +++ b/src/pages.json @@ -357,13 +357,6 @@ { "root": "pages/human-face", "pages": [ - { - "path": "list", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, { "path": "guardian-ward-apply", "style": { @@ -668,4 +661,4 @@ } ] } -} \ No newline at end of file +} diff --git a/src/pages/human-face/guardian-ward-apply.vue b/src/pages/human-face/guardian-ward-apply.vue index b9edeb5..39965c2 100644 --- a/src/pages/human-face/guardian-ward-apply.vue +++ b/src/pages/human-face/guardian-ward-apply.vue @@ -9,7 +9,7 @@ {{ wardName }} - 被监护人人脸信息 + {{ faceIdentityDescription }} {{ isDetailMode ? detailStatus.label : "需审核" }} @@ -121,6 +121,8 @@ const spuUploadActionUrl = getFileUploadActionUrl() const wardUserId = ref("") const wardName = ref("被监护人") +/** 当前目标是否为登录用户本人,用于复用同一套上传、审核和撤回流程。 */ +const currentUser = ref(false) const uploadFiles = ref([]) const submitting = ref(false) const cancelling = ref(false) @@ -154,7 +156,13 @@ const faceGuides = [ const uploadHeader = computed(() => hooks.useDefaultHeader()) const isDetailMode = computed(() => pageMode.value === "detail") -const pageTitle = computed(() => (isDetailMode.value ? "人脸审核详情" : "上传被监护人人脸")) +/** 本人与被监护人共用页面时,标题应准确反映当前办理对象。 */ +const pageTitle = computed(() => { + if (isDetailMode.value) return "人脸审核详情" + return currentUser.value ? "上传人脸" : "上传被监护人人脸" +}) +/** 顶部身份说明根据目标用户切换,避免本人页面仍显示被监护人文案。 */ +const faceIdentityDescription = computed(() => (currentUser.value ? "本人人脸信息" : "被监护人人脸信息")) const detailFaceUrl = computed(() => filePath(faceDetail.value?.faceImg)) const canCancelFace = computed(() => String(faceDetail.value?.processStatus || "") === taskCheckStatusCodeEnum.PADDING) const canReapplyFace = computed(() => String(faceDetail.value?.processStatus || "") === taskCheckStatusCodeEnum.REJECT) @@ -194,6 +202,7 @@ const toRecords = () => { router.jump("/pages/human-face/guardian-ward-records", { wardUserId: wardUserId.value, wardName: encodeURIComponent(wardName.value), + currentUser: currentUser.value ? "1" : "0", }) } @@ -230,7 +239,7 @@ const confirmSingleFace = () => singleFaceConfirmRef.value?.open() ?? Promise.re const formatTime = (value?: string) => (value ? dayjs(value).format("YYYY-MM-DD HH:mm") : "—") /** - * 查询被监护人的人脸审核详情,并更新详情模式页面。 + * 查询本人或被监护人的人脸审核详情,并更新详情模式页面。 */ const loadFaceDetail = async () => { if (!faceId.value) return @@ -240,7 +249,7 @@ const loadFaceDetail = async () => { wardUserId.value = String(faceDetail.value.userId || wardUserId.value) wardName.value = faceDetail.value.username || wardName.value } catch (error: any) { - console.error("查询被监护人人脸审核详情失败", error) + console.error(currentUser.value ? "查询本人人脸审核详情失败" : "查询被监护人人脸审核详情失败", error) uni.showToast({ title: error?.message || error?.msg || "查询审核详情失败", icon: "none" }) } } @@ -302,7 +311,7 @@ const reapplyRejectedFace = () => { } /** - * 提交被监护人的人脸图片并进入审核流程。 + * 提交本人或被监护人的人脸图片并进入审核流程。 */ const submitFaces = async () => { if (submitting.value) return @@ -329,6 +338,7 @@ const submitFaces = async () => { { wardUserId: wardUserId.value, wardName: encodeURIComponent(wardName.value), + currentUser: currentUser.value ? "1" : "0", }, 2, ), @@ -346,13 +356,14 @@ onLoad((options?: Record) => { pageMode.value = String(options?.mode || "apply") faceId.value = String(options?.id || "") wardUserId.value = String(options?.wardUserId || "") - wardName.value = decodeURIComponent(String(options?.wardName || "被监护人")) + currentUser.value = String(options?.currentUser || "") === "1" + wardName.value = decodeURIComponent(String(options?.wardName || (currentUser.value ? "本人" : "被监护人"))) if (isDetailMode.value && faceId.value) { loadFaceDetail() return } if (!wardUserId.value || (isDetailMode.value && !faceId.value)) { - uni.showToast({ title: "缺少被监护人信息", icon: "none" }) + uni.showToast({ title: "缺少目标用户信息", icon: "none" }) setTimeout(() => router.back(), 800) } }) diff --git a/src/pages/human-face/guardian-ward-records.vue b/src/pages/human-face/guardian-ward-records.vue index f066761..6600a59 100644 --- a/src/pages/human-face/guardian-ward-records.vue +++ b/src/pages/human-face/guardian-ward-records.vue @@ -3,7 +3,8 @@ - - diff --git a/src/pages/order/guardian-ward-menu.vue b/src/pages/order/guardian-ward-menu.vue index 21193bc..cbfbe59 100644 --- a/src/pages/order/guardian-ward-menu.vue +++ b/src/pages/order/guardian-ward-menu.vue @@ -1,5 +1,5 @@