This commit is contained in:
lcj
2026-09-04 16:20:56 +08:00
parent 08e2f6888b
commit 4ed72056a9
6 changed files with 304 additions and 68 deletions
+4 -4
View File
@@ -69,20 +69,20 @@ export function checkFaceFlag(cardNo: string): Promise<boolean> {
}
/** 上传图片到 OSS */
export function uploadImage(filePath: string): Promise<string> {
export function uploadImage(filePath: string, endpoint = '/open-api/oss/upload'): Promise<string> {
return new Promise((resolve, reject) => {
uni.uploadFile({
url: `${BASE_URL}/open-api/oss/upload`,
url: `${BASE_URL}${endpoint}`,
filePath,
name: 'file',
success: (res) => {
if (res.statusCode === 200) {
try {
const data = JSON.parse(res.data as string)
if (data.errcode === 0 && data.data?.fileUrl) {
if ((data.errcode === 0 || data.code === 200) && data.data?.fileUrl) {
resolve(data.data.fileUrl)
} else {
reject(new Error(data.errmsg || '上传失败'))
reject(new Error(data.errmsg || data.msg || '上传失败'))
}
} catch { reject(new Error('解析响应失败')) }
} else {
+85 -5
View File
@@ -115,6 +115,35 @@
</button>
</view>
<!-- 5. 照片拍摄要求提示 -->
<view class="photo-tips">
<text class="photo-tips__title">照片拍摄要求</text>
<view class="photo-tips__item">
<view class="photo-tips__dot" />
<text class="photo-tips__text">图片仅允许1张人脸,多人脸直接驳回</text>
</view>
<view class="photo-tips__item">
<view class="photo-tips__dot" />
<text class="photo-tips__text">图片不能无人脸、侧脸过大、遮挡严重(口罩/帽子遮大半脸)</text>
</view>
<view class="photo-tips__item">
<view class="photo-tips__dot" />
<text class="photo-tips__text">不允许全身、远景、远距离人像照片</text>
</view>
<view class="photo-tips__item">
<view class="photo-tips__dot" />
<text class="photo-tips__text">不允许脸部极致特写、贴脸拍摄无留白</text>
</view>
<view class="photo-tips__item">
<view class="photo-tips__dot" />
<text class="photo-tips__text">图片清晰,无严重模糊、逆光、黑影、反光</text>
</view>
<view class="photo-tips__item">
<view class="photo-tips__dot" />
<text class="photo-tips__text">不允许翻拍屏幕、截图、证件复印件照片</text>
</view>
</view>
<!-- 弹窗:证件类型选择 -->
<uni-popup ref="idTypePopup" type="bottom" :mask-click="true" mask-background="transparent" @change="(e: any) => showIdTypePicker = e.show">
<view class="popup-sheet">
@@ -237,11 +266,16 @@ async function handleImage(filePath: string) {
try {
const compressedPath = await compressImage(filePath)
uni.showLoading({ title: '上传中...' })
const url = await uploadImage(compressedPath)
const url = await uploadImage(compressedPath, '/open-api/oss/uploadWithFaceCheck')
photoUrl.value = url
uni.showToast({ title: '上传成功', icon: 'success' })
} catch {
uni.showToast({ title: '上传失败', icon: 'none' })
} catch (e) {
uni.showModal({
title: '上传失败',
content: (e as Error).message || '上传失败',
showCancel: false,
confirmText: '确定',
})
} finally {
uploading.value = false
uni.hideLoading()
@@ -362,8 +396,8 @@ function handleCancel() {
/* ===== Page ===== */
.page {
height: 100vh;
overflow: hidden;
min-height: 100vh;
overflow-y: auto;
background: $color-card;
font-family: $font-family-body;
}
@@ -714,6 +748,52 @@ function handleCancel() {
color: $uv-tips-color;
}
/* ===== 5. Photo Tips ===== */
.photo-tips {
margin: 32rpx 24rpx;
padding: 28rpx;
background: #f7f8fa;
border-radius: 16rpx;
}
.photo-tips__title {
display: block;
font-family: $font-family-body;
font-size: $font-size-sm;
font-weight: $font-weight-medium;
color: $uv-main-color;
margin-bottom: 16rpx;
}
.photo-tips__item {
display: flex;
align-items: flex-start;
margin-bottom: 12rpx;
&:last-child {
margin-bottom: 0;
}
}
.photo-tips__dot {
width: 8rpx;
height: 8rpx;
border-radius: 50%;
background: $uv-primary;
flex-shrink: 0;
margin-top: 14rpx;
margin-right: 12rpx;
}
.photo-tips__text {
flex: 1;
font-family: $font-family-body;
font-size: $font-size-xs;
font-weight: 400;
color: $uv-tips-color;
line-height: 36rpx;
}
/* ===== Popup Sheet ===== */
.popup-sheet {
background: $color-card;
+9 -4
View File
@@ -500,7 +500,7 @@ async function doActivate() {
url: `${BASE_URL}/open-api/card/sendAndBind`,
method: 'POST',
data: {
orderNo: selectedVoucher.value?.id || '',
orderNo: `${selectedVoucher.value?.code || ''}-${selectedVoucher.value?.id || ''}`,
typeId: '820093438328133',
userName: form.userName.trim(),
mobile: phone.value,
@@ -578,10 +578,15 @@ async function handleImage(filePath: string) {
try {
const compressed = await compressImage(filePath)
uni.showLoading({ title: '上传中...' })
faceImg.value = await uploadImage(compressed)
faceImg.value = await uploadImage(compressed, '/open-api/oss/uploadWithFaceCheck')
uni.showToast({ title: '上传成功', icon: 'success' })
} catch {
uni.showToast({ title: '上传失败', icon: 'none' })
} catch (e) {
uni.showModal({
title: '上传失败',
content: (e as Error).message || '上传失败',
showCancel: false,
confirmText: '确定',
})
} finally {
uploading.value = false
uni.hideLoading()
+27 -19
View File
@@ -58,7 +58,7 @@
</view>
<!-- 预约入园日期 -->
<view class="record-info">
<text class="record-date">预约入园日期:{{ r.date }}</text>
<text class="record-date">预约入园日期:<text class="record-date--value">{{ formatDateOnly(r.date) }}</text></text>
</view>
<!-- 操作 -->
<view class="record-actions">
@@ -124,7 +124,7 @@
</uni-popup>
<!-- 详情弹窗 -->
<uni-popup ref="detailPopup" type="bottom" :mask-click="true">
<uni-popup ref="detailPopup" type="center" :mask-click="true">
<view class="detail-sheet">
<view class="sheet-header">
<text class="sheet-title">使用详情</text>
@@ -137,17 +137,9 @@
<text class="sheet-label">预约景区</text>
<text class="sheet-value">{{ detailRecord?.scenicName }}</text>
</view>
<view class="sheet-row">
<text class="sheet-label">卡种</text>
<text class="sheet-value">{{ detailRecord?.cardType }}</text>
</view>
<view class="sheet-row">
<text class="sheet-label">卡号</text>
<text class="sheet-value">{{ detailRecord?.cardNo }}</text>
</view>
<view class="sheet-row">
<text class="sheet-label">预约入园日期</text>
<text class="sheet-value">{{ detailRecord?.date }}</text>
<text class="sheet-value sheet-value--date">{{ formatDateOnly(detailRecord?.date) }}</text>
</view>
<view v-if="detailRecord?.session" class="sheet-row">
<text class="sheet-label">预约场次</text>
@@ -157,10 +149,6 @@
<text class="sheet-label">预约人</text>
<text class="sheet-value">{{ detailRecord?.userName }}</text>
</view>
<view class="sheet-row">
<text class="sheet-label">证件号</text>
<text class="sheet-value">{{ detailRecord?.maskedId }}</text>
</view>
<view class="sheet-row">
<text class="sheet-label">预约状态</text>
<text class="sheet-value">{{ detailStatusLabel(detailRecord?.status || '') }}</text>
@@ -177,6 +165,11 @@
<text class="sheet-label">取消时间</text>
<text class="sheet-value">{{ detailRecord.cancelTime }}</text>
</view>
<!-- 人脸图片 -->
<view v-if="detailRecord?.photo" class="sheet-photo">
<text class="sheet-label">人脸图片</text>
<image class="sheet-photo-avatar" :src="detailRecord.photo" mode="aspectFill" @tap="previewPhoto(detailRecord.photo)" />
</view>
<!-- 核销人脸照片 -->
<view v-if="detailRecord?.verifyPhoto" class="sheet-photo">
<text class="sheet-label">核销照片</text>
@@ -213,6 +206,7 @@ interface ReserveRecord {
cancelTime?: string
verifyTime?: string
verifyPhoto?: string
photo?: string
cardInstruction?: string
cardModelId?: string
canCancel?: boolean
@@ -288,6 +282,7 @@ async function fetchRecords(append = false) {
cancelTime: item.cancelTime || '',
verifyTime: item.verifyTime || '',
verifyPhoto: item.verifyPhoto || '',
photo: item.photo || '',
cardInstruction: item.cardInstruction || '',
cardModelId: item.cardModelId || item.thirdId || '',
canCancel: !!item.canCancel,
@@ -332,6 +327,12 @@ function formatReserveDate(date?: string): string {
return `${m[1]} 年 ${Number(m[2])} 月 ${Number(m[3])} 日`
}
/** 日期去除时分秒(如 2026-08-05 10:00:00 → 2026-08-05) */
function formatDateOnly(date?: string): string {
if (!date) return ''
return date.split(' ')[0]
}
function showCancelModal(r: ReserveRecord) {
cancelRecord.value = r
cancelPopup.value?.open()
@@ -449,6 +450,7 @@ async function viewDetail(r: ReserveRecord) {
cancelTime: res.cancelTime || r.cancelTime,
verifyTime: res.verifyTime || r.verifyTime,
verifyPhoto: res.verifyPhoto || r.verifyPhoto,
photo: res.photo || r.photo,
cardInstruction: res.cardInstruction || r.cardInstruction || '',
cardModelId: res.cardModelId || r.cardModelId || '',
}
@@ -622,6 +624,11 @@ function previewPhoto(url: string) {
color: $uv-tips-color;
}
.record-date--value {
color: $uv-error;
font-weight: $font-weight-medium;
}
.record-actions {
display: flex;
justify-content: flex-end;
@@ -743,7 +750,7 @@ function previewPhoto(url: string) {
/* ===== Detail Sheet ===== */
.detail-sheet {
background: $color-card; border-radius: $radius-lg $radius-lg 0 0; max-height: 75vh;
width: 640rpx; background: $color-card; border-radius: $radius-lg; max-height: 75vh;
display: flex; flex-direction: column;
}
@@ -778,6 +785,7 @@ function previewPhoto(url: string) {
.sheet-label { font-family: $font-family-body; font-size: $font-size-sm; color: $uv-main-color; }
.sheet-value { font-family: $font-family-body; font-size: $font-size-sm; color: $uv-content-color; text-align: right; }
.sheet-value--date { color: $uv-error; font-weight: $font-weight-medium; }
.sheet-photo {
display: flex;
@@ -788,9 +796,9 @@ function previewPhoto(url: string) {
}
.sheet-photo-avatar {
width: 100rpx;
height: 100rpx;
border-radius: 50%;
width: 200rpx;
height: 200rpx;
border-radius: 8rpx;
}
.sheet-tip {