fix:更新已知bug,优化代码

2022-11-28 19:11:12 +08:00
parent f6aee95cfc
commit 9445b206a2
1378 changed files with 53759 additions and 20789 deletions
--- a/public/static/system/css/content.css
+++ b/public/static/system/css/content.css
@@ -3,10 +3,6 @@ xm-select > .xm-label .scroll .label-content {
    padding-right: 10px;
 }

-.layui-card {
-    overflow: hidden!important;
-}
-
 .layui-form-item .layui-input-inline {
    width: 320px;
 }
--- a/public/static/system/css/message.css
+++ b/public/static/system/css/message.css
@@ -11,11 +11,11 @@ body a:hover {
    margin: 0;
 }

-.layui-message-list-item:hover, .layui-message-footer a:hover, .message-btn-more:hover {
+.layui-instant-list-item:hover, .layui-instant-footer a:hover, .message-btn-more:hover {
    background: #F2F2F2;
 }

-.layui-message-list {
+.layui-instant-list {
    position: absolute;
    top: 51px;
    bottom: 44px;
@@ -26,7 +26,7 @@ body a:hover {
    clear: both;
 }

-.layui-message-list-item {
+.layui-instant-list-item {
    padding: 10px 24px;
    border-bottom: 1px solid #e8e8e8;
    -ms-flex-align: start;
@@ -36,11 +36,11 @@ body a:hover {
    flex: 1 1;
 }

-.layui-message-list-item:hover, .message-btn-clear:hover, .message-btn-more:hover {
+.layui-instant-list-item:hover, .message-btn-clear:hover, .message-btn-more:hover {
    background: #F2F2F2;
 }

-.layui-message-item-icon {
+.layui-instant-item-icon {
    width: 40px;
    height: 40px;
    margin-right: 16px;
@@ -48,27 +48,40 @@ body a:hover {
    margin-top: 4px;
 }

-.layui-message-item-right {
+.layui-instant-item-right {
    display: block;
    flex: 1 0;
    line-height: 24px;
+    max-width: 100%;
+    overflow: hidden;
 }

-.layui-message-item-title {
+.layui-instant-item-title {
    font-size: 13px;
-    color: rgba(0, 0, 0, .65);
+    color: #000;
 }

-.layui-message-item-text {
-    color: rgba(0, 0, 0, .45);
+.layui-instant-item-text {
+    color: #000;
    font-size: 12px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.layui-instant-list .active_1 .layui-instant-item-title {
+    color: rgba(0, 0, 0, .55);
+}
+
+.layui-instant-list .active_1 .layui-instant-item-text {
+    color: rgba(0, 0, 0, .55);
 }

 .pull-right {
    float: right;
 }

-.layui-message-btn-clear, .layui-message-btn-more {
+.layui-instant-btn-clear, .layui-instant-btn-more {
    display: block;
    padding: 10px 5px;
    text-align: center;
@@ -76,23 +89,23 @@ body a:hover {
    color: #333;
 }

-.layui-message-btn-more {
+.layui-instant-btn-more {
    color: #666;
    font-size: 13px;
 }

-.layui-message-list-empty {
+.layui-instant-list-empty {
    text-align: center;
    color: rgba(0, 0, 0, .45);
    padding: 73px 0 88px;
 }

-.layui-message-list-empty img {
+.layui-instant-list-empty img {
    height: 76px;
    margin-bottom: 16px;
 }

-.layui-message-footer {
+.layui-instant-footer {
    position: absolute;
    bottom: 0;
    left: 0;
@@ -100,9 +113,10 @@ body a:hover {
    right: 0;
    border-top: 1px solid #e8e8e8;
    text-align: center;
+    white-space: nowrap;
 }

-.layui-message-footer a {
+.layui-instant-footer a {
    display: inline-block;
    text-align: center;
    color: #333;
@@ -113,4 +127,58 @@ body a:hover {

 .layui-icon-email {
    font-size: 40px;
-}
+}
+
+.layui-flow-more a {
+    height: 26px;
+    line-height: 26px;
+}
+
+.layui-flow-more a cite {
+    font-size: 12px;
+}
+
+#instant-content .layui-card-header {
+    padding: 0;
+    font-weight: bold;
+    margin-bottom: 10px;
+}
+
+#instant-content .layui-card-header div {
+    display: inline-block;
+}
+
+#instant-content .layui-card-header .time {
+    float: right;
+    font-weight: normal;
+    color: #999;
+}
+
+#instant-content .layui-panel {
+    min-height: 250px;
+    padding: 0 20px 20px;
+    /*border-top: 2px solid #fe5d58;*/
+    position: relative;
+}
+
+#instant-content .layui-banner {
+    position: absolute;
+    bottom: 8px;
+    color: #999;
+}
+
+#instant-content #layui-info {
+    height: 150px;
+    overflow: auto;
+}
+
+#instant-content #layui-info img {
+    max-width: 100%;
+    padding: 10px;
+    border: 1px solid #eee;
+}
+
+#instant-content .layui-footer {
+    text-align: right;
+    padding: 10px 0;
+}
--- a/public/static/system/js/common.js
+++ b/public/static/system/js/common.js
@@ -2,7 +2,7 @@

 // 以下代码是配置layui扩展模块的目录，每个页面都需要引入
 layui.config({
-    version: 'v2.0.0',
+    version: 'v1.1.5',
    base: getProjectUrl() + 'module/'
 }).extend({
    tags: 'tags/tags',
--- a/public/static/system/module/admin.js
+++ b/public/static/system/module/admin.js
@@ -405,7 +405,7 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl
                content: n
            })
        },
-        message: function () {
+        bells: function () {
            var that = $(this),
                n = that.data("url");
            admin.event.flowOpen({
@@ -445,7 +445,7 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl

            var elemWidth = 0, client = that[0].getBoundingClientRect();

-            if (n.title == undefined) {
+            if (n.title === undefined) {
                n.title = false;
                n.closeBtn = false
            }
@@ -460,8 +460,8 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl
            }
            elemWidth = parseInt(elemWidth);
            n.anim || (n.anim = 5);
-            n.resize = n.resize != undefined ? n.resize : false;
-            n.shade = n.shade != undefined ? n.shade : 0.1;
+            n.resize = n.resize !== undefined ? n.resize : false;
+            n.shade = n.shade !== undefined ? n.shade : 0.1;
            var top = client.height,
                padding = (that.innerWidth() - that.width()) / 2, // 不用计算 padding
                left = client.left + (client.width / 2) - (elemWidth / 2);
@@ -473,7 +473,7 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl
        }
        , pupupOpen: function (n) {

-            if (n.title == undefined) {
+            if (n.title === undefined) {
                n.title = false;
                n.closeBtn = false
            }
--- a/public/static/system/module/plugin.js
+++ b/public/static/system/module/plugin.js
@@ -31,8 +31,8 @@ layui.define(['i18n'], function (exports) {
                let data;
                layer.closeAll();
                if (res.code === 200) {
-                    layer.msg(res.msg);

+                    layer.msg(res.msg);
                    let index = layui.sessionData('api_install_index').index,
                        elems = $('tr[data-index="' + index + '"]');
                    if (url.indexOf('install') !== -1) {
@@ -128,23 +128,20 @@ layui.define(['i18n'], function (exports) {
            layer.open({
                type: 2,
                title: i18n.prop('立即支付'),
-                area: ['500px','685px'],
+                area: ['500px','550px'],
                offset: "30px",
                resize: false,
                shade: 0.8,
                shadeClose: true,
-                content: data.payUrl,
+                content: data.pay_url,
                success: function (index, layero) {
+                    // 父类消息监听
                    window.onmessage = function (res) {
                        let data = res.data;
                        if (res.data !== null && data.code === 200) {
                            layer.close(layero);
                            plugin.againClick();
                        }
-
-                        if (res.data !== null && data.code === -133) {
-                            layer.close(layero);
-                        }
                    }
                }
            });