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
96a2c5f6
authored
Nov 27, 2019
by
hank
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
ad13e7c3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
24 deletions
+30
-24
src/common/index.ts
+4
-4
src/conpoments/film_list_item/index.tsx
+8
-4
src/pages/home/device/device_detail/index.tsx
+1
-1
src/pages/home/device/film_list/index.tsx
+10
-8
src/pages/home/film/film_list/index.tsx
+7
-7
No files found.
src/common/index.ts
View file @
96a2c5f6
export
const
FETCH_TIME_OUT
=
5000
//
export const BASE_URL = 'https://server.bdideal.com'
//
export const WEBVIEW_URL = 'https://visual.bdideal.com'
export
const
BASE_URL
=
'https://dev-server.bdideal.com'
export
const
WEBVIEW_URL
=
'https://dev-visual.bdideal.com'
export
const
BASE_URL
=
'https://server.bdideal.com'
export
const
WEBVIEW_URL
=
'https://visual.bdideal.com'
//
export const BASE_URL = 'https://dev-server.bdideal.com'
//
export const WEBVIEW_URL = 'https://dev-visual.bdideal.com'
/** 蓝牙的服务 uuid */
export
const
BLE_SERVICE_ID
=
'000088A0-0000-1000-8000-00805F9B34FB'
...
...
src/conpoments/film_list_item/index.tsx
View file @
96a2c5f6
...
...
@@ -41,8 +41,8 @@ class FilmListItem extends Component {
}
=
this
.
props
templateUrl
=
templateUrl
||
''
return
(
<
View
className=
"films-item"
onClick=
{
()
=>
onClick
&&
onClick
()
}
>
<
View
className=
"films-item-img-box"
>
<
View
className=
"films-item"
>
<
View
className=
"films-item-img-box"
onClick=
{
()
=>
onClick
&&
onClick
()
}
>
{
/* {templateShow === 'HORIZONTAL' ? null : (
<View
className="films-item-img-bg"
...
...
@@ -57,8 +57,12 @@ class FilmListItem extends Component {
/>
</
View
>
<
View
className=
"films-item-info"
>
<
Text
className=
"films-item-info-name"
>
{
filmName
}
</
Text
>
<
Text
className=
"films-item-info-detail"
>
{
filmDescribe
?
filmDescribe
:
'无'
}
</
Text
>
<
Text
className=
"films-item-info-name"
onClick=
{
()
=>
onClick
&&
onClick
()
}
>
{
filmName
}
</
Text
>
<
Text
className=
"films-item-info-detail"
onClick=
{
()
=>
onClick
&&
onClick
()
}
>
{
filmDescribe
?
filmDescribe
:
'无'
}
</
Text
>
<
View
className=
"films-item-info-time"
>
<
Text
className=
"films-item-info-count"
>
{
updateTime
}
</
Text
>
{
isChoose
?
null
:
(
...
...
src/pages/home/device/device_detail/index.tsx
View file @
96a2c5f6
...
...
@@ -221,7 +221,7 @@ class DeviceDetail extends Component {
className=
"item-input"
value=
{
equipmentName
}
placeholder=
"请输入设备名称"
onInput=
{
this
.
setDevice
Describ
e
}
onInput=
{
this
.
setDevice
Nam
e
}
/>
</
View
>
<
View
className=
"device-detail-item"
>
...
...
src/pages/home/device/film_list/index.tsx
View file @
96a2c5f6
...
...
@@ -122,14 +122,16 @@ class Films extends Component {
autoClose
key=
{
item
.
filmId
}
onClick=
{
()
=>
this
.
handleItem
(
item
)
}
options=
{
[
{
text
:
'删除'
,
style
:
{
backgroundColor
:
'#F32B2B'
}
}
]
}
options=
{
[
//
{
// text: '删除',
// style:
{
// backgroundColor: '#F32B2B'
//
}
//
}
]
}
>
<
FilmListItem
onClick=
{
()
=>
this
.
goDetail
(
item
)
}
...
...
src/pages/home/film/film_list/index.tsx
View file @
96a2c5f6
...
...
@@ -107,7 +107,7 @@ class Films extends Component {
}
goDetail
(
item
:
IMilmListItme
)
{
//
Taro.navigateTo({ url: `/pages/home/tempaltes/film_detail?filmId=${item.filmId}` })
Taro
.
navigateTo
({
url
:
`/pages/home/tempaltes/film_detail?filmId=
${
item
.
filmId
}
`
})
}
onSetting
(
item
)
{
if
(
process
.
env
.
TARO_ENV
!==
'rn'
)
{
...
...
@@ -238,12 +238,12 @@ class Films extends Component {
key=
{
item
.
filmId
}
onClick=
{
()
=>
this
.
handleItem
(
item
)
}
options=
{
[
{
text
:
'删除'
,
style
:
{
backgroundColor
:
'#F32B2B'
}
}
//
{
//
text: '删除',
//
style:
{
//
backgroundColor: '#F32B2B'
//
}
//
}
]
}
>
<
FilmListItem
onClick=
{
()
=>
this
.
goDetail
(
item
)
}
{
...
item
}
onSetting=
{
()
=>
{
this
.
onSetting
(
item
)}
}
/>
...
...
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