pcwl_yancheng/uni-fans-score
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修复bug

Browse Source
This commit is contained in:
ISFP_T
2026-02-03 17:47:55 +08:00
parent 9f66ee9658
commit 5a13803743
12 changed files with 1181 additions and 854 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/api/device.js
-31
View File
@@ -60,34 +60,3 @@ export const rentPowerBank = (deviceNo, phone) => {
} }
}) })
} }
// 确认支付并弹出风扇
export const confirmPaymentAndRent = (orderId) => {
console.log(`确认支付并弹出风扇, orderId: ${orderId}`)
return request({
url: `/app/device/confirmPaymentAndRent?orderId=${orderId}`,
method: 'GET'
})
}
// 强制打开空格子
export const forcefOpenEmptyGrid = (deviceNo) => {
console.log(`强制打开空格子, deviceNo: ${deviceNo}`)
return request({
url: `/app/device/forcef/${deviceNo}`,
method: 'post'
})
}
// 发送租借指令
export const sendRentCommand = (data) => {
return request({
url: '/app/device/sendRentCommand',
method: 'post',
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
config/api/order.js
+28 -23
View File
@@ -51,7 +51,6 @@ export const createOrder = (data) => {
// 查询订单 // 查询订单
export const queryById = (id) => { export const queryById = (id) => {
console.log(`查询订单详情, orderId: ${id}`)
return request({ return request({
url: `/app/order/${id}`, url: `/app/order/${id}`,
method: 'get', method: 'get',
@@ -61,7 +60,6 @@ export const queryById = (id) => {
// 用户查询商品订单详情 // 用户查询商品订单详情
export const getProductOrderDetail = (id) => { export const getProductOrderDetail = (id) => {
console.log(`查询商品订单详情, orderId: ${id}`)
return request({ return request({
url: `/app/product/order/${id}`, url: `/app/product/order/${id}`,
method: 'get', method: 'get',
@@ -80,7 +78,6 @@ export const cancelOrder = (data) => {
// 结束订单 // 结束订单
export const overOrderById = (orderId) => { export const overOrderById = (orderId) => {
console.log(`调用结束订单API, orderId: ${orderId}`)
return request({ return request({
url: `/app/order/close/${orderId}`, url: `/app/order/close/${orderId}`,
method: 'get', method: 'get',
@@ -98,7 +95,6 @@ export const getOrderByOrderNo = (orderNo) => {
// 充电宝未弹出反馈（快捷反馈） // 充电宝未弹出反馈（快捷反馈）
export const reportDeviceNoEject = (data) => { export const reportDeviceNoEject = (data) => {
console.log('充电宝未弹出反馈：', data)
return request({ return request({
url: '/app/order/report-no-eject', url: '/app/order/report-no-eject',
method: 'post', method: 'post',
@@ -108,7 +104,6 @@ export const reportDeviceNoEject = (data) => {
// 充电宝转为自用 // 充电宝转为自用
export const convertToOwned = (orderId) => { export const convertToOwned = (orderId) => {
console.log('充电宝转为自用，订单ID：', orderId)
return request({ return request({
url: `/app/order/convert-to-owned/${orderId}`, url: `/app/order/convert-to-owned/${orderId}`,
method: 'post' method: 'post'
@@ -117,7 +112,6 @@ export const convertToOwned = (orderId) => {
// 不想还了转为自用（按最高费用） // 不想还了转为自用（按最高费用）
export const closeWithMaxFee = (orderNo) => { export const closeWithMaxFee = (orderNo) => {
console.log('不想还了转为自用，订单号：', orderNo)
return request({ return request({
url: `/app/order/closeWithMaxFee/${orderNo}`, url: `/app/order/closeWithMaxFee/${orderNo}`,
method: 'post' method: 'post'
@@ -156,9 +150,36 @@ export const getWxPaymentStatus = (orderNo) => {
}) })
} }
// ==================== Antom 支付相关接口 ====================
// 创建 Antom H5 支付订单
export const createAntomPayment = (orderNo, paymentType, osType) => {
return request({
url: `/app/antom-payment/create/${orderNo}?paymentType=${paymentType}&osType=${osType}`,
method: 'get'
})
}
// 获取 Antom 可用支付方式列表
export const getAntomPaymentMethods = (orderNo, osType) => {
return request({
url: `/app/antom-payment/consult/${orderNo}?osType=${osType}`,
method: 'get',
hideLoading: true
})
}
// Antom 支付结果查询
export const getAntomPaymentStatus = (orderNo, osType) => {
return request({
url: `/app/antom-payment/inquiry/${orderNo}?osType=${osType}`,
method: 'get',
hideLoading: true
})
}
// 通过订单号获取支付分订单信息 // 通过订单号获取支付分订单信息
export const getOrderByOrderNoScore = (orderNo) => { export const getOrderByOrderNoScore = (orderNo) => {
console.log('通过订单号获取支付分订单信息', orderNo);
return request({ return request({
url: `/app/wx-payment/score/create/${orderNo}`, url: `/app/wx-payment/score/create/${orderNo}`,
method: 'get', method: 'get',
@@ -168,7 +189,6 @@ export const getOrderByOrderNoScore = (orderNo) => {
// 通过订单号获取支付分订单状态 // 通过订单号获取支付分订单状态
export const getOrderByOrderNoScorePayStatus = (orderNo) => { export const getOrderByOrderNoScorePayStatus = (orderNo) => {
console.log('通过订单号获取支付分订单状态', orderNo);
return request({ return request({
url: `/app/wx-payment/score/status/${orderNo}`, url: `/app/wx-payment/score/status/${orderNo}`,
method: 'get', method: 'get',
@@ -178,7 +198,6 @@ export const getOrderByOrderNoScorePayStatus = (orderNo) => {
// 更新订单套餐信息 // 更新订单套餐信息
export const updateOrderPackage = (data) => { export const updateOrderPackage = (data) => {
console.log('更新订单套餐信息：', data)
return request({ return request({
url: '/app/device/updateOrderPackage', url: '/app/device/updateOrderPackage',
method: 'post', method: 'post',
@@ -188,7 +207,6 @@ export const updateOrderPackage = (data) => {
// 用户端删除商品订单（逻辑删除） // 用户端删除商品订单（逻辑删除）
export const deleteProductOrder = (id) => { export const deleteProductOrder = (id) => {
console.log('删除商品订单，订单ID：', id)
return request({ return request({
url: `/app/product/order/${id}`, url: `/app/product/order/${id}`,
method: 'delete' method: 'delete'
@@ -197,22 +215,9 @@ export const deleteProductOrder = (id) => {
// 用户端取消商品订单支付 // 用户端取消商品订单支付
export const cancelProductOrder = (OutOrderNo) => { export const cancelProductOrder = (OutOrderNo) => {
console.log('取消商品订单支付，订单ID：', OutOrderNo)
return request({ return request({
url: `/app/product/order/${OutOrderNo}/cancel`, url: `/app/product/order/${OutOrderNo}/cancel`,
method: 'put' method: 'put'
}) })
} }
/*
* 弃用
*/
export const getPotionsDetail = (data) => {
console.log(data);
return request({
url: '/device/position/positionDetails',
method: 'get',
data
})
}
config/console.js
+1 -1
View File
@@ -6,7 +6,7 @@
// 配置项：true 表示打印日志，false 表示不打印日志 // 配置项：true 表示打印日志，false 表示不打印日志
export const CONSOLE_CONFIG = { export const CONSOLE_CONFIG = {
// 是否启用 console.log // 是否启用 console.log
enableLog: true, enableLog: false,
// 是否启用 console.warn // 是否启用 console.warn
enableWarn: true, enableWarn: true,
// 是否启用 console.error // 是否启用 console.error
locale/en-US.js
+3 -1
View File
@@ -157,6 +157,7 @@ export default {
order: { order: {
myOrders: 'My Orders', myOrders: 'My Orders',
myDeviceOrders:'Customize Orders',
noOrderRecord: 'No order records', noOrderRecord: 'No order records',
getOrderListFailed: 'Failed to get order list', getOrderListFailed: 'Failed to get order list',
confirmCancelContent: 'Are you sure to cancel this order?', confirmCancelContent: 'Are you sure to cancel this order?',
@@ -799,10 +800,11 @@ export default {
goods: { goods: {
title: 'Product Details', title: 'Product Details',
goodsTitle:'Customize Details',
productName: 'FengDianZhe Shared Fan + Power Bank + Hand Warmer Series - Cherry Blossom Pink', productName: 'FengDianZhe Shared Fan + Power Bank + Hand Warmer Series - Cherry Blossom Pink',
perUnit: '/pc', perUnit: '/pc',
buyNow: 'Buy Now', buyNow: 'Buy Now',
productDetail: 'Product Details', productDetail: 'Customize Details',
features: { features: {
battery: '8000Ahm', battery: '8000Ahm',
batteryDesc: 'Large Capacity Battery', batteryDesc: 'Large Capacity Battery',
locale/zh-CN.js
+3 -1
View File
@@ -157,6 +157,7 @@ export default {
order: { order: {
myOrders: '我的订单', myOrders: '我的订单',
myDeviceOrders:'我的定制',
noOrderRecord: '暂无订单记录', noOrderRecord: '暂无订单记录',
getOrderListFailed: '获取订单列表失败', getOrderListFailed: '获取订单列表失败',
confirmCancelContent: '确定要取消此订单吗？', confirmCancelContent: '确定要取消此订单吗？',
@@ -799,10 +800,11 @@ export default {
goods: { goods: {
title: '商品详情', title: '商品详情',
goodsTitle:'定制详情',
productName: '风电者共享风扇 + 充电宝 + 暖手宝系列-樱花粉', productName: '风电者共享风扇 + 充电宝 + 暖手宝系列-樱花粉',
perUnit: '/个', perUnit: '/个',
buyNow: '立即购买', buyNow: '立即购买',
productDetail: '商品详情', productDetail: '定制详情',
features: { features: {
battery: '8000Ahm', battery: '8000Ahm',
batteryDesc: '大容量电池', batteryDesc: '大容量电池',
pages.json
+3 -2
View File
@@ -126,7 +126,7 @@
{ {
"path": "pages/device/orderDetail", "path": "pages/device/orderDetail",
"style": { "style": {
"navigationBarTitleText": "订单详情", "navigationBarTitleText": "定制详情",
"navigationBarBackgroundColor": "#ffffff", "navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "black"
} }
@@ -276,7 +276,8 @@
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationBarBackgroundColor": "#ffffff", "navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "black",
"navigationStyle": "custom"
} }
}, },
{ {
pages/device/goods.vue
+1 -1
View File
@@ -364,7 +364,7 @@
onMounted(() => { onMounted(() => {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: t('goods.title') title: t('goods.goodsTitle')
}) })
// 初始化地区数据 // 初始化地区数据
initRegionData() initRegionData()
pages/device/orderDetail.vue
+83 -10
View File
@@ -114,7 +114,7 @@
<view class="action-btn secondary" @click="onDeleteOrder"> <view class="action-btn secondary" @click="onDeleteOrder">
删除订单 删除订单
</view> </view>
<view class="action-btn primary" @click="onReorder"> <view class="action-btn primary" @click="onReorder(orderDetail.productId)">
再次定制 再次定制
</view> </view>
</template> </template>
@@ -124,7 +124,7 @@
<view class="action-btn secondary" @click="onContactService"> <view class="action-btn secondary" @click="onContactService">
联系客服 联系客服
</view> </view>
<view class="action-btn primary" @click="onReorder"> <view class="action-btn primary" @click="onReorder(orderDetail.productId)">
再次定制 再次定制
</view> </view>
</template> </template>
@@ -133,7 +133,7 @@
</template> </template>
<script setup> <script setup>
import { ref, computed, onMounted } from 'vue'; import { ref, computed, onMounted, onUnmounted } from 'vue';
import { onLoad } from '@dcloudio/uni-app'; import { onLoad } from '@dcloudio/uni-app';
import { import {
queryById, queryById,
@@ -149,6 +149,8 @@
const orderDetail = ref({}); const orderDetail = ref({});
const orderId = ref(''); const orderId = ref('');
const countdownText = ref('');
let countdownTimer = null;
// 订单状态文本 // 订单状态文本
const statusText = computed(() => { const statusText = computed(() => {
@@ -234,6 +236,10 @@
if (status === 0 || status === '0') { if (status === 0 || status === '0') {
title = '待付款'; title = '待付款';
// 如果有倒计时文本，添加到标题中
if (countdownText.value) {
title = `${title} ${countdownText.value}`;
}
} else if (status === 1 || status === '1') { } else if (status === 1 || status === '1') {
title = '待发货'; title = '待发货';
} else if (status === 2 || status === '2') { } else if (status === 2 || status === '2') {
@@ -251,6 +257,66 @@
}); });
}; };
// 启动倒计时
const startCountdown = () => {
// 清除之前的定时器
if (countdownTimer) {
clearInterval(countdownTimer);
countdownTimer = null;
}
const status = orderDetail.value.status;
const expireTime = orderDetail.value.expireTime;
// 只有待付款状态且有过期时间才显示倒计时
if ((status === 0 || status === '0') && expireTime) {
// 计算倒计时
const updateCountdown = () => {
const now = new Date().getTime();
const expireTimestamp = new Date(expireTime).getTime();
const diff = expireTimestamp - now;
if (diff > 0) {
// 计算总分钟数和秒数
const totalMinutes = Math.floor(diff / (1000 * 60));
const seconds = Math.floor((diff % (1000 * 60)) / 1000);
// 格式化为 MM:SS
const minutesStr = String(totalMinutes).padStart(2, '0');
const secondsStr = String(seconds).padStart(2, '0');
countdownText.value = `${minutesStr}:${secondsStr}`;
updatePageTitle();
} else {
// 倒计时结束
countdownText.value = '';
if (countdownTimer) {
clearInterval(countdownTimer);
countdownTimer = null;
}
// 重新加载订单详情（订单可能已自动取消）
loadOrderDetail();
}
};
// 立即执行一次
updateCountdown();
// 每秒更新一次
countdownTimer = setInterval(updateCountdown, 1000);
} else {
countdownText.value = '';
updatePageTitle();
}
};
// 组件卸载时清除定时器
onUnmounted(() => {
if (countdownTimer) {
clearInterval(countdownTimer);
countdownTimer = null;
}
});
// 加载订单详情 // 加载订单详情
const loadOrderDetail = async () => { const loadOrderDetail = async () => {
try { try {
@@ -269,6 +335,7 @@
outTradeNo: data.outTradeNo, outTradeNo: data.outTradeNo,
userId: data.userId, userId: data.userId,
// 状态信息 // 状态信息
status: data.status, status: data.status,
payStatus: data.payStatus, payStatus: data.payStatus,
@@ -282,6 +349,7 @@
createTime: data.createTime, createTime: data.createTime,
updateTime: data.updateTime, updateTime: data.updateTime,
payTime: data.payTime, payTime: data.payTime,
expireTime: data.expireTime, // 订单自动取消时间
// 收货信息 // 收货信息
receiverName: data.receiverName, receiverName: data.receiverName,
@@ -300,6 +368,7 @@
pictureUrl: data.pictureUrl, pictureUrl: data.pictureUrl,
color: data.color, color: data.color,
quantity: data.quantity, quantity: data.quantity,
productId:data.productId,
// 兼容旧字段 // 兼容旧字段
orderId: data.id, orderId: data.id,
@@ -315,8 +384,8 @@
productImage: data.pictureUrl || data.productImage || '' productImage: data.pictureUrl || data.productImage || ''
}; };
// 根据订单状态更新页面标题 // 启动倒计时
updatePageTitle(); startCountdown();
} }
uni.hideLoading(); uni.hideLoading();
@@ -528,9 +597,13 @@
// 再次定制 // 再次定制
const onReorder = (order) => { const onReorder = (order) => {
uni.navigateTo({ if(order){
url: `/pages/device/goods?productId=${order.productId}` uni.navigateTo({
}); url: `/pages/device/goods?productId=${order}`
});
}
// console.log(order);
}; };
</script> </script>
@@ -622,8 +695,8 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 20rpx; margin-bottom: 20rpx;
font-size: 26rpx; font-size: 28rpx;
height: 40rpx; height: 50rpx;
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
pages/device/orderList.vue
+1 -4
View File
@@ -54,9 +54,6 @@
import{ import{
createProductOrder createProductOrder
}from "@/config/api/product.js" }from "@/config/api/product.js"
import {
confirmPaymentAndRent
} from '../../config/api/device.js';
import { import {
updateUserBalance updateUserBalance
} from '../../config/api/user.js'; } from '../../config/api/user.js';
@@ -288,7 +285,7 @@
// 设置页面标题并监听订单完成事件 // 设置页面标题并监听订单完成事件
onMounted(() => { onMounted(() => {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: t('order.myOrders') title: t('order.myDeviceOrders')
}) })
// 监听订单完成事件 // 监听订单完成事件
pages/order/index.vue
-3
View File
@@ -49,9 +49,6 @@
cancelOrder, cancelOrder,
createWxPayment createWxPayment
} from '../../config/api/order.js'; } from '../../config/api/order.js';
import {
confirmPaymentAndRent
} from '../../config/api/device.js';
import { import {
updateUserBalance updateUserBalance
} from '../../config/api/user.js'; } from '../../config/api/user.js';
pages/order/payment.vue
+722 -445
View File
File diff suppressed because it is too large Load Diff
pages/order/success.vue
+336 -332
View File
@@ -1,346 +1,350 @@
<template> <template>
<view class="success-container"> <view class="success-container">
<!-- 支付成功状态 --> <!-- 支付成功状态 -->
<view class="status-card"> <view class="status-card">
<view class="status-icon success"></view> <view class="status-icon success"></view>
<view class="status-text">{{ $t('success.paymentSuccess') }}</view> <view class="status-text">{{ $t('success.paymentSuccess') }}</view>
<view class="status-desc">{{ $t('success.paymentSuccessDesc') }}</view> <view class="status-desc">{{ $t('success.paymentSuccessDesc') }}</view>
</view> </view>
<!-- 订单信息 -->
<view class="order-card">
<view class="card-title">{{ $t('success.orderInfo') }}</view>
<view class="info-item">
<text class="label">{{ $t('order.orderNo') }}</text>
<text class="value">{{ orderInfo.orderNo || '-' }}</text>
</view>
<view class="info-item">
<text class="label">{{ $t('order.deviceNo') }}</text>
<text class="value">{{ orderInfo.deviceNo || '-' }}</text>
</view>
<view class="info-item">
<text class="label">{{ $t('success.paymentAmount') }}</text>
<text class="value">￥{{ orderInfo.amount || '0.00' }}</text>
</view>
<view class="info-item">
<text class="label">{{ $t('success.paymentTime') }}</text>
<text class="value">{{ orderInfo.payTime || '-' }}</text>
</view>
</view>
<!-- 设备状态 --> <!-- 订单信息 -->
<view class="device-status"> <view class="order-card">
<view class="status-message">{{ deviceMessage }}</view> <view class="card-title">{{ $t('success.orderInfo') }}</view>
<view class="loading-animation" v-if="isLoading"> <view class="info-item">
<view class="loading-circle"></view> <text class="label">{{ $t('order.orderNo') }}</text>
</view> <text class="value">{{ orderInfo.orderNo || '-' }}</text>
</view> </view>
<view class="info-item">
<text class="label">{{ $t('order.deviceNo') }}</text>
<text class="value">{{ orderInfo.deviceNo || '-' }}</text>
</view>
<view class="info-item">
<text class="label">{{ $t('success.paymentAmount') }}</text>
<text class="value">￥{{ orderInfo.amount || '0.00' }}</text>
</view>
<view class="info-item">
<text class="label">{{ $t('success.paymentTime') }}</text>
<text class="value">{{ orderInfo.payTime || '-' }}</text>
</view>
</view>
<!-- 操作按钮 --> <!-- 设备状态 -->
<view class="button-group"> <view class="device-status">
<button class="primary-btn" @click="goToHome">{{ $t('success.backToHome') }}</button> <view class="status-message">{{ deviceMessage }}</view>
<button class="secondary-btn" @click="goToOrderList">{{ $t('success.viewOrder') }}</button> <view class="loading-animation" v-if="isLoading">
</view> <view class="loading-circle"></view>
</view> </view>
</view>
<!-- 操作按钮 -->
<view class="button-group">
<button class="primary-btn" @click="goToHome">{{ $t('success.backToHome') }}</button>
<button class="secondary-btn" @click="goToOrderList">{{ $t('success.viewOrder') }}</button>
</view>
</view>
</template> </template>
<script> <script setup>
import { queryById } from '@/config/api/order.js' import {
import { confirmPaymentAndRent } from '@/config/api/device.js' ref,
getCurrentInstance
} from 'vue'
import {
onLoad
} from '@dcloudio/uni-app'
import {
queryById,
getOrderByOrderNo
} from '@/config/api/order.js'
export default { // 获取当前实例以访问 $t 方法
data() { const {
return { proxy
orderId: '', } = getCurrentInstance()
orderInfo: {},
isLoading: true, // 响应式数据
deviceMessage: '', const orderId = ref('')
hasTriggeredDevice: false const orderInfo = ref({})
} const isLoading = ref(true)
}, const deviceMessage = ref('')
onLoad(options) { const hasTriggeredDevice = ref(false)
// 设置页面标题
uni.setNavigationBarTitle({ // 页面加载
title: this.$t('success.paymentSuccess') onLoad((options) => {
}) // 设置页面标题
uni.setNavigationBarTitle({
this.deviceMessage = this.$t('success.preparingDevice') title: proxy.$t('success.paymentSuccess')
})
if (options && options.orderId) {
this.orderId = options.orderId deviceMessage.value = proxy.$t('success.preparingDevice')
this.loadOrderInfo()
// #ifdef H5
// 添加页面显示监听，防止页面切换后重复触发弹出 if (uni.getStorageSync('pendingPaymentNo')) {
uni.$once('orderSuccess:' + this.orderId, () => { orderId.value = options.orderId
console.log('已经触发过弹出逻辑，不再重复触发') loadOrderInfo()
this.hasTriggeredDevice = true
}) // 添加页面显示监听，防止页面切换后重复触发弹出
} else { uni.$once('orderSuccess:' + orderId.value, () => {
uni.showToast({ console.log('已经触发过弹出逻辑，不再重复触发')
title: this.$t('order.orderNotExist'), hasTriggeredDevice.value = true
icon: 'none' })
}) } else {
setTimeout(() => { uni.showToast({
this.goToHome() title: proxy.$t('order.orderNotExist'),
}, 1500) icon: 'none'
} })
}, setTimeout(() => {
methods: { goToHome()
async loadOrderInfo() { }, 1500)
try { }
uni.showLoading({ // #endif
title: this.$t('common.loading') // #ifndef H5
}) if (options && options.orderId) {
orderId.value = options.orderId
const res = await queryById(this.orderId) loadOrderInfo()
if (res.code === 200 && res.data) {
const orderData = res.data // 添加页面显示监听，防止页面切换后重复触发弹出
this.orderInfo = { uni.$once('orderSuccess:' + orderId.value, () => {
orderNo: orderData.orderNo || orderData.orderId, console.log('已经触发过弹出逻辑，不再重复触发')
deviceNo: orderData.deviceNo, hasTriggeredDevice.value = true
amount: orderData.payAmount || orderData.amount, })
payTime: orderData.payTime || this.formatTime(new Date()) } else {
} uni.showToast({
title: proxy.$t('order.orderNotExist'),
// 检查订单状态 icon: 'none'
if (orderData.orderStatus === 'IN_USED') { })
// 如果已经是使用中状态，可能说明开锁已经完成 setTimeout(() => {
this.deviceMessage = '设备已弹出，请取走您的风扇' goToHome()
this.isLoading = false }, 1500)
}
// 如果是第一次加载页面且设备已弹出，记录状态，避免重复弹出 // #endif
if (!this.hasTriggeredDevice) { })
uni.$emit('orderSuccess:' + this.orderId)
this.hasTriggeredDevice = true // 加载订单信息
} const loadOrderInfo = async () => {
} else { try {
// 正常触发弹出逻辑 uni.showLoading({
this.triggerDeviceEject() title: proxy.$t('common.loading')
} })
} else {
throw new Error('获取订单信息失败') const res = await queryById(orderId.value)
} if (res.code === 200 && res.data) {
const orderData = res.data
uni.hideLoading() orderInfo.value = {
} catch (error) { orderNo: orderData.orderNo || orderData.orderId,
uni.hideLoading() deviceNo: orderData.deviceNo,
uni.showToast({ amount: orderData.payAmount || orderData.amount,
title: error.message || this.$t('order.getOrderFailed'), payTime: orderData.payTime || formatTime(new Date())
icon: 'none' }
})
} // 检查订单状态
}, if (orderData.orderStatus === 'IN_USED') {
// 如果已经是使用中状态，可能说明开锁已经完成
// 触发弹出风扇 deviceMessage.value = '设备已弹出，请取走您的风扇'
async triggerDeviceEject() { isLoading.value = false
if (this.hasTriggeredDevice) {
console.log('已经触发过弹出风扇，不重复触发') // 如果是第一次加载页面且设备已弹出，记录状态，避免重复弹出
return if (!hasTriggeredDevice.value) {
} uni.$emit('orderSuccess:' + orderId.value)
hasTriggeredDevice.value = true
this.hasTriggeredDevice = true }
uni.$emit('orderSuccess:' + this.orderId) } else {
this.isLoading = true // 在此页面不再触发设备弹出操作，仅更新展示文案和加载状态
this.deviceMessage = this.$t('success.preparingDevice') deviceMessage.value = proxy.$t('success.paymentSuccessDesc')
isLoading.value = false
try { }
console.log(`准备触发弹出风扇，orderId: ${this.orderId}`) } else {
throw new Error('获取订单信息失败')
// 调用确认支付并弹出的方法 }
const result = await confirmPaymentAndRent(this.orderId)
console.log('确认支付并弹出风扇结果:', JSON.stringify(result)) uni.hideLoading()
} catch (error) {
if (result && result.code === 200) { uni.hideLoading()
this.deviceMessage = this.$t('success.deviceReady') uni.showToast({
uni.showToast({ title: error.message || proxy.$t('order.getOrderFailed'),
title: this.$t('success.deviceReady'), icon: 'none'
icon: 'success' })
}) }
} else { }
throw new Error((result && result.msg) || this.$t('success.deviceFailed'))
} // 格式化时间
} catch (error) { const formatTime = (date) => {
console.error('弹出风扇错误:', error) const year = date.getFullYear()
this.deviceMessage = this.$t('success.deviceFailed') const month = (date.getMonth() + 1).toString().padStart(2, '0')
uni.showToast({ const day = date.getDate().toString().padStart(2, '0')
title: error.message || this.$t('success.deviceFailed'), const hour = date.getHours().toString().padStart(2, '0')
icon: 'none' const minute = date.getMinutes().toString().padStart(2, '0')
}) const second = date.getSeconds().toString().padStart(2, '0')
} finally { return `${year}-${month}-${day} ${hour}:${minute}:${second}`
this.isLoading = false }
}
}, // 返回首页
const goToHome = () => {
formatTime(date) { uni.reLaunch({
const year = date.getFullYear() url: '/pages/index/index'
const month = (date.getMonth() + 1).toString().padStart(2, '0') })
const day = date.getDate().toString().padStart(2, '0') }
const hour = date.getHours().toString().padStart(2, '0')
const minute = date.getMinutes().toString().padStart(2, '0') // 查看订单列表
const second = date.getSeconds().toString().padStart(2, '0') const goToOrderList = () => {
return `${year}-${month}-${day} ${hour}:${minute}:${second}` uni.redirectTo({
}, url: '/pages/order/index'
goToHome() { })
uni.switchTab({ }
url: '/pages/index/index'
})
},
goToOrderList() {
uni.redirectTo({
url: '/pages/order/index'
})
}
}
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.success-container { .success-container {
padding: 20px; padding: 20px;
background-color: #f5f5f5; background-color: #f5f5f5;
min-height: 100vh; min-height: 100vh;
} }
.status-card { .status-card {
background-color: #fff; background-color: #fff;
border-radius: 12px; border-radius: 12px;
padding: 30px; padding: 30px;
text-align: center; text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
.status-icon {
width: 60px;
height: 60px;
margin: 0 auto 16px;
background-color: #07c160;
border-radius: 50%;
position: relative;
&::after {
content: '';
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
width: 30px;
height: 20px;
border: 3px solid #fff;
border-top: none;
border-right: none;
transform-origin: center;
transform: translate(-50%, -70%) rotate(-45deg);
}
}
.status-text {
font-size: 24px;
font-weight: bold;
color: #07c160;
margin-bottom: 8px;
}
.status-desc {
font-size: 14px;
color: #666;
}
}
.order-card { .status-icon {
background-color: #fff; width: 60px;
border-radius: 12px; height: 60px;
padding: 20px; margin: 0 auto 16px;
margin-bottom: 20px; background-color: #07c160;
border-radius: 50%;
.card-title { position: relative;
font-size: 16px;
font-weight: bold;
margin-bottom: 16px;
color: #333;
}
.info-item {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 12px;
.label {
color: #666;
font-size: 14px;
}
.value {
color: #333;
font-size: 14px;
}
}
}
.device-status { &::after {
background-color: #fff; content: '';
border-radius: 12px; position: absolute;
padding: 20px; left: 50%;
margin-bottom: 20px; top: 50%;
text-align: center; transform: translate(-50%, -50%);
width: 30px;
.status-message { height: 20px;
font-size: 16px; border: 3px solid #fff;
color: #333; border-top: none;
margin-bottom: 12px; border-right: none;
} transform-origin: center;
transform: translate(-50%, -70%) rotate(-45deg);
.loading-animation { }
display: flex; }
justify-content: center;
align-items: center;
height: 40px;
.loading-circle {
width: 30px;
height: 30px;
border-radius: 50%;
border: 3px solid #f0f0f0;
border-top-color: #07c160;
animation: spin 1s linear infinite;
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
}
}
.button-group { .status-text {
margin-top: 30px; font-size: 24px;
display: flex; font-weight: bold;
// flex-direction: column; color: #07c160;
gap: 16px; margin-bottom: 8px;
}
.primary-btn {
background-color: #07c160; .status-desc {
color: #fff; font-size: 14px;
border: none; color: #666;
border-radius: 24px; }
padding: 12px; }
font-size: 16px;
.order-card {
&:active { background-color: #fff;
opacity: 0.8; border-radius: 12px;
} padding: 20px;
} margin-bottom: 20px;
.secondary-btn { .card-title {
background-color: #fff; font-size: 16px;
color: #07c160; font-weight: bold;
border: 1px solid #07c160; margin-bottom: 16px;
border-radius: 24px; color: #333;
padding: 12px; }
font-size: 16px;
.info-item {
&:active { display: flex;
background-color: #f5f5f5; justify-content: space-between;
} align-items: center;
} margin-bottom: 12px;
}
.label {
color: #666;
font-size: 14px;
}
.value {
color: #333;
font-size: 14px;
}
}
}
.device-status {
background-color: #fff;
border-radius: 12px;
padding: 20px;
margin-bottom: 20px;
text-align: center;
.status-message {
font-size: 16px;
color: #333;
margin-bottom: 12px;
}
.loading-animation {
display: flex;
justify-content: center;
align-items: center;
height: 40px;
.loading-circle {
width: 30px;
height: 30px;
border-radius: 50%;
border: 3px solid #f0f0f0;
border-top-color: #07c160;
animation: spin 1s linear infinite;
}
@keyframes spin {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
}
}
.button-group {
margin-top: 30px;
display: flex;
// flex-direction: column;
gap: 16px;
.primary-btn {
background-color: #07c160;
color: #fff;
border: none;
border-radius: 24px;
padding: 12px;
font-size: 16px;
&:active {
opacity: 0.8;
}
}
.secondary-btn {
background-color: #fff;
color: #07c160;
border: 1px solid #07c160;
border-radius: 24px;
padding: 12px;
font-size: 16px;
&:active {
background-color: #f5f5f5;
}
}
}
</style> </style>