xctc-utils 1.6.1 → 1.6.3

package/README.md

@@ -10,30 +10,43 @@
 存储： useUtils.useLocalStorage(key,value)
 取值： useUtils.getLocalStorage(key)
 ```
-
 #### sessionStorage使用，存取值时数据已经过处理
 ```
-
 存储： useUtils.useSessionStorage(key,value)
 取值： useUtils.getSessionStorage(key)
 
 ```
-
 #### 删除缓存
 ```
 key:string 需要删除的缓存键
-isAll:boolean 为true时删除调用方法的所有缓存，否则只删除当前传入的 key 值
-如果 isAll 为 true 时，方法会优先执行缓存的clear函数， key 传任意值，
-删除临时缓存： useUtils.removeSessionStorage(key,isAll)
-删除永久缓存： useUtils.removeLocalStorage(key,isAll)
-
+all:boolean 为true时删除调用方法的所有缓存，否则只删除当前传入的 key 值
+如果 all 为 true 时，方法会优先执行缓存的clear函数， key 传任意值，
+删除临时缓存： useUtils.removeSessionStorage(key,all)
+删除永久缓存： useUtils.removeLocalStorage(key,all)
 ```
 
-### 剪贴板操作集合
-#### 将数据复制到剪贴板函数
+### 地址栏参数处理
+#### 设置参数
 ```
-useUtils.handleCopyValue(val)
+interface SetOptions {
+    url:string, // 完整的 url 地址
+    data:string, // 具体需要拼接在地址参数
+    keyword:string, // 地址栏参数 key 值
+    key:string, // 参数加密 key
+    iv:string  // 参数加密 iv
+}
+useUtils.params.set( options:SetOptions )
+```
+#### 获取参数
+```
+/**
+ * @param keys 需要截取地址栏参数键数组值，如： ['code','state']
+ * @param cache 是否需要缓存地址栏数据： 不传或传空，则不做处理，session 临时缓存 local永久缓存
+ * @param cacheKey 缓存数据的键 默认值 urlParamsData
+ */
+useUtils.params.get( keys:string[],cache?:string,cacheKey?:string )
 ```
+
 ###  AES 加密、解密处理函数集合
 #### AES 加密、解密，同一个数据的加密和解密传入的key 和 iv保持一致。
 ```
@@ -41,9 +54,10 @@ work： 需要加密的对象，如传入的是对象，该方法默认进行JSO
 key：16位或者32位字符串作为密钥
 iv：16位或者32位字符串作为密钥偏移量
 data： encrypt方法加密后返回的数据
-加密：useUtils.encrypt( work:any , key:string , iv:string )
-解密：useUtils.decrypt( data:string , key:string , iv:string )
+加密：useUtils.crypto.encrypt( work:any , key:string , iv:string )
+解密：useUtils.crypto.decrypt( data:string , key:string , iv:string )
 ```
+
 ### 数据类型判断集合
 #### 数据类型判断
 ```
@@ -60,16 +74,16 @@ useUtils.type.isWindow(val)    // 是否在浏览器环境下运行
 ```
 useUtils.isJson(data) // 判断传入数据是否是 JSON对象字符串，如果是，返回序列化后的JSON对象，否则返回false
 ```
+
 ### 环境判断
-#### 获取当前设备环境
-设备环境：
+#### 获取当前设备环境：设备环境
 ```
-
 当前使用设备类型： useUtils.deviceEnvironment() // android ios ，未识别到返回 other 
 是否在微信浏览器环境中：  useUtils.weixinBrowser() // true false
 是否是手持设备： useUtils.isMobile() // true 移动设备 false PC设备
 
 ```
+
 ### 微信授权等方法集合
 #### 微信授权登录
 ```
@@ -83,7 +97,7 @@ interface configOption {
     cryptokey?:string, // 将地址栏携带参数加密key， 必须与 weixinShareInit 方法中的 key 参数一致
 }
 进入系统时，默认调用该方法，自动执行微信跳转授权，回调地址中code处理、state处理，
-useUtils.weixinUrlCode(config)
+useUtils.weixin.getUrlCode(config)
 
 ```
 #### 微信config接口权限注入
@@ -95,12 +109,11 @@ interface ShareConfig{
     jsApiList?:string[],
 }
 
-useUtils.weixinShareConfig(config:ShareConfig)
+useUtils.weixin.configReady(config:ShareConfig)
 ```
-
 #### 微信分享接口加载
 ```
-interface Share{
+interface ShareOptions{
     title?:string, // 分享标题 默认值 微信分享
     desc?:string, // 分享描述 默认值 微信分享描述
     link: '', // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致，默认取当前访问地址
@@ -109,13 +122,25 @@ interface Share{
     iv?:string, // 分享链接中对 state 数据加密的iv 必须与 weixinUrlCode 方法中的 cryptoiv 参数一致
     key?:string, // 分享链接中对 state 数据加密的 key 必须与 weixinUrlCode 方法中的 cryptokey 参数一致
 }
-useUtils.weixinShareInit(config:Share)
+useUtils.weixin.shareReady(config:ShareOptions)
+```
+#### 唤起微信支付
+```
+interface ConfigPay{
+    timeStamp:string, // 支付签名时间戳
+    nonceStr:string,  // 支付签名随机串，不长于 32 位
+    package:string, // 统一支付接口返回的prepay_id参数值
+    signType:string, // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
+    paySign:string,// 支付签名
+    cb?:any,//回调
+}
+useUtils.weixin.onlinePay(config:ConfigPay)
 ```
 
 ### 时间相关方法
 #### 获取当前时间的时间戳
 ```
-useUtils.getTime() // 返回秒
+useUtils.date.getTime() // 返回秒
 ```
 #### 时间戳转任意格式时间字符串
 ```
@@ -125,7 +150,7 @@ useUtils.getTime() // 返回秒
  * @param format 解析后展示时间字符串格式，默认 "YYYY-MM-DD HH:mm:ss" 格式， 可传格式如： YYYY年MM月DD日 HH时 YYYY/MM/DD HH
  * @returns 
  */
-useUtils.formatTimeStamp(num,format) // 返回 format 格式时间戳
+useUtils.date.formatTimeStamp(num,format) // 返回 format 格式时间戳
 
 ```
 #### 时间字符串转时间戳
@@ -135,7 +160,7 @@ useUtils.formatTimeStamp(num,format) // 返回 format 格式时间戳
  * @param str 字符串格式必须为： 2017/03/03 12:23:55 格式，避免兼容性，不能传 “-” 分割的时间字符串 2017-03-03
  * @returns 
  */
-useUtils.formatStrTime(str) // 返回时间戳 秒
+useUtils.date.formatStrTime(str) // 返回时间戳 秒
 
 ```
 
@@ -176,3 +201,8 @@ useUtils.getIframeContentHeight("ueditor")
 useUtils.findIdcardAge(idcard)
 ```
 
+### 剪贴板操作集合
+#### 将数据复制到剪贴板函数
+```
+useUtils.handleCopyValue(val)
+```

package/app.ts

@@ -6,7 +6,6 @@
 // ts-node app.ts
 
 import {formatTimeStamp,formatStrTime} from "./src/time"
-import {weixinUrlCode} from "./src/weixin"
 import {decrypt,encrypt} from "./src/crypto"
 
 

package/dist/index.js

@@ -39,9 +39,9 @@ var utils = __importStar(require("./utils"));
 var crypto = __importStar(require("./crypto"));
 var weixin = __importStar(require("./weixin"));
 var time = __importStar(require("./time"));
-var mobile = __importStar(require("./mobile"));
 var format = __importStar(require("./format"));
 var isType = __importStar(require("./is"));
 var modal = __importStar(require("./modal"));
-var obj = __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, storage), utils), weixin), crypto), time), mobile), format), { type: __assign({}, isType) }), modal);
+var params = __importStar(require("./params"));
+var obj = __assign(__assign(__assign({}, storage), utils), { weixin: __assign({}, weixin), crypto: __assign({}, crypto), date: __assign({}, time), format: __assign({}, format), type: __assign({}, isType), modal: __assign({}, modal), params: __assign({}, params) });
 exports.default = obj;

package/dist/params/index.d.ts

@@ -0,0 +1,16 @@
+interface SetOptions {
+    url: string;
+    data: string;
+    keyword: string;
+    key: string;
+    iv: string;
+}
+export declare const set: (options: SetOptions) => string | undefined;
+/**
+ *
+ * @param keys 需要截取地址栏参数键数组值
+ * @param cache 是否需要缓存地址栏数据： 不传或传空，则不做处理，session 临时缓存 local永久缓存
+ * @param cacheKey 缓存数据的键 默认值 urlParamsData
+ */
+export declare const get: (keys: string[], cache?: string, cacheKey?: string) => void;
+export {};

package/dist/params/index.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.get = exports.set = void 0;
+var crypto_1 = require("../crypto");
+var storage_1 = require("../storage");
+var defaultKey = "5uMz4R8rop26DkC8";
+var defaultIv = "5uMz4Rsd0926DkC8";
+var is_1 = require("../is");
+var win = window;
+var loc = win.location;
+var set = function (options) {
+    var _a = options.url, url = _a === void 0 ? "" : _a, _b = options.data, data = _b === void 0 ? "" : _b, _c = options.keyword, keyword = _c === void 0 ? "state" : _c, _d = options.key, key = _d === void 0 ? defaultKey : _d, _e = options.iv, iv = _e === void 0 ? defaultIv : _e;
+    if (!data || !url)
+        return;
+    if (url.length < 10 || !url.includes("http") || !url.includes(".")) {
+        console.error("params.set函数必须传入合法的url地址，如：http://dousougou.com");
+        return;
+    }
+    if (!(0, is_1.isString)(data) || !data.includes("=")) {
+        console.error("params.set函数data参数必须传入合法的字符串，如id=1&age=22");
+        return;
+    }
+    var val = (0, crypto_1.encrypt)(data, key, iv);
+    var urlData = "".concat(url, "?").concat(keyword, "=").concat(val);
+    return urlData;
+};
+exports.set = set;
+/**
+ *
+ * @param keys 需要截取地址栏参数键数组值
+ * @param cache 是否需要缓存地址栏数据： 不传或传空，则不做处理，session 临时缓存 local永久缓存
+ * @param cacheKey 缓存数据的键 默认值 urlParamsData
+ */
+var get = function (keys, cache, cacheKey) {
+    var win = window;
+    var loc = win.location;
+    var search = loc.search;
+    if (search.startsWith("?")) {
+        search = search.substring(1);
+    }
+    var urlArr = search.split("&");
+    var paramsData = {};
+    for (var k = 0; k < keys.length; k++) {
+        var keyItem = keys[k];
+        if (keyItem.includes("=")) {
+            console.error("传入的参数不能含有=字符，合法格式：['code','state']");
+            break;
+        }
+        var urlItem = "";
+        for (var i = 0; k < urlArr.length; i++) {
+            if (urlItem === null || urlItem === void 0 ? void 0 : urlItem.includes(keyItem)) {
+                urlItem = "";
+                break;
+            }
+            urlItem = urlArr[i];
+            if (urlItem === null || urlItem === void 0 ? void 0 : urlItem.includes(keyItem)) {
+                var dataStr = urlItem.substring(urlItem.indexOf(keyItem) + keyItem.length + 1);
+                var decryptStr = (0, crypto_1.decrypt)(dataStr);
+                paramsData[keyItem] = {
+                    data: getParamsObj(decryptStr),
+                    str: dataStr
+                };
+            }
+        }
+    }
+    if (!cacheKey)
+        cacheKey = "urlParamsData";
+    if (cache == "session") {
+        (0, storage_1.useSessionStorage)(cacheKey, paramsData);
+    }
+    if (cache == "local") {
+        (0, storage_1.useLocalStorage)(cacheKey, paramsData);
+    }
+};
+exports.get = get;
+var getParamsObj = function (objStr) {
+    var objData = {};
+    if (objStr === null || objStr === void 0 ? void 0 : objStr.includes("=")) {
+        var objArr = objStr.split("&");
+        for (var k = 0; k < objArr.length; k++) {
+            var item = objArr[k];
+            if (item.includes("=")) {
+                var indexVal = item.indexOf("=");
+                objData[item.substring(0, indexVal)] = item.substring(indexVal + 1);
+            }
+        }
+    }
+    return objData;
+};

package/dist/storage/index.d.ts

@@ -17,14 +17,14 @@ export declare function getSessionStorage(key: string): any;
 /**
  *
  * @param key 需要删除的key值
- * @param isAll  是否删除所有缓存
+ * @param all  是否删除所有缓存
  * @returns
  */
-export declare function removeSessionStorage(key?: string, isAll?: boolean): void;
+export declare function removeSessionStorage(key?: string, all?: boolean): void;
 /**
  *
  * @param key 需要删除的key值
- * @param isAll  是否删除所有缓存
+ * @param all  是否删除所有缓存
  * @returns
  */
-export declare function removeLocalStorage(key?: string, isAll?: boolean): void;
+export declare function removeLocalStorage(key?: string, all?: boolean): void;

package/dist/storage/index.js

@@ -78,11 +78,11 @@ function getStorage(key, obj) {
 /**
  *
  * @param key 需要删除的key值
- * @param isAll  是否删除所有缓存
+ * @param all  是否删除所有缓存
  * @returns
  */
-function removeSessionStorage(key, isAll) {
-    if ((0, is_1.isBoolean)(isAll) && isAll) {
+function removeSessionStorage(key, all) {
+    if ((0, is_1.isBoolean)(all) && all) {
         wss.clear();
         return;
     }
@@ -94,11 +94,11 @@ exports.removeSessionStorage = removeSessionStorage;
 /**
  *
  * @param key 需要删除的key值
- * @param isAll  是否删除所有缓存
+ * @param all  是否删除所有缓存
  * @returns
  */
-function removeLocalStorage(key, isAll) {
-    if ((0, is_1.isBoolean)(isAll) && isAll) {
+function removeLocalStorage(key, all) {
+    if ((0, is_1.isBoolean)(all) && all) {
         wls.clear();
         return;
     }

package/dist/utils.d.ts

@@ -1,4 +1,5 @@
 import { UeditorHeightOption } from "./types";
+export declare function isMobile(): boolean;
 /**
  * 判断当前传入的字符串是否为 json格式 字符串
  * @param str

package/dist/utils.js

@@ -1,6 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleCopyValue = exports.weixinBrowser = exports.deviceEnvironment = exports.getIframeContentHeight = exports.checkIframeContentHeight = exports.$id = exports.isJson = void 0;
+exports.handleCopyValue = exports.weixinBrowser = exports.deviceEnvironment = exports.getIframeContentHeight = exports.checkIframeContentHeight = exports.$id = exports.isJson = exports.isMobile = void 0;
+var win = window;
+// 是否是手机端环境
+function isMobile() {
+    var info = win.navigator.userAgent;
+    var isPhone = /mobile/i.test(info);
+    return isPhone;
+}
+exports.isMobile = isMobile;
 /**
  * 判断当前传入的字符串是否为 json格式 字符串
  * @param str

package/dist/weixin/index.d.ts

@@ -9,9 +9,9 @@ interface configOption {
     isPassLogin?: boolean;
     redirectUri?: string;
 }
-export declare function weixinUrlCode(config: configOption): void;
-export declare function weixinEnvSDK(): any;
-export declare function weixinCode(appId?: string, scope?: string): void;
+export declare function getUrlCode(config: configOption): void;
+export declare function envSDK(): any;
+export declare function getCode(appId?: string, scope?: string): void;
 interface ShareConfig {
     http?: any;
     cb?: any;
@@ -20,7 +20,7 @@ interface ShareConfig {
     openTagList?: string[];
     url?: string;
 }
-export declare function weixinShareConfig(config: ShareConfig): void;
+export declare function configReady(config: ShareConfig): void;
 interface ShareOptions {
     title?: string;
     desc?: string;
@@ -31,7 +31,7 @@ interface ShareOptions {
     key?: string;
     shareUrl?: string;
 }
-export declare function weixinShareInit(options: ShareOptions): void;
+export declare function shareReady(options: ShareOptions): void;
 /**
  *
  * @param options
@@ -45,5 +45,5 @@ interface ConfigPay {
     paySign: string;
     cb?: any;
 }
-export declare function weixinPay(config: ConfigPay): void;
+export declare function onlinePay(config: ConfigPay): void;
 export {};

package/dist/weixin/index.js

@@ -1,37 +1,59 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.weixinPay = exports.weixinShareInit = exports.weixinShareConfig = exports.weixinCode = exports.weixinEnvSDK = exports.weixinUrlCode = void 0;
+exports.onlinePay = exports.shareReady = exports.configReady = exports.getCode = exports.envSDK = exports.getUrlCode = void 0;
 // import * as weixin from 'weixin-js-sdk' // 引入微信SDK
 var weixin = require("weixin-js-sdk");
 var utils_1 = require("../utils");
 var crypto_1 = require("../crypto");
+var params = __importStar(require("../params"));
 var index_1 = require("../storage/index");
 var w = window;
 var loc = w.location;
 var defaultKey = "5uMz4R8rop26DkC8";
 var defaultIv = "5uMz4Rsd0926DkC8";
 var weixinConfig = {};
-function weixinUrlCode(config) {
+function getUrlCode(config) {
+    var _a;
     config = config || {};
-    var appId = config['appId'] || "";
+    var appId = (config === null || config === void 0 ? void 0 : config.appId) || "";
     if (!appId)
         return;
     weixinConfig = config;
-    var scope = config['scope'] || "snsapi_userinfo";
-    var codeKey = config['codeKey'] || "weixinCode";
-    var stateKey = config['stateKey'] || "weixinState";
+    var scope = (config === null || config === void 0 ? void 0 : config.scope) || "snsapi_userinfo";
+    var codeKey = (config === null || config === void 0 ? void 0 : config.codeKey) || "weixinAuthCode";
+    var stateKey = (config === null || config === void 0 ? void 0 : config.stateKey) || "weixinAuthState";
     weixinConfig['scope'] = scope;
     weixinConfig['codeKey'] = codeKey;
     weixinConfig['stateKey'] = stateKey;
     (0, index_1.useSessionStorage)("weixinConfig", weixinConfig);
-    var _a = weixinConfig.cryptoiv, cryptoiv = _a === void 0 ? "" : _a, _b = weixinConfig.cryptokey, cryptokey = _b === void 0 ? "" : _b;
+    var _b = weixinConfig.cryptoiv, cryptoiv = _b === void 0 ? "" : _b, _c = weixinConfig.cryptokey, cryptokey = _c === void 0 ? "" : _c;
     var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
-    weixinInit();
-    // 获取地址栏返回 code 参数
-    var localCode = "";
-    if (codeKey) {
-        localCode = (0, index_1.getSessionStorage)(codeKey);
-    }
+    initSdk(); // 加载微信sdk环境
+    // 获取地址栏返回 code 参数值
+    var localCode = (0, index_1.getSessionStorage)("urlParamsData") || "";
     // 默认第一次通过链接进入系统，没有code和state
     var searchIndex = -1;
     var stateIndex = -1;
@@ -39,63 +61,36 @@ function weixinUrlCode(config) {
         searchIndex = search.indexOf("code=");
         stateIndex = search.indexOf("state=");
     }
+    // 如果本地已经存储 微信授权返回的 code 值，证明用户在执行刷新操作，不再执行微信授权逻辑
     if (localCode && stateIndex == -1 && searchIndex == -1) {
         return;
     }
-    // 如果链接地址中带有code
+    // 如果链接地址中带有code，证明执行微信授权登录，并返回授权所需的 code 参数
     if (searchIndex >= 0) {
         if (localCode) {
             // localCode 存在，用户已执行微信跳转链接，用户可能执行当前网页的刷新操作
             return;
         }
         else {
-            // 当前系统没有存储 code，流程为用户只需微信授权登录后返回系统，此时通过CODE执行微信登录
-            var urlArr = formatSearch(search, "code=");
-            var code = "";
-            for (var k = 0; k < urlArr.length; k++) {
-                var item = urlArr[k];
-                if (item.indexOf("code=") != -1) {
-                    code = item.substr(5);
-                    if (codeKey)
-                        (0, index_1.useSessionStorage)(codeKey, code);
-                }
-            }
-            if (code) {
-                weixinLogin(code);
+            // 当前系统本地没有存储 code，流程为用户只需微信授权登录后返回系统，此时通过 CODE 执行微信登录
+            var urlParamsData = (0, index_1.getSessionStorage)("urlParamsData") || "";
+            var codeData = ((_a = urlParamsData === null || urlParamsData === void 0 ? void 0 : urlParamsData.code) === null || _a === void 0 ? void 0 : _a.str) || ""; // 第一次进入系统为空
+            if (codeData) {
+                login(codeData);
             }
         }
         return;
     }
-    //  用户通过分享链接进入系统，此时含有State参数，无code参数
+    //  用户通过分享链接进入系统，此时含有 state 参数 ， 无code参数
     if (stateIndex >= 0) {
-        var hrefState = "";
-        var urlArr = formatSearch(search, "state=");
-        for (var k = 0; k < urlArr.length; k++) {
-            var item = urlArr[k];
-            if (item.indexOf("state=") != -1) {
-                hrefState = item.substr(6);
-                var stateKey_1 = weixinConfig['stateKey'];
-                if (!stateKey_1) {
-                    stateKey_1 = "weixinState";
-                    weixinConfig['stateKey'] = stateKey_1;
-                }
-                (0, index_1.useSessionStorage)(stateKey_1, hrefState);
-                var cryptoObj = cryptoConfig(cryptokey, cryptoiv);
-                var stateObj = (0, crypto_1.decrypt)(hrefState, cryptoObj.key, cryptoObj.iv);
-                if (stateObj instanceof Object)
-                    stateObj = JSON.stringify(stateObj);
-                (0, index_1.useSessionStorage)("".concat(stateKey_1, "Obj"), stateObj);
-            }
-        }
         // 将 state进行本地存储，存储完成后跳转到微信授权页面
-        weixinCode(); // 微信授权页面获取CODE
-        return;
+        return getCode(); // 微信授权页面获取CODE
     }
     if (!localCode && stateIndex == -1 && searchIndex == -1) {
-        return weixinCode();
+        return getCode();
     }
 }
-exports.weixinUrlCode = weixinUrlCode;
+exports.getUrlCode = getUrlCode;
 function cryptoConfig(key, iv) {
     if (!key)
         key = defaultKey;
@@ -107,26 +102,41 @@ function cryptoConfig(key, iv) {
     };
 }
 // 执行微信登录
-function weixinLogin(code) {
+function login(code) {
     var appId = weixinConfig.appId, http = weixinConfig.http, stateKey = weixinConfig.stateKey, redirectUri = weixinConfig.redirectUri;
-    if (!appId)
+    if (!appId) {
+        console.error("未正常传入微信公众号appId");
+        return;
+    }
+    if (!code) {
+        console.error("未获取到微信授权的code参数");
         return;
+    }
     var obj = {
         "app_id": appId,
         "js_code": code
     };
-    if (!http)
+    if (!http) {
+        console.error("未正常传入微信授权登录http函数");
         return;
-    (0, index_1.useSessionStorage)("weixinLoginParams", JSON.stringify(obj));
+    }
+    (0, index_1.useSessionStorage)("loginParams", JSON.stringify(obj));
     // 调试字段 isPassLogin ，为true 时不继续执行微信登录，前端可拿到 code 给后端测试
     // if(weixinConfig['isPassLogin']) return
     weixinConfig.http(obj).then(function (res) {
-        (0, index_1.useSessionStorage)("weixinLoginRes", res);
+        var _a;
+        (0, index_1.useSessionStorage)("loginRes", res);
         if (res.code == 40163) {
             // 未登录则先执行登录
-            return weixinCode();
+            return getCode();
+        }
+        var data = {};
+        if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("data")) {
+            data = res.data;
+        }
+        if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("Data")) {
+            data = res.Data;
         }
-        var data = res['data'] || {};
         for (var key in data) {
             var item = data[key];
             if (item instanceof Object) {
@@ -140,24 +150,24 @@ function weixinLogin(code) {
             url = encodeURIComponent(redirectUri);
         }
         var hashVal = loc.hash;
-        var state = (0, index_1.getSessionStorage)(stateKey);
+        var urlParamsData = (0, index_1.getSessionStorage)("urlParamsData") || "";
+        var stateData = ((_a = urlParamsData === null || urlParamsData === void 0 ? void 0 : urlParamsData.state) === null || _a === void 0 ? void 0 : _a.data) || ""; // 默认有值，链接携带
         var str = "";
-        if (state) {
-            var stateObj = (0, index_1.getSessionStorage)("".concat(stateKey, "Obj"));
-            for (var key in stateObj) {
+        if (stateData) {
+            for (var key in stateData) {
                 if (key == "path") {
-                    if (stateObj[key][0] == "/") {
-                        url = "".concat(url, "/#").concat(stateObj.path);
+                    if (stateData[key][0] == "/") {
+                        url = "".concat(url, "/#").concat(stateData.path);
                     }
                     else {
-                        url = "".concat(url, "/#/").concat(stateObj.path);
+                        url = "".concat(url, "/#/").concat(stateData.path);
                     }
                 }
                 else {
-                    str += "".concat(key, "=").concat(stateObj[key], "&");
+                    str += "".concat(key, "=").concat(stateData[key], "&");
                 }
             }
-            if (stateObj['path']) {
+            if (stateData === null || stateData === void 0 ? void 0 : stateData.path) {
                 if (str) {
                     url = "".concat(url, "?").concat(str);
                 }
@@ -179,7 +189,7 @@ function weixinLogin(code) {
             }
         }
     }).catch(function (err) {
-        (0, index_1.useSessionStorage)("weixinLoginError", err);
+        (0, index_1.useSessionStorage)("loginError", err);
     });
 }
 /**
@@ -193,11 +203,14 @@ function formatSearch(search, keys) {
         return false;
     var index = search.indexOf(keys);
     search = search.substr(index);
+    if (search.startsWith("?")) {
+        search = search.substring(1);
+    }
     var urlArr = search.split("&");
     return urlArr;
 }
 // 加载当前微信sdk环境
-function weixinInit() {
+function initSdk() {
     var wx = null;
     if (w.wx && w.wx.ready) {
         wx = w.wx;
@@ -209,13 +222,14 @@ function weixinInit() {
     return wx;
 }
 // 返回微信环境 sdk
-function weixinEnvSDK() {
-    var env = weixinInit() || {};
+function envSDK() {
+    var env = initSdk() || {};
     return env;
 }
-exports.weixinEnvSDK = weixinEnvSDK;
+exports.envSDK = envSDK;
 // 前往微信授权登录页面
-function weixinCode(appId, scope) {
+function getCode(appId, scope) {
+    params.get(['code', 'state'], "session");
     if ((0, utils_1.weixinBrowser)()) {
         var id = "";
         if (weixinConfig['appId']) {
@@ -225,7 +239,7 @@ function weixinCode(appId, scope) {
             id = appId;
         }
         if (!id) {
-            console.log("调用跳转微信授权方法时weixinCode，请传入参数：appId");
+            console.log("调用跳转微信授权方法时getCode，请传入参数：appId");
             return;
         }
         var scopeVal = "snsapi_userinfo";
@@ -249,7 +263,7 @@ function weixinCode(appId, scope) {
         console.log("非微信内核浏览器执行其他业务");
     }
 }
-exports.weixinCode = weixinCode;
+exports.getCode = getCode;
 var defaultJsApiList = [
     'updateAppMessageShareData', 'updateTimelineShareData', "onMenuShareWeibo", "onMenuShareQZone", "startRecord", "stopRecord", "closeWindow", "scanQRCode", "chooseWXPay", "chooseCard", "openCard",
     "onVoiceRecordEnd", "playVoice", "pauseVoice", "stopVoice", "onVoicePlayEnd", "uploadVoice", "downloadVoice", "chooseImage", "previewImage", "uploadImage", "openProductSpecificView", "addCard",
@@ -259,7 +273,7 @@ var defaultOpenTagList = [
     "wx-open-subscribe", "wx-open-launch-app", "wx-open-launch-weapp",
     "wx-open-audio"
 ];
-function weixinShareConfig(config) {
+function configReady(config) {
     if (!config['http'])
         return;
     var url = loc.origin;
@@ -281,7 +295,7 @@ function weixinShareConfig(config) {
     config.http(param).then(function (res) {
         if (res.code == 0) {
             var data = res['data'] || {};
-            var wx = weixinInit();
+            var wx = initSdk();
             wx.config({
                 debug: false,
                 appId: data.appId,
@@ -293,18 +307,18 @@ function weixinShareConfig(config) {
             });
             wx.ready(function (res) {
                 console.log("加载微信分享配置完成：", res);
-                (0, index_1.useSessionStorage)("weixinShareConfigSuccess", "\u52A0\u8F7D\u5FAE\u4FE1\u5206\u4EAB\u914D\u7F6E\u5B8C\u6210\uFF1A".concat(res));
+                (0, index_1.useSessionStorage)("configReadySuccess", "\u52A0\u8F7D\u5FAE\u4FE1\u5206\u4EAB\u914D\u7F6E\u5B8C\u6210\uFF1A".concat(res));
                 if (config['cb'] && typeof config.cb === "function")
                     config.cb();
             });
             wx.error(function (err) {
-                (0, index_1.useSessionStorage)("weixinShareConfigError", "\u52A0\u8F7D\u5FAE\u4FE1\u5206\u4EAB\u914D\u7F6E\u9519\u8BEF\uFF1A".concat(err));
+                (0, index_1.useSessionStorage)("configReadyError", "\u52A0\u8F7D\u5FAE\u4FE1\u5206\u4EAB\u914D\u7F6E\u9519\u8BEF\uFF1A".concat(err));
             });
         }
     });
 }
-exports.weixinShareConfig = weixinShareConfig;
-function weixinShareInit(options) {
+exports.configReady = configReady;
+function shareReady(options) {
     var title = "微信分享标题";
     if (options['title'])
         title = options.title;
@@ -330,10 +344,10 @@ function weixinShareInit(options) {
     }
     if (options['shareUrl'])
         link = options['shareUrl'];
-    var wx = weixinInit();
+    var wx = initSdk();
     (0, index_1.useSessionStorage)("weixinShareUrl", link);
     wx.ready(function () {
-        (0, index_1.useSessionStorage)("weixinShareInit", "success");
+        (0, index_1.useSessionStorage)("shareReady", "success");
         //需在用户可能点击分享按钮前就先调用
         wx.updateAppMessageShareData({
             title: title,
@@ -365,9 +379,9 @@ function weixinShareInit(options) {
         console.log("配置进入错误：", res);
     });
 }
-exports.weixinShareInit = weixinShareInit;
-function weixinPay(config) {
-    var wx = weixinInit();
+exports.shareReady = shareReady;
+function onlinePay(config) {
+    var wx = initSdk();
     // let { timeStamp,signType,prepay_id,paySign,package,nonceStr,appId } = params
     var cb = "";
     if (config['cb'] && typeof config.cb === "function")
@@ -396,4 +410,4 @@ function weixinPay(config) {
         }
     });
 }
-exports.weixinPay = weixinPay;
+exports.onlinePay = onlinePay;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xctc-utils",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "localStorage存储\r ```\r sessionStorage存储\r ```\r crypto-js加密、解密\r ```\r 微信授权登录、微信分享\r ```\r 设备环境获取\r ```\r 是否是微信浏览器\r ```\r 时间戳转时间，字符串转时间戳",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",