Merge branch 'dev_无非居民' into dev_py

@@ -90,9 +90,7 @@ App({
         console.log("login-res-fail", res);
       },
       complete:function(res){
-        if(str=="chat"){
-          that.globalData.refresh_complete = true
-        }
+        
       }
     })
   },
@@ -144,7 +142,6 @@ App({
     appId: appId,
     com_id: "",
     onshow_count: 0,
-    refresh_complete: false,
     // baseUrl: "http://47.99.47.16:20000/",
     // baseUrl: "http://47.96.75.229:20000/",
     // baseUrl: "http://192.144.144.220:20000/",

@@ -740,9 +740,9 @@ Page({
         if (data.children_name && data.children_name.length) {
           setData.children_name = data.children_name
         }
-        if (data.student_no && data.student_no.length) {
-          setData.children_student_no = data.student_no
-        }
+        // if (data.student_no && data.student_no.length) {
+        //   setData.children_student_no = data.student_no
+        // }
         if (data.education_period && data.education_period.length) {
           var childedudegreeData = this.data.childedudegreeData
           childedudegreeData.selected = data.education_period
@@ -1289,10 +1289,10 @@ Page({
           this.showToast('请选择分配比例')
           return
         }
-        if (!formdata.children_student_no || formdata.children_student_no.length < 1) {
-          this.showToast('请填写学籍号')
-          return
-        }
+        // if (!formdata.children_student_no || formdata.children_student_no.length < 1) {
+        //   this.showToast('请填写学籍号')
+        //   return
+        // }
         if (this.data.childedudegreeData.selected.length < 1) {
           this.showToast('请选择教育阶段')
           return

@@ -47,12 +47,12 @@
       <template is="picker_cell_normal" data="{{...childrenpercentData}}" />
 
       <view class='divide_line_30'></view>
-      <view style='height:90rpx'>
+      <!-- <view style='height:90rpx'>
         <text class='red_star_right_10'>*</text>
         <text class='text_777_30 float_left'>子女学籍号</text>
         <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入子女学籍号' name='children_student_no' value='{{children_student_no}}'></input>
       </view>
-      <view class='divide_line_30'></view>
+      <view class='divide_line_30'></view> -->
 
       <template is="picker_cell_normal" data="{{...childedudegreeData}}" />
       <view class='divide_line_30'></view>