提交 8b604b6f 编写于 作者: fxy060608's avatar fxy060608

chore: build

上级 58090847
...@@ -17974,7 +17974,7 @@ function isColor(color) { ...@@ -17974,7 +17974,7 @@ function isColor(color) {
} }
function initBackgroundColor(webviewStyle, routeMeta) { function initBackgroundColor(webviewStyle, routeMeta) {
const { backgroundColor } = routeMeta; let { backgroundColor } = routeMeta;
if (!backgroundColor) { if (!backgroundColor) {
return; return;
} }
...@@ -17984,6 +17984,9 @@ function initBackgroundColor(webviewStyle, routeMeta) { ...@@ -17984,6 +17984,9 @@ function initBackgroundColor(webviewStyle, routeMeta) {
if (!webviewStyle.background) { if (!webviewStyle.background) {
webviewStyle.background = backgroundColor; webviewStyle.background = backgroundColor;
} }
else {
backgroundColor = webviewStyle.background;
}
if (!webviewStyle.backgroundColorTop) { if (!webviewStyle.backgroundColorTop) {
webviewStyle.backgroundColorTop = backgroundColor; webviewStyle.backgroundColorTop = backgroundColor;
} }
......
...@@ -3,7 +3,7 @@ import { normalizeLocale, LOCALE_EN } from '@dcloudio/uni-i18n'; ...@@ -3,7 +3,7 @@ import { normalizeLocale, LOCALE_EN } from '@dcloudio/uni-i18n';
import { LINEFEED, Emitter, sortObject, onCreateVueApp, invokeCreateVueAppHook } from '@dcloudio/uni-shared'; import { LINEFEED, Emitter, sortObject, onCreateVueApp, invokeCreateVueAppHook } from '@dcloudio/uni-shared';
function getBaseSystemInfo() { function getBaseSystemInfo() {
return wx.getSystemInfoSync() return wx.getSystemInfoSync();
} }
function validateProtocolFail(name, msg) { function validateProtocolFail(name, msg) {
...@@ -1207,7 +1207,9 @@ function isWxKey(key) { ...@@ -1207,7 +1207,9 @@ function isWxKey(key) {
} }
function initWx() { function initWx() {
let global = wx; let global = wx;
if (typeof globalThis !== 'undefined' && globalThis.wx && wx !== globalThis.wx) { if (typeof globalThis !== 'undefined' &&
globalThis.wx &&
wx !== globalThis.wx) {
global = globalThis.wx; global = globalThis.wx;
} }
const newWx = {}; const newWx = {};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册