mcrm-mobile 1.9.5 → 1.9.6

package/es/index.js

@@ -92,7 +92,7 @@ import Tag from './tag';
 import Toast from './toast';
 import TreeSelect from './tree-select';
 import Uploader from './uploader';
-var version = '1.9.5';
+var version = '1.9.6';
 var components = [ActionSheet, AddressPicker, Api, Badge, Biz, Button, Calendar, Card, Cell, CellGroup, Checkbox, CheckboxGroup, Circle, Col, Collapse, CollapseItem, CommonUtils, CountDown, DataProcess, DatePicker, DatetimePicker, Dialog, Directive, Divider, Drag, DropdownItem, DropdownMenu, Empty, Field, GoodsAction, GoodsActionButton, GoodsActionIcon, Grid, GridItem, Http, Icon, Image, ImagePreview, IndexAnchor, IndexBar, Info, List, Loading, Local, Menu, MenuIcon, MenuJump, Menus, NavBar, NoticeBar, Notify, Overlay, Pagination, Panel, PasswordInput, Picker, Popover, Popup, Progress, PullRefresh, Radio, RadioGroup, Rank, Rate, Row, SafeKeyboard, Search, Session, ShareSheet, Sidebar, SidebarItem, Slider, Step, Stepper, Steps, Sticky, Swipe, SwipeCell, SwipeItem, Switch, SwitchCell, System, Tab, Tabbar, TabbarItem, Table, TableColumn, Tabs, Tag, Toast, TreeSelect, Uploader];
 
 var install = function install(Vue) {

package/es/menu-jump/index.js

@@ -1576,7 +1576,7 @@ var openPage = /*#__PURE__*/function () {
 
 var verify = /*#__PURE__*/function () {
   var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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, data, cityLimit, checkType, 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, cityLimit, checkType, data, getLocationPromise, timeoutPromise;
 
     return _regeneratorRuntime.wrap(function _callee11$(_context11) {
       while (1) {
@@ -1618,21 +1618,31 @@ var verify = /*#__PURE__*/function () {
               appVersion: appVersion,
               menuCode: menuCode
             };
-            _context11.next = 19;
+            cityLimit = "1";
+            checkType = "1";
+            _context11.prev = 19;
+            _context11.next = 22;
             return Http.menuPositionCheck(menuCode);
 
-          case 19:
+          case 22:
             data = _context11.sent;
-            cityLimit = "1";
-            checkType = "1";
 
             if (data) {
-              data.cityLimit && (cityLimit = data.cityLimit);
-              data.checkType && (checkType = data.checkType);
+              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 (!(mcrm.env.isMcrm && (cityLimit === "1" || checkType === "1"))) {
-              _context11.next = 28;
+              _context11.next = 34;
               break;
             }
 
@@ -1658,10 +1668,10 @@ var verify = /*#__PURE__*/function () {
               }, 1500);
             }); // 使用Promise.race实现超时控制
 
-            _context11.next = 28;
+            _context11.next = 34;
             return Promise.race([getLocationPromise, timeoutPromise]);
 
-          case 28:
+          case 34:
             return _context11.abrupt("return", new Promise(function (resolve, reject) {
               Http.menuPageVerify(body).then( /*#__PURE__*/function () {
                 var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(data) {
@@ -1821,12 +1831,12 @@ var verify = /*#__PURE__*/function () {
               });
             }));
 
-          case 29:
+          case 35:
           case "end":
             return _context11.stop();
         }
       }
-    }, _callee11);
+    }, _callee11, null, [[19, 26]]);
   }));
 
   return function verify(_x38, _x39, _x40) {

package/es/utils/http.js

@@ -147,7 +147,7 @@ instanceJson.interceptors.response.use(function (response) {
   }
 
   if (resData.code === 200 || resData.code === "200" || resData.msg && resData.msg.code === 200 || resData.msg && resData.msg.code === "200") {
-    return resData.data;
+    return resData.data || resData;
   } else if (resData.code === 402 || resData.code === "402" || resData.msg && resData.msg.code === 402 || resData.msg && resData.msg.code === "402") {
     logoutAlert(resData.message || resData.msg.message, 1);
     return Promise.reject(resData.message || resData.msg.message);

package/lib/index.js

@@ -377,7 +377,7 @@ var _uploader = _interopRequireDefault(require("./uploader"));
 
 exports.Uploader = _uploader.default;
 // This file is auto generated by build/build-entry.js
-var version = '1.9.5';
+var version = '1.9.6';
 exports.version = version;
 var components = [_actionSheet.default, _addressPicker.default, _api.default, _badge.default, _biz.default, _button.default, _calendar.default, _card.default, _cell.default, _cellGroup.default, _checkbox.default, _checkboxGroup.default, _circle.default, _col.default, _collapse.default, _collapseItem.default, _commonUtils.default, _countDown.default, _dataProcess.default, _datePicker.default, _datetimePicker.default, _dialog.default, _directive.default, _divider.default, _drag.default, _dropdownItem.default, _dropdownMenu.default, _empty.default, _field.default, _goodsAction.default, _goodsActionButton.default, _goodsActionIcon.default, _grid.default, _gridItem.default, _http.default, _icon.default, _image.default, _imagePreview.default, _indexAnchor.default, _indexBar.default, _info.default, _list.default, _loading.default, _local.default, _menu.default, _menuIcon.default, _menuJump.default, _menus.default, _navBar.default, _noticeBar.default, _notify.default, _overlay.default, _pagination.default, _panel.default, _passwordInput.default, _picker.default, _popover.default, _popup.default, _progress.default, _pullRefresh.default, _radio.default, _radioGroup.default, _rank.default, _rate.default, _row.default, _safeKeyboard.default, _search.default, _session.default, _shareSheet.default, _sidebar.default, _sidebarItem.default, _slider.default, _step.default, _stepper.default, _steps.default, _sticky.default, _swipe.default, _swipeCell.default, _swipeItem.default, _switch.default, _switchCell.default, _system.default, _tab.default, _tabbar.default, _tabbarItem.default, _table.default, _tableColumn.default, _tabs.default, _tag.default, _toast.default, _treeSelect.default, _uploader.default];
 

package/lib/mcrm-mobile.js

@@ -19305,7 +19305,7 @@ instanceJson.interceptors.response.use(function (response) {
   }
 
   if (resData.code === 200 || resData.code === "200" || resData.msg && resData.msg.code === 200 || resData.msg && resData.msg.code === "200") {
-    return resData.data;
+    return resData.data || resData;
   } else if (resData.code === 402 || resData.code === "402" || resData.msg && resData.msg.code === 402 || resData.msg && resData.msg.code === "402") {
     http_logoutAlert(resData.message || resData.msg.message, 1);
     return Promise.reject(resData.message || resData.msg.message);
@@ -22152,7 +22152,7 @@ var openPage = /*#__PURE__*/function () {
 
 var verify = /*#__PURE__*/function () {
   var _ref13 = asyncToGenerator_default()( /*#__PURE__*/regenerator_default.a.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, data, cityLimit, checkType, 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, cityLimit, checkType, data, getLocationPromise, timeoutPromise;
 
     return regenerator_default.a.wrap(function _callee11$(_context11) {
       while (1) {
@@ -22194,21 +22194,31 @@ var verify = /*#__PURE__*/function () {
               appVersion: appVersion,
               menuCode: menuCode
             };
-            _context11.next = 19;
+            cityLimit = "1";
+            checkType = "1";
+            _context11.prev = 19;
+            _context11.next = 22;
             return http.menuPositionCheck(menuCode);
 
-          case 19:
+          case 22:
             data = _context11.sent;
-            cityLimit = "1";
-            checkType = "1";
 
             if (data) {
-              data.cityLimit && (cityLimit = data.cityLimit);
-              data.checkType && (checkType = data.checkType);
+              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 (!(external_mcrm_default.a.env.isMcrm && (cityLimit === "1" || checkType === "1"))) {
-              _context11.next = 28;
+              _context11.next = 34;
               break;
             }
 
@@ -22234,10 +22244,10 @@ var verify = /*#__PURE__*/function () {
               }, 1500);
             }); // 使用Promise.race实现超时控制
 
-            _context11.next = 28;
+            _context11.next = 34;
             return Promise.race([getLocationPromise, timeoutPromise]);
 
-          case 28:
+          case 34:
             return _context11.abrupt("return", new Promise(function (resolve, reject) {
               http.menuPageVerify(body).then( /*#__PURE__*/function () {
                 var _ref14 = asyncToGenerator_default()( /*#__PURE__*/regenerator_default.a.mark(function _callee10(data) {
@@ -22397,12 +22407,12 @@ var verify = /*#__PURE__*/function () {
               });
             }));
 
-          case 29:
+          case 35:
           case "end":
             return _context11.stop();
         }
       }
-    }, _callee11);
+    }, _callee11, null, [[19, 26]]);
   }));
 
   return function verify(_x38, _x39, _x40) {
@@ -39143,7 +39153,7 @@ function isImageFile(item) {
 
 
 
-var version = '1.9.5';
+var version = '1.9.6';
 var components = [action_sheet, address_picker, api, badge, biz, es_button, calendar, card, es_cell, cell_group, es_checkbox, checkbox_group, circle, col, collapse, collapse_item, common_utils, count_down, data_process, date_picker, datetime_picker, dialog, directive, divider, drag, dropdown_item, dropdown_menu, empty, field, goods_action, goods_action_button, goods_action_icon, grid, grid_item, http, icon, es_image, image_preview, index_anchor, index_bar, es_info, list, loading, local, es_menu, menu_icon, menu_jump, es_menus, nav_bar, notice_bar, notify, es_overlay, pagination, panel, password_input, es_picker, popover, es_popup, es_progress, pull_refresh, es_radio, radio_group, rank, es_rate, row, safe_keyboard, search, session["a" /* default */], share_sheet, sidebar, sidebar_item, slider, es_step, stepper, steps, sticky, swipe, swipe_cell, swipe_item, es_switch, switch_cell, system, tab, tabbar, tabbar_item, table, table_column, tabs, tag, es_toast, tree_select, uploader];
 
 var es_install = function install(Vue) {