Merge remote-tracking branch 'origin/master'

马宇豪

2023-07-24 6c7fd1bdc47dba996bffda416576b167321624a3

Merge remote-tracking branch 'origin/master'

 App.vue

@@ -124,6 +124,7 @@
    // 设置整个项目的背景色
    page {
        background-color: #f5f5f5;
        height: 100%;
    }

    /* #endif */

 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"
            }

			

        ]
    }
}

 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; 

 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",

 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>

 static/data.png