diff --git a/resources/assets/js/functions/web.js b/resources/assets/js/functions/web.js
index e808567d..73c71a29 100755
--- a/resources/assets/js/functions/web.js
+++ b/resources/assets/js/functions/web.js
@@ -11,10 +11,10 @@
$.extend({
// 弹窗
modalConfig(config) {
- if (typeof config === "string") {
- config = {
- content: config
- };
+ if (typeof config === "undefined") {
+ config = {content: "Undefined"};
+ } else if (typeof config === "string") {
+ config = {content: config};
}
config.title = $A.L(config.title || (typeof config.render === 'undefined' ? '温馨提示' : ''));
config.content = $A.L(config.content || '');
@@ -112,27 +112,6 @@
$A.Modal.error($A.modalConfig(config));
},
- modalInfoShow(title, data, addConfig) {
- let content = '';
- for (let i in data) {
- let item = data[i];
- content += `
`;
- content += `
${item.column}:
`;
- content += `
${item.value || item.value == '0' ? item.value : '-'}
`;
- content += `
`;
- }
- let config = {
- title: title,
- content: content,
- okText: $A.L('关闭'),
- closable: true
- };
- if (typeof addConfig == 'object' && addConfig) {
- config = Object.assign(config, addConfig);
- }
- this.Modal.info(config);
- },
-
modalAlert(msg) {
alert($A.L(msg));
},
@@ -152,10 +131,10 @@
//通知
noticeConfig(config) {
- if (typeof config === "string") {
- config = {
- desc: config
- };
+ if (typeof config === "undefined") {
+ config = {desc: "Undefined"};
+ } else if (typeof config === "string") {
+ config = {desc: config};
}
config.title = $A.L(config.title || (typeof config.render === 'undefined' ? '温馨提示' : ''));
config.desc = $A.L(config.desc || '');
diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss
index 268d0d79..2b5302bb 100755
--- a/resources/assets/sass/pages/common.scss
+++ b/resources/assets/sass/pages/common.scss
@@ -242,24 +242,6 @@ body {
}
}
-.modal-info-show {
- display: flex;
- .column {
- color: #6D6D6D;
- margin: 5px 0;
- min-width: 70px;
- max-width: 100px;
- text-align: right;
- }
- .value {
- flex: 1;
- width: 0;
- color: #414141;
- margin: 5px 0 5px 5px;
- word-break: break-all;
- }
-}
-
*[hidden="hidden"] {
display: none !important;
}