Merge branch 'StableVersion' of ssh://18.167.251.121:10002/aidlab/aida_front into StableVersion

This commit is contained in:
X1627315083
2026-01-20 16:48:37 +08:00

View File

@@ -1,5 +1,5 @@
<template>
<div class="admin_page">
<div class="admin_page all-user">
<div class="admin_table_search">
<div class="admin_state">
<div class="admin_state_item">
@@ -85,16 +85,16 @@
v-for="plan in planFilterOptions"
:key="plan.id"
class="plan_item"
:class="{
:class="{
active: subscriptionPlanId === plan.id,
disabled: plan.status === 'PENDING'
}"
@click="plan.status !== 'PENDING' && selectPlanFilter(plan.id)"
>
<span class="plan_name">{{ plan.name }}</span>
<MoreOutlined
class="plan_more_icon"
@click.stop="plan.status !== 'PENDING' && openPlanRenameModal(plan)"
<MoreOutlined
class="plan_more_icon"
@click.stop="plan.status !== 'PENDING' && openPlanRenameModal(plan)"
/>
</div>
</div>
@@ -435,7 +435,7 @@ export default defineComponent({
if (!orgId) return
Https.axiosPost(Https.httpUrls.searchSubscribeByOrg, {
organizationId: orgId,
status: ['ACTIVE','PENDING']
status: ['ACTIVE', 'PENDING']
}).then(res => {
// 将与当前用户 subscriptionPlanId 相同的订阅计划放到第一个
const userSubscriptionPlanId = store.state.UserHabit.userDetail.subscriptionPlanId
@@ -459,7 +459,8 @@ export default defineComponent({
orgId => {
if (orgId) {
fetchSubscribePlanList()
const userSubscriptionPlanId = store.state.UserHabit.userDetail.subscriptionPlanId
const userSubscriptionPlanId =
store.state.UserHabit.userDetail.subscriptionPlanId
if (userSubscriptionPlanId) {
selectPlanFilter(userSubscriptionPlanId)
}
@@ -766,4 +767,11 @@ export default defineComponent({
}
}
}
.all-user {
.admin_table_content {
:deep(.ant-table-wrapper) {
overflow: hidden;
}
}
}
</style>