From 3a52e5ed8a4212a2942ee9bb236d313435c22fb2 Mon Sep 17 00:00:00 2001
From: "liu.xiaofeng@ebiz-digits.com" <liu.xiaofeng@ebiz-digits.com>
Date: Wed, 27 Sep 2023 17:14:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=B8=82=E6=B0=91=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4=20=E6=96=B0=E5=B8=82?=
 =?UTF-8?q?=E6=B0=91=E6=8F=90=E7=A4=BA=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ebiz/customer/formBlock.vue | 56 +++++++++++---------
 src/views/ebiz/sale/InsuredInfo.vue        | 60 ++++++++++++----------
 2 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/src/components/ebiz/customer/formBlock.vue b/src/components/ebiz/customer/formBlock.vue
index eb6a6f295..9b65acb80 100644
--- a/src/components/ebiz/customer/formBlock.vue
+++ b/src/components/ebiz/customer/formBlock.vue
@@ -62,6 +62,27 @@
       <van-field v-model="userInfo.email" label="电子邮箱" name="电子邮箱" v-validate="'email'" placeholder="请输入" clearable maxlength="50" />
       <van-field v-model="userInfo.stature" label="身高（cm）" name="身高" placeholder="请输入" clearable v-validate="'onlyNumber|stature'" maxlength="5" />
       <van-field v-model="userInfo.weight" label=" 体重（kg）" name="体重" placeholder="请输入" clearable v-validate="'onlyNumber|avoirdupois'" />
+      <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>
+            <i class="pr5"></i>
+            新市民身份
+          </label>
+          <van-radio name="1" class="ml30">是</van-radio>
+          <van-radio name="0" class="ml20">否</van-radio>
+        </van-radio-group>
+        <van-icon name="question-o" size="20" @click="isNewPeopleFlagTip"/>
+      </div>
+      <van-field
+        v-if="userInfo.isNewPeopleFlag == 1 && manageComCode == '45'"
+        :value="userInfo.npType | idToText('npType')"
+        readonly
+        label="新市民类型"
+        name="新市民类型"
+        right-icon="arrow"
+        placeholder="请选择"
+        @click="toSelect('11')"
+      />
       <van-field
         :value="userInfo.customerType | idToText('customerType')"
         readonly
@@ -85,27 +106,6 @@
     <!-- 工作信息 -->
     <van-cell-group>
       <p class="title pl10 pv12 mt10">工作信息</p>
-      <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>
-            <i class="pr5"></i>
-            新市民身份
-          </label>
-          <van-radio name="1" class="ml30">是</van-radio>
-          <van-radio name="0" class="ml20">否</van-radio>
-        </van-radio-group>
-        <van-icon name="question-o" size="20" @click="isNewPeopleFlagTip"/>
-      </div>
-      <van-field
-        v-if="userInfo.isNewPeopleFlag == 1 && manageComCode == '45'"
-        :value="userInfo.npType | idToText('npType')"
-        readonly
-        label="新市民类型"
-        name="新市民类型"
-        right-icon="arrow"
-        placeholder="请选择"
-        @click="toSelect('11')"
-      />
       <van-field
         :value="userInfo.degree | idToText('degree')"
         readonly
@@ -217,11 +217,17 @@
     <van-popup v-model="censusShow" position="bottom">
       <van-area :area-list="areaList" value="110101" :columns-num="2" @confirm="sureArea($event, '3')" @cancel="areaShow = 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;font-size: 14px;">
+        <div style="letter-spacing: 1px;line-height: 25px;">新市民是指因本人创业就业、子女上学、投靠子女等原因来到城镇常住，未获得当地户籍或获得当地户籍不满三年的各类群体，包括但不限于进城务工人员、新就业大中专毕业生等。</div>
+      </div>
+      <div style="text-align: center;margin-bottom: 15px;">
+        <van-button round type="danger" size="small" style="padding:0px 35px;font-size: 14px;" @click="isNewPeopleFlagTipshow = false">我知道了</van-button>
+      </div>
+    </van-dialog>
   </div>
 </template>
 
diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index abbf044d9..e2e075264 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -145,6 +145,29 @@
         clearable
         @blur="checkAvoirdupois(userInfo.avoirdupois)"
       />
+      <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>
+            <i class="red">*</i>
+            新市民身份
+          </label>
+          <van-radio name="1" class="ml30">是</van-radio>
+          <van-radio name="0" class="ml20">否</van-radio>
+        </van-radio-group>
+        <van-icon name="question-o" size="20" @click="isNewPeopleFlagTip"/>
+      </div>
+      <van-field
+        v-if="userInfo.isNewPeopleFlag == 1"
+        :value="userInfo.npType | idToText('npType')"
+        readonly
+        label="新市民类型"
+        name="新市民类型"
+        required
+        right-icon="arrow"
+        placeholder="请选择"
+        v-validate="'required'"
+        @click="toSelect('11')"
+      />
       <div class="p15 pl8 fs14">
         <van-radio-group v-model="isElecCont" class="flex">
           <label>
@@ -171,29 +194,6 @@
         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>
-            <i class="red">*</i>
-            新市民身份
-          </label>
-          <van-radio name="1" class="ml30">是</van-radio>
-          <van-radio name="0" class="ml20">否</van-radio>
-        </van-radio-group>
-        <van-icon name="question-o" size="20" @click="isNewPeopleFlagTip"/>
-      </div>
-      <van-field
-        v-if="userInfo.isNewPeopleFlag == 1"
-        :value="userInfo.npType | idToText('npType')"
-        readonly
-        label="新市民类型"
-        name="新市民类型"
-        required
-        right-icon="arrow"
-        placeholder="请选择"
-        v-validate="'required'"
-        @click="toSelect('11')"
-      />
       <select-radio :radios="medicalRadio" v-validate="'required'" label="有无社保" name="有无社保" required :value.sync="userInfo.medical"></select-radio>
       <van-field
         :value="userInfo.taxResidentId | idToText('taxIdentity')"
@@ -400,11 +400,17 @@
     </van-popup> -->
     <!--身份证扫描 -->
     <van-popup v-model="isScan" position="bottom"><IdentityCardScan @getScanInfo="getIdentityInfo"></IdentityCardScan></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;font-size: 14px;">
+        <div style="letter-spacing: 1px;line-height: 25px;">新市民是指因本人创业就业、子女上学、投靠子女等原因来到城镇常住，未获得当地户籍或获得当地户籍不满三年的各类群体，包括但不限于进城务工人员、新就业大中专毕业生等。</div>
+      </div>
+      <div style="text-align: center;margin-bottom: 15px;">
+        <van-button round type="danger" size="small" style="padding:0px 35px;font-size: 14px;" @click="isNewPeopleFlagTipshow = false">我知道了</van-button>
+      </div>
+    </van-dialog>
   </div>
 </template>
 <script>