diff --git a/packages/ui/certd-client/src/components/vip-button/index.vue b/packages/ui/certd-client/src/components/vip-button/index.vue index dd7242443..755db9271 100644 --- a/packages/ui/certd-client/src/components/vip-button/index.vue +++ b/packages/ui/certd-client/src/components/vip-button/index.vue @@ -298,8 +298,8 @@ function openUpgrade() { }, }, icon: "stash:thumb-up", - price: productInfo.plus.price, - price3: `¥${productInfo.plus.price3}/3${t("vip.years")}`, + priceText: productInfo.plus.priceText || `¥${productInfo.plus.price}/${t("vip.years")}`, + discountText: productInfo.plus.discountText || `¥${productInfo.plus.price3}/3${t("vip.years")}`, tooltip: productInfo.plus.tooltip, get() { return ( @@ -317,8 +317,8 @@ function openUpgrade() { type: "comm", icon: "vaadin:handshake", privilege: [t("vip.all_pro_privileges"), t("vip.allow_commercial_use_modify_logo_title"), t("vip.data_statistics"), t("vip.plugin_management"), t("vip.unlimited_multi_users"), t("vip.support_user_payment")], - price: productInfo.comm.price, - price3: `¥${productInfo.comm.price3}/3${t("vip.years")}`, + priceText: productInfo.comm.priceText || `¥${productInfo.comm.price}/${t("vip.years")}`, + discountText: productInfo.comm.discountText || `¥${productInfo.comm.price3}/3${t("vip.years")}`, tooltip: productInfo.comm.tooltip, trial: { title: t("vip.click_to_get_7_day_trial"), diff --git a/packages/ui/certd-client/src/store/settings/index.ts b/packages/ui/certd-client/src/store/settings/index.ts index 3d3534c60..4d0bfd212 100644 --- a/packages/ui/certd-client/src/store/settings/index.ts +++ b/packages/ui/certd-client/src/store/settings/index.ts @@ -41,12 +41,16 @@ export interface SettingState { price: number; price3: number; tooltip?: string; + priceText?: string; + discountText?: string; }; comm: { name: string; price: number; price3: number; tooltip?: string; + priceText?: string; + discountText?: string; }; app?: { minVersion?: string; diff --git a/packages/ui/certd-client/src/views/certd/pipeline/detail.vue b/packages/ui/certd-client/src/views/certd/pipeline/detail.vue index 373ab590a..2d3c40f33 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/detail.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/detail.vue @@ -40,6 +40,7 @@ const pipelineOptions: PipelineOptions = { validTime: detail.pipeline.validTime, webhookKey: detail.pipeline.webhookKey, id: detail.pipeline.id, + lastVars: detail.pipeline.lastVars, } as PipelineDetail; }, diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue index bec4e8a39..825114864 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue @@ -7,6 +7,16 @@