Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
visualcloud
/
Vmatrix-client-taro
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
77af143c
authored
Nov 26, 2019
by
hank
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
设备UI 调整
parent
f8af7173
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
5 deletions
+19
-5
src/assets/styles/common.scss
+1
-1
src/pages/home/device/group_device_bind/index.scss
+6
-0
src/pages/home/device/group_device_bind/index.tsx
+11
-3
src/pages/home/device/group_list/index.tsx
+1
-1
No files found.
src/assets/styles/common.scss
View file @
77af143c
...
@@ -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
;
...
...
src/pages/home/device/group_device_bind/index.scss
View file @
77af143c
...
@@ -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
;
}
}
...
...
src/pages/home/device/group_device_bind/index.tsx
View file @
77af143c
...
@@ -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
>
))
}
))
}
...
...
src/pages/home/device/group_list/index.tsx
View file @
77af143c
...
@@ -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
-
10
0
}
height=
{
height
-
10
8
}
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
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment