优化功能

src/bundle/parten/pages/withdraw/progress.vue

@@ -33,7 +33,7 @@
             </view>
 
             <!-- 进度2-到账成功 -->
-            <view class="mx-98rpx flex" v-if="billDetails.order.status == 1">
+            <view class="mx-98rpx flex" v-if="billDetails.order.status > 0">
                 <view class="mr-44rpx">
                     <wd-img width="22rpx" height="260rpx" :src="`${OSS}images/withdraw/withdraw_image2.png`"></wd-img>
                 </view>
@@ -48,7 +48,7 @@
                         <view class="mt-10rpx text-26rpx leading-36rpx">{{ billDetails.order.dtime }}</view>
                     </view>
                     <view class="mt-44rpx font-400 text-30rpx leading-44rpx">
-                        <view>到账成功</view>
+                        <view>{{ billDetails.status == 1 ? '到账成功' : '审核未通过' }}</view>
                         <view class="mt-10rpx text-26rpx leading-36rpx">{{ billDetails.order.update_dtime }}</view>
                     </view>
                 </view>

src/bundle/parten/pages/withdraw/withdraw.vue

@@ -92,7 +92,7 @@
                 <text class="text-#4C9F44" @click="Withdraw.handleWithdrawAll">全部提现</text>
             </view>
 
-            <view class="mx-48rpx h-90rpx leading-90rpx rounded-8rpx text-center mt-112rpx text-[#fff]" :class="withdrawMoney > 0 ? 'bg-[#4C9F44]' : 'bg-[#A5CFA1]'" @click="Withdraw.handleConfirmwithdrawMoney">确定</view>
+            <view class="mx-48rpx h-90rpx leading-90rpx rounded-8rpx text-center mt-112rpx text-[#fff]" :class="Number(withdrawMoney) > 0 ? 'bg-[#4C9F44]' : 'bg-[#A5CFA1]'" @click="Withdraw.handleConfirmwithdrawMoney">确定</view>
         </view>
     </view>
 </template>
@@ -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('提现申请提交成功')

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<number>(0)
@@ -78,9 +79,7 @@
 
     const Navbar = {
         back: () => {
-            uni.navigateBack({
-                delta: 1
-            })
+            router.navigateBack()
         }
     }
 </script>