From ca2f1018ebc3817169ee6a8b5cd4de719424983b Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Sat, 17 Aug 2024 18:04:02 +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/administrative/appointment.vue      |  9 +--
 .../administrative/appointmentDetail.vue      |  9 +--
 src/views/administrative/appointmentEdit.vue  |  9 +--
 src/views/enforce/enterpriseBaseInfo.vue      | 53 ++++++++++++----
 src/views/enforce/scanQrCode.vue              | 17 +++--
 src/views/enforce/sign.vue                    | 63 +++++++++++--------
 src/views/enterprise/register.vue             | 55 +++++++++-------
 src/views/enterprise/registrationEdit.vue     | 15 ++---
 8 files changed, 147 insertions(+), 83 deletions(-)

diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index 9fc7660..1b657c1 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -724,12 +724,13 @@
 
     .addbtn {
       margin: 3%;
-      padding: 0 0 0.2rem;
+      padding: 0 0.35rem;
       width: 94%;
-      font-size: 0.38rem;
+      font-size: 0.35rem;
       color: #1367fe;
-      line-height: 1.75;
-      text-align: center;
+      line-height: 1.5;
+      text-align: right;
+      box-sizing: border-box;
     }
 
     .addbtn i {
diff --git a/src/views/administrative/appointmentDetail.vue b/src/views/administrative/appointmentDetail.vue
index d367e41..fb205a2 100644
--- a/src/views/administrative/appointmentDetail.vue
+++ b/src/views/administrative/appointmentDetail.vue
@@ -629,12 +629,13 @@
 
     .addbtn {
       margin: 3%;
-      padding: 0 0 0.2rem;
+      padding: 0 0.35rem;
       width: 94%;
-      font-size: 0.38rem;
+      font-size: 0.35rem;
       color: #1367fe;
-      line-height: 1.75;
-      text-align: center;
+      line-height: 1.5;
+      text-align: right;
+      box-sizing: border-box;
     }
 
     .addbtn i {
diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue
index 6e50c96..02069d9 100644
--- a/src/views/administrative/appointmentEdit.vue
+++ b/src/views/administrative/appointmentEdit.vue
@@ -711,12 +711,13 @@
 
     .addbtn {
       margin: 3%;
-      padding: 0 0 0.2rem;
+      padding: 0 0.35rem;
       width: 94%;
-      font-size: 0.38rem;
+      font-size: 0.35rem;
       color: #1367fe;
-      line-height: 1.75;
-      text-align: center;
+      line-height: 1.5;
+      text-align: right;
+      box-sizing: border-box;
     }
 
     .addbtn i {
diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index 366b891..5b2633e 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -15,11 +15,19 @@
                         label="企业名称:"
                         readonly
                 />
-                <van-field
+<!--                <van-field
                         v-model="data.enterpriseInfo.enterpriseNumber"
                         label="统一社会信用代码:"
                         readonly
-                />
+                />-->
+              <van-field
+                  label="统一社会信用代码"
+                  style="white-space: nowrap"
+              />
+              <van-field
+                  v-model="data.enterpriseInfo.enterpriseNumber"
+                  label=" "
+              />
                 <van-field
                         v-model="data.enterpriseInfo.legalPerson"
                         label="法人代表:"
@@ -35,14 +43,18 @@
                         label="注册资本:"
                         readonly
                 />
-                <van-field
+<!--                <van-field
                         v-model="data.enterpriseInfo.enterpriseAddress"
                         label="企业地址:"
                         rows="2"
                         autosize
                         type="textarea"
                         show-word-limit
-                />
+                />-->
+              <div class="fold-div">
+                <label>注册地址</label>
+                <van-text-ellipsis :content="data.enterpriseInfo.enterpriseAddress" rows="1" autosize expand-text="展开" collapse-text="收起" />
+              </div>
                 <van-field
                         v-model="data.enterpriseInfo.establishmentTime"
                         label="成立日期:"
@@ -57,17 +69,14 @@
                     <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>-->
-              <van-field
+<!--              <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-text-ellipsis :content="data.enterpriseInfo.businessScope" rows="2" autosize expand-text="展开" collapse-text="收起" />-->
+              <div class="fold-div">
+                <label>经营范围</label>
+                <van-text-ellipsis :content="data.enterpriseInfo.businessScope" rows="2" autosize expand-text="展开" collapse-text="收起" />
+              </div>
 
             </van-cell-group>
 
@@ -546,4 +555,22 @@
         font-size: 0.38rem;
         padding: 0.27rem 0.43rem;
     }
+
+    .fold-div {
+      display: flex;
+      margin: 0 0.3rem;
+      padding-bottom: 0.3rem;
+      border-bottom: 1px solid #f5f6f7;
+      font-size: 0.38rem;
+    }
+
+    .fold-div label {
+      width: 2.6rem;
+      padding: 0.27rem 0px 0.27rem 0.15rem;
+    }
+
+    .fold-div .van-text-ellipsis {
+      padding: 0.27rem 0px 0px;
+      width: calc(100% - 2.7rem);
+    }
 </style>
diff --git a/src/views/enforce/scanQrCode.vue b/src/views/enforce/scanQrCode.vue
index e921829..4602c94 100644
--- a/src/views/enforce/scanQrCode.vue
+++ b/src/views/enforce/scanQrCode.vue
@@ -15,14 +15,14 @@
         <div class="warp_body">
             <!-- <refresh-list v-model:freshMap="freshMap" @refresh="onRefresh" @onLoad="onLoad"> -->
             <div class="white-body">
-                <div class="carousel_box">
+<!--                <div class="carousel_box">
                     <div class="box-scan-one">
                         <span class="box-scan-text">扫一扫<br/>企业二维码</span>
                     </div>
                     <div class="box-scan-two">
                         <span class="box-scan-text">即可查看<br/>企业信息</span>
                     </div>
-                </div>
+                </div>-->
                 <div class="boutique_box">
                     <!-- <van-cell :border="false" title="精品" /> -->
                     <div class="boutique_body">
@@ -32,6 +32,7 @@
                                           <span class="box-qr-code-text">执法监督码</span>-->
                         </div>
                     </div>
+                  <div class="scan-note">扫一扫企业二维码，即可查看企业信息</div>
                     <div class="nocode" @click="toNoScanView">扫码不成功？手动输入关键词查询 >></div>
                 </div>
             </div>
@@ -271,7 +272,7 @@
 
         .boutique_box {
             position: relative;
-            top: 10%;
+            top: 25%;
             z-index: 100;
             width: 100%;
 
@@ -324,6 +325,14 @@
         color: #fb7905;
         font-size: 0.42rem;
         text-align: center;
-        line-height: 3;
+        line-height: 13;
+    }
+
+    .scan-note {
+      width: 100%;
+      color: #bcbcbc;
+      font-size: 0.38rem;
+      text-align: center;
+      line-height: 2;
     }
 </style>
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 87d009c..0222e52 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -8,8 +8,36 @@
         <!-- 中间 -->
         <div class="warp_body">
             <van-form @failed="onFailed" ref="form">
+
+
+              <van-cell-group>
+                <!--                    <div class="qy-name">企业信息</div>-->
+                <van-field
+                    v-model="submitData.enterpriseName"
+                    label="企业名称"
+                    :rules="[{ required: true, message: '必填项' }]"
+                    placeholder="企业名称"
+                />
+<!--                <van-field
+                    v-model="submitData.enterpriseNumber"
+                    required
+                    label="统一社会信用代码"
+                    :rules="[{ required: true, message: '必填项' }]"
+                    placeholder="统一社会信用代码"
+                />-->
+                <van-field
+                    label="统一社会信用代码"
+                    style="white-space: nowrap"
+                />
+                <van-field
+                    v-model="submitData.enterpriseNumber"
+                    label=" "
+                />
+              </van-cell-group>
+
+              <van-divider class="divdsty"/>
                 <van-cell-group>
-                    <div class="zf-name">执法信息</div>
+<!--                    <div class="zf-name">执法信息</div>-->
                     <van-field
                             v-model="submitData.lawText"
                             label="是否关联预约"
@@ -221,25 +249,7 @@
                     </div>
                 </van-cell-group>
 
-                <van-divider class="divdsty"/>
 
-                <van-cell-group>
-                    <div class="qy-name">企业信息</div>
-                    <van-field
-                            v-model="submitData.enterpriseName"
-                            required
-                            label="企业名称"
-                            :rules="[{ required: true, message: '必填项' }]"
-                            placeholder="企业名称"
-                    />
-                    <van-field
-                            v-model="submitData.enterpriseNumber"
-                            required
-                            label="统一社会信用代码"
-                            :rules="[{ required: true, message: '必填项' }]"
-                            placeholder="统一社会信用代码"
-                    />
-                </van-cell-group>
 
                 <van-action-bar>
                     <van-button round block type="info" native-type="submit" @click="tmpSave">保存</van-button>
@@ -1166,13 +1176,14 @@
     }
 
     .addbtn {
-        margin: 3%;
-        padding: 0 0 0.2rem;
-        width: 94%;
-        font-size: 0.38rem;
-        color: #1367fe;
-        line-height: 1.75;
-        text-align: center;
+      margin: 3%;
+      padding: 0 0.35rem;
+      width: 94%;
+      font-size: 0.35rem;
+      color: #1367fe;
+      line-height: 1.5;
+      text-align: right;
+      box-sizing: border-box;
     }
 
     .addbtn i {
diff --git a/src/views/enterprise/register.vue b/src/views/enterprise/register.vue
index 54f8b1a..4471506 100644
--- a/src/views/enterprise/register.vue
+++ b/src/views/enterprise/register.vue
@@ -13,6 +13,7 @@
     -->
 		<!-- 中间 -->
 		<div class="warp_body">
+      <van-form @failed="onFailed" @submit="submit">
 			<van-cell-group>
         <van-field
             v-model="submitData.enterpriseName"
@@ -52,16 +53,16 @@
           @confirm="onConfirm"
         />
       </van-popup>
-      <van-field
-          label="注册地址"
-        />
-        <van-field
-            v-model="submitData.enterpriseAddress"
-            label=" "
-            placeholder="选填 注册地址或经营地址"
-            style="margin: -1.15rem 0 -1px 0;background: transparent;"
-        />
-
+        <div class="fold-div">
+          <label>注册地址</label>
+  <!--        <van-field
+              v-model="submitData.enterpriseAddress"
+              label=" "
+              placeholder="选填 注册地址"
+              style="margin: -1.15rem 0 -1px 0;background: transparent;"
+          />-->
+          <van-text-ellipsis :content="submitData.enterpriseAddress" rows="2" autosize expand-text="展开" collapse-text="收起" />
+        </div>
         <van-field
           v-model="submitData.legalPerson"
           label="法定代表人"
@@ -120,20 +121,13 @@
           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 class="fold-div">
+          <label>经营范围</label>
+          <van-text-ellipsis :content="submitData.businessScope" rows="2" autosize expand-text="展开" collapse-text="收起" />
         </div>
 
       </van-cell-group>
+      </van-form>
       <van-action-bar>
         <van-action-bar-button text="提交"  @click="submit()" />
       </van-action-bar>
@@ -352,6 +346,7 @@ export default {
 }
 .warp_body {
         margin: 0 3%;
+        padding-bottom: 3rem;
         width: 94%;
         height: 100%;
         background-color: #ebf3fb;
@@ -376,4 +371,22 @@ export default {
   text-align: center;
 }
 
+.fold-div {
+  display: flex;
+  margin: 0 0.3rem;
+  padding-bottom: 0.3rem;
+  border-bottom: 1px solid #f5f6f7;
+  font-size: 0.38rem;
+}
+
+.fold-div label {
+  width: 2.6rem;
+  padding: 0.27rem 0px 0.27rem 0.15rem;
+}
+
+.fold-div .van-text-ellipsis {
+  padding: 0.27rem 0px 0px;
+  width: calc(100% - 2.7rem);
+}
+
 </style>
diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue
index d5ed402..14b2249 100644
--- a/src/views/enterprise/registrationEdit.vue
+++ b/src/views/enterprise/registrationEdit.vue
@@ -854,13 +854,14 @@
     }
 
     .addbtn {
-        margin: 3%;
-        padding: 0 0 0.2rem;
-        width: 94%;
-        font-size: 0.38rem;
-        color: #1367fe;
-        line-height: 1.75;
-        text-align: center;
+      margin: 3%;
+      padding: 0 0.35rem;
+      width: 94%;
+      font-size: 0.35rem;
+      color: #1367fe;
+      line-height: 1.5;
+      text-align: right;
+      box-sizing: border-box;
     }
 
     .addbtn i {