From b781f2810e3482290fa8d85473d6d59252023c6a Mon Sep 17 00:00:00 2001
From: hzj <1304805162@qq.com>
Date: Fri, 14 Nov 2025 16:07:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(j=E6=8F=90=E7=8E=B0=E8=BD=AC=E8=B4=A6?=
 =?UTF-8?q?=E7=9A=84=E8=BF=94=E5=9B=9E=E5=8A=9F=E8=83=BD):=20=E5=B0=86?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=83=BD=E8=AE=BE=E7=BD=AE=E6=88=90=E5=8F=AF?=
 =?UTF-8?q?=E6=90=BA=E5=B8=A6=E5=8F=82=E6=95=B0=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GeneralHeader.vue              | 37 ++++++++++++++++++-
 src/views/Activities/Lottery/Lottery.vue      |  2 +-
 src/views/BDCenter/availableIncome.vue        | 12 ++++--
 src/views/Wallet/CashOut/BankCard.vue         | 13 ++++++-
 src/views/Wallet/CashOut/KYC.vue              | 37 ++++++++++++++++---
 src/views/Wallet/Transfer/SearchPayeeView.vue |  7 ++--
 src/views/Wallet/Transfer/TransferView.vue    |  2 +-
 7 files changed, 92 insertions(+), 18 deletions(-)

diff --git a/src/components/GeneralHeader.vue b/src/components/GeneralHeader.vue
index 7f8f07b..171631d 100644
--- a/src/components/GeneralHeader.vue
+++ b/src/components/GeneralHeader.vue
@@ -88,42 +88,61 @@
 <script setup>
 import { isInApp, closePage } from '@/utils/appBridge.js'
 import { useRouter, useRoute } from 'vue-router'
-import { computed, ref, onMounted, watch } from 'vue'
+import { computed, ref, onMounted, watch, nextTick } from 'vue'
 import { useLangStore } from '@/stores/lang'
 import { setLocale } from '@/locales/i18n'
 
 // 定义props
 const props = defineProps({
+  // 标题
   title: {
     type: String,
     required: true,
   },
+
+  // 是否显示返回按钮
   showBack: {
     type: Boolean,
     default: true,
   },
+
+  // 是否显示帮助按钮
   showHelp: {
     type: Boolean,
     default: false,
   },
+
+  // 是否为首页
   isHomePage: {
     type: Boolean,
     default: false,
   },
+
+  // 是否显示语言列表
   showLanguageList: {
     type: Boolean,
     default: false,
   },
+
+  // 标题颜色
   color: {
     type: String,
     default: '#fff',
   },
+
+  // 返回图标
   backImg: {
     type: String,
     default: () => {
       return new URL('../assets/icon/arrowBack.png', import.meta.url).href
     },
   },
+
+  // 携带参数返回
+  backQuery: {
+    type: Object,
+    default: null,
+  },
 })
 
 // 定义emits
@@ -180,10 +199,24 @@ const handleBack = () => {
   if (isCurrentlyHomePage.value && isInApp()) {
     // 首页且在APP中：关闭页面
     console.log('home back')
-    closePage() // 这个函数似乎未定义，需要确认
+    closePage()
   } else {
     // 非首页或浏览器环境：正常返回
     router.go(-1)
+    if (props.backQuery != null) {
+      console.log('props.backQuery', props.backQuery)
+
+      // 使用 nextTick 确保上一步完成
+      nextTick(() => {
+        // 使用 replace 替换为带参数的版本
+        router.replace({
+          path: props.backQuery.from,
+          query: {
+            activeAction: props.backQuery.activeAction,
+          },
+        })
+      })
+    }
   }
 }
 
diff --git a/src/views/Activities/Lottery/Lottery.vue b/src/views/Activities/Lottery/Lottery.vue
index ba3cdf6..5727466 100644
--- a/src/views/Activities/Lottery/Lottery.vue
+++ b/src/views/Activities/Lottery/Lottery.vue
@@ -1074,7 +1074,7 @@ const clearPayee = () => {
 
 // 前往搜索代理页
 const searchPayee = () => {
-  router.push({ path: '/search-payee', query: { from: 'lottery' } })
+  router.push('/search-payee')
 }
 
 // 前往提现页
diff --git a/src/views/BDCenter/availableIncome.vue b/src/views/BDCenter/availableIncome.vue
index e9d2c1e..b00120f 100644
--- a/src/views/BDCenter/availableIncome.vue
+++ b/src/views/BDCenter/availableIncome.vue
@@ -896,12 +896,15 @@ const fetchBankBalance = async () => {
 
 // 前往提交个人资料
 const gotoKYC = () => {
-  router.push('/KYC')
+  router.push({ path: '/KYC', query: { from: '/available-income', activeAction: 'Cash out' } })
 }
 
 // 前往选择提交方式
 const gotoselectBank = () => {
-  router.push('/bank-card')
+  router.push({
+    path: '/bank-card',
+    query: { from: '/available-income', activeAction: 'Cash out' },
+  })
 }
 
 // 跳转详情
@@ -911,7 +914,10 @@ const showDetails = () => {
 
 // 跳转搜索收款人
 const searchPayee = () => {
-  router.push({ path: '/search-payee', query: { searchType: 'TRANSFER' } })
+  router.push({
+    path: '/search-payee',
+    query: { from: '/available-income', activeAction: 'Transfer' },
+  })
 }
 
 // 处理操作按钮点击
diff --git a/src/views/Wallet/CashOut/BankCard.vue b/src/views/Wallet/CashOut/BankCard.vue
index b251b6d..b66f11f 100644
--- a/src/views/Wallet/CashOut/BankCard.vue
+++ b/src/views/Wallet/CashOut/BankCard.vue
@@ -1,6 +1,12 @@
 <template>
   <div class="fullPage">
-    <GeneralHeader style="width: 100%" title="Bank Card" :showLanguageList="true" color="black" />
+    <GeneralHeader
+      style="width: 100%"
+      title="Bank Card"
+      :showLanguageList="true"
+      color="black"
+      :backQuery="backQuery"
+    />
     <div style="padding: 16px; display: flex; flex-direction: column; gap: 8px">
       <!-- 当前使用的银行卡 -->
       <div style="font-weight: 600">Currently In Use</div>
@@ -312,6 +318,7 @@
 <script setup>
 import { useI18n } from 'vue-i18n'
 import { ref, onMounted, computed } from 'vue'
+import GeneralHeader from '@/components/GeneralHeader.vue'
 import { showError, showWarning, showInfo, showSuccess } from '@/utils/toast.js'
 import { getUserId } from '@/utils/userStore'
 import {
@@ -322,6 +329,10 @@ import {
   useBankCard,
 } from '@/api/wallet'
 import maskLayer from '@/components/MaskLayer.vue'
+import { useRoute } from 'vue-router'
+
+const route = useRoute()
+const backQuery = ref(route.query || null)
 
 const { t } = useI18n()
 
diff --git a/src/views/Wallet/CashOut/KYC.vue b/src/views/Wallet/CashOut/KYC.vue
index a9b90ec..3260032 100644
--- a/src/views/Wallet/CashOut/KYC.vue
+++ b/src/views/Wallet/CashOut/KYC.vue
@@ -1,6 +1,12 @@
 <template>
   <div class="fullPage">
-    <GeneralHeader style="width: 100%" :title="t('kyc')" :showLanguageList="true" color="black" />
+    <GeneralHeader
+      style="width: 100%"
+      :title="t('kyc')"
+      :showLanguageList="true"
+      color="black"
+      :backQuery="backQuery"
+    />
 
     <div style="padding: 16px; display: flex; flex-direction: column; gap: 8px">
       <!-- 银行卡号 -->
@@ -191,9 +197,9 @@
 import { isInApp } from '@/utils/appBridge.js'
 import { useI18n } from 'vue-i18n'
 import GeneralHeader from '@/components/GeneralHeader.vue'
-import { ref, onMounted, computed } from 'vue'
+import { ref, onMounted, computed, nextTick } from 'vue'
 import { showError, showWarning, showInfo, showSuccess } from '@/utils/toast.js'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { uploadImg } from '@/api/upload.js'
 import { setDocumentDirection } from '@/locales/i18n'
 import { getWithdrawInfoList, addWithdrawInfo, updateWithdrawInfo } from '@/api/wallet'
@@ -203,6 +209,8 @@ import { storeToRefs } from 'pinia'
 
 const { t, locale } = useI18n()
 const router = useRouter()
+const route = useRoute()
+const backQuery = ref(route.query || null)
 const lastImgStore = useLastImgStore()
 // 初始化时从 localStorage 恢复数据
 lastImgStore.initFromStorage()
@@ -359,7 +367,24 @@ const Submit = () => {
       console.log('添加信息：', applyInfo.value)
       addWithdrawInfoData()
     }
-    // router.go(-1)
+    // 先返回到 availableIncome (原始状态)
+    router.go(-1)
+
+    // 检查是否来自 availableIncome 页面
+    if (route.query) {
+      console.log('route.query:', route.query)
+
+      // 使用 nextTick 确保上一步完成
+      nextTick(() => {
+        // 然后使用 replace 替换为带参数的版本
+        router.replace({
+          path: route.query.from,
+          query: {
+            activeAction: route.query.activeAction,
+          },
+        })
+      })
+    }
   }
 }
 
@@ -386,7 +411,7 @@ const addWithdrawInfoData = async () => {
     const resAddWithdrawInfo = await addWithdrawInfo(applyInfo.value)
     if (resAddWithdrawInfo.status) {
       showSuccess(t('application_submitted'))
-      getWithdrawInfoListData() // 重新获取提现信息列表
+      // getWithdrawInfoListData() // 重新获取提现信息列表
     }
   } catch (error) {
     showError(error.response?.errorMsg)
@@ -400,7 +425,7 @@ const updateWithdrawInfoData = async () => {
     const resUpdateWithdrawInfo = await updateWithdrawInfo(applyInfo.value)
     if (resUpdateWithdrawInfo.status) {
       showSuccess(t('application_submitted'))
-      getWithdrawInfoListData() // 重新获取提现信息列表
+      // getWithdrawInfoListData() // 重新获取提现信息列表
     }
   } catch (error) {
     showError(error.response?.errorMsg)
diff --git a/src/views/Wallet/Transfer/SearchPayeeView.vue b/src/views/Wallet/Transfer/SearchPayeeView.vue
index 60d8ed5..6726e07 100644
--- a/src/views/Wallet/Transfer/SearchPayeeView.vue
+++ b/src/views/Wallet/Transfer/SearchPayeeView.vue
@@ -7,6 +7,7 @@
       :showLanguageList="true"
       color="black"
       style="box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); z-index: 999"
+      :backQuery="backQuery"
     />
 
     <div class="content">
@@ -233,6 +234,7 @@ import { setDocumentDirection } from '@/locales/i18n'
 const { t, locale } = useI18n()
 const router = useRouter()
 const route = useRoute()
+const backQuery = ref(route.query || null)
 
 // 监听语言变化并设置文档方向
 locale.value && setDocumentDirection(locale.value)
@@ -291,10 +293,7 @@ const performSearch = async () => {
   hasSearched.value = false
 
   try {
-    const response = await userBankSearchUserProfile(
-      searchQuery.value.trim(),
-      route.query?.searchType || ''
-    )
+    const response = await userBankSearchUserProfile(searchQuery.value.trim(), 'TRANSFER')
 
     if (response.status && response.body) {
       // 根据新的API返回数据结构进行映射
diff --git a/src/views/Wallet/Transfer/TransferView.vue b/src/views/Wallet/Transfer/TransferView.vue
index f56e5de..ed44a83 100644
--- a/src/views/Wallet/Transfer/TransferView.vue
+++ b/src/views/Wallet/Transfer/TransferView.vue
@@ -297,7 +297,7 @@ const showDetails = () => {
 }
 
 const searchPayee = () => {
-  router.push({ path: '/search-payee', query: { searchType: 'TRANSFER' } })
+  router.push('/search-payee')
 }
 
 // 清除当前选中的收款人