Merge branch 'wangying' of http://192.168.2.91/gitlab/iot-project-js/doorlock into zjx

# Conflicts:
#	web/resources/lang/zh.json

History.md

-1.1.2 / 2017-11-03
+1.1.4 / 2017-11-07
+
+==================
+ * 1.上传css样式
+
+1.1.3 / 2017-11-06
+
+==================
+ * 1.上传css样式
+
+1.1.2 / 2017-11-03
 
 ==================
  * 1.修改门锁管理、关联开锁信息、绑定开锁信息、邀请绑定页面样式

dev/src/lang/zh.json

@@ -223,11 +223,6 @@
 
         }
     },
-    "userList":{
-        "name": "姓名：{0}",
-        "id": "指纹ID:<span>{0}</span>密码ID:<span>{1}</span>IC卡ID:<span>{2}</span>",
-        "noUserTip": "暂无用户"
-    },
     "commstatusLoading":{
         "connectSuccess": "Wi-Fi连接成功，正在绑定...",
         "bindSuccess": "绑定成功",
@@ -333,6 +328,7 @@
     	"error": "请求发送失败"
     },
     "deviceList":{
-        "model": "型号："
+        "model": "型号：",
+        "noDeviceTip": "暂无产品型号"
     }
 }
\ No newline at end of file

dev/src/public/config.js

@@ -37,5 +37,5 @@ export default {
 	"ring_time": 30000,
 	"remote_opendoor_timeout": 30000,
 	//二维码失效时间
-	"qrcode_timeout": 600000,
+	"qrcode_timeout": 6000,
 }
\ No newline at end of file

dev/src/view/device/v_index.js

@@ -721,7 +721,7 @@ function bindDoorlockTap(){
 
 //tap 门锁管理
 function doorlockManageTap(self){
-	if(self.getValueDoorlockManage() == 1){
+//	if(self.getValueDoorlockManage() == 1){
 		iot.navigator.openWindow({
 	        url: '../doorlockManage/index.html',
 	        id: 'doorlockManage',
@@ -731,12 +731,12 @@ function doorlockManageTap(self){
 	        	role: self.getRole()
 	        }
 	    });
-	}
+//	}
 }
 
 //tap 开门记录
 function opendoorRecordTap(self){
-	if(self.getValueOpendoorRecord() == 1){
+//	if(self.getValueOpendoorRecord() == 1){
 		self.opendoorRecordFlag = false;
 		setRecordTime('openTime', self.openTime.toISOString());
 		iot.navigator.openWindow({
@@ -746,12 +746,12 @@ function opendoorRecordTap(self){
 	        	deviceId: self.deviceId
 	        }
 	    });	
-	}
+//	}
 }
 
 //tap 安全报警
 function securityAlarmTap(self){
-	if(self.getValueSecurityAlarm() == 1){
+//	if(self.getValueSecurityAlarm() == 1){
 		self.securityAlarmFlag = false;
 		setRecordTime('notifyTime', self.notifyTime.toISOString());
 		iot.navigator.openWindow({
@@ -761,7 +761,7 @@ function securityAlarmTap(self){
 	        	deviceId: self.deviceId
 	        }
 	    });	
-	}
+//	}
 }
 
 //tap 门锁用户

dev/src/view/doorlockUsers/v_inviteBind.js

@@ -113,7 +113,7 @@ function qrcodeButtonTap(self){
 			          console.log(qr.style);
 			          setTimeout(() => {
 			          	self.setQrCodeDisabled(true);
-			          },1000*60*10);
+			          },qrcode_timeout);
 			        }
 			    });
 	    	}else{}

web/lib/js/p.js

@@ -9958,7 +9958,7 @@ exports.default = {
 	"ring_time": 30000,
 	"remote_opendoor_timeout": 30000,
 	//二维码失效时间
-	"qrcode_timeout": 600000
+	"qrcode_timeout": 6000
 };
 
 /***/ }),

web/lib/less/addDevice/addDevice.less

@@ -29,6 +29,39 @@
 //产品型号
 .u-list();
 
+.custom-device-list{
+    position: absolute;
+    top: 44px;
+    bottom: 0;
+    left: 0;
+    height: auto;   
+    .u-list-scroll .u-list-row{     
+        height: 75px;
+        padding: 0 35px 0 41px;
+        .u-list-left-image{
+            width: 24px;
+            height: 54px;
+            margin-right: 39px;
+        }
+        .u-list-title{
+            font-size: 16px;
+            line-height: 20px;
+        }
+        .u-list-right-icon{
+            font-family: iconfont;
+        }
+        &:after{
+            .white_gradient_border();
+        }
+    } 
+    .u-list-load{
+        .listLoad();
+    }
+    .u-list-tip{
+        .listNoCont("noDevice.png");
+    }
+}
+
 //配置Wi-Fi
 .wifiAddHelp{
     .help();
@@ -148,6 +181,8 @@
     .buttonPosition();
 }
 
+.mediaPosition();
+
 .u-comm-loading();
 
 .custom-comm-loading();
\ No newline at end of file

web/lib/less/bindUser/bindUser.less

@@ -81,6 +81,8 @@
 	.buttonPosition();
 }
 
+.mediaPosition();
+
 //用户列表
 .u-swipe-list();
 

web/lib/less/device/device.less

@@ -463,4 +463,8 @@
 		}
 		.linkText();
 	}
+}
+
+.remoteOpendoorPage{
+	.mask(1051,@BODY-BG-COLOR);
 }
\ No newline at end of file

web/lib/less/device/recordList.less

@@ -11,7 +11,7 @@
 	height: auto;	
 	.u-list-scroll .u-list-row{		
 		height: 75px;
-		padding: 0 41px;
+		padding: 0 38px 0 41px;
 		.u-list-left-image{
 			width: 30px;
 			height: 30px;

web/lib/less/doorlockManage/doorlockManage.less

@@ -36,6 +36,8 @@
     .buttonPosition();
 }
 
+.mediaPosition();
+
 //门锁管理
 .grid-list{
     position: absolute;
@@ -154,14 +156,14 @@
 //门锁管理
 .doorlockManage li{
     font-size: 16px;
-    padding: 17px 42px;
+    padding: 0 42px;
     position: relative;
-    overflow: hidden;
+    height: 55px;
+    line-height: 55px;
     p{
         float: right;
         color: #A0A0A7;
         font-size: 12px;
-        margin-top: 3px;
     }
     // > icon 
     &.name{
@@ -185,4 +187,37 @@
 
 .u-switch();
 
+.custom-switch{
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 126px;
+    height: 100%;
+    .u-switch-handle{
+        width: 40px;
+        height: 24px;
+        &:before{
+            top: 0;
+            width: 20px;
+            height: 20px;
+        }
+    }
+    //开关 开
+    &.u-switch-on .u-switch-handle{
+        border-color: @CUSTOM-SWITCH-COMPONENT-ONSTATE-BORDER;
+        background-color: @CUSTOM-SWITCH-COMPONENT-ONSTATE-BG;
+        &:before{
+            left: 16px;
+        }        
+    }
+    //开关 关
+    &.u-switch-off .u-switch-handle{
+        border-color: @CUSTOM-SWITCH-COMPONENT-OFFSTATE-BORDER;
+        background-color: @CUSTOM-SWITCH-COMPONENT-OFFSTATE-BG;     
+        &:before{
+            left: 0;
+        }            
+    }   
+}
+
 .unbindState-dialog();
\ No newline at end of file

web/lib/less/doorlockUsers/doorlockUser.less

@@ -31,8 +31,8 @@
 .userInfoLink{
 	li{
 		&:not(.userInfo){
-			height: 52px;
-			line-height: 52px;
+            height: 55px;
+            line-height: 55px;
 			position: relative;
 			padding: 0 65px 0 42px;
 			font-size: @USERINFOLINK-TITLE-FONTSIZE;
@@ -187,7 +187,7 @@
     .mask(1051,@CUSTOM-BACKDROP-BG);
     .guideStep1{
         position: absolute;
-        top: 65px;
+        top: 44px;
         left: 0;
         width: 100%;
         .guideStep1Cont{
@@ -275,7 +275,7 @@
     .guideStep2,
     .guideStep4{
         position: absolute;
-        bottom: 150px;
+        bottom: 65px; 
         left: 0;
         width: 100%;
     }
@@ -284,7 +284,7 @@
     }
     .guideStep3{
         position: absolute;
-        top: 139px;
+        top: 120px;
         left: 0;
         width: 100%;
         .guideStep3Cont{
@@ -326,4 +326,6 @@
             margin-top: -2px;   
         }
     }
-}
+}
\ No newline at end of file
+
+.mediaPosition(true);
\ No newline at end of file

web/lib/less/doorlockUsers/unlockInfo.less

@@ -9,7 +9,7 @@
 	font-size: @UNLOCKINFO-TITLE-FONTSIZE;
 	padding-left: 42px;
 	border-bottom: 2px solid @UNLOCKINFO-TITLE-BOTTOMBORDER;/*no*/
-	~ .custom-unlockInfo-list{
+	~ .custom-swipe-list{
 		top: 92px;
 	}
 }
@@ -51,8 +51,50 @@
 .u-swipe-list();
 
 .custom-swipe-list{
-	.u-swipe-list-scroll .u-swipe-list-row .u-swipe-list-handle{
-		background-color: #242635;
+	position: absolute;
+	top: 44px;
+	bottom: 0;
+	left: 0;
+	height: auto;
+	.u-swipe-list-scroll .u-swipe-list-row{
+		.u-swipe-list-handle{
+			background-color: @CUSTOM-UNLOCKINFO-SWIPELIST-COMPONENT-ROW-BG;
+			padding: 0 42px;
+			height: 55px;
+			font-size: @CUSTOM-UNLOCKINFO-SWIPELIST-COMPONENT-TEXT-FONTSIZE;
+			.u-swipe-list-title{
+				float: left;
+			}
+			.u-swipe-list-subtitle{
+				float: right;
+			}
+		}
+		.u-swipe-list-button{
+			right: 32px;
+			div{
+				width: 85px;
+			    color: @CUSTOM-UNLOCKINFO-SWIPELIST-COMPONENT-BUTTON-COLOR;
+			    font-size: @CUSTOM-UNLOCKINFO-SWIPELIST-COMPONENT-BUTTON-FONTSIZE;
+			    &:nth-last-of-type(1),
+			    &:nth-last-of-type(2){
+				    background-color: @CUSTOM-UNLOCKINFO-SWIPELIST-COMPONENT-BUTTON-BG;
+				}
+			}
+		}
+		&:after{
+			.white_gradient_border();					
+		}
+		&.active .u-swipe-list-handle{
+			left: -202px;
+		}
+	}
+	//上拉加载
+	.u-swipe-list-load{
+		.listLoad();
+	}
+	//swipeList 无内容
+	.u-swipeList-tip{
+		.listNoCont("unlockNoCont.png",70px 70px);	
 	}
 }
 
@@ -64,27 +106,28 @@
 }
 
 .modeSelect{
-    padding: 11px 42px;
+    padding: 10px 42px;
     font-size: 0;
-    margin: 0 -5px;	
+    margin: 0 -12px;	
+    position: relative;
     li{	
 		color: #00ffff;
-	    font-size: 13px;
+	    font-size: 14px;
 		border: 1px solid;/*no*/
 		position: relative;
-		width: 90px;
+		width: 80px;
 	    display: inline-block;
 	    text-align: center;
 	    line-height: 1;
 	    padding: 8px 0;
 	    border-radius: 5px;
-	    margin: 10px 5px;
+	    margin: 10px 12px;
 	    &:before{
 	    	content: '\e631';
 	    	position: absolute;
 	    	top: 50%;
-	    	.transform(translate(-14px,-50%));
-	    	.iconfont(12px);
+	    	.transform(translate(-16px,-50%));
+	    	.iconfont(15px);
 	    	display: none;
 	    }
 	    &.active{
@@ -99,21 +142,24 @@
 .u-select();
 
 .custom-select{
-	height: 160px;
+	height: 170px;
 	.u-select-scroll{
 		.u-select-row{
 		    display: block;
 		    font-size: 16px;
-		    padding: 19px 80px 11px 42px;
+		    padding: 22px 80px 11px 42px;
 		    .u-select-title{
 		    	float: left;
 		    	margin-right: 36px;
 		    }
 		    &:before{
 		    	content: '\e6a9';
+		    	top: auto;
+		    	bottom: 9px;
 		    	right: 42px;
 		    	font-family: iconfont;
 		    	color: #00ffff;
+		    	.transform(none);
 		    	display: block;
 		    }
 		    &:after{
@@ -130,18 +176,67 @@
 	.u-select-tip{
     	top: 80px;
 		.transform(none);
-		.listNoCont(inherit,45px 45px,58px);
+		.listNoCont("noCont.png",45px 45px,inherit,57px);
 	}
 }
 
 .tip{
     text-align: center;
     color: #A0A0A7;
-    margin-top: 4px;	
+    margin-top: 3px;	
 }
 
 .u-switch();
 
+.custom-setHijack-switch{
+	width: 200px;
+	height: auto;
+	text-align: center;
+	color: #00ffff;
+	margin: 27px auto 0;
+	padding: 10px 0;
+	.u-switch-handle{
+		position: relative;
+		top: auto;
+		left: auto;
+		.transform(none);
+		width: 17px;
+		height: 17px;
+		border: 0;
+		border-radius: 0;
+		display: inline-block;
+		vertical-align: middle;
+		margin-right: 6px;
+		&:before{
+			.iconfont(17px);
+			top: 0;
+			width: auto;
+			height: auto;
+			border-radius: 0;
+			background-color: transparent;
+			.box-shadow(none);
+		}
+	}
+	.u-switch-text{
+		display: inline-block;
+		vertical-align: middle;
+	}
+	&.u-switch-on .u-switch-handle{
+		background-color: transparent;
+		&:before{
+			content: '\e6a9';
+			left: 0;
+		}
+	}
+	&.u-switch-off .u-switch-handle{
+		background-color: transparent;
+		&:before{
+			content: '\e6aa';
+			left: 0;
+		}
+	}
+}
+
 .u-button();
 
 .custom-button{
@@ -151,4 +246,172 @@
 
 .guide-dialog{
     .mask(1051,@CUSTOM-BACKDROP-BG);
-}
+    .guideStep1{
\ No newline at end of file
+        position: absolute;
+        top: 44px;
+        left: 0;
+        width: 100%;
+        .modeSelect:after{
+            content: '';
+            position: absolute;
+            top: 0;
+            left: 0;
+            right: 0;
+            width: 360px;
+            height: 100%;
+            margin: 0 auto;
+            border: 2px dashed;/*no*/
+            border-radius: 5px;
+        }
+        .guideStep1Tip{
+            .bgImg("guideArrow1.png");
+            background-position: 190px top;
+            background-repeat: no-repeat;
+            .background-size(24px 57px);
+            padding-top: 64px;
+            margin-top: -2px;
+            font-size: 19px;
+            font-family: tipFont;
+            text-align: center;                             	
+        }
+    }
+    .guideStep3{
+        position: absolute;
+        top: 147px;
+        left: 0;
+        width: 100%;
+        .guideStep3Tip{
+            .bgImg("guideArrow3.png");
+            background-position: 184px bottom;
+            background-repeat: no-repeat;
+            .background-size(16px 65px);
+            padding-bottom: 77px;
+            margin-bottom: -2px;
+            font-size: 19px;
+            font-family: tipFont;
+            text-align: center;     
+		    line-height: 23px; 
+		    span{
+		    	color: #00ffff;
+		    }       	
+        }
+        .guideStep3Cont{
+        	position: relative;
+        	padding-bottom: 7px;
+        	ul{
+        		li{
+				    font-size: 16px;
+				    padding: 22px 80px 11px 42px;
+				    position: relative;
+				    p{
+				    	&:nth-child(1){
+					    	float: left;
+					    	margin-right: 36px;
+					    	.text_oneRow_ellipsis();
+				    	}
+				    	&:nth-child(2){
+				    		overflow: hidden;
+				    		.text_oneRow_ellipsis();
+				    	}
+				    }
+				    &:before{
+				    	content: '\e6a9';
+				    	position: absolute;
+				    	bottom: 9px;
+				    	right: 42px;
+				    	.iconfont(25px);
+				    	color: #00ffff;
+				    }
+				    &:after{
+					    content: '';
+					    position: absolute;
+					    bottom: 0;
+					    left: 0;
+					    right: 0;
+					    height: 1px;/*no*/
+						.white_gradient_border();
+				    }
+				    &.active:before{
+				    	content: '\e6aa';
+				    }      			
+        		}
+        	}
+            //虚线框
+            &:after{
+                content: '';
+                position: absolute;
+                top: 0;
+                left: 0;
+                right: 0;
+                width: 360px;
+                height: 100%;
+                margin: 0 auto;
+                border: 2px dashed;/*no*/
+                border-radius: 5px;
+            }      	
+        }
+    }
+    .guideStep5{
+        position: absolute;
+        top: 248px;
+        left: 0;
+        width: 100%; 	
+    	.guideStep5Tip{
+            .bgImg("guideArrow4.png");
+            background-position: 164px bottom;
+            background-repeat: no-repeat;
+            .background-size(39px 179px);
+            padding-bottom: 188px;
+            margin-bottom: -3px;
+            font-size: 19px;
+            font-family: tipFont;
+            text-align: center;     
+		    line-height: 23px;     		
+    	}
+    	.guideStep5Cont{
+    		position: relative;
+    		p{
+    			text-align: center;
+    			position: relative;
+    			color: #00ffff;
+    			padding: 17px 0;
+				&:before{
+					content: '\e6a9';
+					.iconfont(17px);
+					display: inline-block;
+					vertical-align: middle;
+					margin-right: 9px;
+    			}
+			    &.active:before{
+			    	content: '\e6aa';
+			    }
+    		}
+            //虚线框
+            &:after{
+                content: '';
+                position: absolute;
+                top: 0;
+                left: 0;
+                right: 0;
+                width: 360px;
+                height: 100%;
+                margin: 0 auto;
+                border: 2px dashed;/*no*/
+                border-radius: 5px;
+            }        		
+    	}
+    }
+    .guideStep2,
+    .guideStep4,
+    .guideStep6{
+        position: absolute;
+        bottom: 65px; 
+        left: 0;
+        width: 100%;
+    }
+    .custom-dialog-button{
+        .button(200px);
+    }  
+}  
+
+.mediaPosition(true,true,true);   
\ No newline at end of file

web/lib/less/doorlockUsers/userList.less

@@ -103,6 +103,13 @@
     .listLoad();
 }
 
+.user-list-tip{
+    .transformV_center(left,0);
+    width: 100%;
+    text-align: center; 
+    .listNoCont("noUser.png");
+}
+
 //添加用户
 .inputBox(200px,40px,auto,"gray_addUser_icon.png",90px,65px 65px);
 
@@ -124,4 +131,6 @@
 .custom-button{
     .button();
     .buttonPosition();
-}
+}
\ No newline at end of file
+
+.mediaPosition();
\ No newline at end of file

web/lib/less/login/login.less

@@ -86,6 +86,8 @@
 	.button();
 }
 
+.mediaPosition(false,fasle,false,true);
+
 .link{
     width: 275px;
     margin: 5px auto;

web/lib/less/public/core.less

@@ -177,7 +177,50 @@ p{
     position: absolute;
     bottom: 65px; 
     left: 0;
-    right: 0;   
+    right: 0;  
+}
+
+.mediaPosition(@guideBtnBool: false,@guideStepBool:false,@switchBool:false,@loginBtnBool:false){
+    @media (min-width: 360px/*no*/) and(max-height: 570px/*no*/){
+        .custom-button{
+            bottom: 45px;
+        }
+
+        //指引蒙层
+        &when(@guideBtnBool){
+            .guide-dialog{
+                & .guideStep2, 
+                & .guideStep4, 
+                & .guideStep6{
+                    bottom: 45px;
+                }
+            }
+        }
+
+        &when(@guideStepBool){
+            .guide-dialog{
+                .guideStep5{
+                    top: 228px;
+                    .guideStep5Cont p{
+                        padding: 12px 0;
+                    }
+                }
+            }
+        }
+
+        &when(@switchBool){
+            .custom-setHijack-switch{
+                margin-top: 0;
+            }
+        }
+
+        &when(@loginBtnBool){
+            .custom-guide-button{
+                bottom: 45px;
+            }
+        }
+
+    }    
 }
 
 //自定义输入框组件
@@ -391,13 +434,13 @@ p{
 }
 
 //list 无内容
-.listNoCont(@fontSize:@LIST-NOCONTTIP-FONTSIZE,@bgSize:61px 61px,@paddingTop:88px){
-    color: @LIST-NOCONTTIP-COLOR;
-    font-size: @fontSize;
-    .bgImg("noCont.png");
+.listNoCont(@bgImg:"noCont.png",@bgSize:61px 61px,@fontSize:@LIST-NOCONTTIP-FONTSIZE,@paddingTop:88px){
+    .bgImg(@bgImg);
     background-position: top center;
     background-repeat: no-repeat;
     .background-size(@bgSize);
+    color: @LIST-NOCONTTIP-COLOR;
+    font-size: @fontSize;    
     padding-top: @paddingTop;
 }
 

web/lib/less/public/public.less

@@ -106,27 +106,24 @@
 		    height: 30px;
 		    border: 2px solid;/*no*/
 		    border-radius: 20px;
-		    background-clip: padding-box;
+		    .transition(background-color ease-in-out 0.2s,border ease-in-out 0.2s);
 		    &:before{
 			    content: '';
 			    position: absolute;
-			    z-index: 1;
+    			z-index: 1;
 			    top: -1px;/*no*/
 			    width: 28px;
     			height: 28px;
 			    .transition(left 0.2s ease-in-out);
-			    border-radius: 16px;
+			    border-radius: 50%;
 			    background-color: @SWITCH-COMPONENT-CIRCLE-BG;
-			    background-clip: padding-box;
 			    .box-shadow(0 2px 5px @SWITCH-COMPONENT-CIRCLE-BOXSHADOW);
 		    }
 		}
 		//开关 开
 		&.u-switch-on .u-switch-handle{
 		    border-color: @SWITCH-COMPONENT-ONSTATE-BORDER;
-		    .box-shadow(inset 0 0 0 16px @SWITCH-COMPONENT-ONSTATE-BOXSHADOW);
-		    background-color: @SWITCH-COMPONENT-ONSTATE-BG;
-		    .transition(border ease 0.4s,box-shadow ease 0.4s,background-color ease 1.2s);
+		    background-color: @SWITCH-COMPONENT-ONSTATE-BG;		    
 		    &:before{
 				left: 18px;
 		    }
@@ -134,9 +131,7 @@
 		//开关 关
 		&.u-switch-off .u-switch-handle{
 		    border-color: @SWITCH-COMPONENT-OFFSTATE-BORDER;
-		    .box-shadow(inset 0 0 0 0 @SWITCH-COMPONENT-OFFSTATE-BOXSHADOW);
 		    background-color: @SWITCH-COMPONENT-OFFSTATE-BG;
-		    .transition(border cubic-bezier(0, 0, 0, 1) 0.4s,box-shadow cubic-bezier(0, 0, 0, 1) 0.4s);
 		    &:before{
     			left: -1px;/*no*/
 		    }
@@ -358,7 +353,7 @@
 	    position: relative;
 	    overflow: auto;
 	} 	
-	.u-swipe-list-scroll .u-swipe-list-row{		
+	.u-swipe-list-scroll .u-swipe-list-row{
 	    position: relative;
 	    overflow: hidden;
 		.u-swipe-list-handle{

web/lib/less/public/variables.less

@@ -48,6 +48,7 @@
 @C_GRAY_4: #959595;
 @C_GRAY_5: #898989;
 @C_GRAY_6: #50515d;
+@C_GRAY_7: #C2C2C2;
 @OPACITY: transparent;
 @BLACK_OPACITY: fade(@C_BLACK,80%);
 @BLACK_OPACITY_1: fade(@C_BLACK,40%);
@@ -97,10 +98,8 @@
 @SWITCH-COMPONENT-CIRCLE-BG: @C_WHITE;    //开关
 @SWITCH-COMPONENT-CIRCLE-BOXSHADOW: @BLACK_OPACITY_1;
 @SWITCH-COMPONENT-ONSTATE-BORDER: @C_GREEN;    //开关 开
-@SWITCH-COMPONENT-ONSTATE-BOXSHADOW: @SWITCH-COMPONENT-ONSTATE-BORDER;
 @SWITCH-COMPONENT-ONSTATE-BG: @SWITCH-COMPONENT-ONSTATE-BORDER;
 @SWITCH-COMPONENT-OFFSTATE-BORDER: @C_GRAY;    //开关 关
-@SWITCH-COMPONENT-OFFSTATE-BOXSHADOW: @SWITCH-COMPONENT-OFFSTATE-BORDER;
 @SWITCH-COMPONENT-OFFSTATE-BG: @SWITCH-COMPONENT-OFFSTATE-BORDER;
 @SELECT-COMPONENT-ICON-FONTSIZE: @F_SIZE_20;    //选择列表
 @SELECT-COMPONENT-DEFAULTICON-FONTSIZE: @F_SIZE_25;
@@ -280,5 +279,15 @@
 //绑定开锁信息
 @UNLOCKINFO-TITLE-FONTSIZE: @F_SIZE_16;
 @UNLOCKINFO-TITLE-BOTTOMBORDER: @C_GRAY_6;
-@UNLOCKINFOLIST-TEXT-COLOR: @C_GRAY_3;
-@UNLOCKINFOLIST-TEXT-FONTSIZE: @F_SIZE_16;
+// @UNLOCKINFOLIST-TEXT-COLOR: @C_GRAY_3;
+// @UNLOCKINFOLIST-TEXT-FONTSIZE: @F_SIZE_16;
\ No newline at end of file
+@CUSTOM-UNLOCKINFO-SWIPELIST-COMPONENT-ROW-BG: @BODY-BG-COLOR;
+@CUSTOM-UNLOCKINFO-SWIPELIST-COMPONENT-TEXT-FONTSIZE: @F_SIZE_16;
+@CUSTOM-UNLOCKINFO-SWIPELIST-COMPONENT-BUTTON-COLOR: @C_BLUE_4;
+@CUSTOM-UNLOCKINFO-SWIPELIST-COMPONENT-BUTTON-FONTSIZE: @F_SIZE_16;
+@CUSTOM-UNLOCKINFO-SWIPELIST-COMPONENT-BUTTON-BG: @OPACITY;
+
+@CUSTOM-SWITCH-COMPONENT-ONSTATE-BORDER: @C_BLUE_4;
+@CUSTOM-SWITCH-COMPONENT-ONSTATE-BG: @C_BLUE_4;
+@CUSTOM-SWITCH-COMPONENT-OFFSTATE-BORDER: @C_GRAY_7;
+@CUSTOM-SWITCH-COMPONENT-OFFSTATE-BG: @OPACITY;
\ No newline at end of file

web/view/addDevice/addDevice.css

@@ -559,6 +559,59 @@ p {
   text-align: center;
 }
 
+.custom-device-list {
+  position: absolute;
+  top: 1.173rem;
+  bottom: 0;
+  left: 0;
+  height: auto;
+}
+
+.custom-device-list .u-list-scroll .u-list-row {
+  height: 2rem;
+  padding: 0 0.933rem 0 1.093rem;
+}
+
+.custom-device-list .u-list-scroll .u-list-row .u-list-left-image {
+  width: 0.64rem;
+  height: 1.44rem;
+  margin-right: 1.04rem;
+}
+
+.custom-device-list .u-list-scroll .u-list-row .u-list-title {
+  font-size: 0.427rem;
+  line-height: 0.533rem;
+}
+
+.custom-device-list .u-list-scroll .u-list-row .u-list-right-icon {
+  font-family: iconfont;
+}
+
+.custom-device-list .u-list-scroll .u-list-row:after {
+  background: -webkit-linear-gradient(left, #242635, #fff, #242635);
+  background: linear-gradient(to right, #242635, #fff, #242635);
+}
+
+.custom-device-list .u-list-load {
+  color: #00ffff;
+  font-size: 0.427rem;
+  -webkit-transform: scale(0.7);
+  transform: scale(0.7);
+  height: 0.933rem;
+  line-height: 0.933rem;
+}
+
+.custom-device-list .u-list-tip {
+  background-image: url("../../resources/image/noDevice.png");
+  background-position: top center;
+  background-repeat: no-repeat;
+  -webkit-background-size: 1.627rem 1.627rem;
+  background-size: 1.627rem 1.627rem;
+  color: #91929a;
+  font-size: 0.427rem;
+  padding-top: 2.347rem;
+}
+
 .wifiAddHelp {
   margin: 0.8rem 1.013rem 1.547rem;
 }
@@ -852,6 +905,12 @@ p {
   right: 0;
 }
 
+@media (min-width: 360px /*no*/) and (max-height: 570px /*no*/) {
+  .custom-button {
+    bottom: 1.2rem;
+  }
+}
+
 .u-comm-loading {
   position: fixed;
   top: 0;

web/view/bindUser/bindUser.css

@@ -706,6 +706,12 @@ p {
   right: 0;
 }
 
+@media (min-width: 360px /*no*/) and (max-height: 570px /*no*/) {
+  .custom-button {
+    bottom: 1.2rem;
+  }
+}
+
 .u-swipe-list {
   width: 100%;
   height: 100%;
@@ -898,12 +904,12 @@ p {
 }
 
 .custom-swipe-list .u-swipeList-tip {
-  color: #91929a;
-  font-size: 0.427rem;
   background-image: url("../../resources/image/noCont.png");
   background-position: top center;
   background-repeat: no-repeat;
   -webkit-background-size: 1.627rem 1.627rem;
   background-size: 1.627rem 1.627rem;
+  color: #91929a;
+  font-size: 0.427rem;
   padding-top: 2.347rem;
 }
\ No newline at end of file

web/view/device/recordList.css

@@ -542,7 +542,7 @@ p {
 
 .custom-list .u-list-scroll .u-list-row {
   height: 2rem;
-  padding: 0 1.093rem;
+  padding: 0 1.013rem 0 1.093rem;
 }
 
 .custom-list .u-list-scroll .u-list-row .u-list-left-image {
@@ -578,12 +578,12 @@ p {
 }
 
 .custom-list .u-list-tip {
-  color: #91929a;
-  font-size: 0.427rem;
   background-image: url("../../resources/image/noCont.png");
   background-position: top center;
   background-repeat: no-repeat;
   -webkit-background-size: 1.627rem 1.627rem;
   background-size: 1.627rem 1.627rem;
+  color: #91929a;
+  font-size: 0.427rem;
   padding-top: 2.347rem;
 }
\ No newline at end of file

web/view/doorlockManage/doorlockManage.css

@@ -522,6 +522,12 @@ p {
   color: #999;
 }
 
+@media (min-width: 360px /*no*/) and (max-height: 570px /*no*/) {
+  .custom-button {
+    bottom: 1.2rem;
+  }
+}
+
 .grid-list {
   position: absolute;
   top: 1.173rem;
@@ -650,13 +656,13 @@ p {
   transform: translateY(-50%);
   width: 100%;
   text-align: center;
-  color: #91929a;
-  font-size: 0.427rem;
   background-image: url("../../resources/image/noCont.png");
   background-position: top center;
   background-repeat: no-repeat;
   -webkit-background-size: 1.627rem 1.627rem;
   background-size: 1.627rem 1.627rem;
+  color: #91929a;
+  font-size: 0.427rem;
   padding-top: 2.347rem;
 }
 
@@ -814,16 +820,16 @@ p {
 
 .doorlockManage li {
   font-size: 0.427rem;
-  padding: 0.453rem 1.12rem;
+  padding: 0 1.12rem;
   position: relative;
-  overflow: hidden;
+  height: 1.467rem;
+  line-height: 1.467rem;
 }
 
 .doorlockManage li p {
   float: right;
   color: #A0A0A7;
   font-size: 0.32rem;
-  margin-top: 0.08rem;
 }
 
 .doorlockManage li.name {
@@ -870,7 +876,8 @@ p {
   height: 0.8rem;
   border: 2px solid;
   border-radius: 0.533rem;
-  background-clip: padding-box;
+  -webkit-transition: background-color ease-in-out 0.2s, border ease-in-out 0.2s;
+  transition: background-color ease-in-out 0.2s, border ease-in-out 0.2s;
 }
 
 .u-switch .u-switch-handle:before {
@@ -882,20 +889,15 @@ p {
   height: 0.747rem;
   -webkit-transition: left 0.2s ease-in-out;
   transition: left 0.2s ease-in-out;
-  border-radius: 0.427rem;
+  border-radius: 50%;
   background-color: #fff;
-  background-clip: padding-box;
   -webkit-box-shadow: 0 0.053rem 0.133rem rgba(0, 0, 0, 0.4);
   box-shadow: 0 0.053rem 0.133rem rgba(0, 0, 0, 0.4);
 }
 
 .u-switch.u-switch-on .u-switch-handle {
   border-color: #4cd964;
-  -webkit-box-shadow: inset 0 0 0 0.427rem #4cd964;
-  box-shadow: inset 0 0 0 0.427rem #4cd964;
   background-color: #4cd964;
-  -webkit-transition: border ease 0.4s, -webkit-box-shadow ease 0.4s, background-color ease 1.2s;
-  transition: border ease 0.4s, box-shadow ease 0.4s, background-color ease 1.2s;
 }
 
 .u-switch.u-switch-on .u-switch-handle:before {
@@ -904,11 +906,7 @@ p {
 
 .u-switch.u-switch-off .u-switch-handle {
   border-color: #bbb;
-  -webkit-box-shadow: inset 0 0 0 0 #bbb;
-  box-shadow: inset 0 0 0 0 #bbb;
   background-color: #bbb;
-  -webkit-transition: border cubic-bezier(0, 0, 0, 1) 0.4s, -webkit-box-shadow cubic-bezier(0, 0, 0, 1) 0.4s;
-  transition: border cubic-bezier(0, 0, 0, 1) 0.4s, box-shadow cubic-bezier(0, 0, 0, 1) 0.4s;
 }
 
 .u-switch.u-switch-off .u-switch-handle:before {
@@ -919,6 +917,43 @@ p {
   opacity: 0.3;
 }
 
+.custom-switch {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 3.36rem;
+  height: 100%;
+}
+
+.custom-switch .u-switch-handle {
+  width: 1.067rem;
+  height: 0.64rem;
+}
+
+.custom-switch .u-switch-handle:before {
+  top: 0;
+  width: 0.533rem;
+  height: 0.533rem;
+}
+
+.custom-switch.u-switch-on .u-switch-handle {
+  border-color: #00ffff;
+  background-color: #00ffff;
+}
+
+.custom-switch.u-switch-on .u-switch-handle:before {
+  left: 0.427rem;
+}
+
+.custom-switch.u-switch-off .u-switch-handle {
+  border-color: #C2C2C2;
+  background-color: transparent;
+}
+
+.custom-switch.u-switch-off .u-switch-handle:before {
+  left: 0;
+}
+
 .unbindState-dialog {
   position: fixed;
   top: 0;

web/view/doorlockUsers/doorlockUser.css

@@ -644,8 +644,8 @@ p {
 }
 
 .userInfoLink li:not(.userInfo) {
-  height: 1.387rem;
-  line-height: 1.387rem;
+  height: 1.467rem;
+  line-height: 1.467rem;
   position: relative;
   padding: 0 1.733rem 0 1.12rem;
   font-size: 0.427rem;
@@ -900,7 +900,7 @@ p {
 
 .guide-dialog .guideStep1 {
   position: absolute;
-  top: 1.733rem;
+  top: 1.173rem;
   left: 0;
   width: 100%;
 }
@@ -1006,7 +1006,7 @@ p {
 .guide-dialog .guideStep2,
 .guide-dialog .guideStep4 {
   position: absolute;
-  bottom: 4rem;
+  bottom: 1.733rem;
   left: 0;
   width: 100%;
 }
@@ -1031,7 +1031,7 @@ p {
 
 .guide-dialog .guideStep3 {
   position: absolute;
-  top: 3.707rem;
+  top: 3.2rem;
   left: 0;
   width: 100%;
 }
@@ -1082,4 +1082,16 @@ p {
   text-align: center;
   line-height: 0.64rem;
   margin-top: -0.053rem;
+}
+
+@media (min-width: 360px /*no*/) and (max-height: 570px /*no*/) {
+  .custom-button {
+    bottom: 1.2rem;
+  }
+
+  .guide-dialog .guideStep2,
+  .guide-dialog .guideStep4,
+  .guide-dialog .guideStep6 {
+    bottom: 1.2rem;
+  }
 }
\ No newline at end of file

web/view/doorlockUsers/inviteBind.js

@@ -3214,7 +3214,7 @@ function qrcodeButtonTap(self) {
                         console.log(qr.style);
                         setTimeout(function () {
                             self.setQrCodeDisabled(true);
-                        }, 1000 * 60 * 10);
+                        }, qrcode_timeout);
                     }
                 });
             } else {}

web/view/doorlockUsers/userList.css

@@ -581,6 +581,24 @@ p {
   line-height: 0.933rem;
 }
 
+.user-list-tip {
+  position: absolute;
+  top: 50%;
+  left: 0;
+  -webkit-transform: translateY(-50%);
+  transform: translateY(-50%);
+  width: 100%;
+  text-align: center;
+  background-image: url("../../resources/image/noUser.png");
+  background-position: top center;
+  background-repeat: no-repeat;
+  -webkit-background-size: 1.627rem 1.627rem;
+  background-size: 1.627rem 1.627rem;
+  color: #91929a;
+  font-size: 0.427rem;
+  padding-top: 2.347rem;
+}
+
 .inputBox {
   position: relative;
   margin: 0 1.12rem;
@@ -782,4 +800,10 @@ p {
 .custom-button.disabled {
   background-color: transparent;
   color: #999;
+}
+
+@media (min-width: 360px /*no*/) and (max-height: 570px /*no*/) {
+  .custom-button {
+    bottom: 1.2rem;
+  }
 }
\ No newline at end of file

web/view/login/login.css

@@ -776,6 +776,16 @@ p {
   color: #999;
 }
 
+@media (min-width: 360px /*no*/) and (max-height: 570px /*no*/) {
+  .custom-button {
+    bottom: 1.2rem;
+  }
+
+  .custom-guide-button {
+    bottom: 1.2rem;
+  }
+}
+
 .link {
   width: 7.333rem;
   margin: 0.133rem auto;