Merge branch 'fix/policy_fix' into 'master'

fix: 非本人longTerm字段异常修复

See merge request !49

src/components/LoginModal.vue

@@ -11,6 +11,7 @@
     <cr-form
       class="login-form"
       ref="loginForm"
+      show-error
       validate-trigger="onBlur"
       @submit="login"
       @failed="onFormFailed"

src/components/PopupDatePicker.vue

@@ -8,9 +8,11 @@
       <span>{{ pickerValShow || placeholder }}</span>
       <svg-icon icon-class="triangle-right" slot="button" />
     </div>
-    <cr-popup v-model="show" position="bottom" get-container="body">
+    <cr-popup v-model="show" position="bottom" class="aaaa">
       <cr-date-picker
         ref="datepicker"
+        :before="before"
+        :later="later"
         @confirm="onConfirm"
         @cancel="onCancel"
         :init-value="initVal"
@@ -22,10 +24,27 @@
 <script>
 import popupPickerMixin from "../mixins/popupPicker.mixin.js";
 import { parseTime } from "@/service/utils";
-
+const CURRENT_TIME = new Date();
+const CURRENT_YEAR = CURRENT_TIME.getFullYear();
+// const START_YEAR = 1949;
+const END_YEAR = CURRENT_YEAR;
 export default {
   name: "PopupDatePicker",
   mixins: [popupPickerMixin],
+  props: {
+    before: {
+      type: Number,
+      default() {
+        return 100;
+      }
+    },
+    later: {
+      type: Number,
+      default() {
+        return END_YEAR - CURRENT_YEAR;
+      }
+    }
+  },
   data() {
     return {
       refName: "datepicker",

src/components/PopupWithIframe.vue

@@ -127,7 +127,7 @@ export default {
     font-size: @font-size-18;
     top: 16px;
     right: 14px;
-    z-index: 201;
+    z-index: 99;
   }
   &-head {
     position: absolute;

src/views/Consultant/Question/index.vue

@@ -41,6 +41,7 @@
             "
             v-show="currentStep === 1"
             item-height="35"
+            :later="endYear"
             :show-toolbar="false"
           />
           <cr-radio-btn
@@ -156,6 +157,12 @@ import Card from "@/components/Card";
 import localStorage from "@/service/localStorage";
 import areaList from "@qg/cherry-ui/src/area/demo/china";
 import { subCulQus } from "@/api/consultant";
+
+const CURRENT_TIME = new Date();
+const CURRENT_YEAR = CURRENT_TIME.getFullYear();
+const START_YEAR = 1949;
+const END_YEAR = CURRENT_YEAR;
+
 export default {
   name: "ConsultantQuestion",
   components: {
@@ -177,6 +184,8 @@ export default {
         gender: "",
         relation: ""
       },
+      startYear: CURRENT_YEAR - START_YEAR,
+      endYear: END_YEAR - CURRENT_YEAR,
       currentStep: 0,
       showSubState: false,
       stepTips: [

src/views/Goods/Detail/LIDetail.vue

@@ -71,11 +71,6 @@
     </div>
     <detail-footer :company-info="companyInfo" />
     <copyright />
-    <good-action
-      :content="goodActionInfo"
-      :class="{ 'cal-fee': currentPupopIndex === 6 }"
-      v-show="goodActionShow"
-    />
     <good-action :content="goodActionInfo" :class="{ 'cal-fee': currentPupopIndex === 6 }" />
     <popup-with-iframe
       v-model="popupShow"

src/views/Goods/Detail/modules/CalInsuredFee.vue

@@ -8,7 +8,13 @@
         :rules="[{ required: true, message: 'required' }]"
       >
         <template #input>
-          <popup-date-picker v-model="formData.birth" placeholder="请选择被保人出生日期" />
+          <popup-date-picker
+            :before="60"
+            :later="0"
+            v-model="formData.birth"
+            class="cal-fee-date"
+            placeholder="请选择被保人出生日期"
+          />
         </template>
       </cr-field>
       <cr-field

src/views/Policy/Add/index.vue

@@ -551,6 +551,7 @@ export default {
       const { socialSecurity, longTerm, relation } = this.subFromData.insuredUserInfo;
       this.subFromData.insuredUserInfo.socialSecurity = socialSecurity === "1" ? true : false;
       this.subFromData.insuredUserInfo.longTerm = longTerm === "2" ? true : false;
+      this.subFromData.holderUserInfo.longTerm = longTerm === "2" ? true : false;
       if (relation === "1") {
         this.subFromData.holderUserInfo = {
           ...this.subFromData.holderUserInfo,