Commit 77af143c by hank

设备UI 调整

parent f8af7173
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
height: 88px; height: 88px;
line-height: 88px; line-height: 88px;
margin: 0 auto; margin: 0 auto;
background: rgba(255, 145, 16, 1); background: #ff9110;
border-radius: 60px; border-radius: 60px;
color: white; color: white;
text-align: center; text-align: center;
......
...@@ -36,6 +36,12 @@ ...@@ -36,6 +36,12 @@
margin-left: 30px; margin-left: 30px;
} }
&-state {
width: 28px;
height: 28px;
margin-right: 39px;
}
&-info { &-info {
flex: 1; flex: 1;
} }
......
...@@ -3,7 +3,7 @@ import { ComponentClass } from 'react' ...@@ -3,7 +3,7 @@ import { ComponentClass } from 'react'
import { showMyToast } from '@/common/utils' import { showMyToast } from '@/common/utils'
import DeviceItem from '@/conpoments/device_item' import DeviceItem from '@/conpoments/device_item'
import Taro, { Component, Config } from '@tarojs/taro' import Taro, { Component, Config } from '@tarojs/taro'
import { View, Text, ScrollView, Button, Checkbox, Label } from '@tarojs/components' import { View, Text, ScrollView, Button, Checkbox, Image, Label } from '@tarojs/components'
import { AtSearchBar } from 'taro-ui' import { AtSearchBar } from 'taro-ui'
import './index.scss' import './index.scss'
...@@ -169,14 +169,22 @@ class DeviceSelect extends Component { ...@@ -169,14 +169,22 @@ class DeviceSelect extends Component {
{list.map(item => ( {list.map(item => (
<View className="device-bind-item-container" key={item.equipmentId}> <View className="device-bind-item-container" key={item.equipmentId}>
<Label className="device-bind-item" onClick={() => this.changeItem(item)}> <Label className="device-bind-item" onClick={() => this.changeItem(item)}>
<Checkbox {/* <Checkbox
value="" value=""
className="device-bind-item-checkbox" className="device-bind-item-checkbox"
checked={checked.has(item.equipmentId)} checked={checked.has(item.equipmentId)}
/> /> */}
<View className="device-bind-item-info"> <View className="device-bind-item-info">
<DeviceItem {...item} /> <DeviceItem {...item} />
</View> </View>
<Image
className="device-bind-item-state"
src={
checked.has(item.equipmentId)
? 'https://visual-clouds.oss-cn-beijing.aliyuncs.com/miniprogram/checkbox-select.png'
: 'https://visual-clouds.oss-cn-beijing.aliyuncs.com/miniprogram/checkbox.png'
}
/>
</Label> </Label>
</View> </View>
))} ))}
......
...@@ -195,7 +195,7 @@ class DeviceGroup extends Component { ...@@ -195,7 +195,7 @@ class DeviceGroup extends Component {
<View className="device-list"> <View className="device-list">
<ListView <ListView
count={count} count={count}
height={height - 100} height={height - 108}
dataListLength={list.length} dataListLength={list.length}
pullingUp={done => this.pullingUp(done)} pullingUp={done => this.pullingUp(done)}
pullingDown={done => this.pullingDown(done)} pullingDown={done => this.pullingDown(done)}
......
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