fix: 商家订单以API为准,菜单与permission_codes对齐
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -143,18 +143,11 @@ import { ElMessage } from 'element-plus'
|
||||
import { Refresh } from '@element-plus/icons-vue'
|
||||
import request from '@/utils/request'
|
||||
import ClubScopeHint from '@/components/ClubScopeHint.vue'
|
||||
import {
|
||||
canShowMenuPage,
|
||||
clearMenuAccess,
|
||||
ensureMenuAccess,
|
||||
JITUAN_API,
|
||||
} from '@/utils/club-context'
|
||||
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
const loading = ref(false)
|
||||
const hasPermission = ref(true)
|
||||
const menuRetried = ref(false)
|
||||
|
||||
const PAGE_SIZE = 20
|
||||
const pageNum = ref(1)
|
||||
@@ -223,12 +216,8 @@ const fetchOrderTypes = async () => {
|
||||
}
|
||||
}
|
||||
|
||||
// 商家订单列表接口
|
||||
// 商家订单列表:以 API 权限为准,不用前端菜单缓存拦截
|
||||
const fetchOrders = async () => {
|
||||
if (!canShowMenuPage('order.merchant')) {
|
||||
hasPermission.value = false
|
||||
return
|
||||
}
|
||||
loading.value = true
|
||||
try {
|
||||
const phone = localStorage.getItem('username')
|
||||
@@ -270,18 +259,6 @@ const fetchOrders = async () => {
|
||||
]
|
||||
}
|
||||
} else if (res.code === 403) {
|
||||
if (!menuRetried.value) {
|
||||
menuRetried.value = true
|
||||
clearMenuAccess()
|
||||
await ensureMenuAccess(async () => {
|
||||
const r = await request.get(JITUAN_API.menuAccess)
|
||||
return r.code === 0 ? r.data : null
|
||||
})
|
||||
if (canShowMenuPage('order.merchant')) {
|
||||
await fetchOrders()
|
||||
return
|
||||
}
|
||||
}
|
||||
hasPermission.value = false
|
||||
} else {
|
||||
ElMessage.error(res.msg || '获取订单列表失败')
|
||||
@@ -385,8 +362,6 @@ const getStatusType = (code) => {
|
||||
watch(() => route.query, () => { restoreFromQuery(); fetchOrders() }, { deep: true })
|
||||
|
||||
onMounted(() => {
|
||||
hasPermission.value = canShowMenuPage('order.merchant')
|
||||
if (!hasPermission.value) return
|
||||
restoreFromQuery()
|
||||
fetchOrderTypes()
|
||||
fetchOrders()
|
||||
|
||||
Reference in New Issue
Block a user