1129

dev/src/view/device/v_index.js

@@ -446,6 +446,7 @@ function getDevices(self){
 	    	if (window.iotDebug) {
                 iotDebug.upload(iot,'获取设备信息');
             }
+	    	console.log("124444444");
 	    	uPublic.openRequestErrorAlert(self);
 	    }
 	});

dev/src/view/device/v_opendoorRecord.js

@@ -165,8 +165,8 @@ function getPersonalHistory(self, id){
 //         	}
 //	    	if (window.iotDebug) {
 //              iotDebug.upload(iot,'获取个人开门历史记录');
-//          }
-           	uPublic.openRequestErrorAlert(self);
+//        }
+          uPublic.openRequestErrorAlert(self);
 		},
 		complete: () => {
 			uComponents.hideLoading(self);

web/lib/less/addDevice/addDevice.less

@@ -185,4 +185,13 @@
 
 .u-comm-loading();
 
-.custom-comm-loading();
\ No newline at end of file
+.custom-comm-loading();
+
+.content{
+    width: 100%;
+    position: absolute;
+    top: 1.173rem;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+}
\ No newline at end of file

web/view/addDevice/addDevice.css

@@ -1181,4 +1181,12 @@ p {
 
 .custom-comm-loading .u-comm-loading-button.disabled {
   background-color: transparent;
+}
+
+.content {
+  position: absolute;
+  top: 1.173rem;
+  bottom: 0;
+  left: 0;
+  width: 100%;
 }
\ No newline at end of file

web/view/addDevice/scanCodeAdd.html

@@ -25,7 +25,7 @@
             <v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>
             <p>{{ $t('title.scanCodeAdd') }}</p>
         </div>
-        <div class="content" id="bcid" style="width: 100%; height: 560px; margin-top: 40px;">   
+        <div class="content" id="bcid" >   
         </div>  
         <u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
         <u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>

web/view/device/device.css

@@ -1199,7 +1199,7 @@ p {
 }
 
 .u-marquee .u-marquee-text {
-  /*display: inline-block;*/
+  display: inline-block;
   line-height: 0.667rem;
 }
 
@@ -1248,7 +1248,7 @@ p {
   color: #91929a;
 }
 
-/*.active .u-marquee-text {
+.active .u-marquee-text {
   -webkit-animation: marquee 5s linear infinite;
   animation: marquee 5s linear infinite;
 }
@@ -1263,9 +1263,9 @@ p {
     -webkit-transform: translate(0,-100%);
     transform: translate(0,-100%);
   }
-}*/
+}
 
-/*@keyframes marquee {
+@keyframes marquee {
   from {
     -webkit-transform: translate(0,0.533rem);
     transform: translate(0,0.533rem);
@@ -1275,7 +1275,7 @@ p {
     -webkit-transform: translate(0,-100%);
     transform: translate(0,-100%);
   }
-}*/
+}
 
 .deviceHandle {
   position: absolute;

web/view/device/index.js

@@ -24298,6 +24298,7 @@ function getDevices(self) {
       if (window.iotDebug) {
         iotDebug.upload(_public.iot, '获取设备信息');
       }
+      console.log("124444444");
       _public.uPublic.openRequestErrorAlert(self);
     }
   });

web/view/device/opendoorRecord.js

@@ -16098,7 +16098,7 @@ function getPersonalHistory(self, id) {
 			//         	}
 			//	    	if (window.iotDebug) {
 			//              iotDebug.upload(iot,'获取个人开门历史记录');
-			//          }
+			//        }
 			_public.uPublic.openRequestErrorAlert(self);
 		},
 		complete: function complete() {

web/view/doorlockManage/doorlockManage.css

@@ -849,10 +849,6 @@ p {
   line-height: 1;
 }
 
-.nameDisabled:before{
-	display: none;
-}
-
 .doorlockManage li:after {
   content: '';
   position: absolute;
@@ -999,65 +995,4 @@ p {
   width: 1.733rem;
   height: 1.733rem;
   margin-bottom: 0.373rem;
-}
-
-.custom-isClearSwitch-switch {
-  width: 5.333rem;
-  height: auto;
-  text-align: center;
-  color: #00ffff;
-  margin: 0.72rem auto 0;
-  padding: 0.267rem 0;
-}
-
-.custom-isClearSwitch-switch .u-switch-handle {
-  position: relative;
-  top: auto;
-  left: auto;
-  -webkit-transform: none;
-  transform: none;
-  width: 0.453rem;
-  height: 0.453rem;
-  border: 0;
-  border-radius: 0;
-  display: inline-block;
-  vertical-align: middle;
-  margin-right: 0.16rem;
-}
-
-.custom-isClearSwitch-switch .u-switch-handle:before {
-  font-family: iconfont;
-  font-size: 0.453rem;
-  -webkit-font-smoothing: antialiased;
-  line-height: 1;
-  top: 0;
-  width: auto;
-  height: auto;
-  border-radius: 0;
-  background-color: transparent;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-}
-
-.custom-isClearSwitch-switch .u-switch-text {
-  display: inline-block;
-  vertical-align: middle;
-}
-
-.custom-isClearSwitch-switch.u-switch-on .u-switch-handle {
-  background-color: transparent;
-}
-
-.custom-isClearSwitch-switch.u-switch-on .u-switch-handle:before {
-	content: '\e6aa';
-  left: 0;
-}
-
-.custom-isClearSwitch-switch.u-switch-off .u-switch-handle {
-  background-color: transparent;
-}
-
-.custom-isClearSwitch-switch.u-switch-off .u-switch-handle:before {
-  content: '\e6a9';
-  left: 0;
 }
\ No newline at end of file

web/view/doorlockUsers/doorlockUser.css

@@ -723,10 +723,6 @@ p {
   line-height: 1;
 }
 
-.userInfo-title-disabled:after {
-	display: none;
-}
-
 .userInfoLink li.userInfo .userInfo-subtitle {
   position: relative;
 }

web/view/doorlockUsers/unlockInfo.css

@@ -993,7 +993,7 @@ p {
 }
 
 .custom-setHijack-switch.u-switch-on .u-switch-handle:before {
-	content: '\e6aa';
+  content: '\e6a9';
   left: 0;
 }
 
@@ -1002,7 +1002,7 @@ p {
 }
 
 .custom-setHijack-switch.u-switch-off .u-switch-handle:before {
-  content: '\e6a9';
+  content: '\e6aa';
   left: 0;
 }