Merge branch 'dev'

super-coffee · Apr 28, 2020 · fee14d7 · fee14d7
2 parents 3329aaf + 84d6d75
commit fee14d7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/web/js/searchKey.js b/web/js/searchKey.js
@@ -22,12 +22,12 @@ function searchKey(userMail) {
             if (responseData.status) {
                 datas.datas = responseData.data;
             } else {
-                layer.msg(responseData.data);
+                showMsg(responseData.data);
             };
         })
         .catch(error => {
             console.log(error);
-            layer.msg("发生了一个异常，请到 Console 查看");
+            showMsg("发生了一个异常，请到 Console 查看");
         });
 };
 
@@ -49,4 +49,11 @@ clipboard.on('error', function (e) {
 
 layui.use('form', function () {
     var form = layui.form;
-});
+});
+
+function showMsg(msg) {
+    layui.use('layer', function () {
+        var layermsg = layui.layer;
+        layermsg.msg(msg);
+    });
+}
diff --git a/web/js/showMsg.js b/web/js/showMsg.js
@@ -6,10 +6,3 @@ if (msg != null) {
         layermsg.msg(msg);
     });
 };
-
-function showMsg(msg) {
-    layui.use('layer', function () {
-        var layermsg = layui.layer;
-        layermsg.msg(msg);
-    });
-}