@hlw-uni/mp-vue 2.2.6 → 2.2.8

package/dist/index.js

@@ -685,9 +685,9 @@ var __publicField = (obj, key, value) => {
     return {
       appid: getAppid(device),
       app_name: app.appName || "",
-      app_version: app.appVersion || "",
-      app_version_code: app.appVersionCode || "",
-      app_channel: app.appChannel || "",
+      version: app.appVersion || "",
+      version_code: app.appVersionCode || "",
+      channel: app.appChannel || "",
       device_brand: device.brand || "",
       device_model: device.model || "",
       device_id: device.deviceId || "",
@@ -709,8 +709,7 @@ var __publicField = (obj, key, value) => {
       host_language: app.hostLanguage || "",
       host_theme: app.hostTheme || "",
       platform: device.platform || "",
-      language: app.language || "",
-      version: app.version || ""
+      language: app.language || ""
     };
   }
   function getAppid(device) {
@@ -733,14 +732,14 @@ var __publicField = (obj, key, value) => {
       platform: info.platform,
       system: info.system,
       os: info.os,
-      version: info.version,
       sdk_version: info.sdk_version,
       host_name: info.host_name,
       host_version: info.host_version,
       host_language: info.host_language,
       language: info.language,
-      app_version: info.app_version,
-      app_version_code: info.app_version_code,
+      version: info.version,
+      version_code: info.version_code,
+      channel: info.channel,
       screen_width: info.screen_width,
       screen_height: info.screen_height
     };

package/dist/index.mjs

@@ -684,9 +684,9 @@ function collectDevice() {
   return {
     appid: getAppid(device),
     app_name: app.appName || "",
-    app_version: app.appVersion || "",
-    app_version_code: app.appVersionCode || "",
-    app_channel: app.appChannel || "",
+    version: app.appVersion || "",
+    version_code: app.appVersionCode || "",
+    channel: app.appChannel || "",
     device_brand: device.brand || "",
     device_model: device.model || "",
     device_id: device.deviceId || "",
@@ -708,8 +708,7 @@ function collectDevice() {
     host_language: app.hostLanguage || "",
     host_theme: app.hostTheme || "",
     platform: device.platform || "",
-    language: app.language || "",
-    version: app.version || ""
+    language: app.language || ""
   };
 }
 function getAppid(device) {
@@ -732,14 +731,14 @@ function getQueryInfo(info) {
     platform: info.platform,
     system: info.system,
     os: info.os,
-    version: info.version,
     sdk_version: info.sdk_version,
     host_name: info.host_name,
     host_version: info.host_version,
     host_language: info.host_language,
     language: info.language,
-    app_version: info.app_version,
-    app_version_code: info.app_version_code,
+    version: info.version,
+    version_code: info.version_code,
+    channel: info.channel,
     screen_width: info.screen_width,
     screen_height: info.screen_height
   };

package/dist/utils/device/index.d.ts

@@ -7,11 +7,11 @@ export interface DeviceInfo {
     /** 应用名称 */
     app_name: string;
     /** 小程序版本号（版本名称） */
-    app_version: string;
+    version: string;
     /** 小程序版本号（版本号） */
-    app_version_code: string;
+    version_code: string;
     /** 小程序来源渠道 */
-    app_channel: string;
+    channel: string;
     /** 设备 brand。如：apple、huawei */
     device_brand: string;
     /** 设备型号 */
@@ -56,13 +56,11 @@ export interface DeviceInfo {
     platform: string;
     /** 客户端语言 */
     language: string;
-    /** 客户端版本号 */
-    version: string;
 }
 /**
  * 过滤后常用于接口公共请求 Query 的设备字段子集。
  */
-export type DeviceQueryInfo = Pick<DeviceInfo, "appid" | "device_brand" | "device_model" | "device_id" | "device_type" | "device_orientation" | "platform" | "system" | "os" | "version" | "sdk_version" | "host_name" | "host_version" | "host_language" | "language" | "app_version" | "app_version_code" | "screen_width" | "screen_height">;
+export type DeviceQueryInfo = Pick<DeviceInfo, "appid" | "device_brand" | "device_model" | "device_id" | "device_type" | "device_orientation" | "platform" | "system" | "os" | "sdk_version" | "host_name" | "host_version" | "host_language" | "language" | "version" | "version_code" | "channel" | "screen_width" | "screen_height">;
 /**
  * 获取缓存后的设备信息数据。
  */

package/package.json

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

package/src/components/hlw-reward-ad/index.vue

@@ -150,6 +150,7 @@ defineExpose({
 
 <style scoped>
 .hlw-reward-ad {
-    display: inline-block;
+    display: block;
+    width: 100%;
 }
 </style>

package/src/utils/device/index.ts

@@ -13,11 +13,11 @@ export interface DeviceInfo {
     /** 应用名称 */
     app_name: string;
     /** 小程序版本号（版本名称） */
-    app_version: string;
+    version: string;
     /** 小程序版本号（版本号） */
-    app_version_code: string;
+    version_code: string;
     /** 小程序来源渠道 */
-    app_channel: string;
+    channel: string;
     /** 设备 brand。如：apple、huawei */
     device_brand: string;
     /** 设备型号 */
@@ -62,33 +62,14 @@ export interface DeviceInfo {
     platform: string;
     /** 客户端语言 */
     language: string;
-    /** 客户端版本号 */
-    version: string;
 }
 
 /**
  * 过滤后常用于接口公共请求 Query 的设备字段子集。
  */
-export type DeviceQueryInfo = Pick<DeviceInfo,
-    | "appid"
-    | "device_brand"
-    | "device_model"
-    | "device_id"
-    | "device_type"
-    | "device_orientation"
-    | "platform"
-    | "system"
-    | "os"
-    | "version"
-    | "sdk_version"
-    | "host_name"
-    | "host_version"
-    | "host_language"
-    | "language"
-    | "app_version"
-    | "app_version_code"
-    | "screen_width"
-    | "screen_height"
+export type DeviceQueryInfo = Pick<
+    DeviceInfo,
+    "appid" | "device_brand" | "device_model" | "device_id" | "device_type" | "device_orientation" | "platform" | "system" | "os" | "sdk_version" | "host_name" | "host_version" | "host_language" | "language" | "version" | "version_code" | "channel" | "screen_width" | "screen_height"
 >;
 
 let deviceCache: DeviceInfo | null = null;
@@ -126,9 +107,9 @@ function collectDevice(): DeviceInfo {
     return {
         appid: getAppid(device),
         app_name: (app.appName as string) || "",
-        app_version: (app.appVersion as string) || "",
-        app_version_code: (app.appVersionCode as string) || "",
-        app_channel: (app.appChannel as string) || "",
+        version: (app.appVersion as string) || "",
+        version_code: (app.appVersionCode as string) || "",
+        channel: (app.appChannel as string) || "",
         device_brand: (device.brand as string) || "",
         device_model: (device.model as string) || "",
         device_id: (device.deviceId as string) || "",
@@ -151,7 +132,6 @@ function collectDevice(): DeviceInfo {
         host_theme: (app.hostTheme as string) || "",
         platform: (device.platform as string) || "",
         language: (app.language as string) || "",
-        version: (app.version as string) || "",
     };
 }
 
@@ -181,14 +161,14 @@ function getQueryInfo(info: DeviceInfo): DeviceQueryInfo {
         platform: info.platform,
         system: info.system,
         os: info.os,
-        version: info.version,
         sdk_version: info.sdk_version,
         host_name: info.host_name,
         host_version: info.host_version,
         host_language: info.host_language,
         language: info.language,
-        app_version: info.app_version,
-        app_version_code: info.app_version_code,
+        version: info.version,
+        version_code: info.version_code,
+        channel: info.channel,
         screen_width: info.screen_width,
         screen_height: info.screen_height,
     };