Commit 91bc9820 by 朱建香

1.扫码添加设备页面无相机权限ios修改

2.添加设备样式修改
parent f069821b
...@@ -76,7 +76,7 @@ function resolve(self){ ...@@ -76,7 +76,7 @@ function resolve(self){
iot.native.toAppSetting(); iot.native.toAppSetting();
} }
backTap(self); backTap(self);
},{"title": "","buttons": [Vue.t("btn.cancel"),Vue.t("addDevice.openCamera")]}); },"", [Vue.t("btn.cancel"),Vue.t("addDevice.openCamera")]);
}); });
}else{ }else{
let isFistOpenCamera = iot.storage.getMap('isFistOpenCamera'); let isFistOpenCamera = iot.storage.getMap('isFistOpenCamera');
...@@ -88,11 +88,11 @@ function resolve(self){ ...@@ -88,11 +88,11 @@ function resolve(self){
}, function (err) { }, function (err) {
console.log('error', err); console.log('error', err);
plus.nativeUI.confirm(Vue.t("addDevice.openCameraTip"), (e)=>{ plus.nativeUI.confirm(Vue.t("addDevice.openCameraTip"), (e)=>{
if(e.index == 1){ if(e.index == 0){
iot.native.toAppSetting(); iot.native.toAppSetting();
} }
backTap(self); backTap(self);
},{"title": "","buttons": [Vue.t("btn.cancel"),Vue.t("addDevice.openCamera")]}); },"", [Vue.t("addDevice.openCamera"),Vue.t("btn.cancel")]);
}); });
}else{ }else{
openScanCode(self); openScanCode(self);
......
...@@ -252,10 +252,10 @@ async function showGuide(self){ ...@@ -252,10 +252,10 @@ async function showGuide(self){
} }
}else{ }else{
try{ try{
time =await sleep(1000); time =await sleep(500);
self.setGuideStep1ShowFlag(true); self.setGuideStep1ShowFlag(true);
time = await sleep(1000); time = await sleep(500);
self.setGuideStep2ShowFlag(true); self.setGuideStep2ShowFlag(true);
} }
catch (err){ catch (err){
...@@ -266,10 +266,10 @@ async function showGuide(self){ ...@@ -266,10 +266,10 @@ async function showGuide(self){
async function nextGuide(self){ async function nextGuide(self){
try{ try{
let time = await sleep(1000); let time = await sleep(500);
self.setGuideStep3ShowFlag(true), self.setGuideStep3ShowFlag(true),
time = await sleep(1000); time = await sleep(500);
self.setGuideStep4ShowFlag(true); self.setGuideStep4ShowFlag(true);
} }
catch (err){ catch (err){
......
...@@ -12,9 +12,14 @@ ...@@ -12,9 +12,14 @@
font-size: @ADDDEVICE-TEXT-FONTSIZE; font-size: @ADDDEVICE-TEXT-FONTSIZE;
height: 150px; height: 150px;
line-height: 150px; line-height: 150px;
padding-left: 58px; padding-left: 50px;
.tap_row(@ADDDEVICE-ROW-ACTIVE-BG); .tap_row(@ADDDEVICE-ROW-ACTIVE-BG);
font-size: 16px; font-size: 16px;
img{
margin-right: 25px;
width: 100px;
height: 100px;
}
} }
.addDevice p{ .addDevice p{
...@@ -25,17 +30,6 @@ ...@@ -25,17 +30,6 @@
text-align: center; text-align: center;
} }
.scanAdd img{
width: 70px;
height: 70px;
margin-right: 40px;
}
.wifiAdd img{
width: 105px;
height: 50px;
margin-right: 5px;
}
//产品型号 //产品型号
.u-list(); .u-list();
......
web/resources/image/scanCodeAdd.png

3.07 KB | W: | H:

web/resources/image/scanCodeAdd.png

2.91 KB | W: | H:

web/resources/image/scanCodeAdd.png
web/resources/image/scanCodeAdd.png
web/resources/image/scanCodeAdd.png
web/resources/image/scanCodeAdd.png
  • 2-up
  • Swipe
  • Onion skin
web/resources/image/wifiAdd.png

5.57 KB | W: | H:

web/resources/image/wifiAdd.png

4.5 KB | W: | H:

web/resources/image/wifiAdd.png
web/resources/image/wifiAdd.png
web/resources/image/wifiAdd.png
web/resources/image/wifiAdd.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -454,7 +454,7 @@ p { ...@@ -454,7 +454,7 @@ p {
font-size: 0.48rem; font-size: 0.48rem;
height: 4rem; height: 4rem;
line-height: 4rem; line-height: 4rem;
padding-left: 1.547rem; padding-left: 1.333rem;
font-size: 0.427rem; font-size: 0.427rem;
} }
...@@ -462,6 +462,12 @@ p { ...@@ -462,6 +462,12 @@ p {
background-color: #153D4C; background-color: #153D4C;
} }
.addDevice li img {
margin-right: 0.667rem;
width: 2.667rem;
height: 2.667rem;
}
.addDevice p { .addDevice p {
width: 100%; width: 100%;
font-size: 0.32rem; font-size: 0.32rem;
...@@ -470,18 +476,6 @@ p { ...@@ -470,18 +476,6 @@ p {
text-align: center; 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 { .u-list {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment