huangzhenbao/medical-mall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善设置页面UI设计

Browse Source
This commit is contained in:
huangzhenbao
2026-06-02 17:34:44 +08:00
parent 881262940c
commit 714e63e12a
21 changed files with 697 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pages/mall/consumer/payment.uvue
View File

@@ -11,7 +11,7 @@
<view class="jd-title-center">
<text class="jd-title-clock">◷</text>
<text class="jd-title-text">{{ orderMissing ? '订单不存在' : (isPaymentExpired ? '已取消' : '等待付款') }}</text>
<text class="jd-title-text">{{ orderMissing ? '订单不存在' : (isPaymentExpired ? '已超时未支付' : '等待付款') }}</text>
</view>
</view>
@@ -26,7 +26,7 @@
</view>
<view class="jd-countdown-row" v-else>
<text class="jd-expired-text">订单超时未支付，已自动取消</text>
<text class="jd-expired-text">订单已超时未支付</text>
</view>
</view>
@@ -555,11 +555,11 @@ const countdownText = computed((): string => {
})
const payStatusTitle = computed((): string => {
return isPaymentExpired.value ? '已取消' : '等待付款'
return isPaymentExpired.value ? '已超时未支付' : '等待付款'
})
const payStatusDesc = computed((): string => {
return isPaymentExpired.value ? '订单超时未支付，已自动取消' : '请在 ' + countdownText.value + ' 内支付'
return isPaymentExpired.value ? '订单已超时未支付，请返回订单列表或重新选购' : '请在 ' + countdownText.value + ' 内支付'
})
const getDeadlineByCreatedAt = (createdAt: string): number => {
@@ -944,10 +944,10 @@ const handlePaymentTimeout = async () => {
updateOrderInStorage(orderId.value, cancelledStatus, ORDER_TIMEOUT_CANCEL_REASON)
uni.$emit('orderUpdated', { orderId: orderId.value, status: cancelledStatus, paymentStatus: PAYMENT_STATUS_TIMEOUT, cancelReason: ORDER_TIMEOUT_CANCEL_REASON, payExpireAt: payExpireAtText.value })
if (success) {
uni.showToast({ title: '订单已取消', icon: 'none' })
uni.showToast({ title: '订单已超时未支付', icon: 'none' })
return
}
uni.showToast({ title: '订单已取消', icon: 'none' })
uni.showToast({ title: '订单已超时未支付', icon: 'none' })
}
const parseAddressFromOrder = (orderObj: UTSJSONObject) => {
@@ -1363,7 +1363,7 @@ const confirmPayment = async () => {
}
if (isPaymentExpired.value || remainingSeconds.value <= 0) {
markPaymentExpiredInPage()
uni.showToast({ title: '订单已取消，不能继续支付', icon: 'none' })
uni.showToast({ title: '订单已超时未支付，不能继续支付', icon: 'none' })
return
}
if (!ensureLoggedIn()) return
@@ -1390,7 +1390,7 @@ const confirmPayment = async () => {
if (latestState == 'expired' || latestState == 'cancelled') {
await supabaseService.expireUnifiedOrder(orderId.value, source.value)
markPaymentExpiredInPage()
uni.showToast({ title: '订单已取消，不能继续支付', icon: 'none' })
uni.showToast({ title: '订单已超时未支付，不能继续支付', icon: 'none' })
isPaying.value = false
return
}
@@ -1440,7 +1440,7 @@ const confirmPayment = async () => {
if (isExpiredState(latestStatus, latestPayment, latestReason, latestExpire)) {
markPaymentExpiredInPage()
uni.hideLoading()
uni.showToast({ title: '订单已取消，不能继续支付', icon: 'none' })
uni.showToast({ title: '订单已超时未支付，不能继续支付', icon: 'none' })
isPaying.value = false
return
}