@zfqh/uniapp 0.2.22 → 0.2.24

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.2.22](http://10.10.10.16/caoben/front-end/compare/@zfqh/uniapp@0.2.21...@zfqh/uniapp@0.2.22) (2026-06-27)
+## [0.2.24](http://10.10.10.16/caoben/front-end/compare/@zfqh/uniapp@0.2.23...@zfqh/uniapp@0.2.24) (2026-06-28)
 
 **Note:** Version bump only for package @zfqh/uniapp
 
@@ -11,6 +11,23 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+## [0.2.23](http://10.10.10.16/caoben/front-end/compare/@zfqh/uniapp@0.2.22...@zfqh/uniapp@0.2.23) (2026-06-28)
+
+**Note:** Version bump only for package @zfqh/uniapp
+
+
+
+
+
+
+## [0.2.22](http://10.10.10.16/caoben/front-end/compare/@zfqh/uniapp@0.2.21...@zfqh/uniapp@0.2.22) (2026-06-27)
+
+**Note:** Version bump only for package @zfqh/uniapp
+
+
+
+
+
 
 ## [0.2.21](http://10.10.10.16/caoben/front-end/compare/@zfqh/uniapp@0.2.20...@zfqh/uniapp@0.2.21) (2026-06-26)
 

package/lib/apis/request.js

@@ -1,17 +1,45 @@
 import api from '../configs/api';
 import app from '../configs/app';
 import { createRequest, createInterceptors } from '../utils/request';
-import { LANGUAGE } from '../utils/consts';
+import { LANGUAGE, SYSTEM_INFO } from '../utils/consts';
 import query from '../utils/query';
 import http from '@gmcb/uv-ui/libs/function/http';
 http.interceptors.request.use((conf) => {
     const store = uni.$store;
     if (store) {
         const { tenantId } = store.state.login?.info || {};
+        let channel = query.channel || app.channel;
+        let terminal = 0;
+        // #ifdef MP-WEIXIN
+        terminal = 10;
+        // #endif
+        // #ifdef APP
+        if (SYSTEM_INFO.platform === 'android') {
+            terminal = 32;
+        }
+        else if (SYSTEM_INFO.platform === 'ios') {
+            terminal = 31;
+        }
+        // #endif
+        // #ifdef H5
+        terminal = 20;
+        if (query.platform === 'mp') {
+            terminal = 10;
+        }
+        else if (query.platform === 'app') {
+            if (SYSTEM_INFO.platform === 'android') {
+                terminal = 32;
+            }
+            else if (SYSTEM_INFO.platform === 'ios') {
+                terminal = 31;
+            }
+        }
+        // #endif
         const header = {
             'X-Language': LANGUAGE[query.locale || uni.getLocale()],
             'Tenant-Id': tenantId || 1,
-            Channel: query.channel || app.channel,
+            channel,
+            terminal,
         };
         conf.header = {
             ...header,

package/lib/mixins/webview.js

@@ -35,6 +35,7 @@ export default {
                 app: app.code,
                 channel: app.channel,
                 platform: PLATFORM_CODE,
+                safeTop: SYSTEM_INFO.safeAreaInsets.top,
                 safeBottom: SYSTEM_INFO.safeAreaInsets.bottom,
                 locale: uni.$i18n?.global?.locale,
             };

package/lib/styles/index.scss

@@ -5,11 +5,11 @@
 /* #ifndef APP-NVUE */
 @import './reset-vue.scss';
 @import './text-vue.scss';
-@import './layout-vue.scss';
+@import './layout-vue.scss';
 @import './flex-vue.scss';
 /* #endif */
 /* #ifdef APP-NVUE */
-@import './text-nvue.scss';
+@import './text-nvue.scss';
 @import './layout-nvue.scss';
 @import './flex-nvue.scss';
 /* #endif */

package/lib/styles/text-vue.scss

@@ -13,9 +13,9 @@
     word-break: break-all;
   }
 }
-.break-all {
-  word-break: break-all;
-}
-.break-word {
-  word-break: break-word;
+.break-all {
+  word-break: break-all;
+}
+.break-word {
+  word-break: break-word;
 }

package/lib/utils/consts.js

@@ -8,6 +8,17 @@ export const MENU_BUTTON = { height: 0, width: 0, top: 0, bottom: 0, left: 0 };
 Object.assign(MENU_BUTTON, uni.getMenuButtonBoundingClientRect());
 // #endif
 export const SYSTEM_INFO = Object.assign({}, uni.getWindowInfo(), uni.getDeviceInfo(), uni.getAppBaseInfo());
+// #ifdef H5
+const safeTop = Number(query.safeTop);
+const safeBottom = Number(query.safeBottom);
+if (safeTop > 0) {
+    SYSTEM_INFO.statusBarHeight = safeTop;
+    SYSTEM_INFO.safeAreaInsets.top = safeTop;
+}
+if (safeBottom) {
+    SYSTEM_INFO.safeAreaInsets.bottom = safeBottom;
+}
+// #endif
 // webview宿主环境
 export const WEBVIEW_ENV = {
     h5: false,

package/lib/utils/query.d.ts

@@ -1,10 +1,11 @@
 interface Query {
     platform?: string;
+    channel?: string;
     token?: string;
     accessToken?: string;
     primary?: string;
-    brand?: string;
     app?: string;
+    safeTop?: string | number;
     safeBottom?: string | number;
     tabbar?: string | number;
     [key: string]: any;

package/lib/utils/uni.js

@@ -4,7 +4,7 @@ import { colorGradient } from '@gmcb/uv-ui/libs/function/colorGradient';
 import { app } from '../configs/app';
 import mp from '../configs/mp';
 import color from '../configs/color';
-import { IS_WEBVIEW_ENV, SYSTEM_INFO } from './consts';
+import { IS_WEBVIEW_ENV } from './consts';
 import query from './query';
 // #ifndef H5
 uni.webView = uni;
@@ -96,14 +96,20 @@ uni.showAppFromBackground = true;
 });
 // #ifdef H5
 if (query) {
-    // 给H5添加安全区域，需再url地址参数中添加safeBottom
-    if (Number(query.safeBottom) > 0) {
-        SYSTEM_INFO.safeAreaInsets.bottom = Number(query.safeBottom);
+    const safeTop = Number(query.safeTop);
+    const safeBottom = Number(query.safeBottom);
+    if (safeTop > 0 || safeBottom > 0) {
         const node = document.createElement('style');
         node.type = 'text/css';
-        node.innerText = `
-    .uv-safe-area-inset-bottom { padding-bottom: ${query.safeBottom}px; }
-  `.trim();
+        const styles = [];
+        if (safeTop > 0) {
+            styles.push(`.uv-safe-area-inset-top { padding-top: ${safeTop}px; }`);
+            document.documentElement.style.setProperty('--status-bar-height', `${safeTop}px`);
+        }
+        if (safeBottom > 0) {
+            styles.push(`.uv-safe-area-inset-bottom { padding-bottom: ${safeBottom}px; }`);
+        }
+        node.innerText = styles.join('\n');
         document.body.append(node);
     }
     // 隐藏子应用tabbar，不传或者为空字符表示显式子应用tabbar

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zfqh/uniapp",
-  "version": "0.2.22",
+  "version": "0.2.24",
   "description": "uniapp公共模块",
   "author": "yinjiazeng@163.com",
   "license": "MIT",
@@ -46,5 +46,5 @@
     "@types/qs": "^6.9.16",
     "@types/url-parse": "^1.4.11"
   },
-  "gitHead": "88efb2bfd3a0ae8c05726a8efee46a3602cfb1a1"
+  "gitHead": "ed95ef16d9f6367fd1ba104d6ff8a8c805d307df"
 }

package/types/index.d.ts

@@ -9,7 +9,7 @@ declare global {
   interface Uni extends UniTypes {
     $store: Store;
     $i18n: I18n;
-    $uv: any;
+    $uv: any;
     webView: any;
     showAppFromBackground: boolean;
     getLocationCallback: {
@@ -22,9 +22,9 @@ declare global {
   }
 
   interface Window {
-    __wxjs_environment: string;
-    electron: any;
-    versionName: string;
+    __wxjs_environment: string;
+    electron: any;
+    versionName: string;
     versionCode: number;
   }
 }