Merge branch 'main' of http://git.wdklian.com/allen/uni_mattress

sleep/pages/alertSetting/alertSetting.vue

@@ -459,7 +459,6 @@ export default {
     background-image: url('http://wdklmall.oss-cn-shenzhen.aliyuncs.com/mallgoods/goods/3C62AD507C8345D49AEB2AAD8F7584BB.png');
     background-size: 100% 100%;
     background-repeat: no-repeat;
-	height: 100%;
 
     .section_2 {
       padding-bottom: 1.25rem;

sleep/pages/report/report.vue

@@ -1311,7 +1311,7 @@
 	  width: 100%;
 	  overflow-y: auto;
 	  overflow-x: hidden;
-	  height: 100%;
+	  height: auto!important;
 
 	  .group {
 	    overflow-y: auto;