From 3a10f7237b8af270b92d18186c306cc272b51f35 Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Sat, 17 Aug 2024 15:41:21 +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

---
 .../footer-enforcement-nav/index.vue          |  2 +-
 src/components/footer-nav/index.vue           |  2 +-
 src/views/enforce/enforceNotice.vue           | 26 +++++++-------
 src/views/enforce/enterpriseBaseInfo.vue      | 15 ++++++--
 src/views/enforceHome.vue                     | 11 ++++--
 src/views/enterprise/register.vue             | 35 +++++++++++++++----
 6 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/src/components/footer-enforcement-nav/index.vue b/src/components/footer-enforcement-nav/index.vue
index c2c046e..c913db8 100644
--- a/src/components/footer-enforcement-nav/index.vue
+++ b/src/components/footer-enforcement-nav/index.vue
@@ -22,7 +22,7 @@
 			<van-tabbar-item
 					name="Shop"
 					replace
-					icon="records-o"
+					icon="bullhorn-o"
 					to="/enforce/enforceNotice"
 			>通知</van-tabbar-item
 			>
diff --git a/src/components/footer-nav/index.vue b/src/components/footer-nav/index.vue
index bb8252f..6b83f79 100644
--- a/src/components/footer-nav/index.vue
+++ b/src/components/footer-nav/index.vue
@@ -7,7 +7,7 @@
 			<van-tabbar-item name="Classify" replace icon="description-o" to="/enterprise/enterpriseInspectionNotice">
 				行政检查通知
 			</van-tabbar-item>
-			<van-tabbar-item name="Classify" replace icon="description-o" to="/enterprise/complaintList">
+			<van-tabbar-item name="Classify" replace icon="todo-list-o" to="/enterprise/complaintList">
 				投诉进度查询
 			</van-tabbar-item>
 			<!-- <van-tabbar-item name="My" replace icon="manager-o" to="">{{
diff --git a/src/views/enforce/enforceNotice.vue b/src/views/enforce/enforceNotice.vue
index d078e6c..ce8233b 100644
--- a/src/views/enforce/enforceNotice.vue
+++ b/src/views/enforce/enforceNotice.vue
@@ -26,7 +26,8 @@
 
             <van-pull-refresh v-model="data.refreshing" @refresh="onRefresh">
                 <van-list v-model:loading="data.loading" :finished="data.finished" finished-text="没有更多了" @load="onLoad">
-                    <div class="notice-item" v-for="(item, index) in data.dataList" :key="index"><i></i>
+                  <div class="goods_box" v-for="(item, index) in data.dataList" :key="index">
+                    <div class="notice-item"><i></i>
                         <div class="item-cont">
                             <span class="item-title">{{ item.planName }}</span>
                             <!--           <span class="item-time"> {{ item.enforcementDepartment }} - {{ item.createTime }}</span>-->
@@ -40,6 +41,7 @@
                                 <a>{{ null==item.fileObject?'':item.fileObject.fileName }}</a></div>
                         </div>
                     </div>
+                  </div>
                 </van-list>
             </van-pull-refresh>
         </div>
@@ -278,13 +280,10 @@
             height: 1.33rem;
         }
 
-        .shop-center {
-            display: flex;
-            position: relative;
-            margin: 2% 0;
-            height: 100%;
-            background: #fff;
+      .shop-center {
+            flex: 1;
             overflow-y: scroll;
+            position: relative;
 
             .goods_box {
                 display: flex;
@@ -395,17 +394,18 @@
     .notice-item {
         display: flex;
         position: relative;
-        margin: 3% 0.26rem;
-        height: 10vh;
+        margin: 1% 0;
+        padding: 0 2% 0 0;
+        width: 96%;
         align-items: center;
-        border-bottom: 1px solid #f3f4f5;
+        /*border-bottom: 1px solid #f3f4f5;*/
     }
 
     .notice-item > i {
         display: inline-block;
-        margin: 5% 0.25rem;
-        height: 80%;
+        margin: 5% 0 5% 0.2rem;
         width: 1.5rem;
+        height: 1.5rem;
         background: url("../../assets/images/icon_notice2.png") no-repeat left top 50%;
         background-size: auto 80%;
     }
@@ -466,4 +466,6 @@
         line-height: 0.9rem;
     }
 
+
+
 </style>
diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index 005ad9b..366b891 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -53,10 +53,21 @@
                         label="营业期限:"
                         readonly
                 />
-<!--                <div style="display: flex; justify-content: space-between">-->
+<!--                <div style="display: flex; justify-content: space-between">
                     <div style="font-size: 10px; width: 200px; padding-left: 12px;">经营范围:</div>
                     <van-text-ellipsis :content="data.enterpriseInfo.businessScope" rows="2" expand-text="展开" collapse-text="收起"/>
-<!--                </div>-->
+             </div>-->
+              <van-field
+                  label="经营范围"
+              />
+              <van-text-ellipsis :content="data.enterpriseInfo.businessScope" rows="2" autosize expand-text="展开" collapse-text="收起"
+                                 style="position: relative;
+              margin: -1.15rem 0px 0 2.67rem;
+              padding: 0.35rem;
+              width: calc(100% - 3.5rem);
+              background: transparent;
+              font-size: 0.38rem;"
+              />
 
             </van-cell-group>
 
diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue
index 77639a7..f585b03 100644
--- a/src/views/enforceHome.vue
+++ b/src/views/enforceHome.vue
@@ -30,6 +30,7 @@
                 <ul class="notice_list" :class="data.noticeList.length>1?{notice_top:freshMap.animate}:''">
                     <li v-for="(item, index) in data.noticeList" :key="index">
                         {{item.content}}
+                      <van-icon name="arrow" />
                     </li>
                 </ul>
             </div>
@@ -662,8 +663,8 @@
         padding: 0 0.25rem 0 1rem;
         width: 94%;
         min-height: 1rem;
-        background-color: rgba(249, 238, 219, 0.9);
-        border-radius: 0.5rem;
+        background-color: rgba(249, 238, 219, 0.85);
+        border-radius: 0.25rem;
         color: #df6104;
         box-sizing: border-box;
         overflow: hidden;
@@ -707,6 +708,12 @@
         left: 0;
     }
 
+    .notice_list li i {
+      float: right;
+      margin-top: 0.05rem;
+    }
+
+
     .notice_top {
         transition: all 0.5s;
         margin-top: -30px;
diff --git a/src/views/enterprise/register.vue b/src/views/enterprise/register.vue
index 94e0273..54f8b1a 100644
--- a/src/views/enterprise/register.vue
+++ b/src/views/enterprise/register.vue
@@ -26,14 +26,18 @@
           />
           <Popup :visible="popupVisible" :content="popupContent" @close="closePopup"  @reciveData="reciveData" />
         <van-field
-          v-model="submitData.enterpriseNumber"
           required
           label="统一社会信用代码"
-          placeholder="必填 统一社会信用代码"
+          style="white-space: nowrap"
+        />
+        <van-field
+            v-model="submitData.enterpriseNumber"
+            label=" "
+            placeholder="必填 统一社会信用代码"
         />
         <van-field
           v-model="submitData.enterpriseTypeText"
-          label="类型"
+          label="企业类型"
           placeholder="选填 企业类型"
           readonly
           clickable
@@ -49,10 +53,15 @@
         />
       </van-popup>
       <van-field
-          v-model="submitData.enterpriseAddress"
           label="注册地址"
-          placeholder="选填 注册地址或经营地址"
         />
+        <van-field
+            v-model="submitData.enterpriseAddress"
+            label=" "
+            placeholder="选填 注册地址或经营地址"
+            style="margin: -1.15rem 0 -1px 0;background: transparent;"
+        />
+
         <van-field
           v-model="submitData.legalPerson"
           label="法定代表人"
@@ -103,14 +112,27 @@
         <van-calendar v-model:show="data.showOperatingTermPicker" type="range"
         :min-date="data.minDate" :max-date="data.maxDate" @confirm="onOperatingTermConfirm" />
       </van-popup>
-        <van-field
+<!--        <van-field
           v-model="submitData.businessScope"
           label="经营范围"
           placeholder="选填 经营范围"
           rows="1"
           autosize="{ maxHeight: 100, minHeight: 50 }"
           type="textarea"
+        />-->
+        <div style="display: table;"><van-field
+            label="经营范围"
         />
+        <van-text-ellipsis :content="submitData.businessScope" rows="2" autosize expand-text="展开" collapse-text="收起"
+        style="position: relative;
+              margin: -1.15rem 0px 0 2.67rem;
+              padding: 0.35rem;
+              width: calc(100% - 3.5rem);
+              background: transparent;
+              font-size: 0.38rem;"
+        />
+        </div>
+
       </van-cell-group>
       <van-action-bar>
         <van-action-bar-button text="提交"  @click="submit()" />
@@ -334,6 +356,7 @@ export default {
         height: 100%;
         background-color: #ebf3fb;
         margin-top: 0.15rem;
+        overflow-y: auto;
   }
 
 /deep/ .van-action-bar {