Browse Source

fix(订单管理): 修复服务日期验证和提现流程问题

恢复服务日期未到的打卡验证逻辑
简化提现流程,移除确认弹窗并优化错误提示
master
主管理员 2 weeks ago
parent
commit
fb46973c55
2 changed files with 12 additions and 39 deletions
  1. +3
    -30
      otherPages/myOrdersManage/transaction/index.vue
  2. +9
    -9
      pages/myOrdersManage/components/timelineService.vue

+ 3
- 30
otherPages/myOrdersManage/transaction/index.vue View File

@ -139,41 +139,14 @@
try { try {
console.log('开始领取提现,item:', item) console.log('开始领取提现,item:', item)
//
const confirmResult = await new Promise((resolve) => {
uni.showModal({
title: '确认领取',
content: `确定要领取¥${item.amount}吗?`,
success: (res) => {
resolve(res.confirm)
}
})
})
if (!confirmResult) {
return
}
uni.showLoading({
title: '处理中...'
})
// //
if (typeof wx === 'undefined' || !wx.canIUse('requestMerchantTransfer')) { if (typeof wx === 'undefined' || !wx.canIUse('requestMerchantTransfer')) {
console.log('微信API不可用,尝试直接调用后端接口')
// API
const result = await withdrawalSuccessful({
id: item.id,
userId: store.state.user.userInfo.userId
})
console.log('withdrawalSuccessful result:', result)
console.log('微信API不可用')
uni.hideLoading() uni.hideLoading()
if (result.code === 200) { if (result.code === 200) {
uni.showToast({ uni.showToast({
title: '领取成功',
icon: 'success',
title: '领取失败,请将微信升级到最新版本',
icon: 'icon',
duration: 1500, duration: 1500,
success() { success() {
// //


+ 9
- 9
pages/myOrdersManage/components/timelineService.vue View File

@ -193,15 +193,15 @@
today.setHours(0, 0, 0, 0); today.setHours(0, 0, 0, 0);
serviceDate.setHours(0, 0, 0, 0); serviceDate.setHours(0, 0, 0, 0);
// if (serviceDate > today) {
// //
// uni.showToast({
// title: '',
// icon: 'none',
// duration: 2000
// });
// return;
// }
if (serviceDate > today) {
//
uni.showToast({
title: '服务日期未到,无法打卡',
icon: 'none',
duration: 2000
});
return;
}
// //
const paths = [ const paths = [


Loading…
Cancel
Save