Merge branch 'jianxiang' into 'debug'

Jianxiang

See merge request iot-project-js/doorlock!39

dev/config/lang.js

@@ -2,7 +2,7 @@ const path = require('path');
 const srcPath = path.join(__dirname,"..","src");
 const outputPath = "../resources/lang/";
 module.exports = {
-	lang:["zh","en"],
+	lang:["zh"],
 	group:srcPath,
     output:outputPath
 };
\ No newline at end of file

web/lib/less/device/device.less

@@ -188,11 +188,11 @@
     .bgImg("red_securityAlarm_icon.png");
     &:before{
         content: '';
-        width: 100%;
-        height: 100%;
         display: block;
         position: absolute;
-        .bgImgSize(40px,40px,"red_securityAlarmLight_icon.png",center,cover);
+        top: 0;
+        left: 0;
+        .bgImgSize(100%,100%,"red_securityAlarmLight_icon.png",center,cover);
         .animation(alarmLight 2.5s linear infinite);
     }
 }

web/view/device/device.css

@@ -1143,12 +1143,12 @@ p {
 
 .securityAlarm_img:before {
   content: '';
-  width: 100%;
-  height: 100%;
   display: block;
   position: absolute;
-  width: 1.067rem;
-  height: 1.067rem;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
   background: url("../../resources/image/red_securityAlarmLight_icon.png") no-repeat center;
   -webkit-background-size: cover;
   background-size: cover;