diff --git a/packages/libs/lib-server/src/system/basic/service/plus-service.ts b/packages/libs/lib-server/src/system/basic/service/plus-service.ts index 67ad88a1..d3f470bf 100644 --- a/packages/libs/lib-server/src/system/basic/service/plus-service.ts +++ b/packages/libs/lib-server/src/system/basic/service/plus-service.ts @@ -130,12 +130,15 @@ export class PlusService { return res.accessToken; } - async getVipTrial() { + async getVipTrial(vipType= "plus") { await this.register(); const plusRequestService = await this.getPlusRequestService(); const res = await plusRequestService.request({ url: '/activation/subject/vip/trialGet', method: 'POST', + data:{ + vipType + } }); if (res.license) { await this.updateLicense(res.license); diff --git a/packages/ui/certd-client/.env b/packages/ui/certd-client/.env index 3adf5c89..f567e668 100644 --- a/packages/ui/certd-client/.env +++ b/packages/ui/certd-client/.env @@ -10,4 +10,4 @@ VITE_APP_LOGO=static/images/logo/logo.svg VITE_APP_LOGIN_LOGO=static/images/logo/rect-black.svg VITE_APP_PROJECT_PATH=https://github.com/certd/certd VITE_APP_NAMESPACE=fs -VITE_APP_VIP_PRODUCT_URL=http://localhost:1017/subject#/product/list \ No newline at end of file +VITE_APP_VIP_PRODUCT_URL="http://localhost:1017/subject#/app/certd/product" \ No newline at end of file diff --git a/packages/ui/certd-client/.env.production b/packages/ui/certd-client/.env.production index 0eeba503..e223168b 100644 --- a/packages/ui/certd-client/.env.production +++ b/packages/ui/certd-client/.env.production @@ -1,3 +1,6 @@ VITE_APP_API=api #登录与权限开启 VITE_APP_PM_ENABLED=true + + +VITE_APP_VIP_PRODUCT_URL="https://app.handfree.work/subject#/app/certd/product" \ No newline at end of file diff --git a/packages/ui/certd-client/src/components/vip-button/api.ts b/packages/ui/certd-client/src/components/vip-button/api.ts index 200e38ac..7e05c337 100644 --- a/packages/ui/certd-client/src/components/vip-button/api.ts +++ b/packages/ui/certd-client/src/components/vip-button/api.ts @@ -8,10 +8,10 @@ export async function doActive(form: any) { }); } -export async function getVipTrial() { +export async function getVipTrial(vipType: string) { return await request({ url: "/sys/plus/getVipTrial", method: "post", - data: {}, + data: { vipType }, }); } 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 6a3823d6..547ce5f8 100644 --- a/packages/ui/certd-client/src/components/vip-button/index.vue +++ b/packages/ui/certd-client/src/components/vip-button/index.vue @@ -1,5 +1,5 @@