From e54611272728bd0731623b69d2b9cdff69f7e6a1 Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Wed, 12 Jun 2024 17:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8Fbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Shop.vue                            |  4 +-
 src/views/administrative/appointmentList.vue  |  8 +--
 src/views/common/analyse.vue                  |  2 +-
 src/views/enforce/earlyWarning.vue            | 54 +++++++++++++------
 src/views/enforce/enforceNotice.vue           |  6 +--
 src/views/enforce/enforcementPlan.vue         |  4 +-
 src/views/enforce/enterpriseBaseInfo.vue      |  2 +-
 src/views/enforce/enterpriseWarningInfo.vue   |  6 +--
 src/views/enforce/historyCheck.vue            | 48 +++++++++++++----
 src/views/enforce/noScan.vue                  |  5 +-
 src/views/enterprise/complaintList.vue        |  6 +--
 .../enterprise/enterpriseInspectionList.vue   |  6 +--
 src/views/enterprise/qrCodeHistory.vue        |  4 +-
 src/views/enterprise/registrationDetail.vue   |  8 +--
 src/views/enterprise/registrationEdit.vue     |  2 +-
 src/views/enterprise/registrationList.vue     |  6 +--
 .../enterprise/registrationSelectList.vue     |  4 +-
 17 files changed, 113 insertions(+), 62 deletions(-)

diff --git a/src/views/Shop.vue b/src/views/Shop.vue
index 3f7461f..6ca1319 100644
--- a/src/views/Shop.vue
+++ b/src/views/Shop.vue
@@ -256,7 +256,7 @@ onDeactivated(() => {
 		.goods_box {
 			display: flex;
 			background-color: #fff;
-			margin: 6px;
+			margin: 10px;
 			border-radius: 10px;
 
 			.swipe_cell {
@@ -277,7 +277,7 @@ onDeactivated(() => {
 	}
 
 	.shop_footer_body {
-		height: 101px;
+		//height: 101px;
 		position: relative;
 		.footer-one-btn {
 			height: 50px;
diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue
index c560f6e..5419675 100644
--- a/src/views/administrative/appointmentList.vue
+++ b/src/views/administrative/appointmentList.vue
@@ -27,7 +27,7 @@
         </div>
         <div class="search-button-date">
             <span class="date-select" v-show="data.dateShow" @click="selectDate">{{  data.dateSearch }}</span>
-            <div style="border-color: black;" class="van-hairline--bottom"></div>
+            <div class="van-hairline--bottom"></div>
             <van-button class="search-button" @click="goAdd" type="primary" size="mini">创建</van-button>
             <van-popup v-model:show="data.showDatePicker" position="bottom">
                 <van-date-picker
@@ -371,7 +371,7 @@
             .goods_box {
                 display: flex;
                 background-color: #fff;
-                margin: 6px;
+                margin: 10px;
                 border-radius: 10px;
 
                 .swipe_cell {
@@ -412,7 +412,7 @@
         }
 
         .shop_footer_body {
-            height: 101px;
+            //height: 101px;
             position: relative;
 
             .footer-one-btn {
@@ -476,7 +476,7 @@
     }
 
     /deep/ .card_box_span:nth-child(2) p {
-        font-size: 0.4rem;
+        font-size: 0.45rem;
         font-weight: bold;
         white-space: nowrap;
         overflow: hidden;
diff --git a/src/views/common/analyse.vue b/src/views/common/analyse.vue
index db2f63d..a5fb912 100644
--- a/src/views/common/analyse.vue
+++ b/src/views/common/analyse.vue
@@ -505,7 +505,7 @@
 
         .title {
             margin: 2% 2.5%;
-            font-size: 0.4rem;
+            font-size: 0.45rem;
             font-weight: 600;
         }
     }
diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue
index f0bd61f..1307f8e 100644
--- a/src/views/enforce/earlyWarning.vue
+++ b/src/views/enforce/earlyWarning.vue
@@ -47,24 +47,20 @@
                                         </p>
                                     </div>
                                     <!--									 <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" />-->
-                                    <div style="border-color: aqua; border: 2px;" class="van-hairline--bottom"></div>
-                                    <div class="card_box_span" style="padding-left: 1%;">
-                                        <van-icon v-if="item.warningLevel==1" name="warning" color="red" size="30"
-                                                  style="margin-top: 2%;"/>
-                                        <van-icon v-else-if="item.warningLevel==2" name="warning" color="#ed6a0c"
-                                                  size="30" style="margin-top: 2%;"/>
-                                        <van-icon v-else-if="item.warningLevel==3" name="warning" color="#fed200"
-                                                  size="30" style="margin-top: 2%;"/>
-                                        <van-icon v-else name="info" size="30" color="#fed200" style="margin-top: 2%;"/>
-                                        <p style="padding-left: 15px; font-size: 16px;font-weight: bold;">{{
-                                            item.enterpriseName }}</p>
+                                    <div class="van-hairline--bottom"></div>
+                                    <div class="card_box_span card-title">
+                                        <van-icon v-if="item.warningLevel==1" name="warning" color="red" />
+                                        <van-icon v-else-if="item.warningLevel==2" name="warning" color="#ed6a0c" />
+                                        <van-icon v-else-if="item.warningLevel==3" name="warning" color="#fed200" />
+                                        <van-icon v-else name="info" color="#fed200" />
+                                        <p>{{item.enterpriseName }}</p>
                                     </div>
                                     <div class="card_box_span">
-                                        <p style="padding-left: 30px;"><span class="card_box_label">预警原因：</span> {{
+                                        <p style="padding-left: 0.9rem;"><span class="card_box_label">预警原因：</span> {{
                                             item.warningCause }}</p>
                                     </div>
                                     <div class="card_box_span">
-                                        <p style="padding-left: 30px;"><span class="card_box_label">预警级别：</span>
+                                        <p style="padding-left: 0.9rem;"><span class="card_box_label">预警级别：</span>
                                             {{ item.warningLevel==1?"Ⅰ级 (特别严重)":item.warningLevel==2?"Ⅱ级 (严重)":
                                             item.warningLevel==3?"Ⅲ级 (较重)": "Ⅳ (一般)"}}
                                         </p>
@@ -294,7 +290,7 @@
             .goods_box {
                 display: flex;
                 background-color: #fff;
-                margin: 6px;
+                margin: 10px;
                 border-radius: 10px;
 
                 .swipe_cell {
@@ -316,8 +312,8 @@
                     .card_box_span {
                         display: flex;
                         align-items: center;
-                        margin: 2% 0;
-                        padding-left: 3%;
+                        margin: 1% 0;
+                        padding: 0 3%;
                         font-size: 0.38rem;
                         line-height: 1.5;
 
@@ -335,7 +331,7 @@
         }
 
         .shop_footer_body {
-            height: 101px;
+            //height: 101px;
             position: relative;
 
             .footer-one-btn {
@@ -387,4 +383,28 @@
         }
     }
 
+    /deep/ .van-hairline--bottom {
+      margin: -1% 0 3% 0;
+      height: 0;
+      background-color: transparent;
+      border: 1px;
+    }
+
+    /deep/ .card_box .card_box_span:first-child {
+      color: #c1bfbf;
+    }
+
+    .card-title i {
+      font-size: 0.75rem;
+      width: 0.9rem;
+    }
+
+  .card-title p {
+      width: calc(94% - 1rem);
+      font-size: 0.45rem;
+      font-weight: bold;
+      /*white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;*/
+    }
 </style>
diff --git a/src/views/enforce/enforceNotice.vue b/src/views/enforce/enforceNotice.vue
index d99ae3d..a5aea42 100644
--- a/src/views/enforce/enforceNotice.vue
+++ b/src/views/enforce/enforceNotice.vue
@@ -269,7 +269,7 @@ const toPdfView = (url) =>{
 		.goods_box {
 			display: flex;
 			background-color: #fff;
-			margin: 6px;
+			margin: 10px;
 			border-radius: 10px;
 
 			.swipe_cell {
@@ -307,7 +307,7 @@ const toPdfView = (url) =>{
 	}
 
 	.shop_footer_body {
-		height: 101px;
+		//height: 101px;
 		position: relative;
 		.footer-one-btn {
 			height: 50px;
@@ -394,7 +394,7 @@ const toPdfView = (url) =>{
 .item-title, .item-text {
   float: left;
   width: 100%;
-  font-size: 0.4rem;
+  font-size: 0.45rem;
   font-weight: 600;
   line-height: 0.75rem;
   white-space: nowrap;
diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue
index eee6acf..575739b 100644
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@@ -323,7 +323,7 @@
             .goods_box {
                 display: flex;
                 background-color: #fff;
-                margin: 6px;
+                margin: 10px;
                 border-radius: 10px;
 
                 .swipe_cell {
@@ -364,7 +364,7 @@
         }
 
         .shop_footer_body {
-            height: 101px;
+            //height: 101px;
             position: relative;
 
             .footer-one-btn {
diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index 6008378..10bc1e8 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -451,7 +451,7 @@
     .goods_box {
         display: flex;
         background-color: #fff;
-        margin: 6px;
+        margin: 10px;
         border-radius: 10px;
 
         .swipe_cell {
diff --git a/src/views/enforce/enterpriseWarningInfo.vue b/src/views/enforce/enterpriseWarningInfo.vue
index ac1b3ec..da1ee31 100644
--- a/src/views/enforce/enterpriseWarningInfo.vue
+++ b/src/views/enforce/enterpriseWarningInfo.vue
@@ -274,7 +274,7 @@
 			.goods_box {
 				display: flex;
 				background-color: #fff;
-				margin: 6px;
+				margin: 10px;
 				border-radius: 10px;
 
 				.swipe_cell {
@@ -312,7 +312,7 @@
 		}
 
 		.shop_footer_body {
-			height: 101px;
+			//height: 101px;
 			position: relative;
 			.footer-one-btn {
 				height: 50px;
@@ -375,7 +375,7 @@
 
   /deep/ .card_box_span p.warn-name {
     margin: 2% 2% 0;
-    font-size: 0.4rem;
+    font-size: 0.45rem;
     font-weight: bold;
   }
 
diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue
index 196e14b..9979d65 100644
--- a/src/views/enforce/historyCheck.vue
+++ b/src/views/enforce/historyCheck.vue
@@ -53,11 +53,6 @@
                                 <div class="card_box">
                                     <div class="card_box_span">
                                         <p>执法时间：{{ item.enforcementTime }}
-                                            <span class="card_box_action" v-if="item.isSubmit == 0">
-                     							<van-button @click="toEditView(item.id)" type="primary"
-                                                            size="mini">编辑</van-button>
-
-                   						</span>
                                         <span v-if="null != item.enforce" class="remsty">未扫码</span>
                                         </p>
                                     </div>
@@ -78,6 +73,9 @@
                                             <p><span class="card_box_label">企业名称：</span> {{ item.enterpriseName }}</p>
                                         </div>
                                     </div>
+                                    <div class="card_box_action" v-if="item.isSubmit == 0">
+                     							       <span><van-button @click="toEditView(item.id)" type="primary" size="mini">编辑</van-button></span>
+                                    </div>
                                 </div>
                             </van-swipe-cell>
                         </div>
@@ -352,7 +350,7 @@
             .goods_box {
                 display: flex;
                 background-color: #fff;
-                margin: 6px;
+                margin: 10px;
                 border-radius: 10px;
 
                 .swipe_cell {
@@ -384,16 +382,16 @@
                         }
                     }
 
-                    .card_box_action {
+                    /*.card_box_action {
                         position: absolute;
                         right: 4%;
-                    }
+                    }*/
                 }
             }
         }
 
         .shop_footer_body {
-            height: 101px;
+            //height: 101px;
             position: relative;
 
             .footer-one-btn {
@@ -403,6 +401,36 @@
         }
     }
 
+    .shop .shop-center .goods_box .card_box .card_box_action {
+      /*position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 1;
+      width: 100%;
+      height: 100%;
+      background-color: rgba(46, 119, 249, .15);
+      border-radius: 10px;*/
+    }
+
+    .shop .shop-center .goods_box .card_box .card_box_action span {
+      position: absolute;
+      right: 0.2rem;
+      top: 1.2rem;
+      width: 1.25rem;
+      height: 0.6rem;
+      background: #1989fa;
+      border-radius: 30px;
+      box-shadow: 0 0 5px rgba(5, 99, 193, .3)
+    }
+
+    .shop .shop-center .goods_box .card_box .card_box_action span button {
+      position: relative;
+      top: -0.25rem;
+      left: 0.2rem;
+      height: 70%;
+      font-size: 0.3rem;
+    }
+
     .search-button-list {
         height: 3%;
         display: flex;
@@ -457,7 +485,7 @@
     }
 
     /deep/ .card_box_span:nth-child(2) p {
-        font-size: 0.4rem;
+        font-size: 0.45rem;
         font-weight: bold;
         white-space: nowrap;
         overflow: hidden;
diff --git a/src/views/enforce/noScan.vue b/src/views/enforce/noScan.vue
index 0fdaf85..cd94f22 100644
--- a/src/views/enforce/noScan.vue
+++ b/src/views/enforce/noScan.vue
@@ -155,6 +155,7 @@
         margin: 0;
         width: 20%;
         height: 0.88rem;
+        border-radius: 0.15rem;
     }
     .searchbox {
         margin: 2% 3%;
@@ -166,7 +167,7 @@
         background-size: auto 50%;
         box-sizing: border-box;
         border: 1px solid rgba(0, 0, 0, .05);
-        border-radius: 0.5rem;
+        border-radius: 0.15rem;
         color: #999999;
         outline: none;
     }
@@ -175,7 +176,9 @@
         margin: 1% 3%;
         padding-bottom: 2rem;
         width: 94%;
+        height: calc(100% - 4rem);
         background: #fff;
+        overflow-y: auto;
     }
 
     .case-item {
diff --git a/src/views/enterprise/complaintList.vue b/src/views/enterprise/complaintList.vue
index 053ae8a..be2dde7 100644
--- a/src/views/enterprise/complaintList.vue
+++ b/src/views/enterprise/complaintList.vue
@@ -345,7 +345,7 @@ const searchComplaint = (val) =>{
 		.goods_box {
 			display: flex;
 			background-color: #fff;
-			margin: 6px;
+			margin: 10px;
 			border-radius: 10px;
 
 			.swipe_cell {
@@ -383,7 +383,7 @@ const searchComplaint = (val) =>{
 	}
 
 	.shop_footer_body {
-		height: 101px;
+		//height: 101px;
 		position: relative;
 		.footer-one-btn {
 			height: 50px;
@@ -436,7 +436,7 @@ const searchComplaint = (val) =>{
 }
 
 /deep/ .card_box_span:nth-child(2) p {
-  font-size: 0.4rem;
+  font-size: 0.45rem;
   font-weight: bold;
   white-space: nowrap;
   overflow: hidden;
diff --git a/src/views/enterprise/enterpriseInspectionList.vue b/src/views/enterprise/enterpriseInspectionList.vue
index 66c994b..97af47d 100644
--- a/src/views/enterprise/enterpriseInspectionList.vue
+++ b/src/views/enterprise/enterpriseInspectionList.vue
@@ -353,7 +353,7 @@
             .goods_box {
                 display: flex;
                 background-color: #fff;
-                margin: 6px;
+                margin: 10px;
                 border-radius: 10px;
 
                 .swipe_cell {
@@ -394,7 +394,7 @@
         }
 
         .shop_footer_body {
-            height: 101px;
+            //height: 101px;
             position: relative;
 
             .footer-one-btn {
@@ -458,7 +458,7 @@
     }
 
     /deep/ .card_box_span:nth-child(2) p {
-        font-size: 0.4rem;
+        font-size: 0.45rem;
         font-weight: bold;
         white-space: nowrap;
         overflow: hidden;
diff --git a/src/views/enterprise/qrCodeHistory.vue b/src/views/enterprise/qrCodeHistory.vue
index 649bdb9..273d1c4 100644
--- a/src/views/enterprise/qrCodeHistory.vue
+++ b/src/views/enterprise/qrCodeHistory.vue
@@ -318,7 +318,7 @@ const cancelSelectDate = () =>{
 		.goods_box {
 			display: flex;
 			background-color: #fff;
-			margin: 6px;
+			margin: 10px;
 			border-radius: 10px;
 
 			.swipe_cell {
@@ -356,7 +356,7 @@ const cancelSelectDate = () =>{
 	}
 
 	.shop_footer_body {
-		height: 101px;
+		//height: 101px;
 		position: relative;
 		.footer-one-btn {
 			height: 50px;
diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue
index da6b9c1..eb9bdad 100644
--- a/src/views/enterprise/registrationDetail.vue
+++ b/src/views/enterprise/registrationDetail.vue
@@ -1,9 +1,9 @@
 <template>
 	<div class="address_edit">
 		<!-- 导航栏 -->
-		<div class="header_body">
-			<!--<header-nav :slefBack="true" @goBack="goBack" :titelText="`执法信息详情`"></header-nav>-->
-		</div>
+    <!--<div class="header_body">
+      <header-nav :slefBack="true" @goBack="goBack" :titelText="`执法信息详情`"></header-nav>
+		</div>-->
 		<!-- 中间 -->
 		<div class="warp_body">
             <van-form @failed="onFailed" @submit="submit">
@@ -361,7 +361,7 @@ const reciveData2 = (item) =>{
 }
 
 .warp_body {
-    margin: 0 3%;
+    margin: 3%;
     padding-bottom: 3rem;
     width: 94%;
     height: 100%;
diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue
index 776d3a8..99d34e4 100644
--- a/src/views/enterprise/registrationEdit.vue
+++ b/src/views/enterprise/registrationEdit.vue
@@ -468,7 +468,7 @@
     }
 
     .warp_body {
-        margin: 0 3%;
+        margin: 3%;
         padding-bottom: 3rem;
         width: 94%;
         height: 100%;
diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue
index 567a4da..dde8047 100644
--- a/src/views/enterprise/registrationList.vue
+++ b/src/views/enterprise/registrationList.vue
@@ -376,7 +376,7 @@
             .goods_box {
                 display: flex;
                 background-color: #fff;
-                margin: 6px;
+                margin: 10px;
                 border-radius: 10px;
 
                 .swipe_cell {
@@ -417,7 +417,7 @@
         }
 
         .shop_footer_body {
-            height: 101px;
+            //height: 101px;
             position: relative;
 
             .footer-one-btn {
@@ -488,7 +488,7 @@
     }
 
     /deep/ .card_box_span:nth-child(2) p {
-        font-size: 0.4rem;
+        font-size: 0.45rem;
         font-weight: bold;
         white-space: nowrap;
         overflow: hidden;
diff --git a/src/views/enterprise/registrationSelectList.vue b/src/views/enterprise/registrationSelectList.vue
index 0cb918b..179b09f 100644
--- a/src/views/enterprise/registrationSelectList.vue
+++ b/src/views/enterprise/registrationSelectList.vue
@@ -315,7 +315,7 @@ const oneCheckbox = (item) => {
 		.goods_box {
 			display: flex;
 			background-color: #fff;
-			margin: 6px;
+			margin: 10px;
 			border-radius: 10px;
 
 			.swipe_cell {
@@ -353,7 +353,7 @@ const oneCheckbox = (item) => {
 	}
 
 	.shop_footer_body {
-		height: 101px;
+		//height: 101px;
 		position: relative;
 		.footer-one-btn {
 			height: 50px;