From 4483280f9967a917d5518c4efbfe9a304b678737 Mon Sep 17 00:00:00 2001
From: "liu.xiaofeng@ebiz-digits.com" <liu.xiaofeng@ebiz-digits.com>
Date: Thu, 28 Sep 2023 09:44:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E6=8A=95=E4=BF=9D=E8=A2=AB?=
 =?UTF-8?q?=E4=BF=9D=E4=BA=BA=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E6=96=B0?=
 =?UTF-8?q?=E5=B8=82=E6=B0=91=E5=BC=B9=E5=94=B1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ebiz/customer/formBlock.vue |  6 +--
 src/views/ebiz/sale/InsuredInfo.vue        |  6 +--
 src/views/ebiz/sale/InsuredPerson.vue      | 44 ++++++++++++----------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/components/ebiz/customer/formBlock.vue b/src/components/ebiz/customer/formBlock.vue
index 9b65acb80..ffea71fec 100644
--- a/src/components/ebiz/customer/formBlock.vue
+++ b/src/components/ebiz/customer/formBlock.vue
@@ -221,10 +221,10 @@
       <div slot="title">
         <p style="color: #E9332E;">新市民身份说明</p>
       </div>
-      <div style="padding: 20px;font-size: 14px;">
-        <div style="letter-spacing: 1px;line-height: 25px;">新市民是指因本人创业就业、子女上学、投靠子女等原因来到城镇常住，未获得当地户籍或获得当地户籍不满三年的各类群体，包括但不限于进城务工人员、新就业大中专毕业生等。</div>
+      <div style="padding: 20px 30px 30px;font-size: 14px;">
+        <div style="line-height: 25px;">新市民是指因本人创业就业、子女上学、投靠子女等原因来到城镇常住，未获得当地户籍或获得当地户籍不满三年的各类群体，包括但不限于进城务工人员、新就业大中专毕业生等。</div>
       </div>
-      <div style="text-align: center;margin-bottom: 15px;">
+      <div style="text-align: center;margin-bottom: 30px;">
         <van-button round type="danger" size="small" style="padding:0px 35px;font-size: 14px;" @click="isNewPeopleFlagTipshow = false">我知道了</van-button>
       </div>
     </van-dialog>
diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index e2e075264..5fcf435b6 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -404,10 +404,10 @@
       <div slot="title">
         <p style="color: #E9332E;">新市民身份说明</p>
       </div>
-      <div style="padding: 20px;font-size: 14px;">
-        <div style="letter-spacing: 1px;line-height: 25px;">新市民是指因本人创业就业、子女上学、投靠子女等原因来到城镇常住，未获得当地户籍或获得当地户籍不满三年的各类群体，包括但不限于进城务工人员、新就业大中专毕业生等。</div>
+      <div style="padding: 20px 30px 30px;font-size: 14px;">
+        <div style="line-height: 25px;">新市民是指因本人创业就业、子女上学、投靠子女等原因来到城镇常住，未获得当地户籍或获得当地户籍不满三年的各类群体，包括但不限于进城务工人员、新就业大中专毕业生等。</div>
       </div>
-      <div style="text-align: center;margin-bottom: 15px;">
+      <div style="text-align: center;margin-bottom: 30px;">
         <van-button round type="danger" size="small" style="padding:0px 35px;font-size: 14px;" @click="isNewPeopleFlagTipshow = false">我知道了</van-button>
       </div>
     </van-dialog>
diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue
index 8d93738e7..26ae504ae 100644
--- a/src/views/ebiz/sale/InsuredPerson.vue
+++ b/src/views/ebiz/sale/InsuredPerson.vue
@@ -191,21 +191,6 @@
         :readonly="isAppnt"
         @blur="checkAvoirdupois(userInfo.avoirdupois)"
       />
-    </van-cell-group>
-    <!-- 工作信息 -->
-    <van-cell-group class="mt5" v-if="!isScan">
-      <p style="border-bottom: 1px solid #ebedf0" class="fs15 mt10 fwb pl10 pv12">工作信息</p>
-      <!-- <van-field
-        :value="userInfo.degree | idToText('degree')"
-        readonly
-        label="文化程度"
-        name="文化程度"
-        required
-        right-icon="arrow"
-        placeholder="请选择"
-        v-validate="'required'"
-        @click="toSelect('3')"
-      /> -->
       <div class="p15 pl8 fs14" style="border-bottom: 1px solid #eee;display: flex;justify-content: space-between;align-items: center;" v-if="manageComCode == '45'">
         <van-radio-group v-model="userInfo.isNewPeopleFlag" class="flex">
           <label>
@@ -229,6 +214,21 @@
         v-validate="'required'"
         @click="toSelect('11')"
       />
+    </van-cell-group>
+    <!-- 工作信息 -->
+    <van-cell-group class="mt5" v-if="!isScan">
+      <p style="border-bottom: 1px solid #ebedf0" class="fs15 mt10 fwb pl10 pv12">工作信息</p>
+      <!-- <van-field
+        :value="userInfo.degree | idToText('degree')"
+        readonly
+        label="文化程度"
+        name="文化程度"
+        required
+        right-icon="arrow"
+        placeholder="请选择"
+        v-validate="'required'"
+        @click="toSelect('3')"
+      /> -->
       <select-radio
         :radios="medicalRadio"
         label="有无社保"
@@ -463,11 +463,17 @@
     <van-popup v-model="isMarriageStatusShow" position="bottom">
       <van-picker show-toolbar :columns="columns" @confirm="onMarriageConfirm" @cancel="isMarriageStatusShow = false" />
     </van-popup>
-    <van-popup v-model:show="isNewPeopleFlagTipshow" closeable position="bottom" round  :style="{ height: '30%' }">
-      <div class="isNewPeopleFlagTipClass">
-        新市民是指因本人创业就业、子女上学、投靠子女等原因来到城镇常住，未获得当地户籍或获得当地户籍不满三年的各类群体，包括但不限于进城务工人员、新就业大中专毕业生等。
+    <van-dialog v-model="isNewPeopleFlagTipshow" :showConfirmButton="false">
+      <div slot="title">
+        <p style="color: #E9332E;">新市民身份说明</p>
       </div>
-    </van-popup>
+      <div style="padding: 20px 30px 30px;font-size: 14px;">
+        <div style="line-height: 25px;">新市民是指因本人创业就业、子女上学、投靠子女等原因来到城镇常住，未获得当地户籍或获得当地户籍不满三年的各类群体，包括但不限于进城务工人员、新就业大中专毕业生等。</div>
+      </div>
+      <div style="text-align: center;margin-bottom: 30px;">
+        <van-button round type="danger" size="small" style="padding:0px 35px;font-size: 14px;" @click="isNewPeopleFlagTipshow = false">我知道了</van-button>
+      </div>
+    </van-dialog>
   </div>
 </template>