Merge branch 'dev2.0' into dev_wy

@@ -98,25 +98,28 @@ Page({
       onChange: 'onPickerSelect'
     },
     edutypeData: {
-      label: '教育类别',
+      label: '教育类型',
+      isrequre: true,
       bindtype: 'edu_type',
       selected: '',
       isblack: 'true',
-      values: ["职业能力", "专业能力"],
-      placeholder: '请选择教育类别',
+      values: ["学历教育", "非学历教育"],
+      placeholder: '请选择教育类型',
       onChange: 'onPickerSelect'
     },
     edustyleData: {
-      label: '教育类型',
+      label: '教育类别',
+      isrequre: true,
       bindtype: 'edu_style',
       selected: '',
       isblack: 'true',
-      values: ["学历教育", "非学历教育"],
-      placeholder: '请选择教育类型',
+      values: ["职业能力", "专业能力"],
+      placeholder: '请选择教育类别',
       onChange: 'onPickerSelect'
     },
     edulevelData: {
       label: '学历教育阶段',
+      isrequre: true,
       bindtype: 'edu_level',
       selected: '',
       isblack: 'true',
@@ -592,10 +595,10 @@ Page({
         break;
       case 'continuing_education':
         if (this.data.edutypeData.selected.length < 1) {
-          this.showToast('请选择教育类型')
+          this.showToast('请选择教育类别')
           return
-        } else if (this.data.edutypeData.edu_lable == 'school') {
-          newdata.edu_type_lable = '0'
+        } else if (this.data.edu_lable == 'school') {
+          // newdata.edu_type_lable = '0'
           newdata.study_startdate = this.data.studystartdate.selected
           newdata.study_enddate = this.data.studyenddate.selected
           if (this.data.edulevelData.selected.length < 1) {
@@ -610,8 +613,9 @@ Page({
             this.showToast('请选择受教育日期')
             return
           }
+          newdata.education_type = 'title'//学历
           newdata.education_period = this.data.edulevelData.selected
-        } else if (this.data.edutypeData.edu_lable == 'tech') {
+        } else if (this.data.edu_lable == 'tech') {
           if (this.data.edustyleData.selected.length < 1) {
             this.showToast('请选择教育类型')
             return
@@ -629,10 +633,9 @@ Page({
             return
           }
           //新增教育类型(区别教育类别)
-          newdata.education_style = this.data.edustyleData.selected
-          newdata.edu_type_lable = '1'
+          // newdata.edu_type_lable = '1'
+          newdata.education_type = this.data.edustyleData.selected == '职业能力' ? 'profession' : 'major'
         }
-        newdata.education_type = this.data.edutypeData.selected
         newdata.education_end = this.data.studystartdate.datelong
         newdata.education_start = this.data.studyenddate.datelong
         break;