@zfqh/uniapp 0.1.9 → 0.1.10

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.10](http://10.10.10.16/caoben/front-end/compare/@zfqh/uniapp@0.1.10...@zfqh/uniapp@0.1.10) (2026-06-21)
+
+**Note:** Version bump only for package @zfqh/uniapp
+
+
+
+
+
 ## [0.1.9](http://10.10.10.16/caoben/front-end/compare/@zfqh/uniapp@0.1.8...@zfqh/uniapp@0.1.9) (2026-06-21)
 
 **Note:** Version bump only for package @zfqh/uniapp

package/lib/apis/request.js

@@ -2,15 +2,15 @@ import api from '../configs/api';
 import app from '../configs/app';
 import { createRequest, createInterceptors } from '../utils/request';
 import { LANGUAGE } from '../utils/consts';
+import { defaultLocale } from '../utils/locale';
 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 || {};
-        const { appLanguage } = store.state.system?.info || {};
         const header = {
-            'X-Language': LANGUAGE[appLanguage],
+            'X-Language': LANGUAGE[defaultLocale],
             'Tenant-Id': tenantId || 1,
             Channel: query.channel || app.channel,
         };

package/lib/mixins/webview.js

@@ -24,10 +24,18 @@ export default {
             return this.$store.state.login?.info || {};
         },
         queryString() {
-            const { loginInfo } = this;
+            const { accessToken, storeId, userId, tenantId, storeName, tenantName, nickName, username, } = this.loginInfo;
             const q = {
-                token: loginInfo.accessToken || '',
+                token: accessToken,
+                storeId,
+                userId,
+                tenantId,
+                storeName,
+                tenantName,
+                nickName,
+                username,
                 app: app.code,
+                channel: app.channel,
                 platform: PLATFORM_CODE,
             };
             if (query.primary) {

package/lib/modules/login.js

@@ -1,20 +1,11 @@
-import { storageKeys, getStorageSync, setStorage, setStorageSync, removeStorage } from '../utils/storage';
+import { storageKeys, getStorageSync, setStorage, removeStorage } from '../utils/storage';
 import query from '../utils/query';
 import navigate from '../utils/navigate';
 import Throttle from '../utils/throttle';
 import { getPage } from '../utils/pages';
 import { postRefreshToken } from '../apis/core';
 const throttle = new Throttle();
-// #ifdef H5
-const queryToken = query.accessToken || query.token;
-if (queryToken != null) {
-    const store = getStorageSync(storageKeys.login) || {};
-    if (queryToken !== store.accessToken) {
-        store.accessToken = queryToken;
-        setStorageSync(storageKeys.login, store);
-    }
-}
-// #endif
+const _accessToken = query.accessToken || query.token;
 function getDefaultState() {
     return {
         accessToken: null,
@@ -33,8 +24,22 @@ function getDefaultState() {
     };
 }
 const store = {
-    state: {
-        info: getStorageSync(storageKeys.login) || getDefaultState(),
+    state() {
+        const defaultState = getDefaultState();
+        if (_accessToken) {
+            Object.keys(defaultState).forEach((key) => {
+                if (query[key] != null) {
+                    defaultState[key] = query[key];
+                }
+            });
+            defaultState.accessToken = _accessToken;
+            return {
+                info: defaultState,
+            };
+        }
+        return {
+            info: getStorageSync(storageKeys.login) || defaultState,
+        };
     },
     getters: {
         // 是否已登录
@@ -48,7 +53,9 @@ const store = {
                 data.accessToken = data.accessToken.replace(/^bearer\s+/i, '');
             }
             state.info = { ...state.info, ...data };
-            setStorage(storageKeys.login, state.info);
+            if (!_accessToken) {
+                setStorage(storageKeys.login, state.info);
+            }
         },
         resetState(state) {
             state.info = getDefaultState();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zfqh/uniapp",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "uniapp公共模块",
   "author": "yinjiazeng@163.com",
   "license": "MIT",