From e43dd03132781d73070e9865f5ccf8ae4d231da7 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 9 Mar 2025 15:53:58 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B4=AD=E4=B9=B0=E5=85=8D=E8=B4=B9?=
 =?UTF-8?q?=E5=A5=97=E9=A4=90=E6=97=B6=EF=BC=8C=E5=85=88=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=AF=B9=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/router/source/modules/certd.ts        |  1 +
 .../src/views/certd/suite/buy.vue             | 14 --------------
 .../src/views/certd/suite/order-modal.vue     | 19 ++++++++++++++++++-
 3 files changed, 19 insertions(+), 15 deletions(-)

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<any>(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 @@
 
       <div class="flex-o mt-5">
         <span class="label">支付方式：</span>
-        <fs-dict-select v-model:value="formRef.payType" :dict="paymentsDictRef" style="width: 200px"> </fs-dict-select>
+        <div v-if="durationSelected.price === 0">免费</div>
+        <fs-dict-select v-else v-model:value="formRef.payType" :dict="paymentsDictRef" style="width: 200px"> </fs-dict-select>
       </div>
     </div>
   </a-modal>
@@ -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<any>(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: "请选择支付方式"