Commit 3cee774b authored by 罗超's avatar 罗超

1

parent d8422a53
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</view> </view>
<view class="subpicker" v-if="item1.subType==2"> <view class="subpicker" v-if="item1.subType==2">
<picker :mode ="item1.mode" class="subpicker" :range="item1.array" @change="changPicker($event,item1.field,item1.mode,item1.array)"> <picker :mode ="item1.mode" class="subpicker" :range="item1.array" @change="changPicker($event,item1.field,item1.mode,item1.array)">
<input class="subInput" disabled type="text" :placeholder="item1.placehloder" v-model="data[item1.field]" />{{data[item1.field]}} <input class="subInput" disabled type="text" :placeholder="item1.placehloder" v-model="data[item1.field]" />
</picker> </picker>
</view> </view>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</view> </view>
</view> </view>
<view class="saveBtn" :style="{'background-color': `${mainColor}`}" @click="saveData"> <view class="saveBtn" :style="{'background-color': `${mainColor}`}" @click="saveData">
保存 保存{{data.nativePlace}}
</view> </view>
</view> </view>
</template> </template>
...@@ -313,6 +313,7 @@ ...@@ -313,6 +313,7 @@
City:0,//市行政编码 City:0,//市行政编码
District:0,//区行政编码 District:0,//区行政编码
AlbumList:[],//照片墙 AlbumList:[],//照片墙
Age:0
}, },
//控制图片显示 //控制图片显示
AlbumListShow:{ AlbumListShow:{
...@@ -329,15 +330,14 @@ ...@@ -329,15 +330,14 @@
}, },
methods:{ methods:{
changPicker(arg,e,mode,arr){ changPicker(arg,e,mode,arr){
console.log(arg)
if(mode=="selector"){ if(mode=="selector"){
this.data[e]=arr[arg.detail.value] this.data[e]=arr[arg.detail.value]
}else if(mode=="date"){ }else if(mode=="date"){
this.data[e]=arg.detail.value this.data[e]=arg.detail.value
}else if(mode=="region"){ }else if(mode=="region"){
this.data.nativePlace=JSON.parse(JSON.stringify(arg.detail.value)) this.data.nativePlace=JSON.parse(JSON.stringify(arg.detail.value)).join(",")
this.data.addCode=JSON.parse(JSON.stringify(arg.detail.code)) this.data.addCode=JSON.parse(JSON.stringify(arg.detail.code))
console.log(this.data.nativePlace) this.$forceUpdate()
} }
}, },
chooseImg(index,key) { chooseImg(index,key) {
...@@ -387,10 +387,14 @@ ...@@ -387,10 +387,14 @@
}, },
saveData(){ saveData(){
let msg=JSON.parse(JSON.stringify(this.data)) let msg=JSON.parse(JSON.stringify(this.data))
if(this.data.nativePlace&&this.data.nativePlace.length>0){ if(msg.Age==""){
msg.PName=this.data.nativePlace[0] msg.Age=0
msg.CName=this.data.nativePlace[1] }
msg.DName=this.data.nativePlace[2] if(msg.nativePlace&&msg.nativePlace.length>0){
let newPlace=msg.nativePlace.split(",")
msg.PName=newPlace[0]
msg.CName=newPlace[1]
msg.DName=newPlace[2]
} }
if(this.data.addCode&&this.data.addCode.length>0){ if(this.data.addCode&&this.data.addCode.length>0){
console.log(this.data.addCode) console.log(this.data.addCode)
...@@ -457,7 +461,7 @@ ...@@ -457,7 +461,7 @@
}); });
return return
} }
if(this.data. Marriage==""){ if(this.data.Marriage==""){
uni.showToast({ uni.showToast({
title: '请选择婚姻状况', title: '请选择婚姻状况',
duration: 2000, duration: 2000,
...@@ -465,6 +469,14 @@ ...@@ -465,6 +469,14 @@
}); });
return return
} }
if(this.data.nativePlace==""){
uni.showToast({
title: '请选择籍贯',
duration: 2000,
icon:"none"
});
return
}
console.log(this.data) console.log(this.data)
this.request2({ this.request2({
url: '/api/AppletMiai/GetSetMiAiBaseInfo', url: '/api/AppletMiai/GetSetMiAiBaseInfo',
...@@ -515,9 +527,9 @@ ...@@ -515,9 +527,9 @@
this.data=res.data this.data=res.data
if(res.data.PName&&res.data.DName&&res.data.CName){ if(res.data.PName&&res.data.DName&&res.data.CName){
// this.data.nativePlace=[res.data.PName,res.data.DName,res.data.CName] // this.data.nativePlace=[res.data.PName,res.data.DName,res.data.CName]
this.data.nativePlace=JSON.parse(JSON.stringify([res.data.PName,res.data.DName,res.data.CName])) this.data.nativePlace=JSON.parse(JSON.stringify([res.data.PName,res.data.DName,res.data.CName])) .split(",")
}else{ }else{
this.data.nativePlace="" this.data.nativePlace=""
} }
this.data.addCode="" this.data.addCode=""
......
...@@ -251,27 +251,99 @@ ...@@ -251,27 +251,99 @@
<view class="pd-bubble"> <view class="pd-bubble">
<view class="bubble" v-if="dataList.HuKou">户口:{{dataList.HuKou}}</view> <view class="bubble" v-if="dataList.HuKou">户口:{{dataList.HuKou}}</view>
<view class="bubble" v-if="dataList.NativePlace">籍贯:{{dataList.NativePlace}}</view> <view class="bubble" v-if="dataList.NativePlace">籍贯:{{dataList.NativePlace}}</view>
<view class="bubble" v-if="dataList.SchoolInfo">{{dataList.SchoolInfo}}</view> <view class="bubble" v-if="dataList.SchoolInfo">学校:{{dataList.SchoolInfo}}</view>
<view class="bubble" v-if="dataList.EducationType">学历:{{dataList.EducationType}}</view> <view class="bubble" v-if="dataList.EducationType">学历:{{dataList.EducationType}}</view>
<view class="bubble" v-if="dataList.HouseInfo">{{dataList.HouseInfo}}</view> <view class="bubble" v-if="dataList.HouseInfo">{{dataList.HouseInfo}}</view>
<view class="bubble" v-if="dataList.MajorInfo">{{dataList.MajorInfo}}</view> <view class="bubble" v-if="dataList.MajorInfo">{{dataList.MajorInfo}}</view>
<view class="bubble" v-if="dataList.Job">{{dataList.Job}}</view>
<view class="bubble" v-if="dataList.MotherInfo">母亲:{{dataList.MotherInfo}}</view> <view class="bubble" v-if="dataList.MotherInfo">母亲:{{dataList.MotherInfo}}</view>
<view class="bubble" v-if="dataList.FatherInfo">父亲:{{dataList.FatherInfo}}</view> <view class="bubble" v-if="dataList.FatherInfo">父亲:{{dataList.FatherInfo}}</view>
<view class="bubble" v-if="dataList.CarInfo">车:{{dataList.CarInfo}}</view> <view class="bubble" v-if="dataList.CarInfo">车:{{dataList.CarInfo}}</view>
<view class="bubble" v-if="dataList.Job">职位:{{dataList.Job}}</view>
<view class="bubble" v-if="dataList.WorkUnit">工作单位:{{dataList.WorkUnit}}</view>
</view> </view>
<view class="pd-title">关于她(他)</view> <view class="pd-title">家庭背景</view>
<view class="pd-abouthim">
<u-read-more show-height="100" :toggle="true" :shadow-style="shadowStyle" close-text='展开查看全部'>
<rich-text v-if="dataList.FamilyInfo==''" nodes="无"></rich-text>
<rich-text v-if="dataList.FamilyInfo!=''" :nodes="dataList.FamilyInfo" style="font-size: 12px;color: #000;"></rich-text>
</u-read-more>
</view>
<view class="pd-title">业余爱好</view>
<view class="pd-abouthim">
<u-read-more show-height="100" :toggle="true" :shadow-style="shadowStyle" close-text='展开查看全部'>
<rich-text v-if="dataList.Hobby==''" nodes="无"></rich-text>
<rich-text v-if="dataList.Hobby!=''" :nodes="dataList.Hobby" style="font-size: 12px;color: #000;"></rich-text>
</u-read-more>
</view>
<view class="pd-title">喜欢的食物</view>
<view class="pd-abouthim">
<u-read-more show-height="100" :toggle="true" :shadow-style="shadowStyle" close-text='展开查看全部'>
<rich-text v-if="dataList.LikeFood==''" nodes="无"></rich-text>
<rich-text v-if="dataList.LikeFood!=''" :nodes="dataList.LikeFood" style="font-size: 12px;color: #000;"></rich-text>
</u-read-more>
</view>
<view class="pd-title">喜欢的书</view>
<view class="pd-abouthim">
<u-read-more show-height="100" :toggle="true" :shadow-style="shadowStyle" close-text='展开查看全部'>
<rich-text v-if="dataList.LikeBook==''" nodes="无"></rich-text>
<rich-text v-if="dataList.LikeBook!=''" :nodes="dataList.LikeBook" style="font-size: 12px;color: #000;"></rich-text>
</u-read-more>
</view>
<view class="pd-title">喜欢的电影和电视剧</view>
<view class="pd-abouthim">
<u-read-more show-height="100" :toggle="true" :shadow-style="shadowStyle" close-text='展开查看全部'>
<rich-text v-if="dataList.LikeTV==''" nodes="无"></rich-text>
<rich-text v-if="dataList.LikeTV!=''" :nodes="dataList.LikeTV" style="font-size: 12px;color: #000;"></rich-text>
</u-read-more>
</view>
<view class="pd-title">喜欢的一首情歌</view>
<view class="pd-abouthim">
<u-read-more show-height="100" :toggle="true" :shadow-style="shadowStyle" close-text='展开查看全部'>
<rich-text v-if="dataList.LikeSong==''" nodes="无"></rich-text>
<rich-text v-if="dataList.LikeSong!=''" :nodes="dataList.LikeSong" style="font-size: 12px;color: #000;"></rich-text>
</u-read-more>
</view>
<view class="pd-title">欣赏的名人的爱情和原因</view>
<view class="pd-abouthim">
<u-read-more show-height="100" :toggle="true" :shadow-style="shadowStyle" close-text='展开查看全部'>
<rich-text v-if="dataList.IdealLove==''" nodes="无"></rich-text>
<rich-text v-if="dataList.IdealLove!=''" :nodes="dataList.IdealLove" style="font-size: 12px;color: #000;"></rich-text>
</u-read-more>
</view>
<view class="pd-title">听过最美的情话</view>
<view class="pd-abouthim">
<u-read-more show-height="100" :toggle="true" :shadow-style="shadowStyle" close-text='展开查看全部'>
<rich-text v-if="dataList.LoveTalk==''" nodes="无"></rich-text>
<rich-text v-if="dataList.LoveTalk!=''" :nodes="dataList.LoveTalk" style="font-size: 12px;color: #000;"></rich-text>
</u-read-more>
</view>
<view class="pd-title">单身原因</view>
<view class="pd-abouthim">
<u-read-more show-height="100" :toggle="true" :shadow-style="shadowStyle" close-text='展开查看全部'>
<rich-text v-if="dataList.SingleReason==''" nodes="无"></rich-text>
<rich-text v-if="dataList.SingleReason!=''" :nodes="dataList.SingleReason" style="font-size: 12px;color: #000;"></rich-text>
</u-read-more>
</view>
<view class="pd-title">自我介绍</view>
<view class="pd-abouthim"> <view class="pd-abouthim">
<u-read-more show-height="100" :toggle="true" :shadow-style="shadowStyle" close-text='展开查看全部'> <u-read-more show-height="100" :toggle="true" :shadow-style="shadowStyle" close-text='展开查看全部'>
<rich-text v-if="dataList.About==''" nodes="无"></rich-text> <rich-text v-if="dataList.About==''" nodes="无"></rich-text>
<rich-text v-if="dataList.About!=''" :nodes="dataList.About" style="font-size: 12px;color: #000;"></rich-text> <rich-text v-if="dataList.About!=''" :nodes="dataList.About" style="font-size: 12px;color: #000;"></rich-text>
</u-read-more> </u-read-more>
</view> </view>
<view class="pd-title">理想中的爱情</view> <view class="pd-title">希望的TA是...</view>
<view class="pd-abouthim"> <view class="pd-abouthim">
{{dataList.IdealLove?dataList.IdealLove:'暂无'}} <u-read-more show-height="100" :toggle="true" :shadow-style="shadowStyle" close-text='展开查看全部'>
<rich-text v-if="dataList.HopeYou==''" nodes="无"></rich-text>
<rich-text v-if="dataList.HopeYou!=''" :nodes="dataList.HopeYou" style="font-size: 12px;color: #000;"></rich-text>
</u-read-more>
</view> </view>
<!-- <view class="pd-title">理想中的爱情</view>
<view class="pd-abouthim">
{{dataList.IdealLove?dataList.IdealLove:'暂无'}}
</view> -->
<view class="pd-title">相册</view> <view class="pd-title">相册</view>
<view class="pd-img" style="margin-top: 15px;" > <view class="pd-img" style="margin-top: 15px;" >
<view v-if="dataList.AlbumList.length==0" style="width: 100%;height: 50px;line-height: 50px;text-align: center;color: #666666;"> <view v-if="dataList.AlbumList.length==0" style="width: 100%;height: 50px;line-height: 50px;text-align: center;color: #666666;">
...@@ -423,8 +495,8 @@ ...@@ -423,8 +495,8 @@
}, },
goedit(){ goedit(){
uni.navigateTo({ uni.navigateTo({
url: '/pages/blindDate/personal/editmaterial?UserId='+this.UserId // url: '/pages/blindDate/personal/editmaterial?UserId='+this.UserId
// url: '/pages/blindDate/editData?UserId='+this.UserId url: '/pages/blindDate/editData?UserId='+this.UserId
}); });
}, },
dianjiguanzhu(x){//关注操作 dianjiguanzhu(x){//关注操作
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment