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/count/count.vue | 8 +---
pages/tabBar/weather/weather.vue | 12 ++----
pages.json | 64 ++++++++++++++++++++++++++++++++
static/data.png | 0
App.vue | 1
pages/tabBar/utils/tabBar.js | 2
6 files changed, 72 insertions(+), 15 deletions(-)
diff --git a/App.vue b/App.vue
index 5855e03..4c65956 100644
--- a/App.vue
+++ b/App.vue
@@ -124,6 +124,7 @@
// 设置整个项目的背景色
page {
background-color: #f5f5f5;
+ height: 100%;
}
/* #endif */
diff --git a/pages.json b/pages.json
index 99edc45..a5e30f8 100644
--- a/pages.json
+++ b/pages.json
@@ -42,6 +42,30 @@
}
},
{
+ "path" : "pages/tabBar/notice/measures",
+ "style" :
+ {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false,
+ "app-plus": {
+ "scrollIndicator": "none"
+ }
+ }
+ },
+ {
+ "path" : "pages/tabBar/firstPage/firstPage",
+ "style" :
+ {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false,
+ "app-plus": {
+ "scrollIndicator": "none"
+ }
+ }
+ },
+ {
"path" : "pages/tabBar/response/response",
"style" :
{
@@ -108,6 +132,35 @@
}
}
}
+ },
+ {
+ "path" : "pages/tabBar/current/current",
+ "style" :
+ {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true,
+ "app-plus": {
+ "scrollIndicator": "none",
+ "pullToRefresh": {
+ "support": true,
+ "color": "#000000",
+ "style": "circle"
+ }
+ }
+ }
+ },
+ {
+ "path" : "pages/tabBar/weather/weather",
+ "style" :
+ {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false,
+ "app-plus": {
+ "scrollIndicator": "none"
+ }
+ }
}
],
"globalStyle": {
@@ -126,6 +179,9 @@
"custom": true,
"list": [
{
+ "pagePath": "pages/tabBar/firstPage/firstPage"
+ },
+ {
"pagePath": "pages/tabBar/notice/notice"
},
{
@@ -139,8 +195,16 @@
},
{
"pagePath": "pages/tabBar/count/count"
+ },
+ {
+ "pagePath": "pages/tabBar/current/current"
+ },
+ {
+ "pagePath": "pages/tabBar/weather/weather"
}
+
+
]
}
}
diff --git a/pages/tabBar/count/count.vue b/pages/tabBar/count/count.vue
index 430f114..c7a50a8 100644
--- a/pages/tabBar/count/count.vue
+++ b/pages/tabBar/count/count.vue
@@ -13,11 +13,7 @@
</view>
</view>
<view class="content">
- <u-empty
- text="数据累积中，统计分析模块待呈现……"
- icon="http://cdn.uviewui.com/uview/empty/data.png"
- >
- </u-empty>
+ <u-empty text="数据累积中，统计分析模块待呈现……" mode="data"></u-empty>
</view>
<tabBar :currentPagePath="page"></tabBar>
</view>
@@ -53,7 +49,7 @@
</script>
-<style>
+<style lang='scss' scoped>
.box {
display: flex;
flex-direction: column;
diff --git a/pages/tabBar/utils/tabBar.js b/pages/tabBar/utils/tabBar.js
index 4902507..0473dd4 100644
--- a/pages/tabBar/utils/tabBar.js
+++ b/pages/tabBar/utils/tabBar.js
@@ -48,7 +48,7 @@
"pagePath": "pages/tabBar/current/current",
"iconPath": "/static/send.png",
"selectedIconPath": "/static/send_selected.png",
- "text": "信息"
+ "text": "我发布的"
},
{
"pagePath": "pages/tabBar/information/information",
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
diff --git a/static/data.png b/static/data.png
new file mode 100644
index 0000000..67353e7
--- /dev/null
+++ b/static/data.png
Binary files differ
--
Gitblit v1.9.2