|
@@ -83,7 +83,7 @@ Page({ |
|
@@ -83,7 +83,7 @@ Page({ |
|
83
|
app.post(url, params, {}).then((res) => {
|
83
|
app.post(url, params, {}).then((res) => {
|
|
84
|
console.log('自动获取手机号', res);
|
84
|
console.log('自动获取手机号', res);
|
|
85
|
if (+res.code === 1) {
|
85
|
if (+res.code === 1) {
|
|
86
|
- this.setData({phone_number:res.data,is_wrong_phone:false,is_choose_phone:true})
|
86
|
+ this.setData({'user.tel':res.data,phone_number:res.data,is_wrong_phone:false,is_choose_phone:true})
|
|
87
|
}
|
87
|
}
|
|
88
|
});
|
88
|
});
|
|
89
|
},
|
89
|
},
|
|
@@ -153,25 +153,14 @@ Page({ |
|
@@ -153,25 +153,14 @@ Page({ |
|
153
|
console.log(2);
|
153
|
console.log(2);
|
|
154
|
this.setData({is_change:true});
|
154
|
this.setData({is_change:true});
|
|
155
|
}
|
155
|
}
|
|
156
|
- // if((this.data.is_choose_country&&this.data.country !== '')&&
|
|
|
|
157
|
- // (this.data.is_choose_city&&this.data.city !== '') &&
|
|
|
|
158
|
- // (this.data.is_choose_phone&&this.data.phone_number !== '') &&
|
|
|
|
159
|
- // (this.data.is_choose_introduce&&this.data.introduce !== '')
|
|
|
|
160
|
- // ) {
|
|
|
|
161
|
- // console.log(1);
|
|
|
|
162
|
- // this.setData({is_change:true});
|
|
|
|
163
|
- // }else if((this.data.is_choose_country&&this.data.country !== '')){
|
|
|
|
164
|
- // console.log(2);
|
|
|
|
165
|
- // this.setData({is_change:true});
|
|
|
|
166
|
- // }
|
|
|
|
167
|
- // if(((this.data.is_choose_country&&this.data.country !== '') || this.data.user.country !== null) &&
|
|
|
|
168
|
- // ((this.data.is_choose_city&&this.data.city !== '')|| this.data.user.city !== null) &&
|
|
|
|
169
|
- // ((this.data.is_choose_phone&&this.data.phone_number !== '')|| this.data.user.tel !== null) &&
|
|
|
|
170
|
- // !this.data.is_wrong_phone &&
|
|
|
|
171
|
- // ((this.data.is_choose_introduce&&this.data.introduce !== '') || this.data.user.introduce !== null)) {
|
|
|
|
172
|
- // console.log('111');
|
|
|
|
173
|
- // this.setData({is_change:true});
|
|
|
|
174
|
- // }
|
156
|
+ if((this.data.is_choose_country&&this.data.country !== '')&&
|
|
|
|
157
|
+ (this.data.is_choose_city&&this.data.city !== '') &&
|
|
|
|
158
|
+ (this.data.user.tel!==null&&this.data.user.tel !== '') &&
|
|
|
|
159
|
+ (this.data.is_choose_introduce&&this.data.introduce !== '')
|
|
|
|
160
|
+ ) {
|
|
|
|
161
|
+ console.log(1);
|
|
|
|
162
|
+ this.setData({is_change:true});
|
|
|
|
163
|
+ }
|
|
175
|
}
|
164
|
}
|
|
176
|
},
|
165
|
},
|
|
177
|
//保存
|
166
|
//保存
|
