feat(vip): restructure membership settings into structured groups

Replace the pipe-delimited VIP configuration with structured groups and accordions, matching the reference theme (Zibll) 1:1. Settings: - 会员等级 keeps only the nav buttons and the two level switches, plus the "must enable level 1 first" guard. Level identity fields (display name, intro, benefits HTML, icon) and 会员商品 move into the 一级会员/二级会员 tabs of 会员购买选项, so each level is configured in one place. - Level tab titles bind to the configured display name via a new titleKey/titleFallback hook in AksFormRenderer. - 会员商品 is a repeater with exactly the reference fields: 执行价/原价/ 促销标签/标签颜色/会员有效时间/时长单位. The tag colour uses the full b+jb palette and now reaches the product card instead of a hardcoded jb-yellow. - 会员续费 gains the 自定义商品 type backed by per-level renew-product groups; the discount becomes a 0.1-9.9 slider with float sanitizing. - 会员升级 becomes the reference three-block accordion (month-to-month day-rate, jump to permanent, permanent to permanent), each with its own price, strikethrough price, promo tag and tag colour. - 积分兑换明细 is a repeater (points/level/duration/unit) where the duration accepts the literal Permanent. Runtime: - PaymentRuntime normalizes the structured groups into purchasable rows (money normalization, palette validation, zero-price and out-of-range rows dropped) and no longer emits any *_raw strings. - The catalog builder carries tag_class through and routes renewals to the renew-product group under 自定义商品. - The points-exchange order note carries time/unit so month durations use calendar math instead of a 30-day approximation. Dead code removed: parse_level_products, parse_packages, parse_upgrade_product_line and their pipe-splitting, plus nine zero-call PaymentRuntime proxy methods in HomeCms. No dual-format or migration path was added; SchemaProvider already falls back to defaults when a stored group value is not an array, so existing pipe strings degrade safely. Verified: php -l on every changed PHP file, 655 Node contract tests passing (14 new ones in vip-settings-structured-contract.test.cjs exercising the real schema build and runtime normalization via a PHP harness), and the admin SPA builds.
2026-10-18 17:14:00 +08:00
1 parent dcb80cff6e
commit af8dccdc45
@@ -1053,6 +1053,8 @@ const repeaterDraft = ref({})
 function createRepeaterItem() {
  const newItem = { _id: `rpt_${Date.now()}_${++repeaterIdCounter}` }
  for (const field of (props.schema.fields || [])) {
+    // UI-only chrome rows (notice / alert) are presentation only.
+    if (field.ui_only) continue
    if (field.default !== undefined) {
      newItem[field.key] = field.default
    } else if (field.type === 'switch') {
@@ -64,9 +64,9 @@
                  <n-tabs type="line" animated>
                    <n-tab-pane
                      v-for="tab in field.tabs"
-                      :key="tab.title || tab.key"
-                      :name="tab.title || tab.key"
-                      :tab="tab.title || tab.key"
+                      :key="tab.key || tab.title"
+                      :name="tabName(tab)"
+                      :tab="tabName(tab)"
                    >
                      <template v-for="sub in (tab.fields || [])" :key="sub.key">
                        <AksField
@@ -231,6 +231,18 @@ function isFieldVisible(field) {
  return matchDependsOn(field.dependsOn)
 }

+/**
+ * Tab label. `titleKey` binds the label to a live form value (e.g. the VIP level
+ * display name) so renaming a level renames its tab; `titleFallback` is used
+ * while that value is still empty.
+ */
+function tabName(tab) {
+  if (!tab) return ''
+  const dynamic = tab.titleKey ? props.formData?.[tab.titleKey] : ''
+  const label = typeof dynamic === 'string' ? dynamic.trim() : ''
+  return label || tab.titleFallback || tab.title || tab.key || ''
+}
+
 /** Whole group can be hidden (e.g. optional advanced blocks). */
 function isGroupVisible(group) {
  return matchDependsOn(group.dependsOn)
@@ -1,24 +1,109 @@
 /**
- * VIP会员 — 参考主题结构：会员等级、会员权益（普通/一级/二级 tab）、
- * 会员购买选项（一级/二级/续费/升级 tab）、卡密兑换与积分兑换。
+ * VIP会员 — 结构 1:1 对照参考主题 Zibll：会员等级（开关）、会员权益
+ * （普通/一级/二级 tab）、会员购买选项（一级/二级/续费/升级 tab）、
+ * 积分兑换会员与界面文案。
+ *
+ * 会员商品 / 续费商品 / 升级价格 / 积分兑换明细均为结构化 group 或
+ * accordion，不再使用 `|` 分隔的 textarea。等级 Tab 标题通过 titleKey
+ * 绑定「会员显示名称」，改名即改 Tab 名。
 */
+
+const VIP_EQUITY_DEFAULT = '<li>全站资源折扣购买</li><li>部分内容免费阅读</li><li>一对一技术指导</li><li>VIP用户专属QQ群</li>';
+
+const vipTagPalette = [
+  { label: '#f74b3d', value: 'b-red' },
+  { label: '#f3920a', value: 'b-yellow' },
+  { label: '#08c4c1', value: 'b-cyan' },
+  { label: '#0a8cf3', value: 'b-blue' },
+  { label: '#1fd05a', value: 'b-green' },
+  { label: '#c133f5', value: 'b-purple' },
+  { label: '#121517', value: 'b-black' },
+  { label: 'linear-gradient(135deg, #ffbeb4 10%, #f61a1a 100%)', value: 'jb-red' },
+  { label: 'linear-gradient(135deg, #ff5e7f 30%, #ff967e 100%)', value: 'jb-pink' },
+  { label: 'linear-gradient(135deg, #ffd6b2 10%, #ff651c 100%)', value: 'jb-yellow' },
+  { label: 'linear-gradient(140deg, #039ab3 10%, #58dbcf 90%)', value: 'jb-cyan' },
+  { label: 'linear-gradient(135deg, #b6e6ff 10%, #198aff 100%)', value: 'jb-blue' },
+  { label: 'linear-gradient(135deg, #ccffcd 10%, #52bb51 100%)', value: 'jb-green' },
+  { label: 'linear-gradient(135deg, #fec2ff 10%, #d000de 100%)', value: 'jb-purple' },
+  { label: 'linear-gradient(25deg, #eab869 10%, #fbecd4 60%, #ffe0ae 100%)', value: 'jb-vip1' },
+  { label: 'linear-gradient(317deg, #4d4c4c 30%, #878787 70%, #5f5c5c 100%)', value: 'jb-vip2' },
+];
+
+const vipUnitOptions = [
+  { label: '天', value: 'day' },
+  { label: '月', value: 'month' },
+];
+
+/**
+ * 会员商品字段集（参考主题 CFS_Module::vip_product）。
+ */
+function vipProductFields() {
+  return [
+    { key: 'price', label: '执行价', type: 'number', sanitize_type: 'money_decimal', default: '699.00', min: 0, suffix: '元', help: '会员的实际购买价格' },
+    { key: 'show_price', label: '原价', type: 'number', sanitize_type: 'money_decimal', default: '999.00', min: 0, suffix: '元', help: '显示在执行价格前面，并划掉' },
+    { key: 'tag', label: '促销标签', type: 'textarea', sanitize_type: 'html', default: '', rows: 1, help: '支持HTML，请注意控制长度' },
+    { key: 'tag_class', label: '标签颜色', type: 'palette', default: 'jb-yellow', dependsOn: { key: 'tag', operator: 'not_empty' }, options: vipTagPalette },
+    { key: 'time', label: '会员有效时间', type: 'spinner', default: 3, min: 0, max: 3600, step: 1, help: '开通会员的时长。填0则为永久会员' },
+    { key: 'unit', label: '时长单位', type: 'radio', default: 'month', inline: true, dependsOn: { key: 'time', operator: 'truthy' }, options: vipUnitOptions },
+    { key: '_time_permanent_hint', label: '', type: 'alert', alertType: 'success', ui_only: true, dependsOn: { key: 'time', operator: 'eq', value: 0 }, content: '会员有效时间已设置为：永久会员' },
+  ];
+}
+
+/**
+ * 会员等级 Tab 字段集（参考主题 CFS_Module::vip_tab，显示名称并入 Tab）。
+ */
+function vipLevelTabFields(level) {
+  const dep = { key: `pay_user_vip_${level}_s`, value: true };
+  return [
+    { key: `pay_user_vip_${level}_name`, label: '会员显示名称', type: 'input', default: level === 1 ? '黄金会员' : '钻石会员', dependsOn: dep, help: '会员名称（例如“黄金会员”、“超级会员”）' },
+    { key: `pay_user_vip_${level}_desc`, label: '一句话简介', type: 'input', default: '尊享专属特权', dependsOn: dep },
+    { key: `pay_user_vip_${level}_equity`, label: '会员权益 HTML', type: 'textarea', sanitize_type: 'html', default: VIP_EQUITY_DEFAULT, rows: 4, dependsOn: dep, help: '建议使用 <li> 列表项' },
+    { key: `vip_${level}_product_s`, label: '购买会员', type: 'switch', default: true, dependsOn: dep, help: '关闭后则不能付费购买会员，但可通过积分兑换会员，请确保已开启积分以及积分兑换会员功能' },
+    {
+      key: `vip_${level}_product`,
+      label: '会员商品',
+      type: 'group',
+      max: 8,
+      button_title: '添加会员商品',
+      default: [
+        { price: 99, show_price: 199, tag: '<i class="fa fas fa-fw fa-bolt"></i> 限时特惠', time: 3, unit: 'month' },
+        { price: 199, show_price: 299, tag: '<i class="fa fas fa-fw fa-bolt"></i> 站长推荐', time: 6, unit: 'month' },
+      ],
+      dependsOn: { all: [dep, { key: `vip_${level}_product_s`, value: true }] },
+      help: '会员购买价格配置：执行价、原价、促销标签、标签颜色与会员有效时间',
+      fields: vipProductFields(),
+    },
+    { key: `vip_${level}_img_icon`, label: '会员图标', type: 'upload', default: '', dependsOn: dep, help: `留空使用内置 vip-${level}.svg 图标；建议尺寸300x300` },
+  ];
+}
+
 export const vipSchema = {
  key: 'payment.vip',
  title: 'VIP会员',
  icon: 'fa fas fa-gem',
-  description: '双级会员：等级名称、权益（下载次数与限速）、套餐、续费/升级与积分兑换。',
+  description: '双级会员：等级开关、权益（下载次数与限速）、会员商品、续费/升级与积分兑换。',
  defaults: {
    nav_pay_vip: true,
    nav_user_pay_vip: true,
    pay_user_vip_1_s: true,
    pay_user_vip_1_name: '黄金会员',
    pay_user_vip_1_desc: '尊享专属特权',
-    pay_user_vip_1_equity: '<li>全站资源折扣购买</li><li>部分内容免费阅读</li><li>一对一技术指导</li><li>VIP用户专属QQ群</li>',
+    pay_user_vip_1_equity: VIP_EQUITY_DEFAULT,
+    vip_1_product_s: true,
+    vip_1_product: [
+      { price: 99, show_price: 199, tag: '<i class="fa fas fa-fw fa-bolt"></i> 限时特惠', time: 3, unit: 'month' },
+      { price: 199, show_price: 299, tag: '<i class="fa fas fa-fw fa-bolt"></i> 站长推荐', time: 6, unit: 'month' },
+    ],
    vip_1_img_icon: '',
    pay_user_vip_2_s: true,
    pay_user_vip_2_name: '钻石会员',
    pay_user_vip_2_desc: '尊享专属特权',
-    pay_user_vip_2_equity: '<li>全站资源折扣购买</li><li>部分内容免费阅读</li><li>一对一技术指导</li><li>VIP用户专属QQ群</li>',
+    pay_user_vip_2_equity: VIP_EQUITY_DEFAULT,
+    vip_2_product_s: true,
+    vip_2_product: [
+      { price: 99, show_price: 199, tag: '<i class="fa fas fa-fw fa-bolt"></i> 限时特惠', time: 3, unit: 'month' },
+      { price: 199, show_price: 299, tag: '<i class="fa fas fa-fw fa-bolt"></i> 站长推荐', time: 6, unit: 'month' },
+    ],
    vip_2_img_icon: '',
    pay_user_vip_desc: '开通VIP会员，享受会员专属折扣以及多项特权',
    pay_user_vip_more: '<div>购买后不支持退款</div><div>VIP权益仅适用于本站</div><div>欢迎与站长联系</div>',
@@ -29,17 +114,45 @@ export const vipSchema = {
    pay_download_limit_vip_2: 0,
    pay_download_speed_vip_2: 0,
    vip_1_product_s: true,
-    payment_vip_1_products: '30|59|1|month|限时|月卡\n98|199|3|month|特惠|季卡\n365|599|12|month|超值|年卡\n999|1299|0|day|永久|永久卡',
-    vip_2_product_s: true,
-    payment_vip_2_products: '58|99|1|month|限时|月卡\n168|299|3|month|特惠|季卡\n598|999|12|month|超值|年卡\n1299|1999|0|day|永久|永久卡',
    vip_renew: true,
+    vip_renew_desc: '立即续费会员，畅享VIP权益',
    vip_renew_price_type: 'discount',
    vip_renew_discount: 8,
    vip_renew_reduce: '20.00',
+    vip_1_renew_product: [
+      { price: 69, show_price: 199, tag: '<i class="fa fas fa-fw fa-bolt"></i> 限时特惠', time: 3, unit: 'month' },
+      { price: 169, show_price: 299, tag: '<i class="fa fas fa-fw fa-bolt"></i> 站长推荐', time: 6, unit: 'month' },
+    ],
+    vip_2_renew_product: [
+      { price: 269, show_price: 599, tag: '<i class="fa fas fa-fw fa-bolt"></i> 限时特惠', time: 3, unit: 'month' },
+      { price: 369, show_price: 899, tag: '<i class="fa fas fa-fw fa-bolt"></i> 站长推荐', time: 6, unit: 'month' },
+    ],
+    vip_2_product_s: true,
+    vip_renew: true,
+    vip_renew_discount: 8,
+    vip_renew_reduce: '20.00',
    vip_upgrade: true,
-    vip_upgrade_product: 'unit|1|按剩余天数升级\njump|199|升级永久二级会员\npermanent|299|永久一级升永久二级',
+    vip_upgrade_desc: '升级VIP会员，享更多会员权益',
+    vip_upgrade_product: {
+      month_to_month_s: true,
+      unit_price: '10.00',
+      unit_tag: '<i class="fa fas fa-fw fa-bolt"></i> 站长推荐',
+      unit_tag_class: 'jb-yellow',
+      jump_s: false,
+      jump_price: '199.00',
+      jump_show_price: '299.00',
+      jump_tag: '<i class="fa fas fa-fw fa-bolt"></i> 升级特惠',
+      jump_tag_class: 'jb-red',
+      permanent_price: '199.00',
+      permanent_show_price: '299.00',
+      permanent_tag: '<i class="fa fas fa-fw fa-bolt"></i> 升级特惠',
+      permanent_tag_class: 'jb-red',
+    },
    pay_vip_points_exchange_s: false,
-    payment_vip_points_packages: '1|500|30|积分月卡\n1|5000|0|积分永久',
+    pay_vip_points_exchange_product: [
+      { points: 500, level: 1, time: 30, unit: 'day' },
+      { points: 5000, level: 1, time: 'Permanent' },
+    ],
    pay_vip_points_exchange_desc: '',
  },
  groups: [
@@ -65,15 +178,16 @@ export const vipSchema = {
        { key: 'nav_pay_vip', label: '导航栏购买按钮', type: 'switch', default: true, help: '在顶部导航栏显示开通会员按钮；请注意顶部导航的整体宽度。' },
        { key: 'nav_user_pay_vip', label: '用户框购买按钮', type: 'switch', default: true, help: '在导航栏用户框内显示开通会员按钮。' },
        { key: 'pay_user_vip_1_s', label: '启用一级会员', type: 'switch', default: true },
-        { key: 'pay_user_vip_1_name', label: '一级会员显示名称', type: 'input', default: '黄金会员', dependsOn: { key: 'pay_user_vip_1_s', value: true } },
-        { key: 'pay_user_vip_1_desc', label: '一级会员一句话简介', type: 'input', default: '尊享专属特权', dependsOn: { key: 'pay_user_vip_1_s', value: true } },
-        { key: 'pay_user_vip_1_equity', label: '一级会员权益 HTML', type: 'textarea', sanitize_type: 'html', default: '<li>全站资源折扣购买</li><li>部分内容免费阅读</li><li>一对一技术指导</li><li>VIP用户专属QQ群</li>', rows: 4, dependsOn: { key: 'pay_user_vip_1_s', value: true }, help: '建议使用 <li> 列表项' },
-        { key: 'vip_1_img_icon', label: '一级会员图标 URL', type: 'input', default: '', dependsOn: { key: 'pay_user_vip_1_s', value: true }, help: '留空使用内置 vip-1.svg 图标' },
+        {
+          key: 'vip_level_order_notice',
+          label: '',
+          type: 'notice',
+          ui_only: true,
+          alertType: 'danger',
+          dependsOn: { all: [{ key: 'pay_user_vip_2_s', value: true }, { key: 'pay_user_vip_1_s', operator: 'falsy' }] },
+          content: '<div style="text-align:center"><b>必须先开启一级会员后才能开启二级会员！</b></div>',
+        },
        { key: 'pay_user_vip_2_s', label: '启用二级会员', type: 'switch', default: true },
-        { key: 'pay_user_vip_2_name', label: '二级会员显示名称', type: 'input', default: '钻石会员', dependsOn: { key: 'pay_user_vip_2_s', value: true } },
-        { key: 'pay_user_vip_2_desc', label: '二级会员一句话简介', type: 'input', default: '尊享专属特权', dependsOn: { key: 'pay_user_vip_2_s', value: true } },
-        { key: 'pay_user_vip_2_equity', label: '二级会员权益 HTML', type: 'textarea', sanitize_type: 'html', default: '<li>全站资源折扣购买</li><li>部分内容免费阅读</li><li>一对一技术指导</li><li>VIP用户专属QQ群</li>', rows: 4, dependsOn: { key: 'pay_user_vip_2_s', value: true } },
-        { key: 'vip_2_img_icon', label: '二级会员图标 URL', type: 'input', default: '', dependsOn: { key: 'pay_user_vip_2_s', value: true }, help: '留空使用内置 vip-2.svg 图标' },
      ],
    },
    {
@@ -97,6 +211,8 @@ export const vipSchema = {
            {
              key: 'vip1',
              title: '一级会员',
+              titleKey: 'pay_user_vip_1_name',
+              titleFallback: '一级会员',
              fields: [
                { key: 'pay_download_limit_vip_1', label: '付费资源：免费资源每日可下载(个)', type: 'number', default: 0, min: 0, max: 9999, dependsOn: { key: 'pay_user_vip_1_s', value: true }, help: '一级会员每日最多可下载几个免费资源(为0则不限制)' },
                { key: 'pay_download_speed_vip_1', label: '付费资源：下载限速(KB/s)', type: 'number', default: 0, min: 0, dependsOn: { key: 'pay_user_vip_1_s', value: true }, help: '付费下载限制最大下载速度(为0则不限制)；只对本地服务器文件有效' },
@@ -105,6 +221,8 @@ export const vipSchema = {
            {
              key: 'vip2',
              title: '二级会员',
+              titleKey: 'pay_user_vip_2_name',
+              titleFallback: '二级会员',
              fields: [
                { key: 'pay_download_limit_vip_2', label: '付费资源：免费资源每日可下载(个)', type: 'number', default: 0, min: 0, max: 9999, dependsOn: { key: 'pay_user_vip_2_s', value: true }, help: '二级会员每日最多可下载几个免费资源(为0则不限制)' },
                { key: 'pay_download_speed_vip_2', label: '付费资源：下载限速(KB/s)', type: 'number', default: 0, min: 0, dependsOn: { key: 'pay_user_vip_2_s', value: true }, help: '付费下载限制最大下载速度(为0则不限制)；只对本地服务器文件有效' },
@@ -127,52 +245,108 @@ export const vipSchema = {
            {
              key: 'vip1',
              title: '一级会员',
+              titleKey: 'pay_user_vip_1_name',
+              titleFallback: '一级会员',
              fields: [
-                { key: 'vip_1_product_s', label: '允许购买一级会员', type: 'switch', default: true, dependsOn: { key: 'pay_user_vip_1_s', value: true } },
-                {
-                  key: 'payment_vip_1_products',
-                  label: '一级会员套餐',
-                  type: 'textarea',
-                  default: '30|59|1|month|限时|月卡\n98|199|3|month|特惠|季卡\n365|599|12|month|超值|年卡\n999|1299|0|day|永久|永久卡',
-                  dependsOn: { key: 'vip_1_product_s', value: true },
-                  help: '每行：执行价|原价|时长|单位(day|month)|标签|标题；时长 0=永久',
-                },
+                ...vipLevelTabFields(1),
              ],
            },
            {
              key: 'vip2',
              title: '二级会员',
+              titleKey: 'pay_user_vip_2_name',
+              titleFallback: '二级会员',
              fields: [
-                { key: 'vip_2_product_s', label: '允许购买二级会员', type: 'switch', default: true, dependsOn: { key: 'pay_user_vip_2_s', value: true } },
-                {
-                  key: 'payment_vip_2_products',
-                  label: '二级会员套餐',
-                  type: 'textarea',
-                  default: '58|99|1|month|限时|月卡\n168|299|3|month|特惠|季卡\n598|999|12|month|超值|年卡\n1299|1999|0|day|永久|永久卡',
-                  dependsOn: { key: 'vip_2_product_s', value: true },
-                  help: '每行：执行价|原价|时长|单位(day|month)|标签|标题；时长 0=永久',
-                },
+                ...vipLevelTabFields(2),
              ],
            },
            {
              key: 'renew',
              title: '会员续费',
              fields: [
-                { key: 'vip_renew', label: '允许续费', type: 'switch', default: true, help: '关闭后则不能续费，只能会员到期之后再购买。永久会员不需要续费' },
+                {
+                  key: 'vip_renew',
+                  label: '允许续费',
+                  type: 'switch',
+                  default: true,
+                  help: '关闭后则不能续费，只能会员到期之后再购买。永久会员不需要续费',
+                },
+                {
+                  key: 'vip_renew_desc',
+                  label: '续费介绍',
+                  type: 'input',
+                  default: '立即续费会员，畅享VIP权益',
+                  dependsOn: { key: 'vip_renew', value: true },
+                  help: '续费会员的一句话简介',
+                },
                {
                  key: 'vip_renew_price_type',
                  label: '续费价格类型',
-                  type: 'radio',
+                  type: 'select',
                  default: 'discount',
                  dependsOn: { key: 'vip_renew', value: true },
                  options: [
                    { label: '相同价格', value: 'same' },
                    { label: '折扣价格', value: 'discount' },
                    { label: '优惠立减', value: 'reduce' },
+                    { label: '自定义商品', value: 'customize' },
                  ],
+                  help: '自定义商品时，按下方「一级会员续费」「二级会员续费」的商品选项计价',
+                },
+                {
+                  key: 'vip_renew_discount',
+                  label: '续费折扣',
+                  type: 'slider',
+                  sanitize_type: 'float',
+                  default: 8,
+                  min: 0.1,
+                  max: 9.9,
+                  step: 0.1,
+                  unit: '折',
+                  dependsOn: { key: 'vip_renew_price_type', value: 'discount' },
+                  help: '在会员商品基础上打几折，如 8 = 八折',
+                },
+                {
+                  key: 'vip_renew_reduce',
+                  label: '续费减免金额',
+                  type: 'spinner',
+                  sanitize_type: 'money_decimal',
+                  default: '20.00',
+                  min: 0,
+                  max: 500,
+                  step: 5,
+                  unit: '元',
+                  dependsOn: { key: 'vip_renew_price_type', value: 'reduce' },
+                  help: '在会员商品基础上优惠的金额，优惠后总金额不能为0元',
+                },
+                {
+                  key: 'vip_1_renew_product',
+                  label: '一级会员续费',
+                  type: 'group',
+                  max: 8,
+                  button_title: '添加续费商品',
+                  default: [
+                    { price: 69, show_price: 199, tag: '<i class="fa fas fa-fw fa-bolt"></i> 限时特惠', time: 3, unit: 'month' },
+                    { price: 169, show_price: 299, tag: '<i class="fa fas fa-fw fa-bolt"></i> 站长推荐', time: 6, unit: 'month' },
+                  ],
+                  dependsOn: { key: 'vip_renew_price_type', value: 'customize' },
+                  help: '一级会员续费的商品选项',
+                  fields: vipProductFields(),
+                },
+                {
+                  key: 'vip_2_renew_product',
+                  label: '二级会员续费',
+                  type: 'group',
+                  max: 8,
+                  button_title: '添加续费商品',
+                  default: [
+                    { price: 269, show_price: 599, tag: '<i class="fa fas fa-fw fa-bolt"></i> 限时特惠', time: 3, unit: 'month' },
+                    { price: 369, show_price: 899, tag: '<i class="fa fas fa-fw fa-bolt"></i> 站长推荐', time: 6, unit: 'month' },
+                  ],
+                  dependsOn: { key: 'vip_renew_price_type', value: 'customize' },
+                  help: '二级会员续费的商品选项',
+                  fields: vipProductFields(),
                },
-                { key: 'vip_renew_discount', label: '续费折扣(折，如 8=八折)', type: 'number', default: 8, min: 1, max: 100, dependsOn: { key: 'vip_renew_price_type', value: 'discount' } },
-                { key: 'vip_renew_reduce', label: '续费减免金额', type: 'input', sanitize_type: 'money_decimal', default: '20.00', min: 0, max: 9999, dependsOn: { key: 'vip_renew_price_type', value: 'reduce' } },
              ],
            },
            {
@@ -180,13 +354,45 @@ export const vipSchema = {
              title: '会员升级',
              fields: [
                { key: 'vip_upgrade', label: '允许升级', type: 'switch', default: true },
+                { key: 'vip_upgrade_desc', label: '升级介绍', type: 'input', default: '升级VIP会员，享更多会员权益', dependsOn: { key: 'vip_upgrade', value: true }, help: '升级会员的一句话简介' },
                {
                  key: 'vip_upgrade_product',
-                  label: '升级产品',
-                  type: 'textarea',
-                  default: 'unit|1|按剩余天数升级\njump|199|升级永久二级会员\npermanent|299|永久一级升永久二级',
+                  label: '升级价格',
+                  type: 'accordion',
+                  default: {
+                    month_to_month_s: true,
+                    unit_price: '10.00',
+                    unit_tag: '<i class="fa fas fa-fw fa-bolt"></i> 站长推荐',
+                    unit_tag_class: 'jb-yellow',
+                    jump_s: false,
+                    jump_price: '199.00',
+                    jump_show_price: '299.00',
+                    jump_tag: '<i class="fa fas fa-fw fa-bolt"></i> 升级特惠',
+                    jump_tag_class: 'jb-red',
+                    permanent_price: '199.00',
+                    permanent_show_price: '299.00',
+                    permanent_tag: '<i class="fa fas fa-fw fa-bolt"></i> 升级特惠',
+                    permanent_tag_class: 'jb-red',
+                  },
                  dependsOn: { key: 'vip_upgrade', value: true },
-                  help: '每行一条。永久VIP1升级：permanent|价格|标题；按剩余天：unit|每日单价|标题；限时跳转永久：jump|价格|标题',
+                  help: '会员升级的商品选项',
+                  fields: [
+                    { key: '_upgrade_unit_notice', label: '', type: 'notice', ui_only: true, alertType: 'warning', content: '月费会员升级为月费会员，用户会员有效期不会改变；价格按照会员剩余天数计算升级价格，请在下方设置每天的单价' },
+                    { key: 'month_to_month_s', label: '月费会员升级月费会员', type: 'switch', default: true },
+                    { key: 'unit_price', label: '天单价', type: 'number', sanitize_type: 'money_decimal', default: '10.00', min: 0, unit: '元', dependsOn: { key: 'month_to_month_s', value: true } },
+                    { key: 'unit_tag', label: '促销标签', type: 'textarea', sanitize_type: 'html', default: '<i class="fa fas fa-fw fa-bolt"></i> 站长推荐', rows: 1, dependsOn: { key: 'month_to_month_s', value: true }, help: '支持HTML，请注意控制长度' },
+                    { key: 'unit_tag_class', label: '标签颜色', type: 'palette', default: 'jb-yellow', dependsOn: { all: [{ key: 'month_to_month_s', value: true }, { key: 'unit_tag', operator: 'not_empty' }] }, options: vipTagPalette },
+                    { key: '_upgrade_jump_notice', label: '', type: 'notice', ui_only: true, alertType: 'warning', content: '如果网站可以购买月费会员和永久会员，则可以开启此项；允许用户由月费会员直接升级到更高一级的永久会员，用户之前还未到期的部分将自动一起转为永久会员，可能会涉及到差价问题，请自行告知用户；如果网站没有永久会员的购买选项请务必关闭此项' },
+                    { key: 'jump_s', label: '月费会员升级永久会员', type: 'switch', default: false },
+                    { key: 'jump_price', label: '执行价', type: 'number', sanitize_type: 'money_decimal', default: '199.00', min: 0, unit: '元', dependsOn: { key: 'jump_s', value: true }, help: '月费会员升级永久会员的价格' },
+                    { key: 'jump_show_price', label: '原价', type: 'number', sanitize_type: 'money_decimal', default: '299.00', min: 0, unit: '元', dependsOn: { key: 'jump_s', value: true }, help: '显示在执行价格前面，并划掉' },
+                    { key: 'jump_tag', label: '促销标签', type: 'textarea', sanitize_type: 'html', default: '<i class="fa fas fa-fw fa-bolt"></i> 升级特惠', rows: 1, dependsOn: { key: 'jump_s', value: true }, help: '支持HTML，请注意控制长度' },
+                    { key: 'jump_tag_class', label: '标签颜色', type: 'palette', default: 'jb-red', dependsOn: { all: [{ key: 'jump_s', value: true }, { key: 'jump_tag', operator: 'not_empty' }] }, options: vipTagPalette },
+                    { key: 'permanent_price', label: '执行价', type: 'number', sanitize_type: 'money_decimal', default: '199.00', min: 0, unit: '元', help: '永久会员升级永久会员的价格' },
+                    { key: 'permanent_show_price', label: '原价', type: 'number', sanitize_type: 'money_decimal', default: '299.00', min: 0, unit: '元', help: '显示在执行价格前面，并划掉' },
+                    { key: 'permanent_tag', label: '促销标签', type: 'textarea', sanitize_type: 'html', default: '<i class="fa fas fa-fw fa-bolt"></i> 升级特惠', rows: 1, help: '支持HTML，请注意控制长度' },
+                    { key: 'permanent_tag_class', label: '标签颜色', type: 'palette', default: 'jb-red', dependsOn: { key: 'permanent_tag', operator: 'not_empty' }, options: vipTagPalette },
+                  ],
                },
              ],
            },
@@ -199,14 +405,43 @@ export const vipSchema = {
      title: '积分兑换会员',
      icon: 'fa fas fa-database',
      fields: [
-        { key: 'pay_vip_points_exchange_s', label: '启用积分兑换', type: 'switch', default: false },
+        { key: 'pay_vip_points_exchange_s', label: '启用积分兑换', type: 'switch', default: false, help: '开启后用户可使用积分兑换会员；由于积分可免费获取，所以积分兑换会员功能不支持升级及续费' },
        {
-          key: 'payment_vip_points_packages',
-          label: '兑换套餐',
-          type: 'textarea',
-          default: '1|500|30|积分月卡\n1|5000|0|积分永久',
+          key: 'pay_vip_points_exchange_product',
+          label: '积分兑换明细',
+          type: 'group',
+          max: 16,
+          button_title: '添加积分兑换商品',
+          default: [
+            { points: 500, level: 1, time: 30, unit: 'day' },
+            { points: 5000, level: 1, time: 'Permanent' },
+          ],
          dependsOn: { key: 'pay_vip_points_exchange_s', value: true },
-          help: '每行：等级|积分|天数|标题（天数 0=永久；仅未开通会员可兑）',
+          help: '每一行为一个可兑换的会员套餐',
+          fields: [
+            { key: 'points', label: '使用积分', type: 'number', default: 100, min: 0, unit: '积分' },
+            {
+              key: 'level',
+              label: '兑换会员',
+              type: 'radio',
+              default: 1,
+              inline: true,
+              options: [
+                { label: '一级会员', value: 1 },
+                { label: '二级会员', value: 2 },
+              ],
+            },
+            { key: 'time', label: '兑换时长', type: 'input', default: '', help: '填 Permanent 为永久' },
+            {
+              key: 'unit',
+              label: '时长单位',
+              type: 'radio',
+              default: 'day',
+              inline: true,
+              dependsOn: { key: 'time', operator: 'neq', value: 'Permanent' },
+              options: vipUnitOptions,
+            },
+          ],
        },
        { key: 'pay_vip_points_exchange_desc', label: '兑换说明', type: 'textarea', sanitize_type: 'html', default: '', rows: 2, dependsOn: { key: 'pay_vip_points_exchange_s', value: true }, help: '显示在积分兑换弹窗底部，可以为提醒事项、兑换协议等，支持HTML代码' },
      ],