@hlw-uni/mp-vue 2.1.12 → 2.1.14

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

@@ -1,5 +1,5 @@
 import { AdapterPayload } from '../_internal/unwrap';
-import { Ref } from 'vue';
+import { ComputedRef, Ref } from 'vue';
 
 /** 6 种广告类型 */
 export type AdType = "banner" | "grid" | "custom" | "video" | "reward" | "popup";
@@ -11,6 +11,8 @@ export interface AdConfig {
     video_unit_id: string;
     reward_unit_id: string;
     popup_unit_id: string;
+    /** VIP 屏蔽展示型广告（reward 除外）：0=否，1=屏蔽 banner/grid/custom/video/popup */
+    vip_no_ad?: 0 | 1;
 }
 /** 广告错误对象（onError 回调参数） */
 export interface AdError {
@@ -31,6 +33,13 @@ export interface AdAdapter {
     getConfig: () => Promise<AdapterPayload<AdConfig>>;
     /** 是否已登录；不传 = 不校验（showReward 调用前会问一次） */
     isAuth?: () => boolean;
+    /** 是否 VIP；配合 config.vip_no_ad=1 时屏蔽展示型广告（reward 不受影响） */
+    isVip?: () => boolean;
+    /**
+     * 用户级强制屏蔽：返回 true 直接屏蔽展示型广告（reward 不受影响），
+     * 优先级高于 mp.vip_no_ad + isVip 的联合判断；不传 = 不强制。
+     */
+    userNoAd?: () => boolean;
 }
 /** 激励视频关闭回调返回 */
 export interface AdCloseResult {
@@ -43,21 +52,7 @@ export interface AdCloseResult {
  */
 export declare function setConfigAd(a: AdAdapter): void;
 export declare function useAd(): {
-    config: Ref<{
-        banner_unit_id: string;
-        grid_unit_id: string;
-        custom_unit_id: string;
-        video_unit_id: string;
-        reward_unit_id: string;
-        popup_unit_id: string;
-    }, AdConfig | {
-        banner_unit_id: string;
-        grid_unit_id: string;
-        custom_unit_id: string;
-        video_unit_id: string;
-        reward_unit_id: string;
-        popup_unit_id: string;
-    }>;
+    config: ComputedRef<AdConfig>;
     loaded: Ref<boolean, boolean>;
     loadConfig: (force?: boolean) => Promise<void>;
     getUnitId: (type: AdType) => string;

package/dist/index.js

@@ -637,7 +637,8 @@ var __publicField = (obj, key, value) => {
     custom_unit_id: "",
     video_unit_id: "",
     reward_unit_id: "",
-    popup_unit_id: ""
+    popup_unit_id: "",
+    vip_no_ad: 0
   };
   let adapter$1 = null;
   let pending$1 = null;
@@ -655,7 +656,17 @@ var __publicField = (obj, key, value) => {
   const interstitialCache = /* @__PURE__ */ new Map();
   function useAd() {
     const store = useAdStore();
-    const { config: config2, loaded } = pinia.storeToRefs(store);
+    const { loaded } = pinia.storeToRefs(store);
+    const config2 = vue.computed(() => {
+      var _a, _b;
+      const raw = store.config;
+      const userForce = ((_a = adapter$1 == null ? void 0 : adapter$1.userNoAd) == null ? void 0 : _a.call(adapter$1)) === true;
+      const vipHide = raw.vip_no_ad === 1 && ((_b = adapter$1 == null ? void 0 : adapter$1.isVip) == null ? void 0 : _b.call(adapter$1)) === true;
+      if (userForce || vipHide) {
+        return { ...EMPTY, reward_unit_id: raw.reward_unit_id, vip_no_ad: 1 };
+      }
+      return raw;
+    });
     async function loadConfig2(force = false) {
       if (loaded.value && !force)
         return;
@@ -684,7 +695,7 @@ var __publicField = (obj, key, value) => {
       return flight;
     }
     function getUnitId(type) {
-      return store.config[`${type}_unit_id`] || "";
+      return config2.value[`${type}_unit_id`] || "";
     }
     async function showReward(onClose) {
       const unitId = getUnitId("reward");
@@ -1806,6 +1817,14 @@ var __publicField = (obj, key, value) => {
     _interceptorCleanup.forEach((dispose) => dispose());
     _interceptorCleanup = [];
     const offRequest = http.onRequest((config2) => {
+      const method = (config2.method ?? "GET").toUpperCase();
+      if (method === "GET" && config2.data && typeof config2.data === "object") {
+        const qs = Object.entries(config2.data).filter(([, v]) => v !== void 0 && v !== null).map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(String(v))}`).join("&");
+        if (qs) {
+          config2.url = config2.url + (config2.url.includes("?") ? "&" : "?") + qs;
+        }
+        config2.data = void 0;
+      }
       const device = useDevice();
       if (device.value) {
         const d = device.value;

package/dist/index.mjs

@@ -636,7 +636,8 @@ const EMPTY = {
   custom_unit_id: "",
   video_unit_id: "",
   reward_unit_id: "",
-  popup_unit_id: ""
+  popup_unit_id: "",
+  vip_no_ad: 0
 };
 let adapter$1 = null;
 let pending$1 = null;
@@ -654,7 +655,17 @@ const rewardedCache = /* @__PURE__ */ new Map();
 const interstitialCache = /* @__PURE__ */ new Map();
 function useAd() {
   const store = useAdStore();
-  const { config: config2, loaded } = storeToRefs(store);
+  const { loaded } = storeToRefs(store);
+  const config2 = computed(() => {
+    var _a, _b;
+    const raw = store.config;
+    const userForce = ((_a = adapter$1 == null ? void 0 : adapter$1.userNoAd) == null ? void 0 : _a.call(adapter$1)) === true;
+    const vipHide = raw.vip_no_ad === 1 && ((_b = adapter$1 == null ? void 0 : adapter$1.isVip) == null ? void 0 : _b.call(adapter$1)) === true;
+    if (userForce || vipHide) {
+      return { ...EMPTY, reward_unit_id: raw.reward_unit_id, vip_no_ad: 1 };
+    }
+    return raw;
+  });
   async function loadConfig2(force = false) {
     if (loaded.value && !force)
       return;
@@ -683,7 +694,7 @@ function useAd() {
     return flight;
   }
   function getUnitId(type) {
-    return store.config[`${type}_unit_id`] || "";
+    return config2.value[`${type}_unit_id`] || "";
   }
   async function showReward(onClose) {
     const unitId = getUnitId("reward");
@@ -1805,6 +1816,14 @@ function setupInterceptors(options = {}) {
   _interceptorCleanup.forEach((dispose) => dispose());
   _interceptorCleanup = [];
   const offRequest = http.onRequest((config2) => {
+    const method = (config2.method ?? "GET").toUpperCase();
+    if (method === "GET" && config2.data && typeof config2.data === "object") {
+      const qs = Object.entries(config2.data).filter(([, v]) => v !== void 0 && v !== null).map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(String(v))}`).join("&");
+      if (qs) {
+        config2.url = config2.url + (config2.url.includes("?") ? "&" : "?") + qs;
+      }
+      config2.data = void 0;
+    }
     const device = useDevice();
     if (device.value) {
       const d = device.value;

package/package.json

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

package/src/app.ts

@@ -102,6 +102,21 @@ export function setupInterceptors(options: InterceptorOptions & { sigSecret?: st
      * 请求拦截：注入设备信息、签名和 token。
      */
     const offRequest = http.onRequest((config: RequestConfig) => {
+        // GET 请求：把 cfg.data 合并到 url query，并清空 cfg.data。
+        // 否则 uni.request 会在 sig 之后再把 data 自动拼到 URL，导致后端 raw query
+        // 多了未参与签名的字段（如 id/cate_id），sig 校验必然失败。
+        const method = (config.method ?? 'GET').toUpperCase();
+        if (method === 'GET' && config.data && typeof config.data === 'object') {
+            const qs = Object.entries(config.data as Record<string, unknown>)
+                .filter(([, v]) => v !== undefined && v !== null)
+                .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(String(v))}`)
+                .join('&');
+            if (qs) {
+                config.url = config.url + (config.url.includes('?') ? '&' : '?') + qs;
+            }
+            config.data = undefined;
+        }
+
         const device = useDevice();
         if (device.value) {
             const d = device.value;

package/src/composables/ad/index.ts

@@ -43,7 +43,7 @@
  */
 
 import { defineStore, storeToRefs } from "pinia";
-import { ref } from "vue";
+import { ref, computed } from "vue";
 import { useMsg, type HlwMsg } from "../msg";
 import { unwrapPayload, type AdapterPayload } from "../_internal/unwrap";
 
@@ -61,6 +61,8 @@ export interface AdConfig {
     video_unit_id: string;
     reward_unit_id: string;
     popup_unit_id: string;
+    /** VIP 屏蔽展示型广告（reward 除外）：0=否，1=屏蔽 banner/grid/custom/video/popup */
+    vip_no_ad?: 0 | 1;
 }
 
 /** 广告错误对象（onError 回调参数） */
@@ -83,6 +85,13 @@ export interface AdAdapter {
     getConfig: () => Promise<AdapterPayload<AdConfig>>;
     /** 是否已登录；不传 = 不校验（showReward 调用前会问一次） */
     isAuth?: () => boolean;
+    /** 是否 VIP；配合 config.vip_no_ad=1 时屏蔽展示型广告（reward 不受影响） */
+    isVip?: () => boolean;
+    /**
+     * 用户级强制屏蔽：返回 true 直接屏蔽展示型广告（reward 不受影响），
+     * 优先级高于 mp.vip_no_ad + isVip 的联合判断；不传 = 不强制。
+     */
+    userNoAd?: () => boolean;
 }
 
 /** 激励视频关闭回调返回 */
@@ -98,6 +107,7 @@ const EMPTY: AdConfig = {
     video_unit_id: "",
     reward_unit_id: "",
     popup_unit_id: "",
+    vip_no_ad: 0,
 };
 
 let adapter: AdAdapter | null = null;
@@ -140,7 +150,22 @@ const interstitialCache = new Map<string, any>();
 
 export function useAd() {
     const store = useAdStore();
-    const { config, loaded } = storeToRefs(store);
+    const { loaded } = storeToRefs(store);
+
+    /**
+     * 真实生效的广告配置；以下任一命中即屏蔽展示型 unit_id（reward 保留）：
+     *   1. adapter.userNoAd() === true  —— 用户级强制屏蔽，优先级最高
+     *   2. raw.vip_no_ad === 1 && adapter.isVip() —— 小程序级 VIP 隐藏开关
+     */
+    const config = computed<AdConfig>(() => {
+        const raw = store.config;
+        const userForce = adapter?.userNoAd?.() === true;
+        const vipHide   = raw.vip_no_ad === 1 && adapter?.isVip?.() === true;
+        if (userForce || vipHide) {
+            return { ...EMPTY, reward_unit_id: raw.reward_unit_id, vip_no_ad: 1 };
+        }
+        return raw;
+    });
 
     /**
      * 拉取广告配置（小程序冷启动后调一次即可）。
@@ -171,9 +196,9 @@ export function useAd() {
         return flight;
     }
 
-    /** 取指定类型的 unit_id（hlw-ad 组件 / 业务直接调时用） */
+    /** 取指定类型的 unit_id（hlw-ad 组件 / 业务直接调时用），自动应用 VIP 屏蔽 */
     function getUnitId(type: AdType): string {
-        return store.config[`${type}_unit_id` as keyof AdConfig] || "";
+        return (config.value[`${type}_unit_id` as keyof AdConfig] as string) || "";
     }
 
     /**