diff --git a/src/bundle/parten/pages/withdraw/progress.vue b/src/bundle/parten/pages/withdraw/progress.vue index cc90686..e588fde 100644 --- a/src/bundle/parten/pages/withdraw/progress.vue +++ b/src/bundle/parten/pages/withdraw/progress.vue @@ -33,7 +33,7 @@ - + @@ -48,7 +48,7 @@ {{ billDetails.order.dtime }} - 到账成功 + {{ billDetails.status == 1 ? '到账成功' : '审核未通过' }} {{ billDetails.order.update_dtime }} diff --git a/src/bundle/parten/pages/withdraw/withdraw.vue b/src/bundle/parten/pages/withdraw/withdraw.vue index 56d50cd..57e62ec 100644 --- a/src/bundle/parten/pages/withdraw/withdraw.vue +++ b/src/bundle/parten/pages/withdraw/withdraw.vue @@ -92,7 +92,7 @@ 全部提现 - 确定 + 确定 @@ -103,7 +103,7 @@ import { toast } from '@/utils/toast' import { amount } from '@/utils/test' import { router } from '@/utils/tools' - import { getUserInfo } from '@/api/user' + import { getUserInfo, getUserBalance } from '@/api/user' const OSS = inject('OSS') const useStore = useUserStore() @@ -206,8 +206,9 @@ try { await withdrawApply(store.defaultStore.id, money, selectBank.value.id) // 重新获取用户余额 - const balance = await getUserInfo() - useStore.setUserMoney(Number(balance.user_money)) + + const balance = await getUserBalance(store.defaultStore.id) + useStore.setUserMoney(Number(balance.store_msg.balance)) uni.hideLoading toast.success('提现申请提交成功') diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue index 0862191..6669feb 100644 --- a/src/components/Navbar.vue +++ b/src/components/Navbar.vue @@ -30,6 +30,7 @@ */ import { getNavBarHeight } from '@/utils/index' + import { router } from '@/utils/tools' const OSS = inject('OSS') const navbarHeight = ref(0) @@ -78,9 +79,7 @@ const Navbar = { back: () => { - uni.navigateBack({ - delta: 1 - }) + router.navigateBack() } }