From 3d4d372d404449aef4dfc995fc7002b7ea8be611 Mon Sep 17 00:00:00 2001
From: Kennen <317052920@qq.com>
Date: Sun, 25 Jun 2023 18:57:10 +0800
Subject: [PATCH] fix(SubscriptionModelDialog): Add judgment when click submit

---
 apps/dfs/src/views/Layout.vue                 |  4 +--
 .../SubscriptionModelDialog.vue               | 25 +++++++++++++------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/apps/dfs/src/views/Layout.vue b/apps/dfs/src/views/Layout.vue
index 308507f5bf..7a65951478 100644
--- a/apps/dfs/src/views/Layout.vue
+++ b/apps/dfs/src/views/Layout.vue
@@ -337,8 +337,8 @@ export default {
     },
     // 检查是否有安装过agent
     checkAgentInstall() {
-      this.$axios.get('api/tcm/orders/checkAgent').then(data => {
-        if (data === 0) {
+      this.$axios.get('api/tcm/agent').then(data => {
+        if (data?.total === 0) {
           this.subscriptionModelVisible = true
         }
       })
diff --git a/apps/dfs/src/views/agent-download/SubscriptionModelDialog.vue b/apps/dfs/src/views/agent-download/SubscriptionModelDialog.vue
index 63ac3bfba3..ed201f8edc 100644
--- a/apps/dfs/src/views/agent-download/SubscriptionModelDialog.vue
+++ b/apps/dfs/src/views/agent-download/SubscriptionModelDialog.vue
@@ -344,9 +344,15 @@
                   <div class="is-active-triangle"></div>
                   <VIcon size="16" class="is-active-icon">check-bold</VIcon>
                 </div>
-                <div class="spec-li-title mt-1 lh-base fw-bold font-color-dark">
+                <div class="spec-li-title mt-1 lh-base fw-bold font-color-dark flex align-items-center">
                   <span>{{ item.name }}: </span>
                   <span>{{ item.desc }}</span>
+                  <ElTag
+                    v-if="item.chargeProvider === 'FreeTier'"
+                    size="small"
+                    class="bg-color-warning text-white border-0 ml-2"
+                    >{{ $t('dfs_instance_createagent_mianfeitiyan') }}</ElTag
+                  >
                 </div>
                 <div
                   v-if="agentDeploy === 'selfHost'"
@@ -1075,7 +1081,7 @@ export default {
     },
     //格式化价格
     formatPrice(item, isOriginalPrice) {
-      if (!item || item?.chargeProvider === 'FreeTier') return 0
+      if (!item || item?.chargeProvider === 'FreeTier') return '0'
 
       let amount = this.getAmount(item, isOriginalPrice) + this.mdbPrices
       return (
@@ -1188,10 +1194,7 @@ export default {
         if (this.agentCount > 0) {
           this.specificationItems = this.specificationItems.filter(it => it.chargeProvider !== 'FreeTier')
         }
-        this.specification =
-          this.agentCount > 0 || this.agentDeploy !== 'selfHost'
-            ? this.specificationItems[1]?.value
-            : this.specificationItems[0]?.value
+        this.specification = this.specificationItems[0]?.value
         // 价格套餐
         this.allPackages = paidPrice.map(t => {
           return Object.assign(t, {
@@ -1478,7 +1481,15 @@ export default {
       this.$axios
         .post('api/tcm/orders', params)
         .then(data => {
-          if (data.chargeProvider === 'FreeTier' || (data.chargeProvider === 'Aliyun' && row.agentType === 'Local')) {
+          if (data.chargeProvider === 'FreeTier' && this.agentDeploy === 'fullManagement') {
+            this.finish()
+            this.$router.push({
+              name: 'Instance'
+            })
+          } else if (
+            data.chargeProvider === 'FreeTier' ||
+            (data.chargeProvider === 'Aliyun' && row.agentType === 'Local')
+          ) {
             //免费实例（授权码）-半托管-直接部署页面
             this.finish()
             let downloadUrl = window.App.$router.resolve({