diff --git a/src/api/wallet.js b/src/api/wallet.js index bf991ec..d1f9e4f 100644 --- a/src/api/wallet.js +++ b/src/api/wallet.js @@ -46,10 +46,17 @@ export function userBankTransfer(data) { * 搜索用户资料 * @param {string} type - 用户类型 (AGENT/BD/ANCHOR) * @param {string} account - 用户账号/ID + * @param {string} searchType - 搜索类型 * @returns {Promise} 返回用户资料 */ -export function userBankSearchUserProfile(account) { - return get(`/wallet/bank/search/user-profile?account=${account}&type=AGENT`) +export function userBankSearchUserProfile(account, searchType = '') { + if (searchType == '') { + return get(`/wallet/bank/search/user-profile?account=${account}&type=AGENT`) + } else { + return get( + `/wallet/bank/search/user-profile?account=${account}&type=AGENT&searchType=${searchType}` + ) + } } /** diff --git a/src/router/index.js b/src/router/index.js index 2732575..3552b8e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -55,7 +55,7 @@ const router = createRouter({ { path: '/transfer', name: 'transfer', - component: () => import('../views/TransferView.vue'), + component: () => import('../views/Wallet/Transfer/TransferView.vue'), meta: { requiresAuth: true }, }, { @@ -85,7 +85,7 @@ const router = createRouter({ { path: '/search-payee', name: 'search-payee', - component: () => import('../views/SearchPayeeView.vue'), + component: () => import('../views/Wallet/Transfer/SearchPayeeView.vue'), meta: { requiresAuth: true }, }, { diff --git a/src/views/BDCenter/availableIncome.vue b/src/views/BDCenter/availableIncome.vue index daaed5f..e8dc33d 100644 --- a/src/views/BDCenter/availableIncome.vue +++ b/src/views/BDCenter/availableIncome.vue @@ -910,7 +910,7 @@ const showDetails = () => { // 跳转搜索收款人 const searchPayee = () => { - router.push('/search-payee') + router.push({ path: '/search-payee', query: { searchType: 'TRANSFER' } }) } // 处理操作按钮点击 diff --git a/src/views/SearchPayeeView.vue b/src/views/Wallet/Transfer/SearchPayeeView.vue similarity index 80% rename from src/views/SearchPayeeView.vue rename to src/views/Wallet/Transfer/SearchPayeeView.vue index 96402a8..60d8ed5 100644 --- a/src/views/SearchPayeeView.vue +++ b/src/views/Wallet/Transfer/SearchPayeeView.vue @@ -2,7 +2,7 @@
- + route.query?.from == 'lottery') -const pageTitle = computed(() => - route.query?.from == 'lottery' ? t('add_recharge_agent') : t('search_payee') -) - const searchQuery = ref('') const searchResults = ref([]) const isSearching = ref(false) @@ -249,105 +244,10 @@ const hasSearched = ref(false) const userRole = ref('') const isLoadingRole = ref(false) const selectedUserType = ref('') -const showTypeSelector = ref(false) const maskLayerShow = ref(false) const selectedUser = ref({}) -// 模拟用户数据 - 根据角色显示不同的用户 -const allUsers = { - TEAM_OWN: [ - { - id: '1234567890', - name: 'Agent User', - type: 'AGENT', - isHost: false, - isAgency: true, - hasSalary: false, - }, - { - id: '0987654321', - name: 'BD Manager', - type: 'BD', - isHost: false, - isAgency: true, - hasSalary: true, - }, - { - id: '1122334455', - name: 'Host Anchor', - type: 'ANCHOR', - isHost: true, - isAgency: false, - hasSalary: true, - }, - ], - TEAM_MEMBER: [ - { - id: '1234567890', - name: 'Team Agent', - type: 'AGENT', - isHost: false, - isAgency: true, - hasSalary: false, - }, - { - id: '0987654321', - name: 'BD Manager', - type: 'BD', - isHost: false, - isAgency: true, - hasSalary: true, - }, - ], - BD: [ - { - id: '1234567890', - name: 'Agent User', - type: 'AGENT', - isHost: false, - isAgency: true, - hasSalary: false, - }, - ], - default: [ - { - id: '1234567890', - name: 'Default User', - type: 'USER', - isHost: false, - isAgency: false, - hasSalary: false, - }, - ], -} - -// 根据角色获取可搜索的用户列表 -const availableUsers = computed(() => { - return allUsers[userRole.value] || allUsers['default'] -}) - -// 根据用户角色获取可选择的用户类型 -// const availableUserTypes = computed(() => { -// switch (userRole.value) { -// case 'TEAM_OWN': -// return [ -// { label: 'Agent', value: 'AGENT' }, -// { label: 'BD Manager', value: 'BD' }, -// { label: 'Anchor', value: 'ANCHOR' }, -// ] -// case 'TEAM_MEMBER': -// return [ -// { label: 'Agent', value: 'AGENT' }, -// { label: 'BD Manager', value: 'BD' }, -// ] -// case 'BD': -// return [{ label: 'Agent', value: 'AGENT' }] -// default: -// return [{ label: 'User', value: 'USER' }] -// } -// }) - // 检查用户转账角色 const checkUserRole = async () => { isLoadingRole.value = true @@ -391,7 +291,10 @@ const performSearch = async () => { hasSearched.value = false try { - const response = await userBankSearchUserProfile(searchQuery.value.trim()) + const response = await userBankSearchUserProfile( + searchQuery.value.trim(), + route.query?.searchType || '' + ) if (response.status && response.body) { // 根据新的API返回数据结构进行映射 @@ -435,11 +338,7 @@ const clearSearch = () => { // 选择用户 const selectUser = (user) => { selectedUser.value = user - if (fromLottery.value) { - maskLayerShow.value = true - } else { - Confirm() - } + maskLayerShow.value = true } const Cancel = () => { @@ -450,26 +349,9 @@ const Cancel = () => { const Confirm = () => { // 将选中的用户信息保存到全局状态 setSelectedPayee({ ...selectedUser.value }) - - // 返回到 Transfer 页面 - // router.push('/transfer') router.go(-1) } -// 获取角色描述 -const getRoleDescription = (role) => { - switch (role) { - case 'TEAM_OWN': - return 'Agents, BD Managers, Anchors' - case 'TEAM_MEMBER': - return 'Agents, BD Managers' - case 'BD': - return 'Agents' - default: - return 'Users' - } -} - watch( () => searchQuery.value, () => { diff --git a/src/views/TransferView.vue b/src/views/Wallet/Transfer/TransferView.vue similarity index 95% rename from src/views/TransferView.vue rename to src/views/Wallet/Transfer/TransferView.vue index ae11a6e..f56e5de 100644 --- a/src/views/TransferView.vue +++ b/src/views/Wallet/Transfer/TransferView.vue @@ -24,7 +24,7 @@
{{ t('details') }}
- + @@ -181,7 +186,7 @@ @click="selectCoin(coin)" :class="['coin-item', { selected: selectedCoin === coin.id }]" > - +
${{ coin.price }}
@@ -208,8 +213,8 @@ import { ref, reactive, onMounted, onUnmounted } from 'vue' import { useI18n } from 'vue-i18n' import { useRouter } from 'vue-router' import GeneralHeader from '@/components/GeneralHeader.vue' -import { getBankBalance, userBankTransfer } from '../api/wallet.js' -import { getSelectedPayee, clearSelectedPayee } from '../utils/payeeStore.js' +import { getBankBalance, userBankTransfer } from '@/api/wallet.js' +import { getSelectedPayee, clearSelectedPayee } from '@/utils/payeeStore.js' import { showError, showSuccess } from '@/utils/toast.js' import { setDocumentDirection } from '@/locales/i18n' @@ -292,7 +297,7 @@ const showDetails = () => { } const searchPayee = () => { - router.push('/search-payee') + router.push({ path: '/search-payee', query: { searchType: 'TRANSFER' } }) } // 清除当前选中的收款人