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

src/assets/style/index.less

@@ -26,7 +26,7 @@ html,body,#app{
 }
 
 .footer_body{
-    height: 2.0rem;
+    height: 1.5rem;
 }
 
 .no_data{

src/components/footer-enforcement-nav/index.vue

@@ -44,13 +44,16 @@ let data = reactive({
 
 </script>
 <style lang="less" scoped>
-.footer_nav{
+.footer_body {
-	height: 2.0rem;
+  height: 1.5rem;
+}
+.footer_nav {
+	height: 1.5rem;
 	background-color: #fff;
 	box-shadow: 0 0 0.1rem #e7e7e7;
-	.footer-bar{
+	.footer-bar {
 		position: absolute;
-		bottom: 0.5rem;
+		bottom: 0.2rem;
 	}
 }
 

src/components/footer-nav/index.vue

@@ -29,15 +29,15 @@ let data = reactive({
 </script>
 <style lang="less" scoped>
 	.footer_body{
-		height: 2rem;
+		height: 1.5rem;
 	}
 	.footer_nav{
-		height: 2.0rem;
+		height: 1.5rem;
 		background-color: #fff;
 		box-shadow: 0 0 0.1rem #e7e7e7;
 		.footer-bar{
 			position: absolute;
-			bottom: 0.5rem;
+			bottom: 0.2rem;
 		}
 	}
 

src/views/enforce/noScanFilter.vue

@@ -288,7 +288,7 @@ const props = defineProps( {
 
 .item-btn {
   display: inline-block;
-  margin: 0 0.3rem 0.2rem 0.1rem;
+  margin: 0.1rem 0.3rem 0.2rem 0.1rem;
   padding: 0.2rem 0.3rem;
   background-color: #f2f3f4;
   color: #999;

src/views/enforce/sign.vue

@@ -507,7 +507,7 @@
         initCheckCategory();
 
         // 数据填充
-        dataFillIn();
+        // dataFillIn();
 
         //查询企业信息
         getEnterpriseInformation(route?.query?.enterpriseNumber, success => {
@@ -926,6 +926,7 @@
         data.popupVisible = false;
         data.popupVisible2 = false;
         data.popupVisibleqz = false;
+        data.popupCp = false;
         data.lawChecked = false;
         data.deptChecked = false;
     }