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

package/dist/{index-Bi9wa93N.js → index-Clzjdhbd.js}

@@ -285,36 +285,6 @@ var envRules = {
   ]
 };
 
-/**
- * ready 功能组件
- */
-function ready() {
-  return __awaiter(this, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-      if (!window.deviceReady) {
-        window.deviceReady = deviceReady;
-      }
-      return [2 /*return*/, new Promise(function (resolve) {
-        //如果已有桥接对象，直接resovle;如果没有桥接对象，注册监听
-        if (isBridgeReady()) {
-          resolve({
-            value: undefined
-          });
-        } else {
-          // TODO 好像没啥用
-          document.addEventListener('deviceready', function () {
-            if (window.webkit.messageHandlers.yjbInterface || window.yjbInterface) {
-              resolve({
-                value: undefined
-              });
-            }
-          }, false);
-        }
-      })];
-    });
-  });
-}
-
 /**
  * 判断一个值是否是函数
  * @param value 任意值
@@ -524,67 +494,6 @@ var getSysTimeDomain = function getSysTimeDomain() {
 function isWeixinClient() {
   return !!navigator.userAgent.match(/MicroMessenger/i);
 }
-/**
- * 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) {
-      switch (_a.label) {
-        case 0:
-          return [4 /*yield*/, ready()];
-        case 1:
-          _a.sent();
-          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*/];
-        }
-      });
-    });
-  });
-}
 /**
  * 判断是否是iframe嵌套环境
  * @returns 是否是iframe嵌套环境
@@ -678,6 +587,36 @@ function exec(_a) {
   }
 }
 
+/**
+ * ready 功能组件
+ */
+function ready() {
+  return __awaiter(this, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+      if (!window.deviceReady) {
+        window.deviceReady = deviceReady;
+      }
+      return [2 /*return*/, new Promise(function (resolve) {
+        //如果已有桥接对象，直接resovle;如果没有桥接对象，注册监听
+        if (isBridgeReady()) {
+          resolve({
+            value: undefined
+          });
+        } else {
+          // TODO 好像没啥用
+          document.addEventListener('deviceready', function () {
+            if (window.webkit.messageHandlers.yjbInterface || window.yjbInterface) {
+              resolve({
+                value: undefined
+              });
+            }
+          }, false);
+        }
+      })];
+    });
+  });
+}
+
 /**
  * nativeIOOperation 功能组件
  */
@@ -865,11 +804,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)];
@@ -880,11 +818,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()];
@@ -894,11 +831,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()];
@@ -908,11 +844,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:
@@ -5393,7 +5328,7 @@ http.interceptors.response.use(parseResponseMiddleware);
  * @returns {Promise<HttpResponse>}
  */
 function userLoginForWeb(param) {
-  return http.post(API_URL + '/login/user', param);
+  return http.post("".concat(API_URL, "/login/user"), param);
 }
 
 /**
@@ -5406,6 +5341,18 @@ function pidLogin(param) {
   return http.post("".concat(API_URL, "/login/passport"), param);
 }
 
+function readHybridNoSystemParam$1() {
+  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
+      })];
+    });
+  });
+}
 function checkFundAccountLoginFromServer() {
   return http.get(API_URL + '/login/fundAccount');
 }
@@ -5426,13 +5373,10 @@ function fetchYJBAPI(param_1) {
           return __generator(this, function (_a) {
             switch (_a.label) {
               case 0:
-                return [4 /*yield*/, ready()];
-              case 1:
-                _a.sent();
                 return [4 /*yield*/, nativeIOOperation(1001, Object.assign({}, options, {
                   param: param
                 }))];
-              case 2:
+              case 1:
                 nativeResponse = _a.sent();
                 if (nativeResponse.code != 0) {
                   //客户端调用失败或网络错误
@@ -5499,7 +5443,7 @@ function getFundAccountTokenForHybrid() {
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
-            return [4 /*yield*/, readHybridNoSystemParam(['fundAccount', 'opStation'])];
+            return [4 /*yield*/, readHybridNoSystemParam$1(['fundAccount', 'opStation'])];
           case 1:
             nonSystemParamRes = _a.sent();
             if (nonSystemParamRes.code != 0) {
@@ -5626,6 +5570,9 @@ function multiLogin(param) {
   return http.post("".concat(API_URL, "/login/multi"), param);
 }
 
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-expressions */
+/* eslint-disable no-async-promise-executor */
 /**
  * 客户端与服务端登录态同步
  * @function syncLoginStatusBetweenNativeAndServer
@@ -5642,7 +5589,7 @@ function syncLoginStatusBetweenNativeAndServer(syncLoginTypes) {
       return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
-            console.log("syncLoginTypes", syncLoginTypes);
+            console.log('syncLoginTypes', syncLoginTypes);
             getLoginParamPromises = [];
             if (syncLoginTypes.includes(LoginType.FUNDACCOUNT)) {
               getLoginParamPromises.push(getFundAccountTokenForHybrid());
@@ -5681,6 +5628,62 @@ function syncLoginStatusBetweenNativeAndServer(syncLoginTypes) {
   });
 }
 
+/**
+ * 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*/];
+        }
+      });
+    });
+  });
+}
+
 /**
  * 登出
  * @function logout
@@ -5689,10 +5692,9 @@ function syncLoginStatusBetweenNativeAndServer(syncLoginTypes) {
  */
 function logoutForWeb(loginType) {
   if (loginType) {
-    return http.post(API_URL + "/logout/".concat(loginType));
-  } else {
-    return http.post(API_URL + '/logout', {});
+    return http.post("".concat(API_URL, "/logout/").concat(loginType));
   }
+  return http.post("".concat(API_URL, "/logout"), {});
 }
 
 /**
@@ -5716,9 +5718,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:
@@ -5743,9 +5745,8 @@ function checkFundAccountLogin() {
         });
       });
     });
-  } else {
-    return http.get(API_URL + '/login/fundAccount');
   }
+  return http.get("".concat(API_URL, "/login/fundAccount"));
 }
 
 /**
@@ -5754,7 +5755,7 @@ function checkFundAccountLogin() {
  * @returns {Promise<HttpResponse>}
  */
 function checkMarginAccountLogin() {
-  return http.get(API_URL + '/login/marginAccount');
+  return http.get("".concat(API_URL, "/login/marginAccount"));
 }
 
 /**
@@ -5763,7 +5764,7 @@ function checkMarginAccountLogin() {
  * @returns {Promise<HttpResponse>}
  */
 function checkUserLogin() {
-  return http.get(API_URL + '/login/user');
+  return http.get("".concat(API_URL, "/login/user"));
 }
 
 /**
@@ -5831,7 +5832,7 @@ function bindInfo(data) {
  * @returns {Promise<HttpResponse> }
  */
 function marginAccountLogin(param) {
-  return http.post(API_URL + '/login/marginAccount', param);
+  return http.post("".concat(API_URL, "/login/marginAccount"), param);
 }
 
 /**
@@ -5841,7 +5842,7 @@ function marginAccountLogin(param) {
  * @returns {Promise<HttpResponse>}
  */
 function fundAccountLogin(param) {
-  return http.post(API_URL + '/login/fundAccount', param);
+  return http.post("".concat(API_URL, "/login/fundAccount"), param);
 }
 
 /**
@@ -6236,7 +6237,7 @@ function getActionRedirectOptions(config) {
    */
 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:
@@ -6265,9 +6266,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,
@@ -6284,7 +6285,7 @@ function loginWithToken() {
 
 function loginWithTokenForWeb(loginType) {
   return __awaiter(this, void 0, void 0, function () {
-    var accountType, instantToken, oldInstantToken, fundAccountLoginResult, marginAccountLoginResult, opStation, _a, code, data, _b, code, data;
+    var accountType, instantToken, oldInstantToken, fundAccountLoginResult, marginAccountLoginResult, opStation, _a, code_1, data_1, _b, code, data;
     return __generator(this, function (_c) {
       switch (_c.label) {
         case 0:
@@ -6300,10 +6301,9 @@ function loginWithTokenForWeb(loginType) {
             // 2025.01.02 经讨论 退登不解绑！！
             // bindInfo({ pid: null, clientId: null })
             return [2 /*return*/, false];
-          } else {
-            bindInfo(fundAccountLoginResult.data);
-            return [2 /*return*/, true];
           }
+          bindInfo(fundAccountLoginResult.data);
+          return [2 /*return*/, true];
         case 2:
           if (!(loginType === LoginType.MARGINACCOUNT)) return [3 /*break*/, 4];
           return [4 /*yield*/, checkMarginAccountLogin()];
@@ -6313,14 +6313,15 @@ function loginWithTokenForWeb(loginType) {
             // 2025.01.02 经讨论 退登不解绑！！
             // bindInfo({ pid: null, clientId: null })
             return [2 /*return*/, false];
-          } else {
-            bindInfo(marginAccountLoginResult.data);
-            return [2 /*return*/, true];
           }
+          bindInfo(marginAccountLoginResult.data);
+          return [2 /*return*/, true];
         case 4:
           return [3 /*break*/, 6];
         case 5:
-          instantToken !== 'notoken' ? localStorage.setItem('instant_token', instantToken) : null;
+          if (instantToken && instantToken !== 'notoken') {
+            localStorage.setItem('instant_token', instantToken);
+          }
           _c.label = 6;
         case 6:
           opStation = getQueryString('op_station');
@@ -6336,9 +6337,9 @@ function loginWithTokenForWeb(loginType) {
             instant_token: instantToken
           })];
         case 7:
-          _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 8:
           return [4 /*yield*/, fundAccountLogin({
             op_station: opStation,
@@ -6361,17 +6362,17 @@ function loginWithTokenForWeb(loginType) {
  */
 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 = {
@@ -6387,11 +6388,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 = {
@@ -6406,33 +6406,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:
@@ -6462,18 +6461,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 经讨论 退登不解绑！！
@@ -6481,46 +6478,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
@@ -6528,14 +6520,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*/];
       }
     });
   });
@@ -6738,41 +6727,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,
@@ -6783,29 +6769,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*/];
       }
     });
@@ -8436,6 +8422,7 @@ var CustomURI = /** @class */function () {
 // // 获取完整URL
 // console.log(uri.href()); // 输出修改后的完整URL
 
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * v2工具：回流配置转换成v1广告配置，并根据使用场景返回跳转参数对象
  * @function linkDecode
@@ -8471,7 +8458,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路由（默认）
@@ -8481,7 +8468,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());
@@ -8528,7 +8517,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路由（默认）
@@ -8537,13 +8526,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,
@@ -8737,9 +8728,9 @@ var openApp = function openApp(param) {
 };
 
 //特殊环境情况可通过全局变量修改
-var EVOLUTION_UNIVERSAL_URL = window.EVOLUTION_UNIVERSAL_URL || window.location.toString().indexOf('https://devwebapps.yjbtest.com') > -1 ? "https://linkm.yjbtest.com/download/app-download.html" : "https://linkm.yongjinbao.com.cn/download/app-download.html";
-var EVOLUTION_TXAPP_URL = window.EVOLUTION_TXAPP_URL || "https://a.app.qq.com/o/simple.jsp?pkgname=cn.com.gjzq.yjb2";
-var EVOLUTION_ANDOWNLOAD_URL = window.EVOLUTION_ANDOWNLOAD_URL || "https://appdl.yongjinbao.com.cn/yjb/android/yongjinbao.apk";
+var EVOLUTION_UNIVERSAL_URL = window.EVOLUTION_UNIVERSAL_URL || window.location.toString().indexOf('https://devwebapps.yjbtest.com') > -1 ? 'https://linkm.yjbtest.com/download/app-download.html' : 'https://linkm.yongjinbao.com.cn/download/app-download.html';
+var EVOLUTION_TXAPP_URL = window.EVOLUTION_TXAPP_URL || 'https://a.app.qq.com/o/simple.jsp?pkgname=cn.com.gjzq.yjb2';
+var EVOLUTION_ANDOWNLOAD_URL = window.EVOLUTION_ANDOWNLOAD_URL || 'https://appdl.yongjinbao.com.cn/yjb/android/yongjinbao.apk';
 var EVOLUTION_MINIAPP_URL = window.EVOLUTION_MINIAPP_URL || EVOLUTION_UNIVERSAL_URL;
 /**
  * 跳转至APP下载并传参
@@ -8806,8 +8797,8 @@ var openAppForWeb = function openAppForWeb(selector, config, urlConfig) {
                   case 5:
                     oConfig = config || {};
                     /**
-                     * 处理可能存在的url中包含多余分享字段
-                     */
+                         * 处理可能存在的url中包含多余分享字段
+                         */
                     if (oConfig && oConfig.param && oConfig.param.url) {
                       url = new CustomURI(oConfig.param.url);
                       url.setQuery({
@@ -8820,7 +8811,7 @@ var openAppForWeb = function openAppForWeb(selector, config, urlConfig) {
                     try {
                       searchParams = new URLSearchParams(location.search);
                       shareMarkInfo = encodeURIComponent(searchParams.get('shareMarkInfo') || '');
-                    } catch (e) {}
+                    } catch (e) {/* empty */}
                     schemeUrl = "com.yjb.jy://?action=".concat(action);
                     if (isIos) {
                       //TOTO 地址后面需要灵活配置
@@ -8848,7 +8839,7 @@ var openAppForWeb = function openAppForWeb(selector, config, urlConfig) {
                   config = JSON.parse(data);
                   if (dataUrl) urlConfig = JSON.parse(dataUrl);
                   setConfigParams(config, urlConfig);
-                } catch (e) {}
+                } catch (e) {/* empty */}
               }
               return isIos ? 'yjbapp://' : schemeUrl;
             }
@@ -8893,30 +8884,28 @@ var openAppForWeb = function openAppForWeb(selector, config, urlConfig) {
                 var url = "".concat(evolution_universal_url).concat(evolution_universal_url.includes('?') ? '&' : '?', "action=").concat(action, "&shareMarkInfo=").concat(shareMarkInfo);
                 pageInit(evolution_scene_url ? "".concat(url, "&sceneUrl=").concat(encodeURIComponent(evolution_scene_url)) : "".concat(url), false, {});
               }
-            } else {
-              if (isAndroid) {
-                //原设置为4000
-                var t_1 = 1000,
-                  hasApp_1 = true;
-                //设置定时器,判断如果没有呼起app,则调用定时器,跳转下载(至腾讯应用宝 or apk下载)
-                setTimeout(function () {
-                  if (!hasApp_1) {
-                    var url = evolution_scene_url || (appId === 'insertApp' ? "".concat(evolution_txapp_url, "&android_schema=").concat(encodeURIComponent(schemeUrl)) : evolution_andownload_url);
-                    pageInit("".concat(url), false, {});
-                  }
-                }, 1500);
-                var t1_1 = Date.now();
-                window.location.href = schemeUrl;
-                setTimeout(function () {
-                  var t2 = Date.now();
-                  if (t2 - t1_1 < t_1 + 100) {
-                    hasApp_1 = false;
-                  }
-                }, t_1);
-              } else if (isIos) {
-                var url = "".concat(evolution_universal_url).concat(evolution_universal_url.includes('?') ? '&' : '?', "action=").concat(action, "&shareMarkInfo=").concat(shareMarkInfo);
-                pageInit(evolution_scene_url ? "".concat(url, "&sceneUrl=").concat(encodeURIComponent(evolution_scene_url)) : "".concat(url), false, {});
-              }
+            } else if (isAndroid) {
+              //原设置为4000
+              var t_1 = 1000,
+                hasApp_1 = true;
+              //设置定时器,判断如果没有呼起app,则调用定时器,跳转下载(至腾讯应用宝 or apk下载)
+              setTimeout(function () {
+                if (!hasApp_1) {
+                  var url = evolution_scene_url || (appId === 'insertApp' ? "".concat(evolution_txapp_url, "&android_schema=").concat(encodeURIComponent(schemeUrl)) : evolution_andownload_url);
+                  pageInit("".concat(url), false, {});
+                }
+              }, 1500);
+              var t1_1 = Date.now();
+              window.location.href = schemeUrl;
+              setTimeout(function () {
+                var t2 = Date.now();
+                if (t2 - t1_1 < t_1 + 100) {
+                  hasApp_1 = false;
+                }
+              }, t_1);
+            } else if (isIos) {
+              var url = "".concat(evolution_universal_url).concat(evolution_universal_url.includes('?') ? '&' : '?', "action=").concat(action, "&shareMarkInfo=").concat(shareMarkInfo);
+              pageInit(evolution_scene_url ? "".concat(url, "&sceneUrl=").concat(encodeURIComponent(evolution_scene_url)) : "".concat(url), false, {});
             }
           };
           return [2 /*return*/];