mcrm-mobile 1.9.8 → 2.0.0

package/lib/menu-jump/index.js

@@ -873,7 +873,7 @@ var spliceUrl = /*#__PURE__*/function () {
             }
 
             if (isSecret) {
-              url += "&isSecret=" + isSecret;
+              url += "&isSecrect=" + isSecret;
             }
 
             url = url.replace("?&", "?");
@@ -1648,7 +1648,7 @@ var openPage = /*#__PURE__*/function () {
 
 var verify = /*#__PURE__*/function () {
   var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11(menu, sybInfo, notAuth) {
-    var _menu$menuCode2, menuCode, _sybInfo, _sybInfo$billId, billId, _sybInfo$custUniqueId, custUniqueId, allVerifySerial, custUniqueIdVerifySerial, verifyLogId, opVerifyLogId, opSys, funcId, funcType, _yield$getExpInfo5, _yield$getExpInfo5$ap, appVersion, body, cityLimit, checkType, data, getLocationPromise, timeoutPromise;
+    var _menu$menuCode2, menuCode, _sybInfo, _sybInfo$billId, billId, _sybInfo$custUniqueId, custUniqueId, allVerifySerial, custUniqueIdVerifySerial, verifyLogId, opVerifyLogId, opSys, funcId, funcType, _yield$getExpInfo5, _yield$getExpInfo5$ap, appVersion, body;
 
     return _regenerator.default.wrap(function _callee11$(_context11) {
       while (1) {
@@ -1678,7 +1678,6 @@ var verify = /*#__PURE__*/function () {
             _yield$getExpInfo5 = _context11.sent;
             _yield$getExpInfo5$ap = _yield$getExpInfo5.appVersion;
             appVersion = _yield$getExpInfo5$ap === void 0 ? "" : _yield$getExpInfo5$ap;
-            // TODO菜单新增位置校验
             body = {
               funcId: funcId,
               funcType: funcType,
@@ -1689,63 +1688,45 @@ var verify = /*#__PURE__*/function () {
               opSys: opSys,
               appVersion: appVersion,
               menuCode: menuCode
-            };
-            cityLimit = "1";
-            checkType = "1";
-            _context11.prev = 19;
-            _context11.next = 22;
-            return _http.default.menuPositionCheck(menuCode);
-
-          case 22:
-            data = _context11.sent;
+            }; // let cityLimit = "1";
+            // let checkType = "1";
+            // try {
+            //   const data = await Http.menuPositionCheck(menuCode);
+            //   if (data) {
+            //     cityLimit = data.cityLimit;
+            //     checkType = data.checkType;
+            //   }
+            // } catch (e) {
+            //   console.error(e);
+            // }
+            // if (mcrm.env.isMcrm && (cityLimit === "1" || checkType === "1")) {
+            //   const getLocationPromise = new Promise((resolve) => {
+            //     mcrm.device.getLocation({
+            //       isRealTime: true,
+            //       onSuccess: (res) => {
+            //         body.longitude = res.longitude;
+            //         body.latitude = res.latitude;
+            //         body.mapCityName = res.cityName || "";
+            //         body.mapProvinceName = res.provinceName || "";
+            //         body.mapAddress = res.address || "";
+            //         resolve(); // 成功时resolve
+            //       },
+            //       onFail: (res) => {
+            //         console.error(res);
+            //         resolve(); // 失败时也resolve，确保Promise完成
+            //       },
+            //     });
+            //   });
+            //   const timeoutPromise = new Promise((resolve) => {
+            //     setTimeout(() => {
+            //       console.log("获取定位超时（1.5秒），继续执行菜单校验");
+            //       resolve();
+            //     }, 1500);
+            //   });
+            //   // 使用Promise.race实现超时控制
+            //   await Promise.race([getLocationPromise, timeoutPromise]);
+            // }
 
-            if (data) {
-              cityLimit = data.cityLimit;
-              checkType = data.checkType;
-            }
-
-            _context11.next = 29;
-            break;
-
-          case 26:
-            _context11.prev = 26;
-            _context11.t0 = _context11["catch"](19);
-            console.error(_context11.t0);
-
-          case 29:
-            if (!(_mcrmJsapi.default.env.isMcrm && (cityLimit === "1" || checkType === "1"))) {
-              _context11.next = 34;
-              break;
-            }
-
-            getLocationPromise = new Promise(function (resolve) {
-              _mcrmJsapi.default.device.getLocation({
-                isRealTime: true,
-                onSuccess: function onSuccess(res) {
-                  body.longitude = res.longitude;
-                  body.latitude = res.latitude;
-                  body.mapCityName = res.cityName || "";
-                  body.mapProvinceName = res.provinceName || "";
-                  body.mapAddress = res.address || "";
-                  resolve(); // 成功时resolve
-                },
-                onFail: function onFail(res) {
-                  console.error(res);
-                  resolve(); // 失败时也resolve，确保Promise完成
-                }
-              });
-            });
-            timeoutPromise = new Promise(function (resolve) {
-              setTimeout(function () {
-                console.log("获取定位超时（1.5秒），继续执行菜单校验");
-                resolve();
-              }, 1500);
-            }); // 使用Promise.race实现超时控制
-
-            _context11.next = 34;
-            return Promise.race([getLocationPromise, timeoutPromise]);
-
-          case 34:
             return _context11.abrupt("return", new Promise(function (resolve, reject) {
               _http.default.menuPageVerify(body).then( /*#__PURE__*/function () {
                 var _ref14 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(data) {
@@ -1910,12 +1891,12 @@ var verify = /*#__PURE__*/function () {
               });
             }));
 
-          case 35:
+          case 18:
           case "end":
             return _context11.stop();
         }
       }
-    }, _callee11, null, [[19, 26]]);
+    }, _callee11);
   }));
 
   return function verify(_x38, _x39, _x40) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcrm-mobile",
-  "version": "1.9.8",
+  "version": "2.0.0",
   "description": "生意宝专用组件库",
   "author": "Wuner",
   "private": false,