xctc-utils 1.4.8 → 1.5.0

package/dist/weixin/index.d.ts

@@ -7,6 +7,7 @@ interface configOption {
     cryptoiv?: string;
     cryptokey?: string;
     isPassLogin?: boolean;
+    redirectUri?: string;
 }
 export declare function weixinUrlCode(config: configOption): void;
 export declare function weixinEnvSDK(): any;

package/dist/weixin/index.js

@@ -108,7 +108,7 @@ function cryptoConfig(key, iv) {
 }
 // 执行微信登录
 function weixinLogin(code) {
-    var appId = weixinConfig.appId, http = weixinConfig.http, stateKey = weixinConfig.stateKey;
+    var appId = weixinConfig.appId, http = weixinConfig.http, stateKey = weixinConfig.stateKey, redirectUri = weixinConfig.redirectUri;
     if (!appId)
         return;
     var obj = {
@@ -136,6 +136,9 @@ function weixinLogin(code) {
             (0, index_1.useLocalStorage)(key, item);
         }
         var url = loc.origin;
+        if (redirectUri) {
+            url = encodeURIComponent(redirectUri);
+        }
         var hashVal = loc.hash;
         var state = (0, index_1.getSessionStorage)(stateKey);
         var str = "";
@@ -232,8 +235,11 @@ function weixinCode(appId, scope) {
         else if (scope) {
             scopeVal = scope;
         }
-        var base = "https://open.weixin.qq.com/connect/oauth2/authorize?";
         var uri = encodeURIComponent(loc.origin);
+        if (weixinConfig['redirectUri']) {
+            uri = encodeURIComponent(weixinConfig.redirectUri);
+        }
+        var base = "https://open.weixin.qq.com/connect/oauth2/authorize?";
         var config = "appid=".concat(id, "&redirect_uri=").concat(uri, "&response_type=code&scope=").concat(scopeVal, "&state=state#wechat_redirect");
         var wxJumpURL = base + config;
         loc.replace(wxJumpURL);

package/package.json

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