提交 a2d25102 作者: 陈师旦

upd: bottomBar样式修改;新增大风实况

上级 722ce2cd
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
/* #ifndef APP-NVUE */ /* #ifndef APP-NVUE */
page { page {
/* 行为相关颜色 */ /* 行为相关颜色 */
--fui-color-primary: #465CFF; --fui-color-primary: #1890ff;
--fui-color-success: #09BE4F; --fui-color-success: #09BE4F;
--fui-color-warning: #FFB703; --fui-color-warning: #FFB703;
--fui-color-danger: #FF2B2B; --fui-color-danger: #FF2B2B;
......
...@@ -116,11 +116,14 @@ ...@@ -116,11 +116,14 @@
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;
padding: 30rpx; // padding: 30rpx 12rpx;
width: calc(100% - 60rpx); padding: 10px 12px;
// width: calc(100% - 60rpx);
width: 100%;
height: v-bind(iHeight); height: v-bind(iHeight);
max-height: v-bind(iMaxHeight); max-height: v-bind(iMaxHeight);
box-shadow: 0 0 15rpx rgba(0, 0, 0, 0.1); box-shadow: 0 0 15rpx rgba(0, 0, 0, 0.1);
box-sizing: border-box;
&.expand { &.expand {
height: v-bind(iMaxHeight); height: v-bind(iMaxHeight);
...@@ -133,7 +136,7 @@ ...@@ -133,7 +136,7 @@
.action { .action {
width: 100%; width: 100%;
position: relative; position: relative;
top: -15rpx; // top: -15rpx;
font-size: 24rpx; font-size: 24rpx;
color: #999; color: #999;
padding-bottom: 10rpx; padding-bottom: 10rpx;
...@@ -155,8 +158,10 @@ ...@@ -155,8 +158,10 @@
} }
.content { .content {
box-sizing: border-box;
width: 100%; width: 100%;
height: calc(100% - 60rpx - 20rpx); // height: calc(100% - 60rpx - 20rpx);
height: 100%;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
......
...@@ -112,6 +112,26 @@ ...@@ -112,6 +112,26 @@
} }
} }
}, },
// 大风监测
{
"path": "pages/business/monitor/wind/index",
"style": {
"navigationBarTitleText": "大风监测",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#1890FF",
"app-plus": {
"titleNView": {
"buttons": [
{
"type": "share",
"color": "white",
"width": "50px"
}
]
}
}
}
},
// === Webview === // === Webview ===
{ {
"path": "pages/common/webview/index", "path": "pages/common/webview/index",
......
/**
* TODO: 色块图例配置,实际上应该和后端的色斑图,进行动态匹配,可以考虑由后端接口返回
*/
/**
* 小时气温图例配置
*/
export const hourTemLegendConfig = {
expand: false,
title: '单位: °C',
option: {
items: [
{
color: '#800000',
label: '<44',
},
{
color: '#960000',
},
{
color: '#AB0001',
label: '40',
},
{
color: '#C80100',
},
{
color: '#E70000',
label: '36',
},
{
color: '#FE371B',
},
{
color: '#FF4B25',
label: '32',
},
{
color: '#FF7300',
},
{
color: '#FF9A02',
label: '28',
},
{
color: '#FFC300',
},
{
color: '#FFE703',
label: '24',
},
{
color: '#FFFF04',
},
{
color: '#F5FF03',
label: '20',
},
{
color: '#DEFF00',
},
{
color: '#C5FF04',
label: '16',
},
{
color: '#B5FF00',
},
{
color: '#98FD0F',
label: '12',
},
{
color: '#8AFA2D',
},
{
color: '#72F806',
label: '8',
},
{
color: '#00FF73',
},
{
color: '#00FF94',
label: '4',
},
{
color: '#00FFB4',
},
{
color: '#00FFD6',
label: '0',
},
{
color: '#06FFF7',
},
{
color: '#00EBFF',
label: '-4',
},
{
color: '#00CBFF',
},
{
color: '#01A6FF',
label: '-8',
},
{
color: '#0085FF',
},
{
color: '#0365FF',
label: '-12',
},
],
},
}
...@@ -29,9 +29,10 @@ export const liveModules: NavItemType[] = [ ...@@ -29,9 +29,10 @@ export const liveModules: NavItemType[] = [
{ {
label: '大风监测', label: '大风监测',
value: 'wind-m', value: 'wind-m',
type: 'webview', // type: 'webview',
navigate: { navigate: {
url: 'https://www.baidu.com', url: '/pages/business/monitor/wind/index',
// url: 'https://www.baidu.com',
}, },
}, },
{ {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论