@huyooo/ui 2.1.6 → 2.1.8

package/dist/{PricingPlans-DNPKQwFa.js → PricingPlans-qRWHwi9x.js}

@@ -9,7 +9,7 @@ import { a as we } from "./PaySubscriptions-pEZtjp1g.js";
 import { _ as U } from "./_plugin-vue_export-helper-CHgC5LLL.js";
 import { L as Ie, a as Ce, b as Be } from "./LandingPageSectionHeader-3hiuw6G0.js";
 import { Icon as te } from "@iconify/vue";
-import { u as Le, a as Re } from "./useSubscriptionCheckout-3BtQARep.js";
+import { u as Le, a as Re } from "./useSubscriptionCheckout-Dmg0kt4F.js";
 import { u as Ae } from "./useEnsureAuthenticated-RZ1DflLz.js";
 const kt = "/Pay/Return";
 function G(l) {

package/dist/composables/Billing/useBillingPlans.d.ts

@@ -17,6 +17,8 @@ export interface BillingPrice {
     unitAmount: number;
     interval?: "day" | "week" | BillingInterval;
     intervalCount?: number;
+    /** 订阅支付成功后附送积分 */
+    bonusPoints?: number;
     metadata?: Record<string, unknown>;
     features?: BillingProductFeature[];
 }
@@ -103,7 +105,10 @@ export declare function useBillingPlans(defaultInterval?: BillingInterval | Bill
             currency: string;
             unitAmount: number;
             interval?: ("day" | "week" | BillingInterval) | undefined;
-            intervalCount?: number | undefined;
+            intervalCount?: number
+            /** 订阅支付成功后附送积分 */
+             | undefined;
+            bonusPoints?: number | undefined;
             metadata?: Record<string, unknown> | undefined;
             features?: {
                 key: string;
@@ -127,7 +132,10 @@ export declare function useBillingPlans(defaultInterval?: BillingInterval | Bill
             currency: string;
             unitAmount: number;
             interval?: ("day" | "week" | BillingInterval) | undefined;
-            intervalCount?: number | undefined;
+            intervalCount?: number
+            /** 订阅支付成功后附送积分 */
+             | undefined;
+            bonusPoints?: number | undefined;
             metadata?: Record<string, unknown> | undefined;
             features?: {
                 key: string;

package/dist/composables.js

@@ -10,7 +10,7 @@ import { u as E } from "./useMessageNotifications-pxa5LHjV.js";
 import { c as y, g as B, a as H, s as I, u as _ } from "./runtime-DDJRAtkv.js";
 import { u as F, a as K, b as N, c as V, d as Y } from "./usePageSEO-B3stKP3n.js";
 import { u as q } from "./useUserMenu-ClPBlvaM.js";
-import { u as J, a as Q } from "./useSubscriptionCheckout-3BtQARep.js";
+import { u as J, a as Q } from "./useSubscriptionCheckout-Dmg0kt4F.js";
 import { c as X, u as Z, a as $, b as ee } from "./useBillingStatusOptions-C6edto7H.js";
 export {
   r as LEGAL_DOCS,

package/dist/main.js

@@ -13,7 +13,7 @@ import { H as x3, b as v3, d as Z3, c as V3, a as H3, s as U3, u as E3 } from ".
 import { b as N } from "./usePageSEO-B3stKP3n.js";
 import { u as S3, a as A3, c as G3, d as D3 } from "./usePageSEO-B3stKP3n.js";
 import { u as b3 } from "./useUserMenu-ClPBlvaM.js";
-import { u as O3, a as T3 } from "./useSubscriptionCheckout-3BtQARep.js";
+import { u as O3, a as T3 } from "./useSubscriptionCheckout-Dmg0kt4F.js";
 import { c as $3, u as N3, a as R3, b as j3 } from "./useBillingStatusOptions-C6edto7H.js";
 import { A as W3, B as Y3, a as q3, _ as Q3, b as K3, O as J3, P as X3, c as e4, d as t4, e as o4, f as a4, S as s4, g as i4, h as n4, u as r4, i as c4 } from "./AuthkitAppSetting-CHVSyEY1.js";
 import { A as l4, a as d4, b as p4, c as f4, d as u4, E as h4, e as g4, f as _4, g as m4, O as L4, h as F4, P as w4, i as y4, j as M4, _ as x4, R as v4, S as Z4, k as V4, l as H4, m as U4, n as E4, o as k4, p as S4, L as A4 } from "./LegalDocViewer-DiNoy_oj.js";
@@ -32,7 +32,7 @@ import { C as h7, a as g7 } from "./CollapseItem-DUzZA6tx.js";
 import { C as m7, E as L7 } from "./CustomTable-BY0oHLXc.js";
 import { M as w7, a as y7 } from "./Menu-uCexrsKP.js";
 import { P as x7, u as v7, a as Z7, v as V7 } from "./PaySubscriptions-pEZtjp1g.js";
-import { P as U7, a as E7, b as k7, c as S7, p as A7, r as G7 } from "./PricingPlans-DNPKQwFa.js";
+import { P as U7, a as E7, b as k7, c as S7, p as A7, r as G7 } from "./PricingPlans-qRWHwi9x.js";
 import { useBillingSubscriptionSummary as P7 } from "./useBillingSubscriptionSummary-BC3G0N4t.js";
 import { R as B7 } from "./ReferrerReferees-t5s4LzbY.js";
 import { _ as T7 } from "./Upload.vue_vue_type_script_setup_true_lang-DsrqOACa.js";

package/dist/pay.js

@@ -1,6 +1,6 @@
 import { P as e, u as t, a as n, v as r } from "./PaySubscriptions-pEZtjp1g.js";
-import { P as i, a as o, b as P, c as p, p as m, r as c } from "./PricingPlans-DNPKQwFa.js";
-import { u as g, a as y } from "./useSubscriptionCheckout-3BtQARep.js";
+import { P as i, a as o, b as P, c as p, p as m, r as c } from "./PricingPlans-qRWHwi9x.js";
+import { u as g, a as y } from "./useSubscriptionCheckout-Dmg0kt4F.js";
 import { useBillingSubscriptionSummary as R } from "./useBillingSubscriptionSummary-BC3G0N4t.js";
 import { c as b, u as x, a as v, b as O } from "./useBillingStatusOptions-C6edto7H.js";
 export {

package/dist/{useSubscriptionCheckout-3BtQARep.js → useSubscriptionCheckout-Dmg0kt4F.js}

@@ -1,27 +1,35 @@
-import { ref as p, computed as q } from "vue";
-import { d as _ } from "./useBillingStatusOptions-C6edto7H.js";
+import { ref as g, computed as S } from "vue";
+import { d as V } from "./useBillingStatusOptions-C6edto7H.js";
 import { g as $ } from "./apiClients-CWSwNzGk.js";
 /* empty css               */
 import { Message as h } from "@arco-design/web-vue";
-import { u as z } from "./useEnsureAuthenticated-RZ1DflLz.js";
+import { u as _ } from "./useEnsureAuthenticated-RZ1DflLz.js";
 function D(e) {
   var u;
-  const i = (u = e == null ? void 0 : e.metadata) == null ? void 0 : u.originalPrice;
-  return typeof i == "number" ? i : void 0;
+  const r = (u = e == null ? void 0 : e.metadata) == null ? void 0 : u.originalPrice;
+  return typeof r == "number" ? r : void 0;
 }
 function F(e) {
-  const i = D(e);
-  return !e || i === void 0 || i <= e.unitAmount ? 0 : i - e.unitAmount;
+  const r = D(e);
+  return !e || r === void 0 || r <= e.unitAmount ? 0 : r - e.unitAmount;
 }
 function H(e) {
-  const i = F(e);
-  return i > 0 ? `优惠 ¥${P(i)}` : "";
+  var d;
+  const r = [], u = (d = e == null ? void 0 : e.metadata) == null ? void 0 : d.includedPointsLabel;
+  if (typeof u == "string" && u.trim())
+    r.push(u.trim());
+  else {
+    const s = typeof (e == null ? void 0 : e.bonusPoints) == "number" ? e.bonusPoints : 0;
+    s > 0 && r.push(`含 ${s.toLocaleString("zh-CN")} 积分`);
+  }
+  const l = F(e);
+  return l > 0 && r.push(`优惠 ¥${P(l)}`), r.join(" · ");
 }
 function P(e) {
   return e === void 0 ? 0 : Math.floor(e / 100);
 }
-function J(e, i = 1) {
-  const u = i > 1 ? `每 ${i} ` : "按";
+function J(e, r = 1) {
+  const u = r > 1 ? `每 ${r} ` : "按";
   switch (e) {
     case "month":
       return `${u}月订阅`;
@@ -36,31 +44,31 @@ function J(e, i = 1) {
   }
 }
 function W(e) {
-  const i = e != null && e.intervalCount && e.intervalCount > 1 ? `${e.intervalCount} ` : "";
+  const r = e != null && e.intervalCount && e.intervalCount > 1 ? `${e.intervalCount} ` : "";
   switch (e == null ? void 0 : e.interval) {
     case "month":
-      return `/ ${i}月`;
+      return `/ ${r}月`;
     case "year":
-      return `/ ${i}年`;
+      return `/ ${r}年`;
     case "day":
-      return `/ ${i}天`;
+      return `/ ${r}天`;
     case "week":
-      return `/ ${i}周`;
+      return `/ ${r}周`;
     default:
       return "";
   }
 }
 function X(e) {
-  const i = (e == null ? void 0 : e.intervalCount) ?? 1;
+  const r = (e == null ? void 0 : e.intervalCount) ?? 1;
   switch (e == null ? void 0 : e.interval) {
     case "month":
-      return `${i} 个月`;
+      return `${r} 个月`;
     case "year":
-      return `${i} 年`;
+      return `${r} 年`;
     case "day":
-      return `${i} 天`;
+      return `${r} 天`;
     case "week":
-      return `${i} 周`;
+      return `${r} 周`;
     default:
       return "";
   }
@@ -81,14 +89,14 @@ function A(e) {
       return "";
   }
 }
-function S(e) {
+function q(e) {
   if (e.type === "quota" && e.value !== void 0) {
-    const i = A(e.quotaPeriod), u = i ? ` / ${i}` : "";
+    const r = A(e.quotaPeriod), u = r ? ` / ${r}` : "";
     return `${e.name}: ${e.value === -1 ? "无限" : e.value}${u}`;
   }
   if (e.type === "unlimited") {
-    const i = A(e.quotaPeriod);
-    return i ? `${e.name}: 不限 / ${i}` : `${e.name}不限`;
+    const r = A(e.quotaPeriod);
+    return r ? `${e.name}: 不限 / ${r}` : `${e.name}不限`;
   }
   return e.type === "boolean" && e.value === !1 ? `${e.name}（不支持）` : e.name;
 }
@@ -99,21 +107,21 @@ function I(e) {
     intervalCount: e.intervalCount ?? 1
   };
 }
-function Y(e, i) {
+function Y(e, r) {
   const u = {
     day: 1,
     week: 2,
     month: 3,
     year: 4
   };
-  return u[e.interval] - u[i.interval] || e.intervalCount - i.intervalCount;
+  return u[e.interval] - u[r.interval] || e.intervalCount - r.intervalCount;
 }
-function Z(e, i) {
+function Z(e, r) {
   let u = 0;
   for (const l of e)
-    for (const f of l.prices) {
-      const s = I(f);
-      (s == null ? void 0 : s.key) === i && (u = Math.max(u, F(f)));
+    for (const d of l.prices) {
+      const s = I(d);
+      (s == null ? void 0 : s.key) === r && (u = Math.max(u, F(d)));
     }
   return u > 0 ? `最高优惠 ¥${P(u)}` : void 0;
 }
@@ -124,39 +132,39 @@ function B() {
   return !!localStorage.getItem("jwtToken");
 }
 function ae(e = "month") {
-  const i = p([]), u = p(null), l = p(null), f = p(!1), s = p(!1), a = p(ee(e)), m = q(() => {
+  const r = g([]), u = g(null), l = g(null), d = g(!1), s = g(!1), f = g(ee(e)), m = S(() => {
     const n = /* @__PURE__ */ new Map();
-    for (const t of i.value)
-      for (const r of t.prices) {
-        const o = I(r);
-        o && n.set(o.key, o);
+    for (const t of r.value)
+      for (const i of t.prices) {
+        const c = I(i);
+        c && n.set(c.key, c);
       }
     return [...n.values()].sort(Y).map((t) => ({
       value: t.key,
       label: J(t.interval, t.intervalCount),
-      badge: Z(i.value, t.key)
+      badge: Z(r.value, t.key)
     }));
-  }), g = q(() => {
+  }), p = S(() => {
     const n = [];
-    for (const t of i.value) {
-      const r = t.prices.find((c) => {
-        const b = I(c);
-        return (b == null ? void 0 : b.key) === a.value;
-      }), o = t.prices.find((c) => c.type === "free"), d = r ?? (o && t.prices.every((c) => c.type === "free") ? o : void 0);
-      d && n.push({
+    for (const t of r.value) {
+      const i = t.prices.find((o) => {
+        const b = I(o);
+        return (b == null ? void 0 : b.key) === f.value;
+      }), c = t.prices.find((o) => o.type === "free"), a = i ?? (c && t.prices.every((o) => o.type === "free") ? c : void 0);
+      a && n.push({
         ...t,
-        features: d.features ?? [],
-        selectedPrice: d
+        features: a.features ?? [],
+        selectedPrice: a
       });
     }
     return n;
   });
   function x(n) {
-    a.value = n;
+    f.value = n;
   }
   function y(n) {
-    const t = u.value, r = l.value;
-    return t != null && t.priceId && n.selectedPrice ? t.priceId === n.selectedPrice.id : t ? t.productId === n.id : r != null && r.priceId && n.selectedPrice ? r.priceId === n.selectedPrice.id : r ? r.productId === n.id : !1;
+    const t = u.value, i = l.value;
+    return t != null && t.priceId && n.selectedPrice ? t.priceId === n.selectedPrice.id : t ? t.productId === n.id : i != null && i.priceId && n.selectedPrice ? i.priceId === n.selectedPrice.id : i ? i.productId === n.id : !1;
   }
   function C(n) {
     var t;
@@ -180,21 +188,21 @@ function ae(e = "month") {
     var t;
     return P((t = n.selectedPrice) == null ? void 0 : t.unitAmount);
   }
-  function G(n) {
+  function j(n) {
     const t = D(n.selectedPrice);
     return t === void 0 ? void 0 : P(t);
   }
-  function O(n) {
+  function G(n) {
     return v(n) ? "" : W(n.selectedPrice);
   }
-  function T(n) {
+  function O(n) {
     if (v(n)) {
       const t = X(n.selectedPrice);
       return t ? `${t}免费体验` : "免费体验";
     }
     return H(n.selectedPrice);
   }
-  function j(n) {
+  function T(n) {
     const t = [];
     return y(n) ? t.push({
       label: "当前方案",
@@ -212,47 +220,50 @@ function ae(e = "month") {
     return y(n) ? "当前方案" : v(n) ? t ? "已订阅付费方案" : B() ? "免费开通" : "免费注册" : t ? C(n) ? "切换周期" : typeof t.unitAmount == "number" && n.selectedPrice.unitAmount > t.unitAmount ? "升级方案" : "切换方案" : "立即订阅";
   }
   function R(n, t) {
-    const r = n.features.find((o) => o.type === "quota" && o.value !== void 0);
-    if (r) {
-      const o = A(r.quotaPeriod), d = r.value === -1 ? "不限量" : r.value;
-      return `${r.name} ${o ? `${d} / ${o}` : d}，覆盖核心使用场景。`;
+    const i = typeof n.description == "string" ? n.description.trim() : "";
+    if (i)
+      return i;
+    const c = n.features.find((a) => a.type === "quota" && a.value !== void 0);
+    if (c) {
+      const a = A(c.quotaPeriod), o = c.value === -1 ? "不限量" : c.value;
+      return `${c.name} ${a ? `${o} / ${a}` : o}，覆盖核心使用场景。`;
     }
     return v(n) ? "注册后自动开通免费权益，适合先体验核心能力。" : t === 1 ? "为正式团队准备的高配能力组合。" : "包含入门所需的核心能力。";
   }
-  function K(n) {
+  function z(n) {
     return n.filter((t) => t.highlight !== !1).map((t) => ({
-      title: S(t),
+      title: q(t),
       description: t.description || ""
     }));
   }
-  function Q(n) {
-    const t = n.filter((c) => c.highlight !== !1), r = t.filter((c) => c.type === "quota" || c.type === "unlimited").map((c) => ({
-      title: S(c),
-      description: c.description || ""
-    })), o = t.filter((c) => c.type === "boolean" && c.value !== !1).map((c) => ({
-      title: c.name,
-      description: c.description || ""
-    })), d = [];
-    return o.length && d.push({
+  function K(n) {
+    const t = n.filter((o) => o.highlight !== !1), i = t.filter((o) => o.type === "quota" || o.type === "unlimited").map((o) => ({
+      title: q(o),
+      description: o.description || ""
+    })), c = t.filter((o) => o.type === "boolean" && o.value !== !1).map((o) => ({
+      title: o.name,
+      description: o.description || ""
+    })), a = [];
+    return c.length && a.push({
       title: "功能特性",
-      items: o
-    }), r.length && d.push({
+      items: c
+    }), i.length && a.push({
       title: "用量配额",
-      items: r
-    }), d;
+      items: i
+    }), a;
   }
   async function k() {
-    f.value = !0;
+    d.value = !0;
     const {
       data: n,
       error: t
-    } = await _.productOptions();
-    if (f.value = !1, t)
+    } = await V.productOptions();
+    if (d.value = !1, t)
       return;
-    i.value = Array.isArray(n) ? n : [], !m.value.some((o) => o.value === a.value) && m.value[0] && (a.value = m.value[0].value);
+    r.value = Array.isArray(n) ? n : [], !m.value.some((c) => c.value === f.value) && m.value[0] && (f.value = m.value[0].value);
   }
   async function L() {
-    var o;
+    var c;
     if (!B()) {
       u.value = null, l.value = null;
       return;
@@ -264,51 +275,51 @@ function ae(e = "month") {
     } = await $().billing.subscriptions.summary.post();
     if (s.value = !1, t)
       return;
-    const r = n;
-    if (!(r != null && r.entitlement) || !r.product) {
+    const i = n;
+    if (!(i != null && i.entitlement) || !i.product) {
       u.value = null, l.value = null;
       return;
     }
-    if (r.entitlement.acquiredBy === "subscribe" && r.price) {
+    if (i.entitlement.acquiredBy === "subscribe" && i.price) {
       u.value = {
-        id: r.entitlement.sourceId,
-        productId: r.product.id,
-        productName: r.product.name,
-        priceId: r.price.id,
-        interval: r.price.interval || void 0,
-        intervalCount: r.price.intervalCount || void 0,
-        unitAmount: r.price.unitAmount || void 0,
-        currency: r.price.currency || void 0,
-        status: r.entitlement.status,
-        currentPeriodStart: r.entitlement.startAt || void 0,
-        currentPeriodEnd: r.entitlement.endAt,
-        cancelAtPeriodEnd: !!r.entitlement.cancelAtPeriodEnd,
-        pendingChange: r.entitlement.pendingChange || null,
+        id: i.entitlement.sourceId,
+        productId: i.product.id,
+        productName: i.product.name,
+        priceId: i.price.id,
+        interval: i.price.interval || void 0,
+        intervalCount: i.price.intervalCount || void 0,
+        unitAmount: i.price.unitAmount || void 0,
+        currency: i.price.currency || void 0,
+        status: i.entitlement.status,
+        currentPeriodStart: i.entitlement.startAt || void 0,
+        currentPeriodEnd: i.entitlement.endAt,
+        cancelAtPeriodEnd: !!i.entitlement.cancelAtPeriodEnd,
+        pendingChange: i.entitlement.pendingChange || null,
         trialEnd: null
       }, l.value = null;
       return;
     }
     u.value = null, l.value = {
-      id: r.entitlement.sourceId,
-      productId: r.product.id,
-      productName: r.product.name,
-      priceId: (o = r.price) == null ? void 0 : o.id,
-      status: r.entitlement.status,
-      startAt: r.entitlement.startAt,
-      endAt: r.entitlement.endAt
+      id: i.entitlement.sourceId,
+      productId: i.product.id,
+      productName: i.product.name,
+      priceId: (c = i.price) == null ? void 0 : c.id,
+      status: i.entitlement.status,
+      startAt: i.entitlement.startAt,
+      endAt: i.entitlement.endAt
     };
   }
-  async function V() {
+  async function Q() {
     await Promise.all([k(), L()]);
   }
   return {
-    products: i,
-    plans: g,
+    products: r,
+    plans: p,
     currentSubscription: u,
     currentTrial: l,
-    listLoading: f,
+    listLoading: d,
     currentLoading: s,
-    billingInterval: a,
+    billingInterval: f,
     billingIntervalTabs: m,
     setBillingInterval: x,
     isCurrentPlan: y,
@@ -317,17 +328,17 @@ function ae(e = "month") {
     isFreePlan: v,
     isPlanActionDisabled: E,
     getDisplayPrice: M,
-    getDisplayOriginalPrice: G,
-    getDisplayCycle: O,
-    getPromotionLabel: T,
-    getBadgeLabels: j,
+    getDisplayOriginalPrice: j,
+    getDisplayCycle: G,
+    getPromotionLabel: O,
+    getBadgeLabels: T,
     getButtonLabel: N,
     getPlanSummary: R,
-    getFeatureItems: K,
-    getFeatureGroups: Q,
+    getFeatureItems: z,
+    getFeatureGroups: K,
     loadProducts: k,
     loadCurrentSubscription: L,
-    refresh: V
+    refresh: Q
   };
 }
 function te(e) {
@@ -340,46 +351,46 @@ function re(e) {
   return e && typeof e == "object" && "alipayUrl" in e && typeof e.alipayUrl == "string" ? e.alipayUrl : "";
 }
 function de(e) {
-  const i = p(null), {
+  const r = g(null), {
     ensureAuthenticated: u
-  } = z();
+  } = _();
   async function l(s) {
     if (!s.selectedPrice) {
       h.warning("当前方案暂无可购买价格");
       return;
     }
     if (!u(() => l(s))) return;
-    const a = e.currentSubscription.value;
-    if ((a == null ? void 0 : a.priceId) === s.selectedPrice.id) {
+    const f = e.currentSubscription.value;
+    if ((f == null ? void 0 : f.priceId) === s.selectedPrice.id) {
       h.info("当前已经是该方案");
       return;
     }
     if (s.selectedPrice.type === "free")
       return;
-    i.value = s.id;
-    const m = a ? await $().billing.subscriptions.change.post({
-      subscriptionId: a.id,
+    r.value = s.id;
+    const m = f ? await $().billing.subscriptions.change.post({
+      subscriptionId: f.id,
       newPriceId: s.selectedPrice.id,
       proration: !0
     }) : await $().billing.subscriptions.create.post({
       priceId: s.selectedPrice.id
     });
-    if (i.value = null, m.error)
+    if (r.value = null, m.error)
       return;
-    const g = re(m.data);
-    if (g) {
-      te(g);
+    const p = re(m.data);
+    if (p) {
+      te(p);
       return;
     }
     h.success(ne(m.data) || "订阅已更新"), await e.refreshCurrentSubscription();
   }
-  function f(s) {
-    return i.value === s.id;
+  function d(s) {
+    return r.value === s.id;
   }
   return {
-    checkoutPlanId: i,
+    checkoutPlanId: r,
     checkout: l,
-    isCheckingOut: f
+    isCheckingOut: d
   };
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huyooo/ui",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "private": false,
   "type": "module",
   "files": [