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 @@
{{ data.dateSearch }} -
+
创建
-
-
- - - - -

{{ - item.enterpriseName }}

+
+
+ + + + +

{{item.enterpriseName }}

-

预警原因: {{ +

预警原因: {{ item.warningCause }}

-

预警级别: +

预警级别: {{ item.warningLevel==1?"Ⅰ级 (特别严重)":item.warningLevel==2?"Ⅱ级 (严重)": item.warningLevel==3?"Ⅲ级 (较重)": "Ⅳ (一般)"}}

@@ -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;*/ + } 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 @@

执法时间:{{ item.enforcementTime }} - - 编辑 - - 未扫码

@@ -78,6 +73,9 @@

企业名称: {{ item.enterpriseName }}

+
+ 编辑 +
@@ -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 @@