From d294f4cdc00abe5f420ecc746cf0c8b8c721d65e Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Tue, 27 Aug 2024 16:46:45 +0800
Subject: [PATCH 1/2] =?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/Home.vue                            |  6 +--
 src/views/HomeWx.vue                          |  6 +--
 .../administrative/appointmentDetail.vue      | 49 ++++++++++++++++---
 src/views/enforce/enforcementPlanDetailed.vue |  2 +-
 src/views/enforce/enterpriseBaseInfo.vue      |  2 +-
 src/views/enforce/historyCheck.vue            |  7 ++-
 src/views/enforceHome.vue                     |  9 ++--
 .../compaint/registrationListView.vue         |  2 +-
 .../enterprise/enterpriseInspectionDetail.vue | 40 +++++++++++++--
 src/views/enterprise/register.vue             |  2 +-
 10 files changed, 96 insertions(+), 29 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index 46f2de0..50085dd 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -295,10 +295,10 @@
         }
 
         .boutique_box {
-            position: fixed;
+            position: absolute;
             width: 100%;
-            bottom: calc(1.67rem + constant(safe-area-inset-bottom));
-            bottom: calc(1.67rem + env(safe-area-inset-bottom));
+            bottom: calc(0.5rem + constant(safe-area-inset-bottom));
+            bottom: calc(0.5rem + env(safe-area-inset-bottom));
 
             .boutique_body {
                 padding: 0 0 0.27rem 0;
diff --git a/src/views/HomeWx.vue b/src/views/HomeWx.vue
index 2d7df22..977c4f7 100644
--- a/src/views/HomeWx.vue
+++ b/src/views/HomeWx.vue
@@ -248,10 +248,10 @@
         }
 
         .boutique_box {
-            position: fixed;
+            position: absolute;
             width: 100%;
-            bottom: calc(1.67rem + constant(safe-area-inset-bottom));
-            bottom: calc(1.67rem + env(safe-area-inset-bottom));
+            bottom: calc(0.5rem + constant(safe-area-inset-bottom));
+            bottom: calc(0.5rem + env(safe-area-inset-bottom));
 
             .boutique_body {
                 padding: 0 0 0.27rem 0;
diff --git a/src/views/administrative/appointmentDetail.vue b/src/views/administrative/appointmentDetail.vue
index de511f5..798da2a 100644
--- a/src/views/administrative/appointmentDetail.vue
+++ b/src/views/administrative/appointmentDetail.vue
@@ -28,24 +28,32 @@
                         :rules="[{ required: true, message: '必填项' }]"
                 />
 
-                <van-field
+<!--                <van-field
                         v-model="submitData.checkItemText"
                         label="检查事项"
-                        rows="2"
+                        rows="1"
                         autosize
                         readonly
                         type="textarea"
                         show-word-limit
-                />
-                <van-field
+                />-->
+                <div class="fold-div">
+                  <label>检查事项</label>
+                  <van-text-ellipsis :content="submitData.checkItemText" rows="2" autosize expand-text="展开" collapse-text="收起" />
+                </div>
+<!--                <van-field
                         v-model="submitData.checkRequireText"
                         label="检查要求"
-                        rows="2"
+                        rows="1"
                         autosize
                         readonly
                         type="textarea"
                         show-word-limit
-                />
+                />-->
+                <div class="fold-div">
+                  <label>检查要求</label>
+                  <van-text-ellipsis :content="submitData.checkRequireText" rows="2" autosize expand-text="展开" collapse-text="收起" />
+                </div>
                 <van-field
                         v-model="submitData.lawEnforcement"
                         readonly
@@ -63,7 +71,7 @@
                            readonly
 
                 />
-                <van-field
+<!--                <van-field
                         v-model="submitData.remark"
                         label="备注"
                         rows="2"
@@ -71,7 +79,11 @@
                         readonly
                         type="textarea"
                         show-word-limit
-                />
+                />-->
+                <div class="fold-div">
+                <label>备注</label>
+                <van-text-ellipsis :content="submitData.remark" rows="2" autosize expand-text="展开" collapse-text="收起" />
+              </div>
                   <div class="add-inspect">
                       <p v-if="submitData.userObjs.length > 0"><label>联合检查部门、人员</label></p>
                       <p v-for="(item, index) in submitData.userObjs" :key="index">
@@ -670,4 +682,25 @@
       color: #666;
     }
 
+    .fold-div {
+      position: relative;
+      display: flex;
+      margin: -1px 0.3rem 0;
+      padding: 0.05rem 0;
+      border-bottom: 1px solid #f6f7f8;
+      color: #323233;
+      font-size: 0.37rem;
+    }
+
+    .fold-div label {
+      width: 2.6rem;
+      padding: 0.27rem 0px 0.27rem 0.15rem;
+    }
+
+    .fold-div .van-text-ellipsis {
+      padding: 0.24rem 0;
+      width: calc(100% - 2.7rem);
+      color: #666;
+    }
+
 </style>
diff --git a/src/views/enforce/enforcementPlanDetailed.vue b/src/views/enforce/enforcementPlanDetailed.vue
index bfd8e1b..27e86b1 100644
--- a/src/views/enforce/enforcementPlanDetailed.vue
+++ b/src/views/enforce/enforcementPlanDetailed.vue
@@ -135,7 +135,7 @@ onMounted(() => {
       display: flex;
       margin: 0 0.3rem;
       padding-bottom: 0.13rem;
-      border-bottom: 1px solid #f5f6f7;
+      border-bottom: 1px solid #f6f7f8;
       color: rgb(50, 50, 51);
       font-size: 0.37rem;
     }
diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index b65352a..4df5d7a 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -784,7 +784,7 @@
       display: flex;
       margin: 0 0.3rem;
       padding-bottom: 0.13rem;
-      border-bottom: 1px solid #f5f6f7;
+      border-bottom: 1px solid #f6f7f8;
       color: rgb(50, 50, 51);
       font-size: 0.37rem;
     }
diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue
index e606ad6..a3cf6df 100644
--- a/src/views/enforce/historyCheck.vue
+++ b/src/views/enforce/historyCheck.vue
@@ -5,8 +5,11 @@
            <header-nav :slefBack="true" @goBack="goBack" :titelText="`行政检查信息查询`"/>
           <header-nav :slefBack="true" @goBack="goBack" :titelText="`历史检查信息`"/>
        </div> -->
-        <van-search v-model="searchParam.searchValue" show-action placeholder="检查事项/执法部门/执法人员/企业名称 " @search="onSearch">
-        <van-search
+      <van-search v-model="searchParam.searchValue" show-action placeholder="检查事项/执法部门/执法人员/企业名称 " @search="onSearch">
+        <template #action>
+          <div @click="onClickButton">搜索</div>
+        </template>
+      </van-search>
 
         <div class="search-button-list">
             <van-button plain hairline :class="null==data.checkNum?'search-button active':'search-button'"
diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue
index 0c7b2f1..f7abacc 100644
--- a/src/views/enforceHome.vue
+++ b/src/views/enforceHome.vue
@@ -335,7 +335,8 @@
             position: relative;
             margin: 0;
             width: 100%;
-            height: 100%;
+            height: calc(100% - constant(safe-area-inset-bottom));
+            height: calc(100% - env(safe-area-inset-bottom));
             background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
             background-size: auto 100%;
             overflow-x: hidden;
@@ -351,10 +352,10 @@
         }
 
         .boutique_box {
-            position: fixed;
+            position: absolute;
             width: 100%;
-            bottom: calc(1.67rem + constant(safe-area-inset-bottom));
-            bottom: calc(1.67rem + env(safe-area-inset-bottom));
+            bottom: calc(0.5rem + constant(safe-area-inset-bottom));
+            bottom: calc(0.5rem + env(safe-area-inset-bottom));
 
             .boutique_body {
                 padding: 0 0 0.27rem 0;
diff --git a/src/views/enterprise/compaint/registrationListView.vue b/src/views/enterprise/compaint/registrationListView.vue
index 5b36b0e..53f72fd 100644
--- a/src/views/enterprise/compaint/registrationListView.vue
+++ b/src/views/enterprise/compaint/registrationListView.vue
@@ -41,7 +41,7 @@
           </van-popup>
       </div>
     <div class="warning-rule">
-      <span><van-icon name="warning-o" /></span><span>行政执法检查事项的投诉有效期，为检查次日起<b><i>5</i></b>个自然日内。</span>
+      <span><van-icon name="warning-o" /></span><span>行政执法检查事项投诉有效期为检查次日起<b><i>5</i></b>个自然日内。</span>
     </div>
       <!-- 中间 -->
       <div class="shop-center">
diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue
index e69206b..31ac708 100644
--- a/src/views/enterprise/enterpriseInspectionDetail.vue
+++ b/src/views/enterprise/enterpriseInspectionDetail.vue
@@ -6,8 +6,9 @@
 		<!-- </div> -->
 		<!-- 中间 -->
 		<div class="warp_body">
-<!--            <van-cell-group>-->
+
         <van-form @failed="onFailed" @submit="submit">
+          <van-cell-group>
             <van-field
                 v-model="submitData.checkTime"
                 readonly
@@ -18,7 +19,7 @@
                 readonly
                 label="执法部门"
             />
-            <van-field
+<!--            <van-field
                 v-model="submitData.checkItem"
                 label="检查事项"
                 rows="2"
@@ -33,7 +34,16 @@
                 readonly
                 type="textarea"
                 show-word-limit
-            />
+            />-->
+          <div class="fold-div">
+            <label>检查事项</label>
+            <van-text-ellipsis :content="submitData.checkItem" rows="2" autosize expand-text="展开" collapse-text="收起" />
+          </div>
+
+          <div class="fold-div">
+            <label>检查要求</label>
+            <van-text-ellipsis :content="submitData.checkRequire" rows="2" autosize expand-text="展开" collapse-text="收起" />
+          </div>
 
 <!--            <van-field-->
 <!--              v-model="submitData.enterpriseName"-->
@@ -78,8 +88,9 @@
             <van-action-bar v-if="!data.isEnterprise && submitData.isReg != 1 && submitData.status != 1 && submitData.status != 3">
                 <van-button round block type="info" native-type="submit" @click="cancel">取消</van-button>
             </van-action-bar>
+    </van-cell-group>
         </van-form>
-<!--          </van-cell-group>-->
+
         </div>
 
 <!--        <div class="warp_body">-->
@@ -270,7 +281,7 @@ onMounted(() =>{
   padding-bottom: 3rem;
   width: 94%;
   height: 100%;
-  /*background-image: linear-gradient(to bottom, #ebf3fb, #fff);*/
+  background: #ebf3fb;
   overflow-y: auto;
   margin-top: 0.15rem;
 }
@@ -296,5 +307,24 @@ onMounted(() =>{
   cursor: default;
   color: #666;
 }
+.fold-div {
+  position: relative;
+  display: flex;
+  margin: -1px 0.3rem 0;
+  padding: 0.05rem 0;
+  border-bottom: 1px solid #f6f7f8;
+  color: #323233;
+  font-size: 0.37rem;
+}
+
+.fold-div label {
+  width: 2.6rem;
+  padding: 0.27rem 0px 0.27rem 0.15rem;
+}
 
+.fold-div .van-text-ellipsis {
+  padding: 0.24rem 0;
+  width: calc(100% - 2.7rem);
+  color: #666;
+}
 </style>
diff --git a/src/views/enterprise/register.vue b/src/views/enterprise/register.vue
index 65e7491..1520564 100644
--- a/src/views/enterprise/register.vue
+++ b/src/views/enterprise/register.vue
@@ -375,7 +375,7 @@ export default {
   display: flex;
   margin: 0 0.3rem;
   padding-bottom: 0.13rem;
-  border-bottom: 1px solid #f5f6f7;
+  border-bottom: 1px solid #f6f7f8;
   color: rgb(50, 50, 51);
   font-size: 0.37rem;
 }

From cda4ab36f8fb811bd00cfd46cb0a211f952524c0 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Tue, 27 Aug 2024 20:03:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BB=B7=E6=A0=BCLoaddin?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home.vue | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index 50085dd..b76b995 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,7 +1,7 @@
 <template>
-    <!-- <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/> -->
-    <!-- v-if="!isLoading" -->
-    <div class="home app_content">
+     <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
+    <div class="home app_content" v-if="!isLoading">
+<!--    <div class="home app_content">-->
         <!-- 导航栏 -->
         <!--		<div class="header_body">-->
         <!--			<header-nav :leftArrow="false" titelText="执法监督码"></header-nav>-->
@@ -52,9 +52,8 @@
     import Vconsolefrom from 'vconsole';
     import * as w6s from 'szient-js-sdk';
     import sha1 from 'crypto-js/sha1';
-    import { Loading } from 'vant';
     import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, getSiqLoginAuthTest, siqCode} from '../api/Home';
-    import {showSuccessToast} from "vant";
+    import {Loading, showFailToast, showSuccessToast} from "vant";
     import 'vant/es/toast/style';
     const {useCommon} = $globalStore;
     const router = useRouter();
@@ -181,16 +180,15 @@
             //     console.log(success.data);
             //     useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
             //     useCommon.SET_USER_ID(success.data.userId);
+            //     console.log("-----> success.data: ", success.data);
             //     useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
             //     useCommon.SET_TOKEN(success.data.token);
-            //     console.log(useCommon.userId);
-            //     console.log(useCommon.firstLoad);
-            //     if(useCommon.firstLoad){
-            //       isLoading.value = false;
-            //     }
+            //     console.log("-----> useCommon.userId: ", useCommon.userId);
+            //     console.log("-----> useCommon.firstLoad: ", useCommon.firstLoad);
             //      //设置已经初始化
             //     useCommon.SET_IS_FIRST_LOAD(false)
             //     getEnterpriseMerchant(success.data.phonenumber.toString());
+            //     isLoading.value = false;
             // }, error => {
             // })
 
@@ -234,9 +232,7 @@
                               //设置已经初始化
                             useCommon.SET_IS_FIRST_LOAD(false)
                             getEnterpriseMerchant(success.data.phonenumber.toString());
-                               if(useCommon.firstLoad){
-                                      isLoading.value = false;
-                                }
+                            isLoading.value = false;
                         }, error => {
                             console.log("error : " + error)
                         })