diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts index 56b76d1a..ed1dc9f1 100644 --- a/packages/ui/certd-client/src/router/source/modules/certd.ts +++ b/packages/ui/certd-client/src/router/source/modules/certd.ts @@ -145,6 +145,7 @@ export const certdResources = [ title: "套餐", name: "SuiteProduct", path: "/certd/suite", + redirect: "/certd/suite/mine", meta: { show: () => { const settingStore = useSettingStore(); diff --git a/packages/ui/certd-client/src/views/certd/suite/buy.vue b/packages/ui/certd-client/src/views/certd/suite/buy.vue index c3567e56..6d0c552b 100644 --- a/packages/ui/certd-client/src/views/certd/suite/buy.vue +++ b/packages/ui/certd-client/src/views/certd/suite/buy.vue @@ -49,20 +49,6 @@ async function loadProducts() { loadProducts(); const orderModalRef = ref(null); async function doOrder(req: any) { - if (req.price === 0) { - //如果是0,直接请求创建订单 - await api.TradeCreateFree({ - productId: req.productId, - duration: req.duration, - num: 1, - payType: "free" - }); - notification.success({ - message: "套餐购买成功" - }); - return; - } - await orderModalRef.value.open({ ...req }); diff --git a/packages/ui/certd-client/src/views/certd/suite/order-modal.vue b/packages/ui/certd-client/src/views/certd/suite/order-modal.vue index 0f32758b..b0958566 100644 --- a/packages/ui/certd-client/src/views/certd/suite/order-modal.vue +++ b/packages/ui/certd-client/src/views/certd/suite/order-modal.vue @@ -18,7 +18,8 @@
支付方式: - +
免费
+
@@ -34,6 +35,7 @@ import { Modal, notification } from "ant-design-vue"; import DurationValue from "/@/views/sys/suite/product/duration-value.vue"; import { useRouter } from "vue-router"; import qrcode from "qrcode"; +import * as api from "/@/views/certd/suite/api"; const openRef = ref(false); const product = ref(null); @@ -63,6 +65,21 @@ const paymentsDictRef = dict({ const router = useRouter(); async function orderCreate() { + if (durationSelected.value.price === 0) { + //如果是0,直接请求创建订单 + await api.TradeCreateFree({ + productId: formRef.value.productId, + duration: formRef.value.duration, + num: formRef.value.num ?? 1, + payType: "free" + }); + notification.success({ + message: "套餐购买成功" + }); + openRef.value = false; + return; + } + if (!formRef.value.payType) { notification.error({ message: "请选择支付方式"