人生啊人生 1 săptămână în urmă
părinte
comite
e769b29e5f

+ 4 - 4
src/components/ThreeWorldEventQingXiCheAndQv/js/QingXiCheAndQvCarEvent.js

@@ -706,7 +706,7 @@ export class QingXiCheAndQvCarEvent {
             function(res) { console.log("自定义回调数据点击回调", res); },
             [
                 { "type" : "title", "value" : "温馨提示", "height" : 30, "rectangleColor" : "#a9d5ff", "fontColor" : "#FFFFFF", "fontSize" : 10, "background" : "#a9d5ff", },
-                { "tagName" : "点击人物或者闪烁点", "text" : "或者服饰触发", "type" : "switch", "value" : 1, "unit" : null, "height" : 30, "rectangleColor" : "#000000", "left_fontColor" : "#1cc7f6", "left_fontSize" : 12, "left_background" : "#1cc7f6", "right_fontColor" : "#1cc7f6", "right_fontSize" : 12, "right_background" : "#1cc7f6", },
+                { "tagName" : "点击人物或者闪烁点", "text" : "或者服饰触发", "type" : "switch", "value" : 1, "unit" : null, "height" : 30, "rectangleColor" : "#000000", "left_fontColor" : "#ffffff", "left_fontSize" : 12, "left_background" : "#ffffff", "right_fontColor" : "#ffffff", "right_fontSize" : 12, "right_background" : "#ffffff", },
             ],
             false
         );
@@ -757,7 +757,7 @@ export class QingXiCheAndQvCarEvent {
             function(res) { console.log("自定义回调数据点击回调", res); },
             [
                 { "type" : "title", "value" : "温馨提示", "height" : 30, "rectangleColor" : "#a9d5ff", "fontColor" : "#FFFFFF", "fontSize" : 10, "background" : "#a9d5ff", },
-                { "tagName" : "按照箭头方向", "text" : "行走至车辆区域", "type" : "switch", "value" : 1, "unit" : null, "height" : 30, "rectangleColor" : "#000000", "left_fontColor" : "#1cc7f6", "left_fontSize" : 12, "left_background" : "#00d800", "right_fontColor" : "#1cc7f6", "right_fontSize" : 12, "right_background" : "#ffffff", },
+                { "tagName" : "按照箭头方向", "text" : "行走至车辆区域", "type" : "switch", "value" : 1, "unit" : null, "height" : 30, "rectangleColor" : "#000000", "left_fontColor" : "#ffffff", "left_fontSize" : 12, "left_background" : "#00d800", "right_fontColor" : "#ffffff", "right_fontSize" : 12, "right_background" : "#ffffff", },
             ],
             false
         );
@@ -807,7 +807,7 @@ export class QingXiCheAndQvCarEvent {
             function(res) { console.log("自定义回调数据点击回调", res); },
             [
                 { "type" : "title", "value" : "温馨提示", "height" : 30, "rectangleColor" : "#a9d5ff", "fontColor" : "#FFFFFF", "fontSize" : 10, "background" : "#a9d5ff", },
-                { "tagName" : "根据箭头提示", "text" : "绕车一周", "type" : "switch", "value" : 1, "unit" : null, "height" : 30, "rectangleColor" : "#000000", "left_fontColor" : "#1cc7f6", "left_fontSize" : 12, "left_background" : "#1cc7f6", "right_fontColor" : "#1cc7f6", "right_fontSize" : 12, "right_background" : "#1cc7f6", },
+                { "tagName" : "根据箭头提示", "text" : "绕车一周", "type" : "switch", "value" : 1, "unit" : null, "height" : 30, "rectangleColor" : "#000000", "left_fontColor" : "#ffffff", "left_fontSize" : 12, "left_background" : "#1cc7f6", "right_fontColor" : "#ffffff", "right_fontSize" : 12, "right_background" : "#ffffff", },
             ],
             false
         );
@@ -1256,7 +1256,7 @@ export class QingXiCheAndQvCarEvent {
             function(res) { console.log("自定义回调数据点击回调", res); },
             [
                 { "type" : "title", "value" : "温馨提示", "height" : 30, "rectangleColor" : "#a9d5ff", "fontColor" : "#FFFFFF", "fontSize" : 10, "background" : "#a9d5ff", },
-                { "tagName" : "点击安全桩", "text" : "或者闪烁点触发", "type" : "switch", "value" : 1, "unit" : null, "height" : 30, "rectangleColor" : "#000000", "left_fontColor" : "#1cc7f6", "left_fontSize" : 12, "left_background" : "#00d800", "right_fontColor" : "#1cc7f6", "right_fontSize" : 12, "right_background" : "#ffffff", },
+                { "tagName" : "点击安全桩", "text" : "或者闪烁点触发", "type" : "switch", "value" : 1, "unit" : null, "height" : 30, "rectangleColor" : "#000000", "left_fontColor" : "#ffffff", "left_fontSize" : 12, "left_background" : "#00d800", "right_fontColor" : "#ffffff", "right_fontSize" : 12, "right_background" : "#ffffff", },
             ],
             false
         );

+ 18 - 17
src/utils/common/CommonGuiDbListTwo.js

@@ -488,28 +488,29 @@ export class CommonGuiDbListTwo {
 
             
             // 控制颜色
-            var commonColor = "#00ff00";
+            // var commonColor = "#00ff00";
+            var commonColor = "transparent";
 
-            if (addOrUpdateJson["list"] != null && addOrUpdateJson["list"] != undefined) {
+            // if (addOrUpdateJson["list"] != null && addOrUpdateJson["list"] != undefined) {
                 
-                var list = addOrUpdateJson["list"];
+            //     var list = addOrUpdateJson["list"];
                 
-                try {
-
-                    var listObj = list.length > 1 ? list[1] : list[0];
-                    if (listObj["fontColor"] != null && listObj["fontColor"] != undefined) {
-                        commonColor = listObj["fontColor"];
-                    }
-                    else if (listObj["right_fontColor"] != null && listObj["right_fontColor"] != undefined) {
-                        commonColor = listObj["right_fontColor"];
-                    }
-                    else if (listObj["left_fontColor"] != null && listObj["left_fontColor"] != undefined) {
-                        commonColor = listObj["left_fontColor"];
-                    }
+            //     try {
+
+            //         var listObj = list.length > 1 ? list[1] : list[0];
+            //         if (listObj["fontColor"] != null && listObj["fontColor"] != undefined) {
+            //             commonColor = listObj["fontColor"];
+            //         }
+            //         else if (listObj["right_fontColor"] != null && listObj["right_fontColor"] != undefined) {
+            //             commonColor = listObj["right_fontColor"];
+            //         }
+            //         else if (listObj["left_fontColor"] != null && listObj["left_fontColor"] != undefined) {
+            //             commonColor = listObj["left_fontColor"];
+            //         }
                     
-                } catch (e) {}
+            //     } catch (e) {}
 
-            }
+            // }
 
             // 字体颜色
             commonBtn.color = commonColor;