|
@@ -10,23 +10,23 @@
|
|
|
<u-form :model="form" ref="uForm">
|
|
|
<view class="jpLogin-input">
|
|
|
<u-form-item required="true">
|
|
|
- <u-input v-model="form.address" type="select" placeholder="我的出生地" @click="show_birthday_address = true" />
|
|
|
+ <u-input v-model="form.address" type="select" placeholder="我的出生地" @click="birthdayAddressChange" />
|
|
|
<u-select v-model="show_birthday_address" mode="single-column" :list="area_ranges_by_names" @confirm="birthdayAddressConfirm"></u-select>
|
|
|
- </u-form-item>
|
|
|
+ </u-form-item>
|
|
|
</view>
|
|
|
<view class="jpLogin-input">
|
|
|
- <u-form-item required="true"><u-input v-model="form.registered_residence" type="select" placeholder="我的的户口所在地" @click="show_registered_residence = true" /></u-form-item>
|
|
|
- <u-select v-model="show_registered_residence" mode="single-column" :list="area_ranges_by_names" @confirm="registeredResidenceConfirm"></u-select>
|
|
|
+ <u-form-item required="true"><u-input v-model="form.registered_residence" type="select" placeholder="我的的户口所在地" @click="registeredResidenceAddressChange" /></u-form-item>
|
|
|
+<!-- <u-select v-model="show_registered_residence" mode="single-column" :list="area_ranges_by_names" @confirm="registeredResidenceConfirm"></u-select> -->
|
|
|
</view>
|
|
|
<view class="jpLogin-input">
|
|
|
- <u-form-item required="true"><u-input v-model="form.work_address" type="select" placeholder="我的工作所在地" @click="show_work_address = true" /></u-form-item>
|
|
|
- <u-select v-model="show_work_address" mode="single-column" :list="area_ranges_by_names" @confirm="workAddressConfirm"></u-select>
|
|
|
+ <u-form-item required="true"><u-input v-model="form.work_address" type="select" placeholder="我的工作所在地" @click="workAddressChange" /></u-form-item>
|
|
|
+<!-- <u-select v-model="show_work_address" mode="single-column" :list="area_ranges_by_names" @confirm="workAddressConfirm"></u-select>-->
|
|
|
|
|
|
</view>
|
|
|
|
|
|
<view class="jpLogin-input" style="margin-top: 38px;">
|
|
|
<u-form-item required="true"><u-input v-model="form.education" type="select" placeholder="我的学历" @click="show_education = true"/></u-form-item>
|
|
|
- <u-select v-model="show_education" mode="single-column" :list="education_ranges_by_names" @confirm="educationConfirm"></u-select>
|
|
|
+<!-- <u-select v-model="show_education" mode="single-column" :list="education_ranges_by_names" @confirm="educationConfirm"></u-select> -->
|
|
|
</view>
|
|
|
<view class="jpLogin-input">
|
|
|
<u-form-item required="true"><u-input v-model="form.profession" type="select" placeholder="我的行业" @click="show_profession = true"/></u-form-item>
|
|
@@ -97,9 +97,10 @@
|
|
|
<view class="step-btn" @click="previous">返回上一步</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <mpvue-city-picker themeColor="#007AFF" ref="mpvuebirtydayCityPicker" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onBirthdayCityConfirm"></mpvue-city-picker>
|
|
|
- <mpvue-city-picker themeColor="#007AFF" ref="mpvueRegisteredResidenceCityPicker" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onResidenceRegisteredCityConfirm"></mpvue-city-picker>
|
|
|
- <mpvue-city-picker themeColor="#007AFF" ref="mpvueWorkCityPicker" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onWorkCityConfirm"></mpvue-city-picker>
|
|
|
+ <!-- :pickerValueDefault="cityPickerValueDefault"-->
|
|
|
+ <mpvue-city-picker themeColor="#007AFF" ref="mpvuebirtydayCityPicker" @onConfirm="onBirthdayCityConfirm"></mpvue-city-picker>
|
|
|
+ <mpvue-city-picker themeColor="#007AFF" ref="mpvueRegisteredResidenceCityPicker" @onConfirm="onResidenceRegisteredCityConfirm"></mpvue-city-picker>
|
|
|
+ <mpvue-city-picker themeColor="#007AFF" ref="mpvueWorkCityPicker" @onConfirm="onWorkCityConfirm"></mpvue-city-picker>
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
@@ -136,6 +137,7 @@
|
|
|
house_statuses:[],//['已购住房','与人合租','独自租房','与父母同住','住亲朋家','住单位房','需要时购房'],
|
|
|
corportation_types:['世界500强','上市公司','国有企业','私营企业','自有公司'],
|
|
|
children_statuses:[],//['没有孩子','有孩子跟着自己','有孩子跟着对方','有孩子但已独立'],
|
|
|
+ interests_ranges:[],
|
|
|
value:'0',
|
|
|
customStyle: {
|
|
|
background: '#FF5E5E'
|
|
@@ -173,7 +175,15 @@
|
|
|
},
|
|
|
onLoad(){
|
|
|
_self = this;
|
|
|
- let subject = {subject:''}
|
|
|
+ let subject = {subject:''}
|
|
|
+ //uni.removeStorageSync('AreaList')
|
|
|
+ //let areaList = uni.getStorageInfoSync('AreaList');
|
|
|
+ //if(areaList == null)
|
|
|
+
|
|
|
+ //else
|
|
|
+ //{
|
|
|
+ // console.log('城市列表'+JSON.stringify(areaList))
|
|
|
+ //}
|
|
|
loginApi.getBaseDictionary(subject).then(function(data){
|
|
|
//console.log('基础字典'+JSON.stringify(data));
|
|
|
if(data.data)
|
|
@@ -213,7 +223,7 @@
|
|
|
|
|
|
let qyList = data.data.qyList;
|
|
|
if(qyList){
|
|
|
- console.log('区域'+JSON.stringify(qyList));
|
|
|
+ //console.log('区域'+JSON.stringify(qyList));
|
|
|
_self.area_ranges = qyList;
|
|
|
for(let i = 0;i< _self.area_ranges.length;i++)
|
|
|
{
|
|
@@ -223,7 +233,7 @@
|
|
|
}
|
|
|
let xlList = data.data.xlList;
|
|
|
if(xlList){
|
|
|
- console.log('学历'+JSON.stringify(xlList));
|
|
|
+ //console.log('学历'+JSON.stringify(xlList));
|
|
|
_self.education_ranges = xlList;
|
|
|
for(let i = 0;i< _self.education_ranges.length;i++)
|
|
|
{
|
|
@@ -233,7 +243,7 @@
|
|
|
}
|
|
|
let hyList = data.data.hyList;
|
|
|
if(hyList){
|
|
|
- console.log('行业'+JSON.stringify(hyList));
|
|
|
+ //console.log('行业'+JSON.stringify(hyList));
|
|
|
_self.profession_ragnes = hyList;
|
|
|
for(let i = 0;i< _self.profession_ragnes.length;i++)
|
|
|
{
|
|
@@ -254,7 +264,7 @@
|
|
|
}*/
|
|
|
let hyqkList = data.data.hyqkList;
|
|
|
if(hyqkList){
|
|
|
- console.log('婚姻'+JSON.stringify(hyqkList));
|
|
|
+ //console.log('婚姻'+JSON.stringify(hyqkList));
|
|
|
_self.marriage_statuses = hyqkList;
|
|
|
for(let i = 0;i< _self.marriage_statuses.length;i++)
|
|
|
{
|
|
@@ -262,6 +272,17 @@
|
|
|
_self.marriage_statuses_by_names.push(marriage_status);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ let hobbyInfoList = data.data.hobbyInfoList;
|
|
|
+ if(hobbyInfoList){
|
|
|
+ console.log('兴趣列表'+JSON.stringify(hobbyInfoList));
|
|
|
+ _self.interests_ranges = hobbyInfoList;
|
|
|
+ /*for(let i = 0;i< _self.interests_ranges.length;i++)
|
|
|
+ {
|
|
|
+ let marriage_status = {value:_self.marriage_statuses[i].value, label: _self.marriage_statuses[i].name};
|
|
|
+ _self.marriage_statuses_by_names.push(marriage_status);
|
|
|
+ }*/
|
|
|
+ }
|
|
|
}
|
|
|
},function(err){
|
|
|
console.log('获取基础字典错误'+JSON.stringify(err))
|
|
@@ -424,15 +445,15 @@
|
|
|
},
|
|
|
onBirthdayCityConfirm(e) {
|
|
|
_self.form.address = e.label;
|
|
|
- console.log('地址选择'+_self.address)
|
|
|
+ console.log('地址选择'+JSON.stringify(e))
|
|
|
},
|
|
|
onResidenceRegisteredCityConfirm(e) {
|
|
|
_self.form.registered_residence = e.label;
|
|
|
- console.log('地址选择'+_self.registered_residence)
|
|
|
+ console.log('地址选择'+JSON.stringify(e))
|
|
|
},
|
|
|
onWorkCityConfirm(e) {
|
|
|
_self.form.work_address = e.label;
|
|
|
- console.log('地址选择'+_self.work_address)
|
|
|
+ console.log('地址选择'+JSON.stringify(e))
|
|
|
},
|
|
|
birthdayAddressChange(){
|
|
|
this.$refs.mpvuebirtydayCityPicker.show()
|