From 8132724134da2dcc1a23d38b1a8fffe0ceb26fc3 Mon Sep 17 00:00:00 2001 From: AceDataCloud <office@acedata.cloud> Date: Sat, 10 Aug 2024 01:21:24 +0800 Subject: [PATCH 1/3] fix pkg --- src/models/api.ts | 7 +++++++ src/models/application.ts | 3 ++- src/pages/console/application/Buy.vue | 1 + src/pages/console/order/Detail.vue | 3 --- src/pages/distribution/Index.vue | 6 +++++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/models/api.ts b/src/models/api.ts index 73ccfb79..b6272ec0 100644 --- a/src/models/api.ts +++ b/src/models/api.ts @@ -45,10 +45,17 @@ export interface IResponse { headers: ISchema; } +export enum IPackageType { + PERIOD = 'Period', + USAGE = 'Usage' +} + export interface IPackage { id: string; amount: number; price: number; + type?: IPackageType; + duration?: number; } export enum IApiUnit { diff --git a/src/models/application.ts b/src/models/application.ts index 65ba0b2c..432ed147 100644 --- a/src/models/application.ts +++ b/src/models/application.ts @@ -2,7 +2,8 @@ import { ICredential } from './credential'; import { IService } from './service'; export enum IApplicationType { - API = 'Api' + USAGE = 'Usage', + PERIOD = 'Period' } export interface IApplication { diff --git a/src/pages/console/application/Buy.vue b/src/pages/console/application/Buy.vue index 90e53188..affd601f 100644 --- a/src/pages/console/application/Buy.vue +++ b/src/pages/console/application/Buy.vue @@ -20,6 +20,7 @@ <el-radio-group v-if="application?.service?.packages" v-model="form.packageId"> <el-radio-button v-for="(pkg, pkgIndex) in application?.service.packages" + v-show="pkg.type === 'Usage'" :key="pkgIndex" :label="pkg.id" class="mb-2" diff --git a/src/pages/console/order/Detail.vue b/src/pages/console/order/Detail.vue index 8ec45c01..148ab903 100644 --- a/src/pages/console/order/Detail.vue +++ b/src/pages/console/order/Detail.vue @@ -30,9 +30,6 @@ <span v-if="order?.pay_way === PayWay.WechatPay">{{ $t('order.title.wechatPay') }}</span> <span v-if="order?.pay_way === PayWay.Stripe">{{ $t('order.title.stripe') }}</span> </el-descriptions-item> - <el-descriptions-item :label="$t('order.field.amount')"> - {{ order?.amount }} {{ $t(`service.unit.${order?.application?.service?.unit}`) }} - </el-descriptions-item> <el-descriptions-item :label="$t('order.field.createdAt')"> {{ $dayjs.format(order?.created_at) }} </el-descriptions-item> diff --git a/src/pages/distribution/Index.vue b/src/pages/distribution/Index.vue index 84566eb8..2c45b59d 100644 --- a/src/pages/distribution/Index.vue +++ b/src/pages/distribution/Index.vue @@ -149,7 +149,8 @@ <qr-code v-if="distributionLink" :value="distributionLink" - :size="150" + :size="180" + :margin="2" class="block mb-2 ml-auto mr-auto" /> <p class="mt-0"> @@ -390,6 +391,9 @@ export default defineComponent({ } .qr-wrapper { padding: 15px 0; + img { + width: 200px; + } p { text-align: center; color: var(--el-text-color-regular); From b4cee6ba922571750ad962e047463d9d26835743 Mon Sep 17 00:00:00 2001 From: AceDataCloud <office@acedata.cloud> Date: Sat, 10 Aug 2024 01:21:59 +0800 Subject: [PATCH 2/3] fix --- ...acloud-nexior-2becb36b-c15e-4eab-94db-e0c669bbc07f.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@acedatacloud-nexior-2becb36b-c15e-4eab-94db-e0c669bbc07f.json diff --git a/change/@acedatacloud-nexior-2becb36b-c15e-4eab-94db-e0c669bbc07f.json b/change/@acedatacloud-nexior-2becb36b-c15e-4eab-94db-e0c669bbc07f.json new file mode 100644 index 00000000..8b4b6a6a --- /dev/null +++ b/change/@acedatacloud-nexior-2becb36b-c15e-4eab-94db-e0c669bbc07f.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "fix packages", + "packageName": "@acedatacloud/nexior", + "email": "office@acedata.cloud", + "dependentChangeType": "patch" +} From 482b4a190f31dcbc9accee513ba8ed90801e3c95 Mon Sep 17 00:00:00 2001 From: AceDataCloud <office@acedata.cloud> Date: Sat, 10 Aug 2024 01:22:31 +0800 Subject: [PATCH 3/3] fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 61a95d2f..0e66c5db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@acedatacloud/nexior", - "version": "2.1.0", + "version": "2.2.0", "author": "Germey Technology <dev@germey.tech>", "repository": { "type": "git",