Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DoorLock
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
朱建香
DoorLock
Commits
91bc9820
Commit
91bc9820
authored
Feb 09, 2018
by
朱建香
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.扫码添加设备页面无相机权限ios修改
2.添加设备样式修改
parent
f069821b
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
32 deletions
+20
-32
dev/src/view/addDevice/v_scanCodeAdd.js
+3
-3
dev/src/view/doorlockUsers/v_doorlockUser.js
+4
-4
web/lib/less/addDevice/addDevice.less
+6
-12
web/resources/image/scanCodeAdd.png
+0
-0
web/resources/image/wifiAdd.png
+0
-0
web/view/addDevice/addDevice.css
+7
-13
No files found.
dev/src/view/addDevice/v_scanCodeAdd.js
View file @
91bc9820
...
...
@@ -76,7 +76,7 @@ function resolve(self){
iot
.
native
.
toAppSetting
();
}
backTap
(
self
);
},
{
"title"
:
""
,
"buttons"
:
[
Vue
.
t
(
"btn.cancel"
),
Vue
.
t
(
"addDevice.openCamera"
)]}
);
},
""
,
[
Vue
.
t
(
"btn.cancel"
),
Vue
.
t
(
"addDevice.openCamera"
)]
);
});
}
else
{
let
isFistOpenCamera
=
iot
.
storage
.
getMap
(
'isFistOpenCamera'
);
...
...
@@ -88,11 +88,11 @@ function resolve(self){
},
function
(
err
)
{
console
.
log
(
'error'
,
err
);
plus
.
nativeUI
.
confirm
(
Vue
.
t
(
"addDevice.openCameraTip"
),
(
e
)
=>
{
if
(
e
.
index
==
1
){
if
(
e
.
index
==
0
){
iot
.
native
.
toAppSetting
();
}
backTap
(
self
);
},
{
"title"
:
""
,
"buttons"
:
[
Vue
.
t
(
"btn.cancel"
),
Vue
.
t
(
"addDevice.openCamera"
)]}
);
},
""
,
[
Vue
.
t
(
"addDevice.openCamera"
),
Vue
.
t
(
"btn.cancel"
)]
);
});
}
else
{
openScanCode
(
self
);
...
...
dev/src/view/doorlockUsers/v_doorlockUser.js
View file @
91bc9820
...
...
@@ -252,10 +252,10 @@ async function showGuide(self){
}
}
else
{
try
{
time
=
await
sleep
(
10
00
);
time
=
await
sleep
(
5
00
);
self
.
setGuideStep1ShowFlag
(
true
);
time
=
await
sleep
(
10
00
);
time
=
await
sleep
(
5
00
);
self
.
setGuideStep2ShowFlag
(
true
);
}
catch
(
err
){
...
...
@@ -266,10 +266,10 @@ async function showGuide(self){
async
function
nextGuide
(
self
){
try
{
let
time
=
await
sleep
(
10
00
);
let
time
=
await
sleep
(
5
00
);
self
.
setGuideStep3ShowFlag
(
true
),
time
=
await
sleep
(
10
00
);
time
=
await
sleep
(
5
00
);
self
.
setGuideStep4ShowFlag
(
true
);
}
catch
(
err
){
...
...
web/lib/less/addDevice/addDevice.less
View file @
91bc9820
...
...
@@ -12,9 +12,14 @@
font-size: @ADDDEVICE-TEXT-FONTSIZE;
height: 150px;
line-height: 150px;
padding-left: 5
8
px;
padding-left: 5
0
px;
.tap_row(@ADDDEVICE-ROW-ACTIVE-BG);
font-size: 16px;
img{
margin-right: 25px;
width: 100px;
height: 100px;
}
}
.addDevice p{
...
...
@@ -25,17 +30,6 @@
text-align: center;
}
.scanAdd img{
width: 70px;
height: 70px;
margin-right: 40px;
}
.wifiAdd img{
width: 105px;
height: 50px;
margin-right: 5px;
}
//产品型号
.u-list();
...
...
web/resources/image/scanCodeAdd.png
View replaced file @
f069821b
View file @
91bc9820
3.07 KB
|
W:
|
H:
2.91 KB
|
W:
|
H:
2-up
Swipe
Onion skin
web/resources/image/wifiAdd.png
View replaced file @
f069821b
View file @
91bc9820
5.57 KB
|
W:
|
H:
4.5 KB
|
W:
|
H:
2-up
Swipe
Onion skin
web/view/addDevice/addDevice.css
View file @
91bc9820
...
...
@@ -454,7 +454,7 @@ p {
font-size
:
0.48rem
;
height
:
4rem
;
line-height
:
4rem
;
padding-left
:
1.
547
rem
;
padding-left
:
1.
333
rem
;
font-size
:
0.427rem
;
}
...
...
@@ -462,6 +462,12 @@ p {
background-color
:
#153D4C
;
}
.addDevice
li
img
{
margin-right
:
0.667rem
;
width
:
2.667rem
;
height
:
2.667rem
;
}
.addDevice
p
{
width
:
100%
;
font-size
:
0.32rem
;
...
...
@@ -470,18 +476,6 @@ p {
text-align
:
center
;
}
.scanAdd
img
{
width
:
1.867rem
;
height
:
1.867rem
;
margin-right
:
1.067rem
;
}
.wifiAdd
img
{
width
:
2.8rem
;
height
:
1.333rem
;
margin-right
:
0.133rem
;
}
.u-list
{
width
:
100%
;
height
:
100%
;
...
...
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