Merge remote-tracking branch 'origin/v3' into v3

src/views/enforce/noScanFilter.vue

@@ -231,11 +231,10 @@ const props = defineProps( {
 }
 
 .popup-content {
-  margin: 0.25rem 3% 0;
+  margin: 0.25rem 0 0 3%;
   padding-bottom: 3rem;
   width: 94%;
-  height: calc(100% - 1.6rem);
-  overflow-y: auto;
+  height: calc(100% - 1rem);
   font-size: 0.37rem;
 }
 
@@ -244,7 +243,7 @@ const props = defineProps( {
   align-items: center;
   justify-content: space-between;
   margin: 1%;
-  width: 96%;
+  width: 97%;
   height: 1.25rem;
   font-size: 0.37rem;
 }
@@ -332,7 +331,9 @@ const props = defineProps( {
 
 .search-result {
   width: 100%;
+  height: calc(100% - 5rem);
   padding-bottom: 2rem;
+  overflow: auto;
 }
 
 .case-item {