[FIX]解决dev代码合并问题

src/views/ebiz/sale/AddBeneficiaryInfo.vue

@@ -204,9 +204,9 @@ import FieldDatePicter from '@/components/ebiz/FieldDatePicter'
 import OccupationPicker from '@/components/ebiz/occipation/OccupationPicker'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import areaList from '@/assets/js/utils/area'
-// import { getOrderDetail } from '@/api/ebiz/sale/sale'
+import { getOrderDetail } from '@/api/ebiz/sale/sale'
 import filter from '@/filters/index'
-// import getAreaName from '@/assets/js/utils/get-area-name'
+import getAreaName from '@/assets/js/utils/get-area-name'
 import utilsAge from '@/assets/js/utils/age'
 import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan'
 import CustomerPicker from '@/components/ebiz/customer/CustomerPicker'
@@ -214,11 +214,7 @@ import idNoCheck from '@/assets/js/utils/idNoCheck'
 import { idToData } from './js/verification'
 import { selectComp } from './js/methods'
 // let relationToInsured = [{ id: 2, text: '配偶' }, { id: 3, text: '父母' }, { id: 4, text: '子女' }, { id: 5, text: '其他' }]
-let relationToInsured = [
-  { id: 2, text: '配偶' },
-  { id: 3, text: '父母' },
-  { id: 4, text: '子女' }
-]
+let relationToInsured = [{ id: 2, text: '配偶' }, { id: 3, text: '父母' }, { id: 4, text: '子女' }]
 
 export default {
   name: 'insuredInfo',
@@ -412,10 +408,7 @@ export default {
       } else if (pickerType == '3') {
         this.columns = DataDictionary.degree
       } else if (pickerType == '4') {
-        this.columns = [
-          { id: 0, text: '有' },
-          { id: 1, text: '无' }
-        ]
+        this.columns = [{ id: 0, text: '有' }, { id: 1, text: '无' }]
       } else if (pickerType == '5') {
         this.columns = DataDictionary.taxIdentity
       } else if (pickerType == '6') {
@@ -676,7 +669,7 @@ export default {
               }
             }
             //与被保人关系是配偶
-          let insuredInfo = JSON.parse(this.saleInsuredPersonInfo)
+            let insuredInfo = this.saleInsuredPersonInfo
             //如果投保人不是已婚
             if (insuredInfo.marriage != '1') {
               return this.$toast('亲，受益人与被保险人关系为配偶，被保险人婚姻状况必须为已婚哦~')
@@ -848,9 +841,7 @@ export default {
               obj['2'] = true
               obj['3'] = true
               if (obj[idType] === undefined) {
-              return this.$toast(
-                '亲，国籍为中国，且未满2周岁儿童，证件类型必须“身份证”或“户口本”或“出生证”或“台湾居民来往大陆通行证”或“港澳居民来往内地通行证”'
-              )
+                return this.$toast('亲，国籍为中国，且未满2周岁儿童，证件类型必须“身份证”或“户口本”或“出生证”或“台湾居民来往大陆通行证”或“港澳居民来往内地通行证”')
               }
             } else if (age < 16) {
               // 小于16岁
@@ -879,6 +870,7 @@ export default {
             }
           }
           
+          
           let beneficiaries = []
           if (localStorage.beneficiaryInfo) {
             // 从 localStorage 取出数据
@@ -910,6 +902,7 @@ export default {
             }
           }
           
+          
           beneficiaries.push(this.userInfo)
           // console.log(beneficiaries)
           // 保存 新增的受益人信息 以及页面跳转字段