From 2f04bd8c22ab33562a393d4f7db0be4d51bf45d2 Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Tue, 22 Apr 2025 14:36:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E8=A3=85=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E5=BC=B9=E7=AA=97=E8=AE=A1=E5=88=92=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/site/SiteAppPlanSelectorDialog.vue   |  1 +
 jcloud/api/site.py                                  |  4 ++--
 .../marketplace_app_plan/marketplace_app_plan.json  | 13 +++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dashboard/src2/components/site/SiteAppPlanSelectorDialog.vue b/dashboard/src2/components/site/SiteAppPlanSelectorDialog.vue
index 719a8b4..cfbca57 100644
--- a/dashboard/src2/components/site/SiteAppPlanSelectorDialog.vue
+++ b/dashboard/src2/components/site/SiteAppPlanSelectorDialog.vue
@@ -59,6 +59,7 @@ export default {
 										: plan.price_usd
 							  )}/月`,
 					sublabel: ' ',
+					plan_title: plan.title,
 					...plan,
 					features: plan.features.map(f => ({
 						value: f,
diff --git a/jcloud/api/site.py b/jcloud/api/site.py
index d9ba45e..fa566bd 100644
--- a/jcloud/api/site.py
+++ b/jcloud/api/site.py
@@ -970,9 +970,9 @@ def get_plans(name=None, rg=None):
 
 	out = []
 	for plan in plans:
-		if is_paywalled_bench and plan.price_cny == 10:
+		if is_paywalled_bench and plan.price_cny >= 99:
 			continue
-		if not plan.allow_downgrading_from_other_plan and plan.price_cny == 5:
+		if not plan.allow_downgrading_from_other_plan and plan.price_cny >= 99:
 			continue
 		if not on_dedicated_server and plan.dedicated_server_plan:
 			continue
diff --git a/jcloud/marketplace/pagetype/marketplace_app_plan/marketplace_app_plan.json b/jcloud/marketplace/pagetype/marketplace_app_plan/marketplace_app_plan.json
index 65c79ea..0b13dcd 100644
--- a/jcloud/marketplace/pagetype/marketplace_app_plan/marketplace_app_plan.json
+++ b/jcloud/marketplace/pagetype/marketplace_app_plan/marketplace_app_plan.json
@@ -27,11 +27,6 @@
    "fieldtype": "Check",
    "label": "Enabled"
   },
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "label": "Title"
-  },
   {
    "fieldname": "app",
    "fieldtype": "Link",
@@ -97,11 +92,17 @@
    "fieldtype": "Table",
    "label": "Roles",
    "options": "Has Role"
+  },
+  {
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Title"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-04-22 12:13:31.623301",
+ "modified": "2025-04-22 14:23:22.929746",
  "modified_by": "Administrator",
  "module": "Marketplace",
  "name": "Marketplace App Plan",