用户提现状态修改

pages_mine/pages/income/details.vue

@@ -30,7 +30,7 @@
             v-else
           ></up-steps-item>
           <up-steps-item
-            title="打款失败"
+            title="打款失败（退回余额）"
             v-if="data.isPay === '2'"
             error
           ></up-steps-item>
@@ -145,12 +145,15 @@ const handlClick = async () => {
         }
         const res = await volEetCancelTake(params)
         if (res.code === 200) {
+          setTimeout(() => {
           uni.showToast({
-            title: '撤销提现成功',
+            title: res.msg,
           })
+        }, 1500)
           uni.navigateBack({
             delta: 1,
           })
+          
         } else {
           uni.showToast({
             title: '撤销提现失败',

pages_mine/pages/withdrawal/details.vue

@@ -19,26 +19,32 @@
           <up-steps-item title="发起提现" :desc="data?.createTime">
           </up-steps-item>
           <up-steps-item
-            title="已驳回"
+            :title="`后台处理中（${statusText}）`"
+            :desc="data?.updateTime"
+          ></up-steps-item>
+          <up-steps-item
+            title="审核未通过"
             :desc="data?.rejectReason"
             v-if="data?.appStatus === '3'"
             error
           ></up-steps-item>
-          <up-steps-item
-            title="后台处理中"
+          <!-- <up-steps-item
+            title="已撤销"
             :desc="data?.updateTime"
-            v-else
-          ></up-steps-item>
-          <up-steps-item
-            title="打款失败"
-            v-if="data?.isPay === '2'"
+            v-if="data?.appStatus === '4'"
             error
-          ></up-steps-item>
+          ></up-steps-item> -->
           <up-steps-item
-            title="到账"
+            :title="`打款状态 (${appStatusText})`"
             :desc="data?.lastTime"
             v-if="['1', '0'].includes(data?.isPay)"
           ></up-steps-item>
+
+          <!-- <up-steps-item
+            title="打款失败（退回余额）"
+            v-if="data?.isPay === '2'"
+            error
+          ></up-steps-item> -->
         </up-steps>
       </view>
     </view>
@@ -49,7 +55,11 @@
         <view class="font-30-333" v-else>{{ data?.[item.key] || '-' }}</view>
       </view>
     </view>
-    <button @click="handlClick" class="btn-cancel">撤销提现</button>
+    <button 
+      v-if="(['1', '2'].includes(data?.appStatus) && data?.isPay === '0')"
+      @click="handleClick" 
+      class="btn-cancel"
+    >撤销提现</button>
   </scroll-view>
 </template>
 
@@ -114,6 +124,35 @@ const current = computed(() => {
   return 2
 })
 
+const statusText = computed(() => {
+  switch (data.value?.appStatus) {
+    case '1':
+      return '待审核'
+    case '2':
+      return '审核通过'
+    case '3':
+      return '审核未通过'
+    case '4':
+      return '已撤销'
+    default:
+      return ''
+  }
+})
+
+const appStatusText = computed(() => {
+  switch (data.value?.appStatus) {
+    case '1':
+      return '未打款'
+    case '2':
+      return '打款成功'
+    case '3':
+      return '打款失败'
+    case '4':
+      return '打款驳回'
+    default:
+      return ''
+  }
+})
 const onCustomRefresh = () => {
   getDetails()
 }
@@ -142,32 +181,42 @@ const scrolltolower = () => {
 // }
 
 // 撤销提现
-const handlClick = async () => {
-  uni.showModal({
-    title: '提示',
-    content: '确认要撤销此次提现吗？',
-    success: async function (res) {
-      if (res.confirm) {
-        const params = {
-          volunteerTakeRecordId: data.value?.volunteerTakeRecordId
-        }
-        const res = await volEetCancelTake(params)
-        if (res.code === 200) {
-          uni.showToast({
-            title: '撤销提现成功',
-          })
-          uni.navigateBack({
-            delta: 1,
-          })
-        } else {
+const handleClick = async () => {
+  try {
+    const res = await uni.showModal({
+      title: '提示',
+      content: '确认要撤销此次提现吗？',
+      showCancel: true,
+    })
+
+    if (res.confirm) {
+      const params = {
+        volunteerTakeRecordId: data.value?.volunteerTakeRecordId,
+      }
+      const res = await volEetCancelTake(params)
+      if (res.code === 200) {
+        setTimeout(() => {
           uni.showToast({
-            title: res.msg || '撤销提现失败',
-            icon: 'none'
+            title: res.msg,
           })
-        }
+        }, 1500)
+        uni.navigateBack({
+          delta: 1,
+        })
+      } else {
+        uni.showToast({
+          title: res.msg,
+          icon: 'none',
+        })
       }
-    },
-  })
+    }
+  } catch (error) {
+    console.error('撤销提现失败:', error)
+    uni.showToast({
+      title: res.msg,
+      icon: 'none',
+    })
+  }
 }
 
 onLoad((options) => {
@@ -179,7 +228,7 @@ onLoad((options) => {
       console.error('解析数据失败:', error)
       uni.showToast({
         title: '数据解析失败',
-        icon: 'none'
+        icon: 'none',
       })
     }
   }