From 6338006e0f85af8d4915abfbe67696b2b17dd6ce Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 13 May 2021 21:10:19 +0800
Subject: [PATCH] Merge branch 'master' of ssh://dev.zhiheiot.com:29418/mob-components
---
common/Bridge.js | 2 +-
common/common.scss | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/common/Bridge.js b/common/Bridge.js
index d5cdfc2..4bbb318 100644
--- a/common/Bridge.js
+++ b/common/Bridge.js
@@ -144,7 +144,7 @@
if (this._receives[method]) {
if (marker) {
this._receives[method](param, (param2) => {
- this._sendTelling(method, param2, marker);
+ this._sendTelling(method, param2 || {}, marker);
});
} else {
this._receives[method](param);
diff --git a/common/common.scss b/common/common.scss
index d43083f..0b83a70 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -14,4 +14,20 @@
.m-mark {
color: #fb4242;
+}
+
+.m-text-success {
+ color: #22c322;
+}
+.m-text-info {
+ color: #05b7c7;
+}
+.m-text-warning {
+ color: #FFB800;
+}
+.m-text-danger {
+ color: #FF5722;
+}
+.m-text-ignore {
+ color: rgba(0, 0, 0, 0.55);
}
\ No newline at end of file
--
Gitblit v1.9.1