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
809578e1
authored
Oct 12, 2019
by
hank
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改code 协议
parent
2f1ca2e4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
7 deletions
+16
-7
project.config.json
+1
-1
src/pages/home/device/device_list/index.tsx
+13
-2
src/pages/home/tempaltes/film_detail.tsx
+2
-4
No files found.
project.config.json
View file @
809578e1
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
"description"
:
""
,
"description"
:
""
,
"appid"
:
"wx9dd4033f37a9fa9f"
,
"appid"
:
"wx9dd4033f37a9fa9f"
,
"setting"
:
{
"setting"
:
{
"urlCheck"
:
fals
e
,
"urlCheck"
:
tru
e
,
"es6"
:
false
,
"es6"
:
false
,
"postcss"
:
false
,
"postcss"
:
false
,
"minified"
:
false
,
"minified"
:
false
,
...
...
src/pages/home/device/device_list/index.tsx
View file @
809578e1
...
@@ -143,12 +143,23 @@ class MyDevice extends Component {
...
@@ -143,12 +143,23 @@ class MyDevice extends Component {
onlyFromCamera
:
true
,
onlyFromCamera
:
true
,
scanType
:
[
'qrCode'
,
'barCode'
]
scanType
:
[
'qrCode'
,
'barCode'
]
})
})
const
res
=
await
Ble
.
openBle
(
result
)
const
mode
=
JSON
.
parse
(
result
).
model
||
'OWN'
const
code
=
JSON
.
parse
(
result
).
qrcode
console
.
log
(
result
,
mode
,
code
)
if
(
mode
===
'TV'
&&
code
)
{
await
api
.
common
.
addDeviceToken
(
code
)
showMyToast
({
title
:
'添加成功~'
})
this
.
page
=
1
this
.
getDate
()
}
if
(
mode
===
'OWN'
&&
code
)
{
const
res
=
await
Ble
.
openBle
(
code
)
const
{
deviceId
}
=
res
const
{
deviceId
}
=
res
Taro
.
navigateTo
({
url
:
`/pages/system/wifi_list/index?deviceId=
${
deviceId
}
`
})
Taro
.
navigateTo
({
url
:
`/pages/system/wifi_list/index?deviceId=
${
deviceId
}
`
})
}
}
catch
(
error
)
{
}
catch
(
error
)
{
console
.
error
(
error
)
console
.
error
(
error
)
//
showMyToast({ result: error, title: '添加失败~' })
showMyToast
({
result
:
error
,
title
:
'添加失败~'
})
}
}
}
}
}
}
...
...
src/pages/home/tempaltes/film_detail.tsx
View file @
809578e1
...
@@ -153,7 +153,7 @@ class FilmDetail extends Component {
...
@@ -153,7 +153,7 @@ class FilmDetail extends Component {
}
}
render
()
{
render
()
{
const
{
filmInfo
,
filmList
,
showModal
}
=
this
.
state
const
{
filmInfo
,
filmList
,
showModal
,
filmId
}
=
this
.
state
filmInfo
.
templateName
=
filmInfo
.
filmName
filmInfo
.
templateName
=
filmInfo
.
filmName
filmInfo
.
templateDescribe
=
filmInfo
.
filmDescribe
filmInfo
.
templateDescribe
=
filmInfo
.
filmDescribe
return
(
return
(
...
@@ -207,9 +207,7 @@ class FilmDetail extends Component {
...
@@ -207,9 +207,7 @@ class FilmDetail extends Component {
</
Modal
>
</
Modal
>
)
:
null
}
)
:
null
}
{
/* <WebView
{
/* <WebView
src={`https://visual.bdideal.com/#/tempaltes/filmdetail?filmId=${
src={`https://visual.bdideal.com/#/tempaltes/filmdetail?filmId=${filmId}&token=${token.getToken()}`}
filmInfo.filmId
}&token=${token.getToken()}`}
/> */
}
/> */
}
</
View
>
</
View
>
)
)
...
...
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