Merge branch 'hotfix/电投受益人页面校验修改' into dev

# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/main.js
#	src/router/ebiz/index.js

src/api/ebiz/sale/sale.js

@@ -223,6 +223,7 @@ export function revokeOrder(data) {
   })
 }
 // 获取产品允许投保人单位列表
+
 export function getCompany(data) {
   return request({
     url: getUrl('/sale/product/company', 1),
@@ -230,6 +231,7 @@ export function getCompany(data) {
     data
   })
 }
+
 // 2.1.	校验银行卡信息
 export function checkCard(data) {
   return request({

src/main.js

@@ -12,40 +12,25 @@ import noMoreClick from '@/directive/noMoreClick'
 import vueHashCalendar from 'vue-hash-calendar'
 import 'vue-hash-calendar/lib/vue-hash-calendar.css'
 
-import {
-  Cell, CellGroup,
-  DatetimePicker ,
-  Popup ,
-  Picker,
-  Col, 
-  Row,
-  Tab, 
-  Tabs,
-  NavBar,
-  Toast,
-  Button,
-  Dialog,
-  Icon,
-  Lazyload 
-} from 'vant'
-Vue.use(Cell);
+import { Cell, CellGroup, DatetimePicker, Popup, Picker, Col, Row, Tab, Tabs, NavBar, Toast, Button, Dialog, Icon, Lazyload } from 'vant'
+Vue.use(Cell)
 Vue.use(CellGroup)
-Vue.use(DatetimePicker);
+Vue.use(DatetimePicker)
 Vue.use(Popup)
 Vue.use(Picker)
 Vue.use(Col)
-Vue.use(Row);
+Vue.use(Row)
 Vue.use(Tab)
-Vue.use(Tabs);
+Vue.use(Tabs)
 Vue.use(Icon)
 Vue.use(vueHashCalendar)
-Vue.use(NavBar);
+Vue.use(NavBar)
 Vue.use(Toast)
 Vue.use(Button)
 Vue.use(Dialog)
 Vue.use(Lazyload, {
-  lazyComponent: true,
-});
+  lazyComponent: true
+})
 
 Vue.prototype.$assetsUrl = config.assetsUrl
 Vue.prototype.$mainUrl = config.mainUrl
@@ -56,7 +41,7 @@ Vue.directive('no-more-click', noMoreClick)
 //解决ios移动端input调软键盘问题
 let isIphone = navigator.userAgent.indexOf('iPhone') != -1
 if (isIphone) {
-  FastClick.prototype.focus = function (targetElement) {
+  FastClick.prototype.focus = function(targetElement) {
     let length
     if (
       isIphone &&
@@ -100,14 +85,12 @@ if (process.env.VUE_APP_FLAG != 'prd') {
 // Eruda.init()
 
 // 注册过滤器
-Object.keys(Filters).forEach(function (k) {
+Object.keys(Filters).forEach(function(k) {
   Vue.filter(k, Filters[k])
 })
 
 //权限控制
-import {
-  permission
-} from '@/assets/js/utils/permission'
+import { permission } from '@/assets/js/utils/permission'
 permission()
 
 //ios点击300毫秒时延
@@ -118,4 +101,4 @@ new Vue({
   router,
   store,
   render: h => h(App)
-}).$mount('#app')
+}).$mount('#app')

src/router/ebiz/index.js

@@ -24,6 +24,7 @@ import productStore from './product-store'
 import institutionalPerform from './institutionalPerform'
 import performance from './performance'
 import attendance from './attendance'
+
 export default [
   ...proposal,
   ...sale,

src/router/ebiz/performance.js

@@ -4,40 +4,40 @@ const PerformanceList = () => import('@/views/ebiz/performance/PerformanceList')
 const PerformanceInfo = () => import('@/views/ebiz/performance/PerformanceInfo')
 
 export default [
-    {
-      path: '/performance/Performance',
-      name: 'Performance',
-      component: performance,
-      meta: {
-        title: '业绩查询',
-        index: 1
-      }
-    },
-    {
-      path: '/performance/AttendanceInfo',
-      name: 'AttendanceInfo',
-      component: attendanceInfo,
-      meta: {
-        title: '业绩查询',
-        index: 3
-      }
-    },
-    {
-      path: '/performance/PerformanceList',
-      name: 'PerformanceList',
-      component: PerformanceList,
-      meta: {
-        title: '业绩查询',
-        index: 3
-      }
-    },
-    {
-      path: '/performance/PerformanceInfo',
-      name: 'PerformanceInfo',
-      component: PerformanceInfo,
-      meta: {
-        title: '业绩查询',
-        index: 4
-      }
+  {
+    path: '/performance/Performance',
+    name: 'Performance',
+    component: performance,
+    meta: {
+      title: '个险业绩查询',
+      index: 1
     }
-  ]
+  },
+  {
+    path: '/performance/AttendanceInfo',
+    name: 'AttendanceInfo',
+    component: attendanceInfo,
+    meta: {
+      title: '个险业绩查询',
+      index: 3
+    }
+  },
+  {
+    path: '/performance/PerformanceList',
+    name: 'PerformanceList',
+    component: PerformanceList,
+    meta: {
+      title: '个险业绩查询',
+      index: 3
+    }
+  },
+  {
+    path: '/performance/PerformanceInfo',
+    name: 'PerformanceInfo',
+    component: PerformanceInfo,
+    meta: {
+      title: '个险业绩查询',
+      index: 4
+    }
+  }
+]

src/views/ebiz/sale/AddBeneficiaryInfo.vue

@@ -687,9 +687,9 @@ export default {
           }
 
           //如果性别男小于22岁 或者 性别女小于20岁
-          // if ((this.userInfo.sex == '0' && age < 22) || (this.userInfo.sex == '1' && age < 20)) {
-          //   return this.$toast('年龄与婚姻状况不符')
-          // }
+          if ((this.userInfo.sex == '0' && age < 22) || (this.userInfo.sex == '1' && age < 20)) {
+            return this.$toast('年龄与婚姻状况不符')
+          }
         }
 
         // 受益人是被保险人的父母，被保险人是投保人的子女时