@hlw-uni/mp-vue 2.0.2 → 2.0.6

package/dist/app.d.ts

@@ -10,7 +10,7 @@ export interface InterceptorOptions {
     /** Token 来源函数 */
     getToken?: () => string;
     /** 登录失效时的处理函数 */
-    onUnauthorized?: () => void;
+    onLogout?: () => void;
     /** 接口业务错误码是否自动 toast */
     autoToastError?: boolean;
 }

package/dist/composables/ad/index.d.ts

@@ -37,24 +37,6 @@ export interface AdCloseResult {
     /** 用户是否完整观看 */
     isEnded: boolean;
 }
-/** showReward 的 claim 回调返回契约 */
-export interface AdClaimResult {
-    /** 本次结果：true=成功 / false=失败 */
-    ok: boolean;
-    /** 奖励数（用于 toast 显示 +N 积分；无则不 toast） */
-    reward?: number;
-    /** 失败提示语；不传不弹 toast */
-    msg?: string;
-    /** 仅 isEnded=false 时常用：true 让 mp-core 重新 show 一次（业务方挽留确认后用） */
-    retry?: boolean;
-}
-/**
- * showReward 的 claim 回调签名 —— 业务方按场景实现（领积分、解锁、抽奖等）。
- * 每次广告关闭后被调用一次（无论是否完整看完），业务方根据 closeRes.isEnded 决定怎么走：
- *   - isEnded=true  → 调发奖接口 → return { ok: true, reward: N }
- *   - isEnded=false → 业务自己决定挽留：return { ok: false, retry: true } 让重新 show
- */
-export type AdClaimFn = (closeRes: AdCloseResult) => Promise<AdClaimResult>;
 /**
  * 注入业务回调，应用启动时调用一次。
  * 不调用也不会崩，但 loadConfig / showReward 会无效。
@@ -79,23 +61,23 @@ export declare function useAd(): {
     loaded: Ref<boolean, boolean>;
     loadConfig: (force?: boolean) => Promise<void>;
     getUnitId: (type: AdType) => string;
-    showReward: (claim?: AdClaimFn) => Promise<boolean>;
+    showReward: (onClose?: ((res: AdCloseResult) => void | Promise<void>) | undefined) => Promise<void>;
     showPopup: () => Promise<boolean>;
+    confirm: typeof confirmModal;
 };
 /**
- * 激励视频中途关闭挽留弹窗 —— 业务方在 claim 回调里也可以复用：
+ * 激励视频中途关闭挽留弹窗 —— 通过 useAd().confirm 暴露给业务方：
  *
- *   showReward(async (closeRes) => {
- *       if (!closeRes.isEnded) {
- *           const goon = await confirmReward();
- *           return { ok: false, retry: goon };
- *       }
+ *   const { showReward, confirm } = useAd();
+ *   showReward(async ({ isEnded }) => {
+ *       if (!isEnded) return { ok: false, retry: await confirm() };
  *       const r = await claimAdReward();
  *       return r.code === 1 ? { ok: true, reward: r.data?.reward } : { ok: false, msg: r.info };
  *   });
  *
  * @returns true=用户选「继续观看」 / false=放弃
  */
-export declare function confirmReward(): Promise<boolean>;
+declare function confirmModal(): Promise<boolean>;
 /** 销毁全部广告实例并清空缓存（业务一般不用，hot reload 时调） */
 export declare function destroyAds(): void;
+export {};

package/dist/composables/index.d.ts

@@ -10,7 +10,7 @@ export { usePageMeta } from './page-meta';
 export { useStorage, type StorageInstance } from './storage';
 export { useValidate } from './validate';
 export { useFormat } from './format';
-export { useAd, setConfigAd, destroyAds, confirmReward, type AdType, type AdConfig, type AdError, type AdAdapter, type AdCloseResult, type AdClaimResult, type AdClaimFn, } from './ad';
+export { useAd, setConfigAd, destroyAds, type AdType, type AdConfig, type AdError, type AdAdapter, type AdCloseResult, } from './ad';
 export { useShare, useShareConfig, setConfigShare, type ShareConfig, type ShareConfigResolver, type ShareFrom, type ShareAppMessageContent, type ShareTimelineContent, type ShareConfigMap, type ShareConfigAdapter, type PageShareItem, type PageShareFallback, type SharePayload, } from './share';
 export { useContact, setConfigContact, type ContactConfig, type ContactAdapter, type ContactBindProps, } from './contact';
 export { useUtils, type DownloadFileOptions, type DownloadFileResult, type TapEvent } from './utils';

package/dist/composables/msg/index.d.ts

@@ -18,6 +18,8 @@ export interface ModalOptions {
     cancelText?: string;
     confirmColor?: string;
     cancelColor?: string;
+    /** false=隐藏取消按钮（纯提示弹窗用） */
+    showCancel?: boolean;
 }
 export interface HlwMsg {
     toast(opts: ToastOptions | string): void;

package/dist/index.js

@@ -352,7 +352,8 @@ var __publicField = (obj, key, value) => {
           confirmText = "确定",
           cancelText = "取消",
           confirmColor = "#3b82f6",
-          cancelColor = "#999999"
+          cancelColor = "#999999",
+          showCancel = true
         } = opts;
         uni.showModal({
           title,
@@ -361,6 +362,7 @@ var __publicField = (obj, key, value) => {
           cancelText,
           confirmColor,
           cancelColor,
+          showCancel,
           success: (res) => resolve(res.confirm),
           fail: () => resolve(false)
         });
@@ -672,44 +674,19 @@ var __publicField = (obj, key, value) => {
     function getUnitId(type) {
       return store.config[`${type}_unit_id`] || "";
     }
-    async function showReward(claim) {
+    async function showReward(onClose) {
       const unitId = getUnitId("reward");
       if (!unitId) {
         msg().toast("激励广告未配置");
-        return false;
+        return;
       }
       if ((adapter$1 == null ? void 0 : adapter$1.isAuth) && !adapter$1.isAuth()) {
         msg().toast("请先登录");
-        return false;
-      }
-      while (true) {
-        const closeRes = await playRewardedOnce(unitId);
-        if (!claim) {
-          if (closeRes.isEnded)
-            return true;
-          const goon = await confirmReward();
-          if (!goon)
-            return false;
-          continue;
-        }
-        try {
-          const r = await claim(closeRes);
-          if (r.retry)
-            continue;
-          if (!r.ok) {
-            if (r.msg)
-              msg().error(r.msg);
-            return false;
-          }
-          if (r.reward && r.reward > 0)
-            msg().success(`+${r.reward} 积分`);
-          return true;
-        } catch (e) {
-          console.warn("[useAd] claim failed", e);
-          msg().error("领取失败，请稍后再试");
-          return false;
-        }
+        return;
       }
+      const closeRes = await playRewardedOnce(unitId);
+      if (onClose)
+        await onClose(closeRes);
     }
     async function showPopup() {
       const unitId = getUnitId("popup");
@@ -725,7 +702,8 @@ var __publicField = (obj, key, value) => {
       loadConfig: loadConfig2,
       getUnitId,
       showReward,
-      showPopup
+      showPopup,
+      confirm: confirmModal
     };
   }
   async function playRewardedOnce(unitId) {
@@ -744,7 +722,7 @@ var __publicField = (obj, key, value) => {
       hide();
     }
   }
-  function confirmReward() {
+  function confirmModal() {
     return new Promise((resolve) => {
       uni.showModal({
         title: "提示",
@@ -1846,7 +1824,7 @@ var __publicField = (obj, key, value) => {
     const offError = http.onError((err) => {
       var _a;
       if (err.message.includes("401")) {
-        (_a = opts.onUnauthorized) == null ? void 0 : _a.call(opts);
+        (_a = opts.onLogout) == null ? void 0 : _a.call(opts);
       }
     });
     _interceptorCleanup = [offRequest, offResponse, offError];
@@ -1900,7 +1878,6 @@ var __publicField = (obj, key, value) => {
   exports2.alistAdapter = alistAdapter;
   exports2.buildThemeStyle = buildThemeStyle;
   exports2.clearDeviceCache = clearDeviceCache;
-  exports2.confirmReward = confirmReward;
   exports2.cosAdapter = cosAdapter;
   exports2.destroyAds = destroyAds;
   exports2.deviceToQuery = deviceToQuery;

package/dist/index.mjs

@@ -351,7 +351,8 @@ function useMsg() {
         confirmText = "确定",
         cancelText = "取消",
         confirmColor = "#3b82f6",
-        cancelColor = "#999999"
+        cancelColor = "#999999",
+        showCancel = true
       } = opts;
       uni.showModal({
         title,
@@ -360,6 +361,7 @@ function useMsg() {
         cancelText,
         confirmColor,
         cancelColor,
+        showCancel,
         success: (res) => resolve(res.confirm),
         fail: () => resolve(false)
       });
@@ -671,44 +673,19 @@ function useAd() {
   function getUnitId(type) {
     return store.config[`${type}_unit_id`] || "";
   }
-  async function showReward(claim) {
+  async function showReward(onClose) {
     const unitId = getUnitId("reward");
     if (!unitId) {
       msg().toast("激励广告未配置");
-      return false;
+      return;
     }
     if ((adapter$1 == null ? void 0 : adapter$1.isAuth) && !adapter$1.isAuth()) {
       msg().toast("请先登录");
-      return false;
-    }
-    while (true) {
-      const closeRes = await playRewardedOnce(unitId);
-      if (!claim) {
-        if (closeRes.isEnded)
-          return true;
-        const goon = await confirmReward();
-        if (!goon)
-          return false;
-        continue;
-      }
-      try {
-        const r = await claim(closeRes);
-        if (r.retry)
-          continue;
-        if (!r.ok) {
-          if (r.msg)
-            msg().error(r.msg);
-          return false;
-        }
-        if (r.reward && r.reward > 0)
-          msg().success(`+${r.reward} 积分`);
-        return true;
-      } catch (e) {
-        console.warn("[useAd] claim failed", e);
-        msg().error("领取失败，请稍后再试");
-        return false;
-      }
+      return;
     }
+    const closeRes = await playRewardedOnce(unitId);
+    if (onClose)
+      await onClose(closeRes);
   }
   async function showPopup() {
     const unitId = getUnitId("popup");
@@ -724,7 +701,8 @@ function useAd() {
     loadConfig: loadConfig2,
     getUnitId,
     showReward,
-    showPopup
+    showPopup,
+    confirm: confirmModal
   };
 }
 async function playRewardedOnce(unitId) {
@@ -743,7 +721,7 @@ async function playRewardedOnce(unitId) {
     hide();
   }
 }
-function confirmReward() {
+function confirmModal() {
   return new Promise((resolve) => {
     uni.showModal({
       title: "提示",
@@ -1845,7 +1823,7 @@ function setupInterceptors(options = {}) {
   const offError = http.onError((err) => {
     var _a;
     if (err.message.includes("401")) {
-      (_a = opts.onUnauthorized) == null ? void 0 : _a.call(opts);
+      (_a = opts.onLogout) == null ? void 0 : _a.call(opts);
     }
   });
   _interceptorCleanup = [offRequest, offResponse, offError];
@@ -1900,7 +1878,6 @@ export {
   alistAdapter,
   buildThemeStyle,
   clearDeviceCache,
-  confirmReward,
   cosAdapter,
   destroyAds,
   deviceToQuery,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hlw-uni/mp-vue",
-    "version": "2.0.2",
+    "version": "2.0.6",
     "description": "hlw-uni 小程序运行时 — Vue 组件 + composables + theme + http + 工具集（合并自原 mp-core）",
     "main": "dist/index.js",
     "module": "dist/index.mjs",

package/src/app.ts

@@ -20,7 +20,7 @@ export interface InterceptorOptions {
     /** Token 来源函数 */
     getToken?: () => string;
     /** 登录失效时的处理函数 */
-    onUnauthorized?: () => void;
+    onLogout?: () => void;
     /** 接口业务错误码是否自动 toast */
     autoToastError?: boolean;
 }
@@ -165,7 +165,7 @@ export function setupInterceptors(options: InterceptorOptions & { sigSecret?: st
      */
     const offError = http.onError((err: Error) => {
         if (err.message.includes('401')) {
-            opts.onUnauthorized?.();
+            opts.onLogout?.();
         }
     });
 

package/src/composables/ad/index.ts

@@ -88,26 +88,6 @@ export interface AdCloseResult {
     isEnded: boolean;
 }
 
-/** showReward 的 claim 回调返回契约 */
-export interface AdClaimResult {
-    /** 本次结果：true=成功 / false=失败 */
-    ok: boolean;
-    /** 奖励数（用于 toast 显示 +N 积分；无则不 toast） */
-    reward?: number;
-    /** 失败提示语；不传不弹 toast */
-    msg?: string;
-    /** 仅 isEnded=false 时常用：true 让 mp-core 重新 show 一次（业务方挽留确认后用） */
-    retry?: boolean;
-}
-
-/**
- * showReward 的 claim 回调签名 —— 业务方按场景实现（领积分、解锁、抽奖等）。
- * 每次广告关闭后被调用一次（无论是否完整看完），业务方根据 closeRes.isEnded 决定怎么走：
- *   - isEnded=true  → 调发奖接口 → return { ok: true, reward: N }
- *   - isEnded=false → 业务自己决定挽留：return { ok: false, retry: true } 让重新 show
- */
-export type AdClaimFn = (closeRes: AdCloseResult) => Promise<AdClaimResult>;
-
 const EMPTY: AdConfig = {
     banner_unit_id: "",
     grid_unit_id: "",
@@ -180,51 +160,27 @@ export function useAd() {
     }
 
     /**
-     * 显示激励视频
+     * 显示激励视频 —— 播一次、关闭后调 onClose（带 isEnded），其它都交给业务。
      *
-     * 流程：loading → 广告 UI → 关闭 → 业务 claim 回调（按 closeRes.isEnded 决定怎么走）
+     *   showReward(({ isEnded }) => {
+     *       if (!isEnded) confirm().then(goon => goon && tapReward());
+     *       else claimAdReward().then(...);
+     *   });
      *
-     * @param claim 关闭后业务回调；不传则纯展示，看完即返回 true、未看完返回 false
-     * @returns true=最终成功；false=未看完且业务放弃 / 配置缺失 / claim 失败
+     * @param onClose 关闭回调；不传则只播。retry / toast / 发奖全在业务侧自己写。
      */
-    async function showReward(claim?: AdClaimFn): Promise<boolean> {
+    async function showReward(onClose?: (res: AdCloseResult) => void | Promise<void>): Promise<void> {
         const unitId = getUnitId("reward");
         if (!unitId) {
             msg().toast("激励广告未配置");
-            return false;
+            return;
         }
         if (adapter?.isAuth && !adapter.isAuth()) {
             msg().toast("请先登录");
-            return false;
-        }
-
-        while (true) {
-            const closeRes = await playRewardedOnce(unitId);
-
-            // 没传 claim：默认行为 = 看完了 true / 没看完弹挽留 + 重试 / 放弃 false
-            if (!claim) {
-                if (closeRes.isEnded) return true;
-                const goon = await confirmReward();
-                if (!goon) return false;
-                continue;
-            }
-
-            // 业务方决定怎么走（包括「未看完是否挽留」）
-            try {
-                const r = await claim(closeRes);
-                if (r.retry) continue;
-                if (!r.ok) {
-                    if (r.msg) msg().error(r.msg);
-                    return false;
-                }
-                if (r.reward && r.reward > 0) msg().success(`+${r.reward} 积分`);
-                return true;
-            } catch (e) {
-                console.warn("[useAd] claim failed", e);
-                msg().error("领取失败，请稍后再试");
-                return false;
-            }
+            return;
         }
+        const closeRes = await playRewardedOnce(unitId);
+        if (onClose) await onClose(closeRes);
     }
 
     /**
@@ -246,6 +202,7 @@ export function useAd() {
         getUnitId,
         showReward,
         showPopup,
+        confirm: confirmModal,
     };
 }
 
@@ -272,20 +229,18 @@ async function playRewardedOnce(unitId: string): Promise<AdCloseResult> {
 }
 
 /**
- * 激励视频中途关闭挽留弹窗 —— 业务方在 claim 回调里也可以复用：
+ * 激励视频中途关闭挽留弹窗 —— 通过 useAd().confirm 暴露给业务方：
  *
- *   showReward(async (closeRes) => {
- *       if (!closeRes.isEnded) {
- *           const goon = await confirmReward();
- *           return { ok: false, retry: goon };
- *       }
+ *   const { showReward, confirm } = useAd();
+ *   showReward(async ({ isEnded }) => {
+ *       if (!isEnded) return { ok: false, retry: await confirm() };
  *       const r = await claimAdReward();
  *       return r.code === 1 ? { ok: true, reward: r.data?.reward } : { ok: false, msg: r.info };
  *   });
  *
  * @returns true=用户选「继续观看」 / false=放弃
  */
-export function confirmReward(): Promise<boolean> {
+function confirmModal(): Promise<boolean> {
     return new Promise((resolve) => {
         uni.showModal({
             title: "提示",

package/src/composables/index.ts

@@ -14,14 +14,11 @@ export {
     useAd,
     setConfigAd,
     destroyAds,
-    confirmReward,
     type AdType,
     type AdConfig,
     type AdError,
     type AdAdapter,
     type AdCloseResult,
-    type AdClaimResult,
-    type AdClaimFn,
 } from "./ad";
 export {
     useShare,

package/src/composables/msg/index.ts

@@ -20,6 +20,8 @@ export interface ModalOptions {
     cancelText?: string;
     confirmColor?: string;
     cancelColor?: string;
+    /** false=隐藏取消按钮（纯提示弹窗用） */
+    showCancel?: boolean;
 }
 
 export interface HlwMsg {
@@ -87,6 +89,7 @@ export function useMsg(): HlwMsg {
                 cancelText = "取消",
                 confirmColor = "#3b82f6",
                 cancelColor = "#999999",
+                showCancel = true,
             } = opts;
             uni.showModal({
                 title,
@@ -95,6 +98,7 @@ export function useMsg(): HlwMsg {
                 cancelText,
                 confirmColor,
                 cancelColor,
+                showCancel,
                 success: (res) => resolve(res.confirm),
                 fail: () => resolve(false),
             });