From 6c7fd1bdc47dba996bffda416576b167321624a3 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 24 七月 2023 09:03:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pages/tabBar/weather/weather.vue | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/pages/tabBar/weather/weather.vue b/pages/tabBar/weather/weather.vue
index 6eb220b..9e2b3f6 100644
--- a/pages/tabBar/weather/weather.vue
+++ b/pages/tabBar/weather/weather.vue
@@ -1,5 +1,5 @@
<template>
- <view>
+ <view style="height: 100%;">
<!-- 自定义导航栏 -->
<view class="navBarBox fix">
<!-- 状态栏占位 -->
@@ -12,8 +12,9 @@
</view>
</view>
</view>
- <view style="margin-bottom: 50px;">
- <web-view :src="webViewUrl"></web-view>
+ <view style="height: 85%;">
+ <!-- <web-view :src="webViewUrl"></web-view> -->
+ <iframe :src="webViewUrl" width="100%" height="100%"> </iframe>
</view>
<tabBar :currentPagePath="page"></tabBar>
</view>
@@ -40,7 +41,6 @@
},
methods: {
goBack() {
- console.log("1111")
uni.switchTab({
url:'/pages/tabBar/firstPage/firstPage'
});
@@ -81,9 +81,5 @@
}
.statusBar{
background-color:lightgrey;
-}
-/deep/ .embed-map #detail .table-wrapper {
- background-color: #f8f8f8;
- margin-bottom: 50px;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.2