@gjzq/sdk 1.3.1-beta.1 → 1.4.0-beta.1

package/dist/index.d.ts

@@ -87,7 +87,7 @@ declare const beginLogin: (loginType: string, channelId: string, json?: any) =>
  * @param  {Object} loginParam.key 用户登录营销参数，格式参考4015功能号
  * @returns {Promise<boolean> | void}
  */
-declare function beginLoginForWeb(loginType: string, backUrl: string, loginParam?: Object): Promise<boolean | void>;
+declare function beginLoginForWeb(loginType: string, backUrl: string, loginParam?: object): Promise<boolean | void>;
 
 interface BindInfoData {
     userId?: string;
@@ -228,7 +228,7 @@ type HttpResponse<T = unknown> = {
  * @function checkFundAccountLogin
  * @returns {Promise<HttpResponse>}
  */
-declare function checkFundAccountLogin(): Promise<HttpResponse<any>>;
+declare function checkFundAccountLogin(): Promise<HttpResponse>;
 
 /**
  * 检查登录状态
@@ -252,14 +252,14 @@ declare function checkLoginForWeb(loginType: string): Promise<boolean>;
  * @function checkMarginAccountLogin
  * @returns {Promise<HttpResponse>}
  */
-declare function checkMarginAccountLogin(): Promise<HttpResponse<any>>;
+declare function checkMarginAccountLogin(): Promise<HttpResponse>;
 
 /**
  * user登录状态检查
  * @function checkUserLogin
  * @returns {Promise<HttpResponse>}
  */
-declare function checkUserLogin(): Promise<HttpResponse<any>>;
+declare function checkUserLogin(): Promise<HttpResponse>;
 
 type ChooseImgParams = {
     source?: number;
@@ -395,7 +395,7 @@ type FundAccountLoginParams = {
  * @param {FundAccountLoginParams} param
  * @returns {Promise<HttpResponse>}
  */
-declare function fundAccountLogin(param: FundAccountLoginParams): Promise<HttpResponse<any>>;
+declare function fundAccountLogin(param: FundAccountLoginParams): Promise<HttpResponse>;
 
 declare function getAppId(): Promise<string | undefined>;
 
@@ -748,7 +748,7 @@ type MarginAccountLoginParams = {
  * @param {MarginAccountLoginParams} param
  * @returns {Promise<HttpResponse> }
  */
-declare function marginAccountLogin(param: MarginAccountLoginParams): Promise<HttpResponse<any>>;
+declare function marginAccountLogin(param: MarginAccountLoginParams): Promise<HttpResponse>;
 
 type multiLoginParams = {
     [key: string]: unknown;
@@ -1185,7 +1185,7 @@ type UserLoginParams = {
  * @param {UserLoginParams} param
  * @returns {Promise<HttpResponse>}
  */
-declare function userLoginForWeb(param: UserLoginParams): Promise<HttpResponse<any>>;
+declare function userLoginForWeb(param: UserLoginParams): Promise<HttpResponse>;
 
 type userLoginMobileParams = {
     key?: string;
@@ -1250,4 +1250,4 @@ declare const wechatAuth: (options: WechatAuthOptions) => Promise<{
     msg: string;
 } | undefined>;
 
-export { type AddCalendarParams, type ApplyPermissionParams, type ChooseImgParams, type ChooseVideoParams, type ClientJumpParams, type CloseParams, type DeleteCalendarParams, type FundAccountLoginParams, type LinkActionConfigParam, type LinkDecodeParam, type LoginParams, type LogoutParams, type MarginAccountLoginParams, type OpenAppParam, type OpenAppParams, type OpenAppUrlParam, type OpenPageActionParam, type PageConfig$2 as PageConfig, type PidLoginParams, type PortfolioParams$1 as PortfolioParams, type QQStockLoginParams, type ReadFileInDiskParams, type ReadFileParams, type ReadSystemParams, type SaveFileInDiskParams, type SelectCalendarParams, type StartAnyChatParams, type StatusBarParams, type UploadFileparams, type UserLoginParams, type VivoDetectionParams, type WechatAuthOptions, type WechatPayParams, type WechatUserInfoOptions, addCalendar, addToPortfolio, appInit, appleChinaPay, appleUnionPay, applyPermission, beginLogin, beginLoginForWeb, bindInfo, bindInfoFunc, call, callphone, changeSkinType, type changeSkinTypeParams, checkFundAccountLogin, checkLogin, checkLoginForWeb, checkMarginAccountLogin, checkUserLogin, chooseImg, chooseVideo, clientJump, closeLoading, closePage, deleteCalendar, doneSuitability, exec, type execType, fundAccountLogin, getAppId, getAppVersion, getCapital, getInterfaceVersion, getLoginStatus, getPagePath, getSystemVersion, getUDID, getUID, getUkeyByChannelId, getUserUKeysByChannelId, getWechatUserInfo, goAlipay, type goAlipayResult, goBackPage, goWeChatShare, goWechatCustomService, type goWechatCustomServiceParams, goWechatPayment, type goWechatPaymentResult, h5Pay, http, hybridGetPassport, hybridGetUserId, initFinder, linkActionDecode, linkDecode, login, type loginResult, loginWithAccount, type loginWithAccountParams, loginWithToken, loginWithTokenForWeb, logout, logoutForWeb, marginAccountLogin, multiLogin, type multiLoginParams, native2011IOOperation, nativeIOOperation, type nativeIOOperationType, onAppear, onBackKeyPressed, onClose, onDisappear, onSkinChanged, openApp, openAppForWeb, openPage, pageInit, pageInitWithSession, pageInitWithToken, pidLogin, qqStockLogin, readFile, readFileInDisk, readNoSystemParameter, readSystemParameter, type readSystemParameterParams, ready, type readyResult, removePortfolio, saveFileInDisk, savePictureToPhone, scanCode, selectCalendar, setStatusBar, setTitle, setTitles, showAlert, type showAlertParams, showConfirm, type showResult, startAnyChat, syncLoginStatusBetweenNativeAndServer, trackEvent, trackInitAuto, trackPublicValue, trackUserProfile, trackUuid, uploadFile, userLogOut, userLogin, userLoginForWeb, userLoginMobile, type userLoginMobileParams, userLoginModal, vivoDetection, wechatAuth };
+export { type AddCalendarParams, type ApplyPermissionParams, type BindInfoData, type ChooseImgParams, type ChooseVideoParams, type ClientJumpParams, type CloseParams, type DeleteCalendarParams, type FundAccountLoginParams, type LinkActionConfigParam, type LinkDecodeParam, type LoginParams, type LogoutParams, type MarginAccountLoginParams, type OpenAppParam, type OpenAppParams, type OpenAppUrlParam, type OpenPageActionParam, type PageConfig$2 as PageConfig, type PidLoginParams, type PortfolioParams$1 as PortfolioParams, type QQStockLoginParams, type ReadFileInDiskParams, type ReadFileParams, type ReadSystemParams, type SaveFileInDiskParams, type SelectCalendarParams, type StartAnyChatParams, type StatusBarParams, type UploadFileparams, type UserLoginParams, type VivoDetectionParams, type WechatAuthOptions, type WechatPayParams, type WechatUserInfoOptions, addCalendar, addToPortfolio, appInit, appleChinaPay, appleUnionPay, applyPermission, beginLogin, beginLoginForWeb, bindInfo, bindInfoFunc, call, callphone, changeSkinType, type changeSkinTypeParams, checkFundAccountLogin, checkLogin, checkLoginForWeb, checkMarginAccountLogin, checkUserLogin, chooseImg, chooseVideo, clientJump, closeLoading, closePage, deleteCalendar, doneSuitability, exec, type execType, fundAccountLogin, getAppId, getAppVersion, getCapital, getInterfaceVersion, getLoginStatus, getPagePath, getSystemVersion, getUDID, getUID, getUkeyByChannelId, getUserUKeysByChannelId, getWechatUserInfo, goAlipay, type goAlipayResult, goBackPage, goWeChatShare, goWechatCustomService, type goWechatCustomServiceParams, goWechatPayment, type goWechatPaymentResult, h5Pay, http, hybridGetPassport, hybridGetUserId, initFinder, linkActionDecode, linkDecode, login, type loginResult, loginWithAccount, type loginWithAccountParams, loginWithToken, loginWithTokenForWeb, logout, logoutForWeb, marginAccountLogin, multiLogin, type multiLoginParams, native2011IOOperation, nativeIOOperation, type nativeIOOperationType, onAppear, onBackKeyPressed, onClose, onDisappear, onSkinChanged, openApp, openAppForWeb, openPage, pageInit, pageInitWithSession, pageInitWithToken, pidLogin, qqStockLogin, readFile, readFileInDisk, readNoSystemParameter, readSystemParameter, type readSystemParameterParams, ready, type readyResult, removePortfolio, saveFileInDisk, savePictureToPhone, scanCode, selectCalendar, setStatusBar, setTitle, setTitles, showAlert, type showAlertParams, showConfirm, type showResult, startAnyChat, syncLoginStatusBetweenNativeAndServer, trackEvent, trackInitAuto, trackPublicValue, trackUserProfile, trackUuid, uploadFile, userLogOut, userLogin, userLoginForWeb, userLoginMobile, type userLoginMobileParams, userLoginModal, vivoDetection, wechatAuth };

package/dist/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-Bi9wa93N.js');
+var index = require('./index-Clzjdhbd.js');
 require('ts-md5');
 require('weixin-js-sdk');
 require('clipboard');

package/dist/pure.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-Bi9wa93N.js');
+var index = require('./index-Clzjdhbd.js');
 require('ts-md5');
 require('weixin-js-sdk');
 require('clipboard');

package/es/beginLogin/index.mjs

@@ -21,41 +21,38 @@ var beginLogin = function beginLogin(loginType, channelId, json) {
         case 0:
           return [4 /*yield*/, getAppId()];
         case 1:
-          if (!(_a.sent() === 'yjb3.0')) return [3 /*break*/, 14];
+          if (!(_a.sent() === 'yjb3.0')) return [3 /*break*/, 11];
           return [4 /*yield*/, checkLogin(loginType, channelId)];
         case 2:
           checkResult = _a.sent();
-          if (!(checkResult.code == 0)) return [3 /*break*/, 3];
-          return [2 /*return*/, checkResult];
-        case 3:
-          if (!(checkResult.code == -2)) return [3 /*break*/, 4];
-          return [2 /*return*/, {
-            code: -2,
-            result: 'version not supported'
-          }];
-        case 4:
-          if (!(loginType === 'u')) return [3 /*break*/, 9];
+          if (checkResult.code == 0) {
+            return [2 /*return*/, checkResult];
+          } else if (checkResult.code == -2) {
+            return [2 /*return*/, {
+              code: -2,
+              result: 'version not supported'
+            }];
+          }
+          if (!(loginType === 'u')) return [3 /*break*/, 6];
           return [4 /*yield*/, userLogin(json)];
-        case 5:
+        case 3:
           userLoginResult = _a.sent();
-          if (!(userLoginResult.code === 0)) return [3 /*break*/, 7];
+          if (!(userLoginResult.code === 0)) return [3 /*break*/, 5];
           if (isIos) {
             //适配ios移动端
             closePage({});
           }
           return [4 /*yield*/, checkLogin(loginType, channelId)];
-        case 6:
+        case 4:
           return [2 /*return*/, _a.sent()];
-        case 7:
+        case 5:
           //取消登录,需要关闭登录页
           closePage({});
           return [2 /*return*/, {
             code: -3
           }];
-        case 8:
-          return [3 /*break*/, 13];
-        case 9:
-          if (!(loginType === 'p' || +loginType === 1 || +loginType === 2)) return [3 /*break*/, 13];
+        case 6:
+          if (!(loginType === 'p' || +loginType === 1 || +loginType === 2)) return [3 /*break*/, 10];
           args = {
             type: +loginType === 2 ? 2 : 1,
             needPassportId: 1,
@@ -66,29 +63,29 @@ var beginLogin = function beginLogin(loginType, channelId, json) {
             args.fundAccount = json.fundAccount;
           }
           return [4 /*yield*/, login(args)];
-        case 10:
+        case 7:
           loginResult = _a.sent();
-          if (!(loginResult.code === 0)) return [3 /*break*/, 12];
+          if (!(loginResult.code === 0)) return [3 /*break*/, 9];
           //普通登录ios 安卓都需要执行关闭页面操作
           closePage({});
           return [4 /*yield*/, checkLogin(loginType, channelId)];
-        case 11:
+        case 8:
           return [2 /*return*/, _a.sent()];
-        case 12:
+        case 9:
           //取消登录，关闭登录页
           closePage({});
           return [2 /*return*/, {
             code: -3
           }];
-        case 13:
-          return [3 /*break*/, 15];
-        case 14:
+        case 10:
+          return [3 /*break*/, 12];
+        case 11:
           //todo 其他终端还不支持此功能
           return [2 /*return*/, {
             code: -2,
             result: 'app not supported'
           }];
-        case 15:
+        case 12:
           return [2 /*return*/];
       }
     });

package/es/checkFundAccountLogin/funcs.mjs

@@ -0,0 +1,61 @@
+import { __awaiter, __generator } from '../node_modules/tslib/tslib.es6.mjs';
+import { MESSAGE, ALL_NO_SYSTEM_PARAM_KEYS } from '../utils/const.mjs';
+import { nativeIOOperation } from '../nativeIOOperation/index.mjs';
+
+/**
+ * hybrid 读取非系统参数
+ * @param keys
+ * @returns
+ */
+function readHybridNoSystemParam() {
+  return __awaiter(this, arguments, void 0, function (keys) {
+    if (keys === void 0) {
+      keys = ALL_NO_SYSTEM_PARAM_KEYS;
+    }
+    return __generator(this, function (_a) {
+      return [2 /*return*/, nativeIOOperation(4004, {
+        keys: keys
+      })];
+    });
+  });
+}
+/**
+ * hybrid 读取系统参数，native异常时，返回空对象
+ * @param keys
+ * @returns
+ */
+function readHybridSystemParamIgnoreError(keys) {
+  var _this = this;
+  if (keys === void 0) {
+    keys = ALL_NO_SYSTEM_PARAM_KEYS;
+  }
+  return new Promise(function (resolve, reject) {
+    return __awaiter(_this, void 0, void 0, function () {
+      var nonSystemParamRes;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            return [4 /*yield*/, readHybridNoSystemParam(keys)];
+          case 1:
+            nonSystemParamRes = _a.sent();
+            if (nonSystemParamRes.code != 0) {
+              resolve && resolve({
+                code: 0,
+                result: {},
+                message: nonSystemParamRes.message || MESSAGE.NATIVE_ERROR
+              });
+            } else {
+              resolve && resolve({
+                code: 0,
+                result: nonSystemParamRes.result,
+                message: MESSAGE.SUCCESS
+              });
+            }
+            return [2 /*return*/];
+        }
+      });
+    });
+  });
+}
+
+export { readHybridNoSystemParam, readHybridSystemParamIgnoreError };

package/es/checkFundAccountLogin/index.mjs

@@ -4,7 +4,8 @@ import { API_URL } from '../utils/urls.mjs';
 import { http } from '../http/index.mjs';
 import { syncLoginStatusBetweenNativeAndServer } from '../syncLoginStatusBetweenNativeAndServer/index.mjs';
 import { checkFundAccountLoginFromServer } from '../utils/loginFuncs.mjs';
-import { decrypt, readHybridSystemParamIgnoreError } from '../utils/funcs.mjs';
+import { decrypt } from '../utils/funcs.mjs';
+import { readHybridSystemParamIgnoreError } from './funcs.mjs';
 import { logoutForWeb } from '../logoutForWeb/index.mjs';
 
 /**
@@ -28,9 +29,9 @@ function checkFundAccountLogin() {
               if (!!nativeFundAccount) return [3 /*break*/, 2];
               logoutForWeb(LOGOUT_TYPE.FUNDACCOUNT);
               resolve && resolve({
-                "code": -1,
-                "message": "login fail!",
-                "data": ""
+                'code': -1,
+                'message': 'login fail!',
+                'data': ''
               }); //todo
               return [3 /*break*/, 7];
             case 2:
@@ -55,9 +56,8 @@ function checkFundAccountLogin() {
         });
       });
     });
-  } else {
-    return http.get(API_URL + '/login/fundAccount');
   }
+  return http.get("".concat(API_URL, "/login/fundAccount"));
 }
 
 export { checkFundAccountLogin };

package/es/checkLogin/index.mjs

@@ -29,11 +29,10 @@ var checkLogin = function checkLogin(loginType, channelId) {
               code: 0,
               result: userKey
             }];
-          } else {
-            return [2 /*return*/, {
-              code: -1
-            }];
           }
+          return [2 /*return*/, {
+            code: -1
+          }];
         case 3:
           if (!(loginType === 'p')) return [3 /*break*/, 5];
           return [4 /*yield*/, getUkeyByChannelId(channelId)];
@@ -44,11 +43,10 @@ var checkLogin = function checkLogin(loginType, channelId) {
               code: 0,
               result: uKey
             }];
-          } else {
-            return [2 /*return*/, {
-              code: -1
-            }];
           }
+          return [2 /*return*/, {
+            code: -1
+          }];
         case 5:
           if (!(+loginType === 1)) return [3 /*break*/, 7];
           return [4 /*yield*/, getLoginStatus()];
@@ -58,11 +56,10 @@ var checkLogin = function checkLogin(loginType, channelId) {
             return [2 /*return*/, {
               code: 0
             }];
-          } else {
-            return [2 /*return*/, {
-              code: -1
-            }];
           }
+          return [2 /*return*/, {
+            code: -1
+          }];
         case 7:
           if (!(+loginType === 2)) return [3 /*break*/, 9];
           return [4 /*yield*/, getLoginStatus()];
@@ -72,11 +69,10 @@ var checkLogin = function checkLogin(loginType, channelId) {
             return [2 /*return*/, {
               code: 0
             }];
-          } else {
-            return [2 /*return*/, {
-              code: -1
-            }];
           }
+          return [2 /*return*/, {
+            code: -1
+          }];
         case 9:
           return [3 /*break*/, 11];
         case 10:

package/es/checkLoginForWeb/index.mjs

@@ -21,17 +21,17 @@ import { getQueryString } from '../utils/urlFuncs.mjs';
  */
 function checkLoginForWeb(loginType) {
   return __awaiter(this, void 0, void 0, function () {
-    var checkResult, key, param, loginResult, param, loginResult, param, loginResult, fundAccountLoginResult, param, loginResult, instantToken, fundAccountLoginResult, param, loginResult, instantToken, marginAccountLoginResult, userLoginResult;
+    var checkResult, key, param, loginResult, param, loginResult, param_1, loginResult_1, fundAccountLoginResult_1, param, loginResult, instantToken, fundAccountLoginResult, param, loginResult, instantToken, marginAccountLoginResult, userLoginResult;
     return __generator(this, function (_a) {
       switch (_a.label) {
         case 0:
           return [4 /*yield*/, getAppId()];
         case 1:
-          if (!(_a.sent() === 'yjb3.0')) return [3 /*break*/, 28];
+          if (!(_a.sent() === 'yjb3.0')) return [3 /*break*/, 25];
           return [4 /*yield*/, checkLogin(loginType, CHANNELID)];
         case 2:
           checkResult = _a.sent();
-          if (!(checkResult.code === 0)) return [3 /*break*/, 26];
+          if (!(checkResult.code === 0)) return [3 /*break*/, 23];
           key = checkResult.result;
           if (!(loginType === LoginType.USER)) return [3 /*break*/, 4];
           param = {
@@ -47,11 +47,10 @@ function checkLoginForWeb(loginType) {
             // 解绑userId
             // bindInfo({ userId: null, YJB_userId: 'DEFAULT' });
             return [2 /*return*/, false];
-          } else {
-            // 绑userId
-            bindInfo(loginResult.data);
-            return [2 /*return*/, true];
           }
+          // 绑userId
+          bindInfo(loginResult.data);
+          return [2 /*return*/, true];
         case 4:
           if (!(loginType === LoginType.PASSPORT)) return [3 /*break*/, 6];
           param = {
@@ -66,33 +65,32 @@ function checkLoginForWeb(loginType) {
             // 解绑pid
             // bindInfo({ pid: null })
             return [2 /*return*/, false];
-          } else {
-            bindInfo(loginResult.data);
-            return [2 /*return*/, true];
           }
+          bindInfo(loginResult.data);
+          return [2 /*return*/, true];
         case 6:
-          if (!(loginType === LoginType.FUNDACCOUNT)) return [3 /*break*/, 17];
+          if (!(loginType === LoginType.FUNDACCOUNT)) return [3 /*break*/, 16];
           if (!useHybridLogin()) return [3 /*break*/, 10];
           return [4 /*yield*/, getUkeyByChannelId(CHANNELID)];
         case 7:
           key = _a.sent();
-          param = {
+          param_1 = {
             channelId: CHANNELID,
             uKey: key
           };
-          return [4 /*yield*/, pidLogin(param)];
+          return [4 /*yield*/, pidLogin(param_1)];
         case 8:
-          loginResult = _a.sent();
-          if (loginResult.code !== 0) {
+          loginResult_1 = _a.sent();
+          if (loginResult_1.code !== 0) {
             // 2025.01.02 经讨论 退登不解绑！！
             // bindInfo({ pid: null, clientId: null })
             return [2 /*return*/, false];
           }
           return [4 /*yield*/, checkFundAccountLogin()];
         case 9:
-          fundAccountLoginResult = _a.sent();
-          bindInfo(fundAccountLoginResult.data);
-          return [2 /*return*/, fundAccountLoginResult.code == 0];
+          fundAccountLoginResult_1 = _a.sent();
+          bindInfo(fundAccountLoginResult_1.data);
+          return [2 /*return*/, fundAccountLoginResult_1.code == 0];
         case 10:
           return [4 /*yield*/, getUkeyByChannelId(CHANNELID)];
         case 11:
@@ -122,18 +120,16 @@ function checkLoginForWeb(loginType) {
           bindInfo(fundAccountLoginResult.data);
           return [2 /*return*/, fundAccountLoginResult.code == 0];
         case 16:
-          return [3 /*break*/, 25];
-        case 17:
-          if (!(loginType === LoginType.MARGINACCOUNT)) return [3 /*break*/, 24];
+          if (!(loginType === LoginType.MARGINACCOUNT)) return [3 /*break*/, 22];
           return [4 /*yield*/, getUkeyByChannelId(CHANNELID)];
-        case 18:
+        case 17:
           key = _a.sent();
           param = {
             channelId: CHANNELID,
             uKey: key
           };
           return [4 /*yield*/, pidLogin(param)];
-        case 19:
+        case 18:
           loginResult = _a.sent();
           if (loginResult.code !== 0) {
             // 2025.01.02 经讨论 退登不解绑！！
@@ -141,46 +137,41 @@ function checkLoginForWeb(loginType) {
             return [2 /*return*/, false];
           }
           instantToken = getQueryString('instant_token');
-          if (!instantToken) return [3 /*break*/, 21];
+          if (!instantToken) return [3 /*break*/, 20];
           return [4 /*yield*/, loginWithToken()];
-        case 20:
+        case 19:
           return [2 /*return*/, _a.sent()];
-        case 21:
+        case 20:
           return [4 /*yield*/, checkMarginAccountLogin()];
-        case 22:
+        case 21:
           marginAccountLoginResult = _a.sent();
           bindInfo(marginAccountLoginResult.data);
           return [2 /*return*/, marginAccountLoginResult.code == 0];
-        case 23:
-          return [3 /*break*/, 25];
-        case 24:
+        case 22:
           return [2 /*return*/, false];
-        case 25:
-          return [3 /*break*/, 27];
-        case 26:
+        case 23:
           if (checkResult.code === -2) {
             //客户端系统版本不支持,或app端不支持(微信)
             return [2 /*return*/, false];
-          } else {
-            //未登录,登录界面返回
-            return [2 /*return*/, false];
           }
-        case 27:
-          return [3 /*break*/, 35];
-        case 28:
-          if (!(loginType === LoginType.PASSPORT || loginType === LoginType.FUNDACCOUNT)) return [3 /*break*/, 30];
+          _a.label = 24;
+        case 24:
+          //未登录,登录界面返回
+          return [2 /*return*/, false];
+        case 25:
+          if (!(loginType === LoginType.PASSPORT || loginType === LoginType.FUNDACCOUNT)) return [3 /*break*/, 27];
           return [4 /*yield*/, loginWithTokenForWeb(loginType)];
-        case 29:
+        case 26:
           return [2 /*return*/, _a.sent()];
-        case 30:
-          if (!(loginType === LoginType.MARGINACCOUNT)) return [3 /*break*/, 32];
+        case 27:
+          if (!(loginType === LoginType.MARGINACCOUNT)) return [3 /*break*/, 29];
           return [4 /*yield*/, loginWithTokenForWeb(loginType)];
-        case 31:
+        case 28:
           return [2 /*return*/, _a.sent()];
-        case 32:
-          if (!(loginType === LoginType.USER)) return [3 /*break*/, 34];
+        case 29:
+          if (!(loginType === LoginType.USER)) return [3 /*break*/, 31];
           return [4 /*yield*/, checkUserLogin()];
-        case 33:
+        case 30:
           userLoginResult = _a.sent();
           console.log('userLoginResult:', userLoginResult);
           // 绑userId
@@ -188,14 +179,11 @@ function checkLoginForWeb(loginType) {
             // 2025.01.02 经讨论 退登不解绑！！
             // bindInfo({ userId: null })
             return [2 /*return*/, false];
-          } else {
-            bindInfo(userLoginResult.data);
-            return [2 /*return*/, true];
           }
-        case 34:
+          bindInfo(userLoginResult.data);
+          return [2 /*return*/, true];
+        case 31:
           return [2 /*return*/, false];
-        case 35:
-          return [2 /*return*/];
       }
     });
   });

package/es/checkMarginAccountLogin/index.mjs

@@ -7,7 +7,7 @@ import { http } from '../http/index.mjs';
  * @returns {Promise<HttpResponse>}
  */
 function checkMarginAccountLogin() {
-  return http.get(API_URL + '/login/marginAccount');
+  return http.get("".concat(API_URL, "/login/marginAccount"));
 }
 
 export { checkMarginAccountLogin };

package/es/checkUserLogin/index.mjs

@@ -7,7 +7,7 @@ import { http } from '../http/index.mjs';
  * @returns {Promise<HttpResponse>}
  */
 function checkUserLogin() {
-  return http.get(API_URL + '/login/user');
+  return http.get("".concat(API_URL, "/login/user"));
 }
 
 export { checkUserLogin };

package/es/fundAccountLogin/index.mjs

@@ -8,7 +8,7 @@ import { http } from '../http/index.mjs';
  * @returns {Promise<HttpResponse>}
  */
 function fundAccountLogin(param) {
-  return http.post(API_URL + '/login/fundAccount', param);
+  return http.post("".concat(API_URL, "/login/fundAccount"), param);
 }
 
 export { fundAccountLogin };

package/es/linkActionDecode/index.mjs

@@ -1,6 +1,7 @@
 import CustomURI from '../utils/urijs.mjs';
 import { getUrlJson, getActionRedirectOptions } from '../utils/urlFuncs.mjs';
 
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * v2工具：回流配置转换成v1广告配置，并根据使用场景返回跳转参数对象
  * @function linkDecode
@@ -36,7 +37,7 @@ var linkActionDecode = function linkActionDecode(action, config) {
       var str = '';
       if (theRequest) {
         for (var n in theRequest) {
-          str = str + "&".concat(n, "=").concat(theRequest[n]);
+          str = "".concat(str, "&").concat(n, "=").concat(theRequest[n]);
         }
       }
       // 针对哈西路由链接，location参数的处理 1-保持，0-移到hash路由（默认）
@@ -46,7 +47,9 @@ var linkActionDecode = function linkActionDecode(action, config) {
         str = str.replace('&', '?');
       }
       hashIgnore = param.hashIgnore || 0;
-      !+hashIgnore && uri.search("");
+      if (!+hashIgnore) {
+        uri.search('');
+      }
       uri.hash("".concat(commonUrl).concat(str));
     }
     url = decodeURIComponent(uri.href());

package/es/linkDecode/index.mjs

@@ -31,7 +31,7 @@ var linkDecode = function linkDecode(link, config) {
     var str = '';
     if (other) {
       for (var n in other) {
-        str = str + "&".concat(n, "=").concat(other[n]);
+        str = "".concat(str, "&").concat(n, "=").concat(other[n]);
       }
     }
     // 针对哈西路由链接，location参数的处理 1-保持，0-移到hash路由（默认）
@@ -40,13 +40,15 @@ var linkDecode = function linkDecode(link, config) {
     if (hashQuery.length == 1) {
       str = str.replace('&', '?');
     }
-    !+hashIgnore && uri.search("");
+    if (!+hashIgnore) {
+      uri.search('');
+    }
     uri.hash("".concat(commonUrl).concat(str));
   }
   var url = decodeURIComponent(uri.href());
   var jump = getDataJson(jumpInfo);
   var add = getDataJson(addInfo, true);
-  console.log("add:", add);
+  console.log('add:', add);
   var options = {
     url: url,
     hashIgnore: Number(hashIgnore) || 0,

package/es/loginWithToken/index.mjs

@@ -11,7 +11,7 @@ import { getQueryString } from '../utils/urlFuncs.mjs';
    */
 function loginWithToken() {
   return __awaiter(this, void 0, void 0, function () {
-    var accountType, instantToken, oldInstantToken, opStation, _a, code, data, _b, code, data;
+    var accountType, instantToken, oldInstantToken, opStation, _a, code_1, data_1, _b, code, data;
     return __generator(this, function (_c) {
       switch (_c.label) {
         case 0:
@@ -40,9 +40,9 @@ function loginWithToken() {
             instant_token: instantToken
           })];
         case 1:
-          _a = _c.sent(), code = _a.code, data = _a.data;
-          bindInfo(data);
-          return [2 /*return*/, code === 0];
+          _a = _c.sent(), code_1 = _a.code, data_1 = _a.data;
+          bindInfo(data_1);
+          return [2 /*return*/, code_1 === 0];
         case 2:
           return [4 /*yield*/, fundAccountLogin({
             op_station: opStation,