优化
This commit is contained in:
parent
bf968996b0
commit
c328d0e9fb
@ -1,10 +1,14 @@
|
|||||||
import { ref, reactive, onMounted } from 'vue'
|
import { ref, reactive, onMounted } from 'vue'
|
||||||
import { useRouter } from 'vue-router'
|
import { useRouter } from 'vue-router'
|
||||||
import {getBankBalance, getMemberProfile, getTeamMemberWorkStatistics} from '../api/wallet.js'
|
import {
|
||||||
|
getBankBalance,
|
||||||
|
getMemberProfile,
|
||||||
|
getTeamMemberWorkStatistics
|
||||||
|
} from '../api/wallet.js'
|
||||||
import { connectApplication, parseAccessOrigin, parseHeader, setHttpHeaders, isInApp } from '../utils/appBridge.js'
|
import { connectApplication, parseAccessOrigin, parseHeader, setHttpHeaders, isInApp } from '../utils/appBridge.js'
|
||||||
import { appConnectionManager, isAppConnected, getAppHeaderInfo } from '../utils/appConnectionManager.js'
|
import { appConnectionManager, isAppConnected, getAppHeaderInfo } from '../utils/appConnectionManager.js'
|
||||||
import { checkAndRedirect } from '../utils/routeGuard.js'
|
import { checkAndRedirect } from '../utils/routeGuard.js'
|
||||||
import { getUserId } from '../utils/userStore.js'
|
import {getUserId, getUserProfile} from '../utils/userStore.js'
|
||||||
import { showError } from '../utils/toast.js'
|
import { showError } from '../utils/toast.js'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -195,11 +199,18 @@ export function usePageInitialization(options = {}) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const fetchUserInfo = async () => {
|
const fetchUserInfo = async () => {
|
||||||
const res = await getMemberProfile()
|
const userProfile = getUserProfile();
|
||||||
if (res.status && res.body) {
|
if (!userProfile) {
|
||||||
userInfo.id = res.body.account
|
const res = await getMemberProfile()
|
||||||
userInfo.userNickname = res.body.userNickname
|
if (res.status && res.body) {
|
||||||
userInfo.userAvatar = res.body.userAvatar
|
userInfo.id = res.body.account
|
||||||
|
userInfo.userNickname = res.body.userNickname
|
||||||
|
userInfo.userAvatar = res.body.userAvatar
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
userInfo.id = userProfile.account
|
||||||
|
userInfo.userNickname = userProfile.userNickname
|
||||||
|
userInfo.userAvatar = userProfile.userAvatar
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -252,6 +252,7 @@ const {
|
|||||||
} = usePageInitializationWithConfig('AGENCY_CENTER', {
|
} = usePageInitializationWithConfig('AGENCY_CENTER', {
|
||||||
onDataLoaded: (data) => {
|
onDataLoaded: (data) => {
|
||||||
fetchTeamMemberCount()
|
fetchTeamMemberCount()
|
||||||
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -96,7 +96,7 @@ import { ref, computed } from 'vue'
|
|||||||
import { useRouter } from 'vue-router'
|
import { useRouter } from 'vue-router'
|
||||||
import MobileHeader from '../components/MobileHeader.vue'
|
import MobileHeader from '../components/MobileHeader.vue'
|
||||||
import { getSelectedUser } from '../utils/coinSellerStore.js'
|
import { getSelectedUser } from '../utils/coinSellerStore.js'
|
||||||
import { checkFreightDealer, getTeamEntry, getFreightBalance, freightRecharge } from '../api/wallet.js'
|
import { checkFreightDealer, getFreightBalance, freightRecharge } from '../api/wallet.js'
|
||||||
import {showError, showSuccess} from "@/utils/toast.js";
|
import {showError, showSuccess} from "@/utils/toast.js";
|
||||||
import {usePageInitializationWithConfig} from "@/utils/pageConfig.js";
|
import {usePageInitializationWithConfig} from "@/utils/pageConfig.js";
|
||||||
|
|
||||||
@ -141,26 +141,6 @@ const checkDealerAccess = async () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取用户信息
|
|
||||||
const fetchUserInfo = async () => {
|
|
||||||
try {
|
|
||||||
const response = await getTeamEntry()
|
|
||||||
|
|
||||||
if (response && response.status && response.body && response.body.memberProfile) {
|
|
||||||
const profile = response.body.memberProfile
|
|
||||||
userInfo.value = {
|
|
||||||
name: profile.userNickname || 'User',
|
|
||||||
id: profile.account || profile.id,
|
|
||||||
userNickname: profile.userNickname,
|
|
||||||
account: profile.account,
|
|
||||||
userAvatar: profile.userAvatar
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('获取用户信息失败:', error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 获取金币余额
|
// 获取金币余额
|
||||||
const fetchFreightBalance = async () => {
|
const fetchFreightBalance = async () => {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@ -43,26 +43,12 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { ref, onMounted } from 'vue'
|
import { ref, onMounted } from 'vue'
|
||||||
import MobileHeader from '../components/MobileHeader.vue'
|
import MobileHeader from '../components/MobileHeader.vue'
|
||||||
import { getFreightWaterFlow, getTeamEntry } from '../api/wallet.js'
|
import { getFreightWaterFlow } from '../api/wallet.js'
|
||||||
import {formatUTCTime} from "@/utils/utcFormat.js";
|
import {formatUTCTime} from "@/utils/utcFormat.js";
|
||||||
|
import {getUserId} from "@/utils/userStore.js";
|
||||||
|
|
||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
const records = ref([])
|
const records = ref([])
|
||||||
const currentUserId = ref(null)
|
|
||||||
|
|
||||||
// 获取当前用户ID
|
|
||||||
const fetchCurrentUserId = async () => {
|
|
||||||
try {
|
|
||||||
const response = await getTeamEntry()
|
|
||||||
if (response && response.status && response.body && response.body.memberProfile) {
|
|
||||||
currentUserId.value = response.body.memberProfile.id
|
|
||||||
return response.body.memberProfile.id
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('获取用户ID失败:', error)
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
// 获取交易类型显示
|
// 获取交易类型显示
|
||||||
const getTransactionType = (type, origin) => {
|
const getTransactionType = (type, origin) => {
|
||||||
@ -86,7 +72,7 @@ const fetchRecords = async () => {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
// 先获取用户ID
|
// 先获取用户ID
|
||||||
const userId = currentUserId.value || await fetchCurrentUserId()
|
const userId = getUserId()
|
||||||
|
|
||||||
if (!userId) {
|
if (!userId) {
|
||||||
console.error('无法获取用户ID')
|
console.error('无法获取用户ID')
|
||||||
|
|||||||
@ -127,12 +127,6 @@ const handleImageError = (event) => {
|
|||||||
event.target.nextElementSibling.style.display = 'flex'
|
event.target.nextElementSibling.style.display = 'flex'
|
||||||
}
|
}
|
||||||
|
|
||||||
// 删除成员(重命名避免冲突)
|
|
||||||
const handleDeleteMember = (member) => {
|
|
||||||
memberToDelete.value = member
|
|
||||||
showDeleteModal.value = true
|
|
||||||
}
|
|
||||||
|
|
||||||
// 关闭删除模态框
|
// 关闭删除模态框
|
||||||
const closeDeleteModal = () => {
|
const closeDeleteModal = () => {
|
||||||
showDeleteModal.value = false
|
showDeleteModal.value = false
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user