8vd8
41b409c327
取消了订单轮询 更新押金提现及订单查询功能 归还成功之后不会有归还成功的弹窗出现 提现的判断目前判断押金状态和订单状态 修改了提现API的参数名称，从订单ID更改为订单号，并新增了根据设备号和状态查询订单列表的功能。同时，优化了用户在提现过程中的错误提示，确保用户能够获得更清晰的反馈。更新了多个页面的逻辑，提升了整体用户体验。
535 lines
27 KiB
Vue
535 lines
27 KiB
Vue
<template>
|
||
<view class="payment-container">
|
||
<!-- 订单状态 -->
|
||
<view class="status-card">
|
||
<view class="status-icon" :class="orderStatus.class"></view>
|
||
<view class="status-text">{{ orderStatus.text }}</view>
|
||
<view class="status-desc">{{ orderStatus.desc }}</view>
|
||
</view>
|
||
|
||
<!-- 订单信息 -->
|
||
<view class="order-card">
|
||
<view class="card-title">订单信息</view>
|
||
<view class="info-item">
|
||
<text class="label">订单号</text>
|
||
<text class="value">{{ orderInfo.orderNo || '-' }}</text>
|
||
</view>
|
||
<view class="info-item">
|
||
<text class="label">设备号</text>
|
||
<text class="value">{{ orderInfo.deviceNo || '-' }}</text>
|
||
</view>
|
||
<view class="info-item">
|
||
<text class="label">创建时间</text>
|
||
<text class="value">{{ orderInfo.createTime || '-' }}</text>
|
||
</view>
|
||
<view class="info-item">
|
||
<text class="label">联系电话</text>
|
||
<text class="value">{{ orderInfo.phone || '-' }}</text>
|
||
</view>
|
||
</view>
|
||
|
||
<!-- 费用信息 -->
|
||
<view class="price-card">
|
||
<view class="card-title">费用信息</view>
|
||
<view class="price-item">
|
||
<text class="label">押金</text>
|
||
<text class="value">￥{{ orderInfo.deposit || '99.00' }}</text>
|
||
</view>
|
||
<view class="price-item">
|
||
<text class="label">套餐</text>
|
||
<text class="value">{{ packageInfo.time }} (￥{{ packageInfo.price }})</text>
|
||
</view>
|
||
<view class="price-item">
|
||
<text class="label">租借费用</text>
|
||
<text class="value">￥{{ orderInfo.amount || packageInfo.price }}</text>
|
||
</view>
|
||
<view class="price-item total">
|
||
<text class="label">合计</text>
|
||
<text class="value">￥{{ totalAmount }}</text>
|
||
</view>
|
||
</view>
|
||
|
||
|
||
|
||
|
||
<!-- 底部操作栏 -->
|
||
<view class="bottom-bar">
|
||
<view class="total-amount">
|
||
<text>合计：</text>
|
||
<text class="amount">￥{{ totalAmount }}</text>
|
||
</view>
|
||
<button class="pay-btn" @click="handlePayment">立即支付</button>
|
||
</view>
|
||
</view>
|
||
</template>
|
||
|
||
<script>
|
||
import { queryById } from '@/config/user.js'
|
||
import { updateOrderPackage } from '@/config/user.js'
|
||
import { updateUserBalance } from '@/config/user.js'
|
||
import {
|
||
URL
|
||
}from"@/config/url.js"
|
||
|
||
export default {
|
||
data() {
|
||
return {
|
||
orderId: null,
|
||
orderInfo: {},
|
||
packageInfo: {
|
||
time: '',
|
||
price: '0.00'
|
||
},
|
||
passedTotalAmount: null,
|
||
passedDepositAmount: null,
|
||
orderStatus: {
|
||
text: '等待支付',
|
||
desc: '请在15分钟内完成支付',
|
||
class: 'waiting'
|
||
}
|
||
}
|
||
},
|
||
computed: {
|
||
totalAmount() {
|
||
if (this.passedTotalAmount !== null) {
|
||
return parseFloat(this.passedTotalAmount).toFixed(2);
|
||
}
|
||
const deposit = parseFloat(this.orderInfo.deposit || 99)
|
||
const amount = parseFloat(this.orderInfo.amount || this.packageInfo.price || 0)
|
||
return (deposit + amount).toFixed(2)
|
||
}
|
||
},
|
||
onLoad(options) {
|
||
if (options && options.orderId) {
|
||
this.orderId = options.orderId
|
||
|
||
// 获取传递的套餐信息
|
||
if (options.packageTime && options.packagePrice) {
|
||
this.packageInfo = {
|
||
time: options.packageTime,
|
||
price: options.packagePrice
|
||
}
|
||
}
|
||
|
||
if (options.totalAmount) {
|
||
this.passedTotalAmount = options.totalAmount;
|
||
}
|
||
|
||
if (options.depositAmount) {
|
||
this.passedDepositAmount = options.depositAmount;
|
||
}
|
||
|
||
this.loadOrderInfo()
|
||
} else {
|
||
uni.showToast({
|
||
title: '订单信息不存在',
|
||
icon: 'none'
|
||
})
|
||
setTimeout(() => {
|
||
uni.redirectTo({
|
||
url: '/pages/index/index'
|
||
})
|
||
}, 1500)
|
||
}
|
||
},
|
||
methods: {
|
||
// 加载订单信息
|
||
async loadOrderInfo() {
|
||
try {
|
||
uni.showLoading({
|
||
title: '加载中'
|
||
})
|
||
|
||
const res = await queryById(this.orderId)
|
||
if (res.code === 200 && res.data) {
|
||
const orderData = res.data
|
||
|
||
// 处理创建时间，确保显示的是格式化后的时间
|
||
let formattedTime;
|
||
try {
|
||
// 如果orderData.createTime存在并且是有效的日期字符串/时间戳，则格式化它
|
||
if (orderData.createTime) {
|
||
formattedTime = this.formatTime(new Date(orderData.createTime));
|
||
} else {
|
||
// 如果createTime不存在，使用当前时间作为创建时间
|
||
formattedTime = this.formatTime(new Date());
|
||
}
|
||
} catch (e) {
|
||
console.error('时间格式化错误:', e);
|
||
formattedTime = this.formatTime(new Date());
|
||
}
|
||
|
||
this.orderInfo = {
|
||
orderNo: orderData.orderNo || orderData.orderId,
|
||
deviceNo: orderData.deviceNo,
|
||
createTime: formattedTime,
|
||
phone: orderData.phone,
|
||
deposit: this.passedDepositAmount || orderData.depositAmount || '99.00', // 优先使用传递的押金，然后是订单中的押金，最后默认99元
|
||
amount: orderData.amount || this.packageInfo.price || '0.00'
|
||
}
|
||
|
||
// 如果订单中没有套餐信息，但URL参数中有，则使用URL参数中的套餐信息
|
||
if (!orderData.packageTime && this.packageInfo.time) {
|
||
this.orderInfo.packageTime = this.packageInfo.time
|
||
this.orderInfo.packagePrice = this.packageInfo.price
|
||
}
|
||
} else {
|
||
throw new Error('获取订单信息失败')
|
||
}
|
||
|
||
uni.hideLoading()
|
||
} catch (error) {
|
||
uni.hideLoading()
|
||
uni.showToast({
|
||
title: error.message || '获取订单信息失败',
|
||
icon: 'none'
|
||
})
|
||
}
|
||
},
|
||
|
||
// 处理支付
|
||
async handlePayment() {
|
||
try {
|
||
uni.showLoading({
|
||
title: '处理中'
|
||
})
|
||
|
||
// 调用后端创建微信支付订单接口
|
||
const res = await uni.request({
|
||
url: `${URL || 'http://127.0.0.1:8080'}/app/wx-payment/create/${this.orderInfo.orderNo}`,
|
||
method: 'GET',
|
||
header: {
|
||
'Authorization': "Bearer " + uni.getStorageSync('token'),
|
||
'Clientid': uni.getStorageSync('client_id')
|
||
}
|
||
})
|
||
|
||
if (res.statusCode === 200 && res.data.code === 200) {
|
||
const payParams = res.data.data
|
||
|
||
// 调用微信支付
|
||
await uni.requestPayment({
|
||
...payParams,
|
||
success: async () => {
|
||
uni.showToast({
|
||
title: '支付成功',
|
||
icon: 'success'
|
||
});
|
||
|
||
// 更新用户余额
|
||
try {
|
||
await updateUserBalance(this.orderId);
|
||
} catch (error) {
|
||
console.warn('更新用户余额失败:', error);
|
||
}
|
||
|
||
// 支付成功后直接跳转到订单页面，不再轮询
|
||
setTimeout(() => {
|
||
uni.redirectTo({
|
||
url: `/pages/order/index?orderId=${this.orderId}`
|
||
});
|
||
}, 1500);
|
||
},
|
||
fail: (err) => {
|
||
console.error('支付失败:', err)
|
||
throw new Error('支付失败，请重试')
|
||
}
|
||
})
|
||
} else {
|
||
throw new Error(res.data.msg || '创建支付订单失败')
|
||
}
|
||
} catch (error) {
|
||
uni.hideLoading()
|
||
uni.showToast({
|
||
title: error.message || '支付失败',
|
||
icon: 'none'
|
||
})
|
||
}
|
||
},
|
||
|
||
// 发送租借指令
|
||
async sendRentCommand() {
|
||
try {
|
||
uni.showLoading({
|
||
title: '处理中'
|
||
})
|
||
|
||
// 调用发送租借指令的接口
|
||
const res = await this.sendRentRequest()
|
||
|
||
if (res.code === 200) {
|
||
uni.hideLoading()
|
||
uni.showToast({
|
||
title: '租借成功',
|
||
icon: 'success'
|
||
})
|
||
|
||
// 跳转到订单列表页面
|
||
setTimeout(() => {
|
||
uni.redirectTo({
|
||
url: `/pages/order/index?orderId=${this.orderId}`
|
||
})
|
||
}, 1500)
|
||
} else {
|
||
throw new Error(res.msg || '租借失败')
|
||
}
|
||
} catch (error) {
|
||
uni.hideLoading()
|
||
uni.showToast({
|
||
title: error.message || '租借失败',
|
||
icon: 'none'
|
||
})
|
||
}
|
||
},
|
||
|
||
// 发送租借请求
|
||
sendRentRequest() {
|
||
return new Promise((resolve, reject) => {
|
||
uni.request({
|
||
url: `${URL || 'http://127.0.0.1:8080'}/app/device/sendRentCommand`,
|
||
method: 'POST',
|
||
data: {
|
||
orderId: this.orderId
|
||
},
|
||
header: {
|
||
'Content-Type': 'application/x-www-form-urlencoded',
|
||
'Authorization': "Bearer " + uni.getStorageSync('token'),
|
||
'Clientid': uni.getStorageSync('client_id')
|
||
},
|
||
success(res) {
|
||
if (res.statusCode === 200) {
|
||
resolve(res.data)
|
||
} else {
|
||
reject(new Error('请求失败'))
|
||
}
|
||
},
|
||
fail(err) {
|
||
reject(err)
|
||
}
|
||
})
|
||
})
|
||
},
|
||
|
||
// 格式化时间
|
||
formatTime(date) {
|
||
const year = date.getFullYear()
|
||
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')
|
||
|
||
return `${year}-${month}-${day} ${hour}:${minute}`
|
||
},
|
||
|
||
// 检查订单状态（单次查询，不轮询）
|
||
async checkOrderStatus() {
|
||
try {
|
||
const res = await uni.request({
|
||
url: `${URL || 'http://127.0.0.1:8080'}/app/wx-payment/status/${this.orderInfo.orderNo}`,
|
||
method: 'GET',
|
||
header: {
|
||
'Authorization': "Bearer " + uni.getStorageSync('token'),
|
||
'Clientid': uni.getStorageSync('client_id')
|
||
}
|
||
});
|
||
|
||
if (res.statusCode === 200 && res.data.code === 200) {
|
||
return res.data.data;
|
||
} else {
|
||
throw new Error('查询订单状态失败');
|
||
}
|
||
} catch (error) {
|
||
console.error('查询订单状态错误:', error);
|
||
return null;
|
||
}
|
||
},
|
||
}
|
||
}
|
||
|
||
</script>
|
||
|
||
<style lang="scss" scoped>
|
||
.payment-container {
|
||
min-height: 100vh;
|
||
background: #f8f8f8;
|
||
padding: 30rpx;
|
||
padding-bottom: 180rpx;
|
||
box-sizing: border-box;
|
||
|
||
.status-card {
|
||
background: #fff;
|
||
border-radius: 24rpx;
|
||
padding: 40rpx 30rpx;
|
||
margin-bottom: 30rpx;
|
||
display: flex;
|
||
flex-direction: column;
|
||
align-items: center;
|
||
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04);
|
||
|
||
.status-icon {
|
||
width: 120rpx;
|
||
height: 120rpx;
|
||
border-radius: 50%;
|
||
background: #f5f5f5;
|
||
margin-bottom: 20rpx;
|
||
|
||
&.waiting {
|
||
background: #FFF9C4;
|
||
}
|
||
|
||
&.success {
|
||
background: #E8F5E9;
|
||
}
|
||
|
||
&.failed {
|
||
background: #FFEBEE;
|
||
}
|
||
}
|
||
|
||
.status-text {
|
||
font-size: 36rpx;
|
||
font-weight: 600;
|
||
color: #333;
|
||
margin-bottom: 10rpx;
|
||
}
|
||
|
||
.status-desc {
|
||
font-size: 28rpx;
|
||
color: #999;
|
||
}
|
||
}
|
||
|
||
.order-card, .price-card {
|
||
background: #fff;
|
||
border-radius: 24rpx;
|
||
padding: 30rpx;
|
||
margin-bottom: 30rpx;
|
||
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04);
|
||
|
||
.card-title {
|
||
font-size: 32rpx;
|
||
font-weight: 600;
|
||
color: #333;
|
||
margin-bottom: 20rpx;
|
||
position: relative;
|
||
padding-left: 20rpx;
|
||
|
||
&::before {
|
||
content: '';
|
||
position: absolute;
|
||
left: 0;
|
||
top: 50%;
|
||
transform: translateY(-50%);
|
||
width: 8rpx;
|
||
height: 32rpx;
|
||
background: #1976D2;
|
||
border-radius: 4rpx;
|
||
}
|
||
}
|
||
|
||
.info-item, .price-item {
|
||
display: flex;
|
||
justify-content: space-between;
|
||
align-items: center;
|
||
padding: 20rpx 0;
|
||
border-bottom: 1px solid #f5f5f5;
|
||
|
||
&:last-child {
|
||
border-bottom: none;
|
||
}
|
||
|
||
.label {
|
||
font-size: 28rpx;
|
||
color: #666;
|
||
}
|
||
|
||
.value {
|
||
font-size: 28rpx;
|
||
color: #333;
|
||
}
|
||
|
||
&.total {
|
||
margin-top: 10rpx;
|
||
padding-top: 30rpx;
|
||
border-top: 1px solid #f5f5f5;
|
||
|
||
.label, .value {
|
||
font-size: 32rpx;
|
||
font-weight: 600;
|
||
color: #333;
|
||
}
|
||
|
||
.value {
|
||
color: #FF5722;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
.wechat-tip {
|
||
background: #fff;
|
||
border-radius: 24rpx;
|
||
padding: 30rpx;
|
||
margin-bottom: 30rpx;
|
||
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04);
|
||
display: flex;
|
||
align-items: center;
|
||
|
||
.method-icon {
|
||
width: 48rpx;
|
||
height: 48rpx;
|
||
margin-right: 20rpx;
|
||
|
||
&.wechat {
|
||
background: url('../../static/images/wechat.svg') no-repeat center/contain;
|
||
}
|
||
}
|
||
|
||
.method-text {
|
||
font-size: 28rpx;
|
||
color: #333;
|
||
font-weight: 500;
|
||
}
|
||
}
|
||
|
||
.bottom-bar {
|
||
position: fixed;
|
||
left: 0;
|
||
right: 0;
|
||
bottom: 0;
|
||
background: #fff;
|
||
padding: 20rpx 30rpx;
|
||
padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
|
||
display: flex;
|
||
align-items: center;
|
||
justify-content: space-between;
|
||
box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.04);
|
||
|
||
.total-amount {
|
||
font-size: 28rpx;
|
||
color: #666;
|
||
|
||
.amount {
|
||
font-size: 36rpx;
|
||
font-weight: 600;
|
||
color: #FF5722;
|
||
margin-left: 10rpx;
|
||
}
|
||
}
|
||
|
||
.pay-btn {
|
||
background: #1976D2;
|
||
color: #fff;
|
||
font-size: 32rpx;
|
||
font-weight: 600;
|
||
padding: 20rpx 60rpx;
|
||
border-radius: 100rpx;
|
||
border: none;
|
||
|
||
&:active {
|
||
opacity: 0.9;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
</style> |