diff --git a/src/config/constants/julyIteration.ts b/src/config/constants/julyIteration.ts index b13d4e0..f3f2b56 100644 --- a/src/config/constants/julyIteration.ts +++ b/src/config/constants/julyIteration.ts @@ -5,9 +5,14 @@ export const JULY_PERMISSIONS = { wecom: { page: 'wecom:config', - application: 'wecom:application', - member: 'wecom:member', - scene: 'wecom:scene', + applicationCreate: 'wecom:application_create', + applicationTest: 'wecom:application_test', + applicationEdit: 'wecom:application_edit', + memberManage: 'wecom:member_manage', + memberSync: 'wecom:member_sync', + memberDefaultCreator: 'wecom:member_default_creator', + sceneCreate: 'wecom:scene_create', + sceneEdit: 'wecom:scene_edit', binding: 'wecom:account_binding' }, systemConfig: { diff --git a/src/views/account-management/account/index.vue b/src/views/account-management/account/index.vue index a4c8669..32a91e9 100644 --- a/src/views/account-management/account/index.vue +++ b/src/views/account-management/account/index.vue @@ -291,7 +291,6 @@ @@ -759,7 +763,10 @@ remove: true } ] - await ShopSeriesGrantService.manageGrantPackages(grantId.value, { packages }) + await ShopSeriesGrantService.manageGrantPackages(grantId.value, { + expiry_base_override: row.expiry_base_override ?? null, + packages + }) await fetchPackageList() } catch (error) { console.error(error) @@ -858,6 +865,19 @@ flex: 1; } + .package-config-cost { + display: flex; + flex-shrink: 0; + gap: 8px; + align-items: center; + } + + .package-config-field-label { + color: var(--el-text-color-secondary); + font-size: 13px; + white-space: nowrap; + } + .ellipsis-value { display: block; width: 260px; diff --git a/src/views/settings/wecom/applications/components/WecomApplicationFormDialog.vue b/src/views/settings/wecom/applications/components/WecomApplicationFormDialog.vue index 97ea356..f3d8eeb 100644 --- a/src/views/settings/wecom/applications/components/WecomApplicationFormDialog.vue +++ b/src/views/settings/wecom/applications/components/WecomApplicationFormDialog.vue @@ -76,22 +76,8 @@ @@ -102,7 +88,6 @@ import { ElMessage } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus' import { WecomService } from '@/api/modules' - import { JULY_PERMISSIONS } from '@/config/constants' import type { WecomApplication } from '@/types/api' defineOptions({ name: 'WecomApplicationFormDialog' }) diff --git a/src/views/settings/wecom/applications/index.vue b/src/views/settings/wecom/applications/index.vue index 10e8013..aa1dfaf 100644 --- a/src/views/settings/wecom/applications/index.vue +++ b/src/views/settings/wecom/applications/index.vue @@ -9,7 +9,7 @@ >