feat:
取消了订单轮询 更新押金提现及订单查询功能 归还成功之后不会有归还成功的弹窗出现 提现的判断目前判断押金状态和订单状态 修改了提现API的参数名称，从订单ID更改为订单号，并新增了根据设备号和状态查询订单列表的功能。同时，优化了用户在提现过程中的错误提示，确保用户能够获得更清晰的反馈。更新了多个页面的逻辑，提升了整体用户体验。
This commit is contained in:
8vd8
+42
-40
@@ -40,7 +40,7 @@
|
||||
|
||||
<script>
|
||||
import { getUserInfo } from '../../util/index.js'
|
||||
import { withdrawDeposit, queryById, getOrderList } from '../../config/user.js'
|
||||
import { withdrawDeposit,queryById } from '../../config/user.js'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
@@ -48,8 +48,7 @@ export default {
|
||||
depositAmount: '0.00',
|
||||
orderNo: '',
|
||||
records: [],
|
||||
orderId: '',
|
||||
isLoading: false
|
||||
orderId:''
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
@@ -61,34 +60,15 @@ export default {
|
||||
methods: {
|
||||
async loadUserInfo() {
|
||||
try {
|
||||
this.isLoading = true
|
||||
const res = await getUserInfo()
|
||||
console.log('loadUserInfo', res);
|
||||
console.log('loadUserInfo',res);
|
||||
if (res.code === 200) {
|
||||
this.depositAmount = res.data.balanceAmount || '0.00'
|
||||
this.orderNo = res.data.latestOrderNo || ''
|
||||
this.orderId = res.data.latestOrderId || ''
|
||||
|
||||
// 如果有余额但没有orderId，尝试查询用户订单列表获取
|
||||
if (parseFloat(this.depositAmount) > 0 && !this.orderId) {
|
||||
console.log('没有latestOrderId但有余额，尝试查询订单列表')
|
||||
const orderRes = await getOrderList({ pageNum: 1, pageSize: 10 })
|
||||
if (orderRes.code === 200 && orderRes.data && orderRes.data.records && orderRes.data.records.length > 0) {
|
||||
// 查找最近的包含押金的订单
|
||||
const depositOrder = orderRes.data.records.find(order =>
|
||||
order.depositAmount && parseFloat(order.depositAmount) > 0
|
||||
)
|
||||
|
||||
if (depositOrder) {
|
||||
console.log('找到押金订单:', depositOrder)
|
||||
this.orderId = depositOrder.orderId
|
||||
this.orderNo = depositOrder.orderNo
|
||||
}
|
||||
}
|
||||
}
|
||||
this.orderId = res.data.latestOrderId||''
|
||||
|
||||
// 如果存在余额，获取押金记录
|
||||
if (parseFloat(this.depositAmount) > 0) {
|
||||
if (parseFloat(this.depositAmount) > 0 && this.orderNo) {
|
||||
this.records = [
|
||||
{
|
||||
type: '支付',
|
||||
@@ -106,8 +86,6 @@ export default {
|
||||
title: '获取用户信息失败',
|
||||
icon: 'none'
|
||||
})
|
||||
} finally {
|
||||
this.isLoading = false
|
||||
}
|
||||
},
|
||||
async handleWithdraw() {
|
||||
@@ -118,14 +96,15 @@ export default {
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
if (!this.orderId) {
|
||||
uni.showToast({
|
||||
title: '无法找到押金订单',
|
||||
icon: 'none'
|
||||
})
|
||||
return
|
||||
}
|
||||
const res = await queryById(Number(this.orderNo))
|
||||
console.log(res);
|
||||
// if(this.orderNo.length!=0){
|
||||
// uni.showToast({
|
||||
// title:'当前存在进行中的订单',
|
||||
// icon:'none'
|
||||
// })
|
||||
// return
|
||||
// }
|
||||
|
||||
uni.showModal({
|
||||
title: '确认提现',
|
||||
@@ -137,8 +116,8 @@ export default {
|
||||
})
|
||||
|
||||
try {
|
||||
console.log('发起提现请求，订单ID：', this.orderId)
|
||||
const result = await withdrawDeposit(this.orderId)
|
||||
console.log('发起提现请求，订单号：', this.orderNo)
|
||||
const result = await withdrawDeposit(this.orderNo)
|
||||
console.log('提现响应：', result)
|
||||
|
||||
if (result.code === 200) {
|
||||
@@ -166,9 +145,32 @@ export default {
|
||||
} catch (error) {
|
||||
console.error('提现失败：', error)
|
||||
uni.hideLoading()
|
||||
uni.showToast({
|
||||
title: error.message || '提现失败，请稍后再试',
|
||||
icon: 'none'
|
||||
|
||||
// 更详细的错误处理
|
||||
let errorMessage = '提现失败，请稍后再试';
|
||||
|
||||
// 如果有具体错误信息，使用它
|
||||
if (error.message) {
|
||||
// 常见错误消息处理
|
||||
if (error.message.includes('尚未归还')) {
|
||||
errorMessage = '当前订单尚未归还，请归还后再提现';
|
||||
} else if (error.message.includes('已退还')) {
|
||||
errorMessage = '押金已退还，无需重复提现';
|
||||
} else if (error.message.includes('处理中')) {
|
||||
errorMessage = '押金退还处理中，请耐心等待';
|
||||
} else if (error.message.includes('余额为0')) {
|
||||
errorMessage = '账户余额为0，无法提现';
|
||||
} else {
|
||||
// 使用后端返回的具体错误消息
|
||||
errorMessage = error.message;
|
||||
}
|
||||
}
|
||||
|
||||
// 显示错误提示
|
||||
uni.showModal({
|
||||
title: '提现失败',
|
||||
content: errorMessage,
|
||||
showCancel: false
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
+53
-5
@@ -85,7 +85,8 @@
|
||||
<script>
|
||||
import {
|
||||
getDeviceInfo,
|
||||
rentPowerBank
|
||||
rentPowerBank,
|
||||
updateOrderPackage
|
||||
} from '@/config/user.js'
|
||||
export default {
|
||||
data() {
|
||||
@@ -123,6 +124,7 @@
|
||||
onLoad(options) {
|
||||
// console.log(options);
|
||||
this.deviceId = options.deviceNo
|
||||
this.checkOrderStatus() // 新增状态检查
|
||||
console.log(options.deviceNo);
|
||||
this.getDeviceInfo()
|
||||
},
|
||||
@@ -162,10 +164,22 @@
|
||||
const result = await this.$api.checkActiveOrder()
|
||||
|
||||
if (result.hasOrder) {
|
||||
// 如果有正在进行的订单，跳转到归还页面，带上设备ID
|
||||
uni.redirectTo({
|
||||
const order = result.order; // 假设后端返回 order 对象
|
||||
|
||||
// 检查订单状态
|
||||
if (order.status === 'waiting_for_payment') {
|
||||
// 跳转支付页面，带上订单ID
|
||||
uni.redirectTo({
|
||||
url: `/pages/order/payment?orderId=${order.orderId}&deviceId=${this.deviceId}`
|
||||
})
|
||||
}else if(order.status === 'in_used'){
|
||||
// 如果有正在进行的订单，跳转到归还页面，带上设备ID
|
||||
uni.redirectTo({
|
||||
url: `/pages/device/return?deviceId=${this.deviceId}`
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
} catch (error) {
|
||||
uni.showToast({
|
||||
@@ -230,12 +244,46 @@
|
||||
|
||||
// 获取后端返回的订单信息
|
||||
const order = rentResult.data
|
||||
|
||||
// --- 新增：立即更新订单套餐信息 ---
|
||||
try {
|
||||
let packageTimeMinutes = 0;
|
||||
if (selectedPkg.time.includes('小时')) {
|
||||
packageTimeMinutes = parseInt(selectedPkg.time) * 60;
|
||||
} else if (selectedPkg.time.includes('分钟')) {
|
||||
packageTimeMinutes = parseInt(selectedPkg.time);
|
||||
} else {
|
||||
packageTimeMinutes = parseInt(selectedPkg.time) * 60; // 默认按小时处理
|
||||
}
|
||||
|
||||
const updateRes = await updateOrderPackage({
|
||||
orderId: order.orderId,
|
||||
packageTime: packageTimeMinutes,
|
||||
packagePrice: parseFloat(selectedPkg.price)
|
||||
});
|
||||
if (updateRes.code !== 200) {
|
||||
console.warn("更新订单套餐信息失败:", updateRes.msg);
|
||||
// 这里可以选择是否提示用户或阻止流程，当前不阻止
|
||||
} else {
|
||||
console.log("订单套餐信息已提前更新");
|
||||
}
|
||||
} catch (updateError) {
|
||||
console.error("更新订单套餐信息时出错:", updateError);
|
||||
// 即使更新失败，也继续尝试跳转支付，让用户完成支付
|
||||
}
|
||||
// --- 更新结束 ---
|
||||
|
||||
// --- 新增：计算总金额 ---
|
||||
const deposit = 99.00; // 固定押金
|
||||
const packagePrice = parseFloat(selectedPkg.price);
|
||||
const totalAmount = (deposit + packagePrice).toFixed(2);
|
||||
// --- 计算结束 ---
|
||||
|
||||
uni.hideLoading()
|
||||
|
||||
// 跳转到订单支付页面，传递订单ID和套餐信息
|
||||
// 跳转到订单支付页面，传递订单ID、套餐信息和总金额
|
||||
uni.redirectTo({
|
||||
url: `/pages/order/payment?orderId=${order.orderId}&packageTime=${selectedPkg.time}&packagePrice=${selectedPkg.price}`
|
||||
url: `/pages/order/payment?orderId=${order.orderId}&packageTime=${selectedPkg.time}&packagePrice=${selectedPkg.price}&totalAmount=${totalAmount}`
|
||||
})
|
||||
} catch (error) {
|
||||
uni.hideLoading()
|
||||
|
||||
Binary file not shown.
@@ -9,9 +9,15 @@
|
||||
wxLogin,
|
||||
} from '../../../util/index'
|
||||
|
||||
import {
|
||||
getMyIndexInfo
|
||||
} from "../../../config/user.js";
|
||||
import {
|
||||
queryHasOrder
|
||||
} from '@/config/user.js'
|
||||
} from "../../../config/user.js";
|
||||
import {
|
||||
checkOrdersByStatus
|
||||
} from "../../../config/user.js";
|
||||
|
||||
export default {
|
||||
data() {
|
||||
@@ -20,46 +26,79 @@
|
||||
}
|
||||
},
|
||||
async onLoad(option) {
|
||||
console.log('bagCheck onLoad option:', option);
|
||||
try {
|
||||
uni.showLoading({
|
||||
title: '加载中...'
|
||||
title: '处理中...',
|
||||
mask: true
|
||||
});
|
||||
|
||||
if (!uni.getStorageSync('token')) {
|
||||
await wxLogin();
|
||||
// 检查是否传入设备编号
|
||||
if (!option || !option.deviceNo) {
|
||||
throw new Error('未识别到设备编号');
|
||||
}
|
||||
|
||||
if (!option.deviceNo) {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: '设备编号不能为空',
|
||||
icon: 'none'
|
||||
});
|
||||
return;
|
||||
}
|
||||
const deviceNo = option.deviceNo;
|
||||
|
||||
// 查询用户是否有使用中(in_used)的订单
|
||||
const result = await queryHasOrder(option.deviceNo);
|
||||
uni.hideLoading();
|
||||
// 检查用户是否有进行中(in_used)或待支付(waiting_for_payment)的订单
|
||||
const statusesToCheck = ['in_used', 'waiting_for_payment'];
|
||||
const res = await checkOrdersByStatus(deviceNo, statusesToCheck);
|
||||
|
||||
if (result.data && result.data.data && result.data.data.length > 0) {
|
||||
// 如果有使用中的订单，直接跳转到归还页面
|
||||
uni.redirectTo({
|
||||
url: `/pages/device/return?deviceNo=${option.deviceNo}`
|
||||
});
|
||||
if (res.code === 200 && res.data && res.data.length > 0) {
|
||||
// 找到相关订单，取最新的一条
|
||||
const latestOrder = res.data[0]; // 假设返回结果按时间倒序
|
||||
|
||||
if (latestOrder.orderStatus === 'in_used') {
|
||||
// 如果是使用中的订单，跳转到归还页面
|
||||
console.log('检测到使用中订单，跳转归还页:', latestOrder.orderId);
|
||||
uni.redirectTo({
|
||||
url: `/pages/device/return?orderId=${latestOrder.orderId}`
|
||||
});
|
||||
} else if (latestOrder.orderStatus === 'waiting_for_payment') {
|
||||
// 如果是待支付订单，跳转到支付页面，并传递必要信息
|
||||
console.log('检测到待支付订单，跳转支付页:', latestOrder.orderId);
|
||||
const packageTime = latestOrder.packageTime ? `${latestOrder.packageTime / 60}小时` : '默认套餐'; // 示例转换
|
||||
const packagePrice = latestOrder.packagePrice || '0.00';
|
||||
const depositAmount = latestOrder.depositAmount || '99.00';
|
||||
const totalAmount = (parseFloat(depositAmount) + parseFloat(packagePrice)).toFixed(2);
|
||||
|
||||
uni.redirectTo({
|
||||
url: `/pages/order/payment?orderId=${latestOrder.orderId}&packageTime=${packageTime}&packagePrice=${packagePrice}&totalAmount=${totalAmount}&depositAmount=${depositAmount}`
|
||||
});
|
||||
} else {
|
||||
// 其他状态（理论上不应该到这里，除非statusesToCheck配置错误），默认到详情页
|
||||
console.log('检测到其他状态订单，跳转详情页:', latestOrder.orderId);
|
||||
uni.redirectTo({
|
||||
url: `/pages/device/detail?deviceNo=${deviceNo}`
|
||||
});
|
||||
}
|
||||
} else {
|
||||
// 如果没有使用中的订单，跳转到设备详情页面进行租借
|
||||
// 没有找到相关状态的订单，跳转到设备详情页进行租借
|
||||
console.log('未检测到相关订单，跳转详情页');
|
||||
uni.redirectTo({
|
||||
url: `/pages/device/detail?deviceNo=${option.deviceNo}`
|
||||
url: `/pages/device/detail?deviceNo=${deviceNo}`
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
uni.hideLoading();
|
||||
console.error('扫码检查订单失败:', error);
|
||||
uni.showToast({
|
||||
title: '页面加载失败，请重试',
|
||||
icon: 'none'
|
||||
title: error.message || '处理失败，请稍后重试',
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
console.error('bagCheck onLoad error:', error);
|
||||
// 错误时也尝试跳转到详情页，给用户一个操作入口
|
||||
setTimeout(() => {
|
||||
if (option && option.deviceNo) {
|
||||
uni.redirectTo({
|
||||
url: `/pages/device/detail?deviceNo=${option.deviceNo}`
|
||||
});
|
||||
} else {
|
||||
// 如果连deviceNo都没有，则返回首页
|
||||
uni.switchTab({ url: '/pages/index/index' });
|
||||
}
|
||||
}, 2000);
|
||||
} finally {
|
||||
uni.hideLoading();
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
Reference in New Issue
Block a user