学前教育逻辑 1：非必填

@@ -52,6 +52,7 @@ Page({
     rentAddress_haschanged: false,
     extrainfo_arr: ["请上传子女出生证明、学籍信息凭证、学费凭证、本人结婚证和分摊协议", "请上传学历学籍凭证", "请上传出生证明或关系证明、独生子女证、分摊协议、其他法定赡养人赡养证明", "请上传诊断书和医疗费用收据", "请上传首套房证明、还款证明、不动产登记证、结婚证和夫妻约定抵扣协议"],
     cur_index: '',
+    child_edu_pre: false,
 
     hasLoverData: {
       label: '是否有配偶',
@@ -495,7 +496,7 @@ Page({
       bindtype: 'school_country',
       isrequre: true,
       selected: '中国',
-      isblack: 'true',
+      // isblack: 'true',
       values: [],
       placeholder: '中国',
       onChange: 'onPickerSelect',
@@ -1491,9 +1492,15 @@ Page({
             return
           }
         }
-        if (!formdata.school_name || formdata.school_name.length < 1) {
-          this.showToast('请填写就读学校')
-          return
+        if (!this.data.child_edu_pre){
+          if (this.data.schoolCountryData.selected.length < 1) {
+            this.showToast('请选择就读国家')
+            return
+          }
+          if (!formdata.school_name || formdata.school_name.length < 1) {
+            this.showToast('请填写就读学校')
+            return
+          }
         }
         if (this.data.hasLoverData.selected.length < 1) {
           this.showToast('请选择是否有配偶')
@@ -2485,6 +2492,13 @@ Page({
         this.setData({
           childedudegreeData: childedudegreeData
         })
+        var ifPreprimary = (e.detail.value == '0')
+        this.data.schoolCountryData.isrequre = !ifPreprimary
+        this.setData({
+          schoolCountryData: this.data.schoolCountryData,
+          child_edu_pre: ifPreprimary
+        })
+        
         break;
         // case 'edu_degree':
         //   var edudegree_data = this.data.edudegreeData