xctc-utils 1.6.13 → 1.6.15

package/dist/weixin/index.js

@@ -54,13 +54,13 @@ function getUrlCode(config) {
     weixinConfig['stateKey'] = stateKey;
     (0, index_1.useSessionStorage)("weixinConfig", weixinConfig);
     var _b = weixinConfig.cryptoiv, cryptoiv = _b === void 0 ? defaultIv : _b, _c = weixinConfig.cryptokey, cryptokey = _c === void 0 ? defaultKey : _c, _d = weixinConfig.debuggerStatus, debuggerStatus = _d === void 0 ? false : _d;
-    var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
     initSdk(); // 加载微信sdk环境
     // 默认第一次通过链接进入系统，没有code和state
     var codeIndex = -1;
     var stateIndex = -1;
     var msgStr = "";
     var isAuth = false; // 是否完成 code 授权
+    var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
     if (search) {
         codeIndex = search.indexOf("code=");
         stateIndex = search.indexOf("state=");
@@ -304,8 +304,26 @@ var defaultOpenTagList = [
     "wx-open-subscribe", "wx-open-launch-app", "wx-open-launch-weapp",
     "wx-open-audio"
 ];
+var isContinue = function () {
+    var localCodeData = (0, index_1.getSessionStorage)("urlParamsData") || "";
+    var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
+    var codeIndex = -1;
+    if (search) {
+        codeIndex = search.indexOf("code=");
+    }
+    if (localCodeData && localCodeData.hasOwnProperty("code") && codeIndex == -1) {
+        return true;
+    }
+    else {
+        return false;
+    }
+};
 function configReady(config) {
     var _a;
+    if (!isContinue()) {
+        console.error("还未执行微信登录流程");
+        return;
+    }
     var _b = config || {}, appId = _b.appId, url = _b.url, _c = _b.urlKey, urlKey = _c === void 0 ? "url" : _c, _d = _b.appIdKey, appIdKey = _d === void 0 ? "appId" : _d, cb = _b.cb, _e = _b.jsApiList, jsApiList = _e === void 0 ? [] : _e, _f = _b.openTagList, openTagList = _f === void 0 ? [] : _f, _g = _b.http, http = _g === void 0 ? "" : _g;
     if (!http)
         return;
@@ -327,7 +345,6 @@ function configReady(config) {
     }
     config.http(param).then(function (res) {
         if (res) {
-            (0, index_1.useSessionStorage)("configReady-res", res);
             var data = {};
             if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("data")) {
                 data = res.data;
@@ -339,7 +356,6 @@ function configReady(config) {
                 var newKey = key.toLowerCase();
                 data[newKey] = data[key];
             }
-            (0, index_1.useSessionStorage)("configReady-data", data);
             if (!(data === null || data === void 0 ? void 0 : data.appid)) {
                 console.error("后端响应的data数据中缺乏appid或者appId或者AppId字段！");
                 return;
@@ -353,7 +369,6 @@ function configReady(config) {
                 nonceStr: data === null || data === void 0 ? void 0 : data.noncestr,
                 signature: data === null || data === void 0 ? void 0 : data.signature, //必填，生成的签名
             };
-            (0, index_1.useSessionStorage)("configReady-obj", obj);
             var wx = initSdk();
             wx.config(obj);
             wx.ready(function (res) {
@@ -370,6 +385,10 @@ function configReady(config) {
 }
 exports.configReady = configReady;
 function shareReady(options) {
+    if (!isContinue()) {
+        console.error("还未执行微信登录流程");
+        return;
+    }
     var title = "微信分享标题";
     if (options['title'])
         title = options.title;
@@ -432,6 +451,10 @@ function shareReady(options) {
 }
 exports.shareReady = shareReady;
 function onlinePay(config) {
+    if (!isContinue()) {
+        console.error("还未执行微信登录流程");
+        return;
+    }
     var wx = initSdk();
     // let { timeStamp,signType,prepay_id,paySign,package,nonceStr,appId } = params
     var cb = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xctc-utils",
-  "version": "1.6.13",
+  "version": "1.6.15",
   "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",