From 7da8f5dc8cf2a5e779aaf126459019b7e2651768 Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Thu, 12 Sep 2024 11:58:21 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/style/index.less                   |  6 +-----
 .../footer-enforcement-nav/index.vue          | 19 ++-----------------
 src/components/footer-nav/index.vue           | 19 ++-----------------
 src/config/env.js                             |  4 +++-
 src/views/Home.vue                            |  1 -
 src/views/HomeWx.vue                          |  1 -
 .../administrative/appointmentDetail.vue      |  2 +-
 src/views/enforce/enforcementPlanAdd.vue      |  2 +-
 src/views/enforce/enforcementPlanDetailed.vue |  6 +++++-
 src/views/enforce/enterpriseBaseInfo.vue      |  2 +-
 src/views/enforceHome.vue                     |  3 +--
 .../enterprise/enterpriseInspectionDetail.vue |  2 +-
 src/views/enterprise/register.vue             |  2 +-
 src/views/enterprise/registrationDetail.vue   |  2 +-
 14 files changed, 20 insertions(+), 51 deletions(-)

diff --git a/src/assets/style/index.less b/src/assets/style/index.less
index 73ab48f..9e4a926 100644
--- a/src/assets/style/index.less
+++ b/src/assets/style/index.less
@@ -26,11 +26,7 @@ html,body,#app{
 }
 
 .footer_body{
-    height: 2rem;
-    //height: 50px;
-    //padding-bottom: constant(safe-area-inset-bottom);
-    //padding-bottom: env(safe-area-inset-bottom);
-    //box-sizing: content-box;
+    height: 2.0rem;
 }
 
 .no_data{
diff --git a/src/components/footer-enforcement-nav/index.vue b/src/components/footer-enforcement-nav/index.vue
index fb84367..abc9689 100644
--- a/src/components/footer-enforcement-nav/index.vue
+++ b/src/components/footer-enforcement-nav/index.vue
@@ -44,28 +44,13 @@ let data = reactive({
 
 </script>
 <style lang="less" scoped>
-/*.footer_nav{*/
-/*  height: 50px;*/
-/*  padding-bottom: constant(safe-area-inset-bottom);*/
-/*  padding-bottom: env(safe-area-inset-bottom);*/
-/*  box-sizing: content-box;*/
-/*  background-color: #fff;*/
-/*  !*box-shadow: 0 0 0.27rem #e5e5e5;*!*/
-/*  .footer-bar{*/
-/*    position: absolute;*/
-/*    bottom: constant(safe-area-inset-bottom);*/
-/*    bottom: env(safe-area-inset-bottom);*/
-/*  }*/
-/*}*/
-
-
 .footer_nav{
 	height: 2.0rem;
 	background-color: #fff;
-	/*box-shadow: 0 0 0.27rem #e5e5e5;*/
+	box-shadow: 0 0 0.1rem #e7e7e7;
 	.footer-bar{
 		position: absolute;
-		/*bottom: 0.6rem;*/
+		bottom: 0.5rem;
 	}
 }
 
diff --git a/src/components/footer-nav/index.vue b/src/components/footer-nav/index.vue
index c81164e..b25edd6 100644
--- a/src/components/footer-nav/index.vue
+++ b/src/components/footer-nav/index.vue
@@ -28,31 +28,16 @@ let data = reactive({
 
 </script>
 <style lang="less" scoped>
-	/*.footer_nav{*/
-	/*	heighheight: 50px;*/
-    /*padding-bottom: constant(safe-area-inset-bottom);*/
-    /*padding-bottom: env(safe-area-inset-bottom);*/
-    /*box-sizing: content-box;*/
-    /*background-color: #fff;*/
-    /*!*box-shadow: 0 0 0.27rem #e5e5e5;*!*/
-	/*	.footer-bar{*/
-	/*		position: absolute;*/
-    /*  bottom: constant(safe-area-inset-bottom);*/
-    /*  bottom: env(safe-area-inset-bottom);*/
-	/*	}*/
-	/*}*/
-
-
 	.footer_body{
 		height: 2rem;
 	}
 	.footer_nav{
 		height: 2.0rem;
 		background-color: #fff;
-		/*box-shadow: 0 0 0.27rem #e5e5e5;*/
+		box-shadow: 0 0 0.1rem #e7e7e7;
 		.footer-bar{
 			position: absolute;
-			/*bottom: 0.6rem;*/
+			bottom: 0.5rem;
 		}
 	}
 
diff --git a/src/config/env.js b/src/config/env.js
index 9af2296..6c6b2f8 100644
--- a/src/config/env.js
+++ b/src/config/env.js
@@ -2,7 +2,9 @@
 // let baseUrl="http://139.186.135.156:86";
 // let baseUrl="http://10.132.108.1:85";
 // let baseUrl="http://jdm.szssfj.cn/jdmTestApi";
-let baseUrl="http://127.0.0.1:85";
+//let baseUrl="http://jdm.szssfj.cn/jdmTestApi";
+//let baseUrl="http://192.168.110.35:85";
+let baseUrl="http://192.168.110.41:85";
 // let wsUrl='ws://10.76.108.1:9326';
 export {
     baseUrl,
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 3833f3f..79c30a9 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -291,7 +291,6 @@
                 height: 4rem;
                 width: 100%;
                 padding-bottom: 0.27rem;
-
             }
 
         }
diff --git a/src/views/HomeWx.vue b/src/views/HomeWx.vue
index 806be38..5a3e481 100644
--- a/src/views/HomeWx.vue
+++ b/src/views/HomeWx.vue
@@ -242,7 +242,6 @@
                 height: 4rem;
                 width: 100%;
                 padding-bottom: 0.27rem;
-
             }
 
         }
diff --git a/src/views/administrative/appointmentDetail.vue b/src/views/administrative/appointmentDetail.vue
index 87d193d..0f6190b 100644
--- a/src/views/administrative/appointmentDetail.vue
+++ b/src/views/administrative/appointmentDetail.vue
@@ -758,7 +758,7 @@
 
     .fold-div .van-text-ellipsis {
       padding: 0.27rem 0;
-      width: calc(100% - 2.5rem);
+      width: calc(100% - 2.6rem);
       color: #666;
     }
 
diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue
index f1a4b72..98a89e5 100644
--- a/src/views/enforce/enforcementPlanAdd.vue
+++ b/src/views/enforce/enforcementPlanAdd.vue
@@ -183,7 +183,7 @@
         <div class="popcont">
           <div class="poptip">是否公布该行政检查计划？</div>
           <div class="popup-btn">
-            <a @click="addPlan(0)">取消</a><a @click="addPlan(1)">确认</a>
+            <a @click="addPlan(0)">否</a><a @click="addPlan(1)">是</a>
           </div>
         </div>
       </div>
diff --git a/src/views/enforce/enforcementPlanDetailed.vue b/src/views/enforce/enforcementPlanDetailed.vue
index dd30f31..0c6b298 100644
--- a/src/views/enforce/enforcementPlanDetailed.vue
+++ b/src/views/enforce/enforcementPlanDetailed.vue
@@ -155,10 +155,14 @@ onMounted(() => {
 
     .fold-div .van-text-ellipsis {
       padding: 0.27rem 0;
-      width: calc(100% - 3.2rem);
+      width: calc(100% - 2.6rem);
       color: #666;
     }
 
+    .fold-div:last-child .van-text-ellipsis {
+      width: calc(100% - 3.2rem);
+    }
+
     .fold-div i {
       position: absolute;
       bottom: 0.3rem;
diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index 554fa89..3cdcf68 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -787,7 +787,7 @@ export default {
 
     .fold-div .van-text-ellipsis {
       padding: 0.27rem 0;
-      width: calc(100% - 2.5rem);
+      width: calc(100% - 2.6rem);
       color: #666;
     }
 
diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue
index ddaa2fe..ae8fe4d 100644
--- a/src/views/enforceHome.vue
+++ b/src/views/enforceHome.vue
@@ -335,8 +335,7 @@
             position: relative;
             margin: 0;
             width: 100%;
-            height: calc(100% - constant(safe-area-inset-bottom));
-            height: calc(100% - env(safe-area-inset-bottom));
+            height: 100%;
             background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
             background-size: auto 100%;
             overflow-x: hidden;
diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue
index f4a17a6..1248c2a 100644
--- a/src/views/enterprise/enterpriseInspectionDetail.vue
+++ b/src/views/enterprise/enterpriseInspectionDetail.vue
@@ -345,7 +345,7 @@ onMounted(() =>{
 
 .fold-div .van-text-ellipsis {
   padding: 0.27rem 0;
-  width: calc(100% - 2.5rem);
+  width: calc(100% - 2.6rem);
   color: #666;
 }
 
diff --git a/src/views/enterprise/register.vue b/src/views/enterprise/register.vue
index b5b3ac6..62ef618 100644
--- a/src/views/enterprise/register.vue
+++ b/src/views/enterprise/register.vue
@@ -395,7 +395,7 @@ export default {
 
 .fold-div .van-text-ellipsis {
   padding: 0.27rem 0;
-  width: calc(100% - 2.5rem);
+  width: calc(100% - 2.6rem);
   color: #666;
 }
 
diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue
index 330062c..9af8f36 100644
--- a/src/views/enterprise/registrationDetail.vue
+++ b/src/views/enterprise/registrationDetail.vue
@@ -799,7 +799,7 @@ export default {
 
 .fold-div .van-text-ellipsis {
   padding: 0.27rem 0;
-  width: calc(100% - 2.5rem);
+  width: calc(100% - 2.6rem);
   color: #666;
 }