Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wx-app-hairDryer
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
姜雷
wx-app-hairDryer
Commits
295b2aac
Commit
295b2aac
authored
Dec 04, 2020
by
yemin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
0a0a9cd0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
index.js
src/containers/BindEquipment/index.js
+3
-1
EquipmentTest.js
src/containers/Equipment/EquipmentTest.js
+0
-1
No files found.
src/containers/BindEquipment/index.js
View file @
295b2aac
...
@@ -92,8 +92,10 @@ export class Bindequipment extends React.Component {
...
@@ -92,8 +92,10 @@ export class Bindequipment extends React.Component {
scanType
:
[
'qrCode'
,
'barCode'
],
// 可以指定扫二维码还是一维码,默认二者都有
scanType
:
[
'qrCode'
,
'barCode'
],
// 可以指定扫二维码还是一维码,默认二者都有
success
:
res
=>
{
success
:
res
=>
{
const
result
=
res
.
resultStr
;
// 当needResult 为 1 时,扫码返回的结果
const
result
=
res
.
resultStr
;
// 当needResult 为 1 时,扫码返回的结果
var
bar
=
result
.
indexOf
(
"https://www.dcrym.com"
)
!==-
1
?
result
.
slice
(
29
):
result
;
bar
=
bar
.
length
>
8
?
bar
.
substring
(
0
,
8
):
bar
;
this
.
setState
({
this
.
setState
({
deviceCode
:
result
,
deviceCode
:
bar
,
});
});
},
},
fail
:
err
=>
{
fail
:
err
=>
{
...
...
src/containers/Equipment/EquipmentTest.js
View file @
295b2aac
...
@@ -67,7 +67,6 @@ class EquipmentTest extends Component {
...
@@ -67,7 +67,6 @@ class EquipmentTest extends Component {
const
result
=
res
.
resultStr
;
// 当needResult 为 1 时,扫码返回的结果
const
result
=
res
.
resultStr
;
// 当needResult 为 1 时,扫码返回的结果
var
bar
=
result
.
indexOf
(
"https://www.dcrym.com"
)
!==-
1
?
result
.
slice
(
29
):
result
;
var
bar
=
result
.
indexOf
(
"https://www.dcrym.com"
)
!==-
1
?
result
.
slice
(
29
):
result
;
bar
=
bar
.
length
>
8
?
bar
.
substring
(
0
,
8
):
bar
;
bar
=
bar
.
length
>
8
?
bar
.
substring
(
0
,
8
):
bar
;
alert
(
bar
);
this
.
setState
({
this
.
setState
({
deviceCode
:
bar
,
deviceCode
:
bar
,
});
});
...
...
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