Commit 2dfde021 by hank

样式修改

parent 1da17d4a
...@@ -8,3 +8,8 @@ page { ...@@ -8,3 +8,8 @@ page {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.at-tabs .at-tabs__item {
font-size: 30px;
color: #999;
}
...@@ -66,6 +66,7 @@ class App extends Component { ...@@ -66,6 +66,7 @@ class App extends Component {
}, },
tabBar: { tabBar: {
selectedColor: '#FF9110', selectedColor: '#FF9110',
color: '#999',
list: [ list: [
{ {
pagePath: 'pages/home/device/index', pagePath: 'pages/home/device/index',
......
...@@ -26,24 +26,42 @@ ...@@ -26,24 +26,42 @@
flex: 1; flex: 1;
display: flex; display: flex;
padding-left: 40px; padding-left: 40px;
padding-top: 12px; padding-top: 30px;
flex-direction: column; flex-direction: column;
.device-item-info-name { .device-item-info-name {
font-size: 32px; font-size: 32px;
color: #333; color: #333;
font-weight: bold; font-weight: bold;
margin-bottom: 77px; margin-bottom: 57px;
} }
.device-item-info-state { .device-item-info-state {
font-size: 26px; font-size: 26px;
color: #666; color: #666;
position: relative;
padding-left: 25px;
.dian {
display: inline-block;
content: '';
background: #ccc;
position: absolute;
height: 18px;
left: 0;
top: 8px;
width: 18px;
border-radius: 50%;
}
} }
.device-item-info-state-active { .device-item-info-state-active {
font-size: 26px; font-size: 26px;
color: #5ff054; color: #5ff054;
.dian {
background: #5ff054;
}
} }
} }
} }
...@@ -30,15 +30,16 @@ class DeviceItem extends Component { ...@@ -30,15 +30,16 @@ class DeviceItem extends Component {
</View> </View>
<View className="device-item-info"> <View className="device-item-info">
<Text className="device-item-info-name">{equipmentName}</Text> <Text className="device-item-info-name">{equipmentName}</Text>
<Text <View
className={ className={
equipmentState === 'ONLINE' equipmentState === 'ONLINE'
? 'device-item-info-state device-item-info-state-active' ? 'device-item-info-state device-item-info-state-active'
: 'device-item-info-state ' : 'device-item-info-state '
} }
> >
<Text className="dian" />
{equipmentState === 'ONLINE' ? '在线' : '离线'} {equipmentState === 'ONLINE' ? '在线' : '离线'}
</Text> </View>
</View> </View>
</View> </View>
) )
......
...@@ -9,4 +9,5 @@ ...@@ -9,4 +9,5 @@
.at-tabs__item--active { .at-tabs__item--active {
color: #ff9110 !important; color: #ff9110 !important;
font-size: 38px !important;
} }
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
position: relative; position: relative;
flex-direction: column; flex-direction: column;
background-color: white; background-color: white;
padding-top: 34px;
&-scroll { &-scroll {
flex: 1; flex: 1;
...@@ -22,6 +21,7 @@ ...@@ -22,6 +21,7 @@
padding: 20px; padding: 20px;
&-title { &-title {
padding-top: 54px;
font-size: 38px; font-size: 38px;
color: #000; color: #000;
} }
...@@ -40,6 +40,10 @@ ...@@ -40,6 +40,10 @@
color: #666; color: #666;
border: none; border: none;
line-height: 56px; line-height: 56px;
&::after {
display: none;
}
} }
&-list { &-list {
......
...@@ -28,6 +28,11 @@ ...@@ -28,6 +28,11 @@
box-shadow: none; box-shadow: none;
// box-shadow: 0 7px 12px 0 rgba(159, 87, 2, 0.17); // box-shadow: 0 7px 12px 0 rgba(159, 87, 2, 0.17);
border-radius: 3px; border-radius: 3px;
&::after {
display: none;
}
color: #666; color: #666;
border: none; border: none;
line-height: 56px; line-height: 56px;
...@@ -51,7 +56,7 @@ ...@@ -51,7 +56,7 @@
&-item { &-item {
display: inline-block; display: inline-block;
margin-right: 20px; // margin-right: 20px;
font-size: 30px !important; font-size: 30px !important;
background: transparent; background: transparent;
color: #999; color: #999;
......
...@@ -229,7 +229,7 @@ class TemplateTypeDetail extends Component { ...@@ -229,7 +229,7 @@ class TemplateTypeDetail extends Component {
<View className="type-list"> <View className="type-list">
{typeData.map(item => { {typeData.map(item => {
return ( return (
<Button <Text
size="mini" size="mini"
className={ className={
item.typeName === templateShow item.typeName === templateShow
...@@ -243,7 +243,7 @@ class TemplateTypeDetail extends Component { ...@@ -243,7 +243,7 @@ class TemplateTypeDetail extends Component {
}} }}
> >
{SHOWTYPE[item.typeName]} {SHOWTYPE[item.typeName]}
</Button> </Text>
) )
})} })}
</View> </View>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment