提交 8ed0e63e5e68c01524478db3e958dc295961462d

作者 pangy
2 个父辈 09296520 e597c4a6

Merge branch 'dev_无非居民' into dev_py

@@ -90,9 +90,7 @@ App({ @@ -90,9 +90,7 @@ App({
90 console.log("login-res-fail", res); 90 console.log("login-res-fail", res);
91 }, 91 },
92 complete:function(res){ 92 complete:function(res){
93 - if(str=="chat"){  
94 - that.globalData.refresh_complete = true  
95 - } 93 +
96 } 94 }
97 }) 95 })
98 }, 96 },
@@ -144,7 +142,6 @@ App({ @@ -144,7 +142,6 @@ App({
144 appId: appId, 142 appId: appId,
145 com_id: "", 143 com_id: "",
146 onshow_count: 0, 144 onshow_count: 0,
147 - refresh_complete: false,  
148 // baseUrl: "http://47.99.47.16:20000/", 145 // baseUrl: "http://47.99.47.16:20000/",
149 // baseUrl: "http://47.96.75.229:20000/", 146 // baseUrl: "http://47.96.75.229:20000/",
150 // baseUrl: "http://192.144.144.220:20000/", 147 // baseUrl: "http://192.144.144.220:20000/",

147.6 KB | 宽: | 高:

148.7 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖
@@ -740,9 +740,9 @@ Page({ @@ -740,9 +740,9 @@ Page({
740 if (data.children_name && data.children_name.length) { 740 if (data.children_name && data.children_name.length) {
741 setData.children_name = data.children_name 741 setData.children_name = data.children_name
742 } 742 }
743 - if (data.student_no && data.student_no.length) {  
744 - setData.children_student_no = data.student_no  
745 - } 743 + // if (data.student_no && data.student_no.length) {
  744 + // setData.children_student_no = data.student_no
  745 + // }
746 if (data.education_period && data.education_period.length) { 746 if (data.education_period && data.education_period.length) {
747 var childedudegreeData = this.data.childedudegreeData 747 var childedudegreeData = this.data.childedudegreeData
748 childedudegreeData.selected = data.education_period 748 childedudegreeData.selected = data.education_period
@@ -1289,10 +1289,10 @@ Page({ @@ -1289,10 +1289,10 @@ Page({
1289 this.showToast('请选择分配比例') 1289 this.showToast('请选择分配比例')
1290 return 1290 return
1291 } 1291 }
1292 - if (!formdata.children_student_no || formdata.children_student_no.length < 1) {  
1293 - this.showToast('请填写学籍号')  
1294 - return  
1295 - } 1292 + // if (!formdata.children_student_no || formdata.children_student_no.length < 1) {
  1293 + // this.showToast('请填写学籍号')
  1294 + // return
  1295 + // }
1296 if (this.data.childedudegreeData.selected.length < 1) { 1296 if (this.data.childedudegreeData.selected.length < 1) {
1297 this.showToast('请选择教育阶段') 1297 this.showToast('请选择教育阶段')
1298 return 1298 return
@@ -47,12 +47,12 @@ @@ -47,12 +47,12 @@
47 <template is="picker_cell_normal" data="{{...childrenpercentData}}" /> 47 <template is="picker_cell_normal" data="{{...childrenpercentData}}" />
48 48
49 <view class='divide_line_30'></view> 49 <view class='divide_line_30'></view>
50 - <view style='height:90rpx'> 50 + <!-- <view style='height:90rpx'>
51 <text class='red_star_right_10'>*</text> 51 <text class='red_star_right_10'>*</text>
52 <text class='text_777_30 float_left'>子女学籍号</text> 52 <text class='text_777_30 float_left'>子女学籍号</text>
53 <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> 53 <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>
54 </view> 54 </view>
55 - <view class='divide_line_30'></view> 55 + <view class='divide_line_30'></view> -->
56 56
57 <template is="picker_cell_normal" data="{{...childedudegreeData}}" /> 57 <template is="picker_cell_normal" data="{{...childedudegreeData}}" />
58 <view class='divide_line_30'></view> 58 <view class='divide_line_30'></view>
注册登录 后发表评论