mcrm-mobile 1.7.5 → 1.7.7

package/es/index.js

@@ -91,7 +91,7 @@ import Tag from './tag';
 import Toast from './toast';
 import TreeSelect from './tree-select';
 import Uploader from './uploader';
-var version = '1.7.5';
+var version = '1.7.7';
 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, Tab, Tabbar, TabbarItem, Table, TableColumn, Tabs, Tag, Toast, TreeSelect, Uploader];
 
 var install = function install(Vue) {

package/es/menu-jump/index.js

@@ -1411,7 +1411,7 @@ var openPage = /*#__PURE__*/function () {
             return _context9.abrupt("break", 33);
 
           case 33:
-            if (data.digitalNum || menu.isShangKeTong) {
+            if (data.digitalNum || menu.isShangKeTong || data.isShangKeTong) {
               _Session$get = Session.get("mmExpInfo"), appVersion = _Session$get.appVersion;
               viewCode = parseInt(Local.get("lastEntryView"));
               params = {
@@ -1432,7 +1432,7 @@ var openPage = /*#__PURE__*/function () {
                 params.isDigitalEmployee = "1";
               }
 
-              menu.isShangKeTong && (params.isShangKeTong = menu.isShangKeTong);
+              (menu.isShangKeTong || data.isShangKeTong) && (params.isShangKeTong = menu.isShangKeTong);
               Http.addGroupBusinessPoint(params);
             }
 

package/es/utils/http.js

@@ -8,7 +8,7 @@ import Http from "../http";
 import CommonUtils from "../common-utils";
 import Toast from "../toast";
 
-var logoutAlert = function logoutAlert(message) {
+var logoutAlert = function logoutAlert(message, type) {
   Toast.clear();
 
   if (!Session.get("isLoginOutStatus")) {
@@ -30,7 +30,10 @@ var logoutAlert = function logoutAlert(message) {
       });
     } else {
       mcrm.util.common({
-        action: "logout"
+        action: "logout",
+        params: {
+          type: type
+        }
       });
     }
   }
@@ -138,7 +141,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;
   } 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);
+    logoutAlert(resData.message || resData.msg.message, 1);
     return Promise.reject(resData.message || resData.msg.message);
   } else {
     return Promise.reject(resData.message || resData.msg.message);
@@ -160,7 +163,7 @@ instanceJson.interceptors.response.use(function (response) {
       var res = JSON.parse(resultMCRMReturn || "");
 
       if (res.msg.code === "0") {
-        logoutAlert(res.msg.message);
+        logoutAlert(res.msg.message, 2);
       }
 
       return Promise.reject(res.msg.message);
@@ -168,7 +171,7 @@ instanceJson.interceptors.response.use(function (response) {
       return Promise.reject(Message.INTERFACE_ERROR_500);
     }
   } else if (error.response && error.response.status === 401) {
-    logoutAlert(error.response.data.msg.message);
+    logoutAlert(error.response.data.msg.message, 1);
     return Promise.reject("");
   } else if (error.response && error.response.status === 403) {
     try {
@@ -186,7 +189,7 @@ instanceJson.interceptors.response.use(function (response) {
           moduleName: "登录",
           operationResult: 0
         });
-        logoutAlert("您的登录会话已失效，请重新登录。");
+        logoutAlert("您的登录会话已失效，请重新登录。", 2);
       }
     } catch (e) {
       console.error(e);

package/lib/index.js

@@ -373,7 +373,7 @@ var _uploader = _interopRequireDefault(require("./uploader"));
 
 exports.Uploader = _uploader.default;
 // This file is auto generated by build/build-entry.js
-var version = '1.7.5';
+var version = '1.7.7';
 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, _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

@@ -18838,7 +18838,7 @@ external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_default.a.prototype.$toast
 
 
 
-var http_logoutAlert = function logoutAlert(message) {
+var http_logoutAlert = function logoutAlert(message, type) {
   es_toast.clear();
 
   if (!session["a" /* default */].get("isLoginOutStatus")) {
@@ -18853,7 +18853,10 @@ var http_logoutAlert = function logoutAlert(message) {
 
     if (false) {} else {
       external_mcrm_default.a.util.common({
-        action: "logout"
+        action: "logout",
+        params: {
+          type: type
+        }
       });
     }
   }
@@ -18961,7 +18964,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;
   } 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);
+    http_logoutAlert(resData.message || resData.msg.message, 1);
     return Promise.reject(resData.message || resData.msg.message);
   } else {
     return Promise.reject(resData.message || resData.msg.message);
@@ -18983,7 +18986,7 @@ instanceJson.interceptors.response.use(function (response) {
       var res = JSON.parse(resultMCRMReturn || "");
 
       if (res.msg.code === "0") {
-        http_logoutAlert(res.msg.message);
+        http_logoutAlert(res.msg.message, 2);
       }
 
       return Promise.reject(res.msg.message);
@@ -18991,7 +18994,7 @@ instanceJson.interceptors.response.use(function (response) {
       return Promise.reject(utils_message.INTERFACE_ERROR_500);
     }
   } else if (error.response && error.response.status === 401) {
-    http_logoutAlert(error.response.data.msg.message);
+    http_logoutAlert(error.response.data.msg.message, 1);
     return Promise.reject("");
   } else if (error.response && error.response.status === 403) {
     try {
@@ -19009,7 +19012,7 @@ instanceJson.interceptors.response.use(function (response) {
           moduleName: "登录",
           operationResult: 0
         });
-        http_logoutAlert("您的登录会话已失效，请重新登录。");
+        http_logoutAlert("您的登录会话已失效，请重新登录。", 2);
       }
     } catch (e) {
       console.error(e);
@@ -21606,7 +21609,7 @@ var openPage = /*#__PURE__*/function () {
             return _context9.abrupt("break", 33);
 
           case 33:
-            if (data.digitalNum || menu.isShangKeTong) {
+            if (data.digitalNum || menu.isShangKeTong || data.isShangKeTong) {
               _Session$get = session["a" /* default */].get("mmExpInfo"), appVersion = _Session$get.appVersion;
               viewCode = parseInt(local.get("lastEntryView"));
               params = {
@@ -21627,7 +21630,7 @@ var openPage = /*#__PURE__*/function () {
                 params.isDigitalEmployee = "1";
               }
 
-              menu.isShangKeTong && (params.isShangKeTong = menu.isShangKeTong);
+              (menu.isShangKeTong || data.isShangKeTong) && (params.isShangKeTong = menu.isShangKeTong);
               http.addGroupBusinessPoint(params);
             }
 
@@ -37283,7 +37286,7 @@ function isImageFile(item) {
 
 
 
-var version = '1.7.5';
+var version = '1.7.7';
 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["a" /* default */], 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, tab, tabbar, tabbar_item, table, table_column, tabs, tag, es_toast, tree_select, uploader];
 
 var es_install = function install(Vue) {