Skip to content

M
mallapp
Commit 8fb80829 authored by Mac's avatar Mac
Browse files
Options

修改样式

parent 9fcd4c93
Hide whitespace changes
Inline Side-by-side
Showing with 218 additions and 55 deletions
pages/blindDate/editData.vue
View file @ 8fb80829
......@@ -15,14 +15,17 @@
{{item.tip}}
</view>
<view class="name">
{{item.name}} <text v-if="item.tip2" class="tip2">{{item.tip2}}</text>
{{item.name}}
<text v-if="item.tip2" class="tip2">{{item.tip2}}</text>
<text v-if="item.type==1" style="font-size: 24rpx;color: #999999;">(照片至少2张)</text>
</view>
<view class="imgBox" v-if="item.type==1">
<view class="left">
<!-- 大照片 -->
<view class="img1Box" :style="{'border-color': `${mainColor}`}" @click="chooseImg(0,'img1')">
<image :src="data.AlbumList[0]" mode="aspectFill" v-if="AlbumListShow.img1"></image>
<image :src="photoDemo" mode="widthFix" v-if="!AlbumListShow.img1" class="imgDemo"></image>
<image :src="data.AlbumList[0]" mode="aspectFill" class="img1" v-if="AlbumListShow.img1" ></image>
<image :src="photoDemo" mode="widthFix" v-if="!AlbumListShow.img1" style="width: 100rpx;height: auto;" ></image>
<u-icon name="clear" color='#F70027' size='50' class='gibistyle' v-if="AlbumListShow.img1" @click.native.stop="deleteimg(0,'img1')"></u-icon>
</view>
<view class="subImgBox">
......@@ -30,14 +33,17 @@
<view class="img2Box" @click="chooseImg(1,'img2')" :style="{'border-color': `${mainColor}`}">
<image :src="data.AlbumList[1]" mode="aspectFill" class="img2" v-if="AlbumListShow.img2"></image>
<image :src="photoDemo" mode="widthFix" v-if="!AlbumListShow.img2" class="imgDemo"></image>
<u-icon name="clear" color='#F70027' size='50' class='gibistyle' v-if="AlbumListShow.img2" @click.native.stop="deleteimg(1,'img2')"></u-icon>
</view>
<view class="img2Box" @click="chooseImg(2,'img3')" :style="{'border-color': `${mainColor}`}">
<image :src="data.AlbumList[2]" mode="aspectFill" class="img2" v-if="AlbumListShow.img3"></image>
<image :src="photoDemo" mode="widthFix" v-if="!AlbumListShow.img3" class="imgDemo"></image>
<u-icon name="clear" color='#F70027' size='50' class='gibistyle' v-if="AlbumListShow.img3" @click.native.stop="deleteimg(2,'img3')"></u-icon>
</view>
<view class="img2Box" @click="chooseImg(3,'img4')" :style="{'border-color': `${mainColor}`}">
<image :src="data.AlbumList[3]" mode="aspectFill" class="img2" v-if="AlbumListShow.img4"></image>
<image :src="photoDemo" mode="widthFix" v-if="!AlbumListShow.img4" class="imgDemo"></image>
<u-icon name="clear" color='#F70027' size='50' class='gibistyle' v-if="AlbumListShow.img4" @click.native.stop="deleteimg(3,'img4')"></u-icon>
</view>
</view>
......@@ -47,18 +53,22 @@
<view class="img2Box" @click="chooseImg(4,'img5')" :style="{'border-color': `${mainColor}`}">
<image :src="data.AlbumList[4]" mode="aspectFill" class="img2" v-if="AlbumListShow.img5"></image>
<image :src="photoDemo" mode="widthFix" v-if="!AlbumListShow.img5" class="imgDemo"></image>
<u-icon name="clear" color='#F70027' size='50' class='gibistyle' v-if="AlbumListShow.img5" @click.native.stop="deleteimg(4,'img5')"></u-icon>
</view>
<view class="img2Box" @click="chooseImg(5,'img6')" :style="{'border-color': `${mainColor}`}">
<image :src="data.AlbumList[5]" mode="aspectFill" class="img2" v-if="AlbumListShow.img6"></image>
<image :src="photoDemo" mode="widthFix" v-if="!AlbumListShow.img6" class="imgDemo"></image>
<u-icon name="clear" color='#F70027' size='50' class='gibistyle' v-if="AlbumListShow.img6" @click.native.stop="deleteimg(5,'img6')"></u-icon>
</view>
<view class="img2Box" @click="chooseImg(6,'img7')" :style="{'border-color': `${mainColor}`}">
<image :src="data.AlbumList[6]" mode="aspectFill" class="img2" v-if="AlbumListShow.img7"></image>
<image :src="photoDemo" mode="widthFix" v-if="!AlbumListShow.img7" class="imgDemo"></image>
<u-icon name="clear" color='#F70027' size='50' class='gibistyle' v-if="AlbumListShow.img7" @click.native.stop="deleteimg(6,'img7')"></u-icon>
</view>
<view class="img2Box" @click="chooseImg(7,'img8')" :style="{'border-color': `${mainColor}`}">
<image :src="data.AlbumList[7]" mode="aspectFill" class="img2" v-if="AlbumListShow.img8"></image>
<image :src="photoDemo" mode="widthFix" v-if="!AlbumListShow.img8" class="imgDemo"></image>
<u-icon name="clear" color='#F70027' size='50' class='gibistyle' v-if="AlbumListShow.img8" @click.native.stop="deleteimg(7,'img8')"></u-icon>
</view>
</view>
</view>
......@@ -67,13 +77,14 @@
<view class="subItemBox">
<view class="subName">
{{item1.name}}
<text v-if="item1.must!=undefined && item1.must" style="font-size: 12px;color: #F70027;margin-left: 3px;font-weight: normal;">*</text>
</view>
<input type="text" :placeholder="item1.placehloder" :disabled="item1.disabled" v-model="data[item1.field]" :type="item1.showType" class="subInput" v-if="item1.subType==1"/>
<view class="unit" v-if="item1.unit">
{{item1.unit}}
</view>
<view class="subpicker" v-if="item1.subType==2">
<picker :mode ="item1.mode" class="subpicker" :disabled="item1.disabled" :range="item1.array" @change="changPicker($event,item1.field,item1.mode,item1.array)">
<picker :mode ="item1.mode" class="subpicker" range-key='Name' :disabled="item1.disabled" :range="item1.array" @change="changPicker($event,item1.field,item1.mode,item1.array)">
<input class="subInput" disabled type="text" :disabled="item1.disabled" :placeholder="item1.placehloder" v-model="data[item1.field]" />
</picker>
<!-- <u-icon style="flex-grow: 4;" name="arrow-right"></u-icon> -->
......@@ -125,7 +136,8 @@
placehloder:"请填写昵称",
subType:1,
showType:"text",
disabled:true
disabled:true,
must:true,//必填
},{
name:"性别",
field:"SexStr",
......@@ -133,7 +145,8 @@
subType:2,
array:['男','女'],
mode:"selector",
disabled:true
disabled:true,
must:true,
},{
name:"出生日期",
field:"Birthday",
......@@ -141,7 +154,8 @@
subType:2,
array:"",
mode:"date",
disabled:false
disabled:false,
must:true,
},{
name:"身高",
field:"Height",
......@@ -149,7 +163,8 @@
subType:1,
unit:"厘米",
showType:"number",
disabled:false
disabled:false,
must:true,
},{
name:"体重",
field:"Weight",
......@@ -157,41 +172,45 @@
subType:1,
unit:"公斤",
showType:"number",
disabled:false
disabled:false,
must:true,
},{
name:"学历",
field:"EducationTypeStr",
placehloder:"请选择学历",
subType:2,
array:['高中及以下','大专','本科','硕士及以上'],
array:[],
mode:"selector",
disabled:false
disabled:false,
must:true,
},{
name:"毕业院校",
field:"SchoolInfo",
placehloder:"请填写毕业院校",
subType:1,
showType:"text",
disabled:false
disabled:false,
},{
name:"婚姻",
field:"MarriageStr",
placehloder:"请选择婚姻状况",
subType:2,
array:['未婚','离异','丧偶'],
array:[],
mode:"selector",
disabled:false
disabled:false,
must:true,
},{
name:"职位",
field:"Job",
placehloder:"请填写职位",
name:"工作单位",
field:"WorkUnit",
placehloder:"请填写工作单位",
subType:1,
showType:"text",
disabled:false
},{
name:"工作单位",
field:"WorkUnit",
placehloder:"请填写工作单位",
name:"职位",
field:"Job",
placehloder:"请填写职位",
subType:1,
showType:"text",
disabled:false
......@@ -202,7 +221,26 @@
subType:1,
unit:"万",
showType:"number",
disabled:false
disabled:false,
must:true,
},{
name:"房屋",
field:"HouseInfoStr",
placehloder:"请选择房屋情况",
subType:2,
array:[],
mode:"selector",
disabled:false,
must:true,
},{
name:"车辆",
field:"CarInfoStr",
placehloder:"请选择车辆情况",
subType:2,
array:[],
mode:"selector",
disabled:false,
must:true,
},{
name:"籍贯",
field:"nativePlace",
......@@ -212,7 +250,7 @@
mode:"region"
},{
name:"资产",
field:"HouseInfo",
field:"OtherInfo",
placehloder:"请填写资产",
subType:1,
showType:"text",
......@@ -304,17 +342,17 @@
Birthday:"",
Height:"",
Weight:"",
EducationType:"",
EducationType:0,
EducationTypeStr:"",
SchoolInfo:"",
Marriage:"",
Marriage:0,
MarriageStr:"",
Job:"",
WorkUnit:"",
YearMoney:"",
// NativePlace:"",//籍贯（省）
// HuKou:"",//籍贯（国家）
HouseInfo:"",
OtherInfo:"",
nativePlace:"",//自定义籍贯
addCode:"",//行政编码
FamilyInfo:"",
......@@ -337,7 +375,9 @@
City:0,//市行政编码
District:0,//区行政编码
AlbumList:[],//照片墙
Age:0
Age:0,
HouseInfo:0,//房屋信息
CarInfo:0,//车辆信息
},
//控制图片显示
AlbumListShow:{
......@@ -358,7 +398,18 @@
methods:{
changPicker(arg,e,mode,arr){
if(mode=="selector"){
this.data[e]=arr[arg.detail.value]
this.data[e]=arr[arg.detail.value].Name;
if(e == 'EducationTypeStr'){//把对应的id赋值
this.data.EducationType = arr[arg.detail.value].Id;
}else if(e == 'MarriageStr'){
this.data.Marriage = arr[arg.detail.value].Id;
}
else if(e == 'HouseInfoStr'){
this.data.HouseInfo = arr[arg.detail.value].Id;
}
else if(e == 'CarInfoStr'){
this.data.CarInfo = arr[arg.detail.value].Id;
}
}else if(mode=="date"){
this.data[e]=arg.detail.value
}else if(mode=="region"){
......@@ -368,7 +419,6 @@
}
},
addresspick(obj) {
console.log(obj)
this.data.PName=obj.province.Name
this.data.Province=obj.province.ID
this.data.CName=obj.city.Name
......@@ -377,9 +427,14 @@
this.data.District=obj.area.ID
this.address=obj.province.Name+','+obj.city.Name+','+obj.area.Name
},
deleteimg(index,key){
let that = this
that.data.AlbumList[index]='';
that.AlbumListShow[key]=false ;
that.$forceUpdate()
},
chooseImg(index,key) {
let that = this
uni.chooseImage({
count: 1, //默认9
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
......@@ -388,7 +443,8 @@
that.upFile(res.tempFilePaths[0],(_res)=>{
let resData=JSON.parse(_res.data)
that.data.AlbumList[index]=resData.data
that.AlbumListShow[key]=true
that.AlbumListShow[key]=true ;
that.$forceUpdate()
})
}
});
......@@ -429,6 +485,14 @@
if(this.data.AlbumList.length>0){
msg.AlbumList=msg.AlbumList.filter((item)=>(item))
}
if(this.data.AlbumList.length<2){
uni.showToast({
title: '照片墙至少2张',
duration: 2000,
icon:"none"
});
return
}
if(msg.Age==""){
msg.Age=0
}else{
......@@ -443,24 +507,15 @@
}else{
msg.Sex=2
}
if(this.data.EducationTypeStr=="高中及以下"){
msg.EducationType=1
}else if(this.data.EducationTypeStr=="大专"){
msg.EducationType=2
}else if(this.data.EducationTypeStr=="本科"){
msg.EducationType=2
}else if(this.data.EducationTypeStr=="硕士及以上"){
msg.EducationType=4
if(this.data.Birthday==""){
uni.showToast({
title: '请选择出生日期',
duration: 2000,
icon:"none"
});
return
}
if(this.data.MarriageStr=="未婚"){
msg.Marriage=1
}else if(this.data.MarriageStr=="离异"){
msg.Marriage=2
}else if(this.data.MarriageStr=="丧偶"){
msg.Marriage=3
}
if(this.data.Birthday==""){
uni.showToast({
......@@ -486,7 +541,7 @@
});
return
}
if(this.data.EducationTypeStr==""){
if(this.data.EducationType==0){
uni.showToast({
title: '请选择学历',
duration: 2000,
......@@ -494,7 +549,7 @@
});
return
}
if(this.data.MarriageStr==""){
if(this.data.Marriage==0){
uni.showToast({
title: '请选择婚姻状况',
duration: 2000,
......@@ -502,6 +557,31 @@
});
return
}
if(this.data.YearMoney==""){
uni.showToast({
title: '请填写年收入',
duration: 2000,
icon:"none"
});
return
}
if(this.data.HouseInfo==0){
uni.showToast({
title: '请选择房屋信息',
duration: 2000,
icon:"none"
});
return
}
if(this.data.CarInfo==0){
uni.showToast({
title: '请选择车辆信息',
duration: 2000,
icon:"none"
});
return
}
// if(this.data.address==""){
// uni.showToast({
// title: '请选择籍贯',
......@@ -541,7 +621,7 @@
}
);
},
getEnumList(){
getEnumList(){//学历
this.request2(
{
url: '/api/AppletMiai/GetEducationTypeEnumList',
......@@ -549,8 +629,16 @@
},
res => {
if(res.resultCode==1){
if(res.data.length > 0){
this.dataList[1].childDataList.map(x=>{
if(x.name == '学历'){
x.array = res.data;
return
}
})
}
}
}
);
},
......@@ -562,11 +650,59 @@
},
res => {
if(res.resultCode==1){
if(res.data.length > 0){
this.dataList[1].childDataList.map(x=>{
if(x.name == '婚姻'){
x.array = res.data;
return
}
})
}
}
}
);
},
GetHouseList(){
this.request2(
{
url: '/api/AppletMiai/GetHouseInfoEnumList',
data: {}
},
res => {
if(res.resultCode==1){
if(res.data.length > 0){
this.dataList[1].childDataList.map(x=>{
if(x.name == '房屋'){
x.array = res.data;
return
}
})
}
}
}
);
},
GetCarList(){
this.request2(
{
url: '/api/AppletMiai/GetCarInfoEnumList',
data: {}
},
res => {
if(res.resultCode==1){
if(res.data.length > 0){
this.dataList[1].childDataList.map(x=>{
if(x.name == '车辆'){
x.array = res.data;
return
}
})
}
}
}
);
},
//获取个人资料
getInfo(){
this.request2(
......@@ -618,6 +754,9 @@
mounted() {
this.getEnumList();
this.getMarriage();
// 4-14
this.GetHouseList()//获取房屋枚举
this.GetCarList()//获取车辆枚举
uni.getStorage({
key: 'basedata',
success: (res) =>{
......@@ -671,9 +810,12 @@
display: flex;
justify-content: center;
align-items: center;
overflow: hidden;
// overflow: hidden;
position: relative;
.img2{
width: 100%;
height: 100%;
border-radius: 20rpx;
}
}
......@@ -720,10 +862,15 @@
display: flex;
justify-content: center;
align-items: center;
overflow: hidden;
// overflow: hidden;
position: relative;
.img1{
width: 100%;
height: 100%;
border-radius: 30rpx;
}
}
.subImgBox{
width: 492rpx;
......@@ -810,4 +957,10 @@
font-weight: bold;
color: #999999;
}
.gibistyle{
position: absolute;
right: -10px;
top: -10px;
}
</style>
pages/blindDate/persondetails.vue
View file @ 8fb80829
......@@ -292,6 +292,8 @@
<view class="bubble" v-if="dataList.Weight">{{dataList.Weight}}kg</view>
<view class="bubble" v-if="dataList.Marriage">{{dataList.MarriageStr}}</view>
<view class="bubble" v-if="dataList.YearMoney">年收入(税后)：{{dataList.YearMoney}}万元</view>
<view class="bubble" v-if="dataList.HouseInfoStr">{{dataList.HouseInfoStr}}</view>
<view class="bubble" v-if="dataList.CarInfoStr">{{dataList.CarInfoStr}}</view>
</view>
<view class="pd-title">其他资料</view>
......@@ -302,7 +304,7 @@
<view class="bubble" v-if="dataList.EducationType">学历:{{dataList.EducationTypeStr}}</view>
<view class="bubble" v-if="dataList.Job">职位:{{dataList.Job}}</view>
<view class="bubble" v-if="dataList.WorkUnit">工作单位:{{dataList.WorkUnit}}</view>
<view class="bubble" v-if="dataList.HouseInfo">资产:{{dataList.HouseInfo}}</view>
<view class="bubble" v-if="dataList.OtherInfo">资产:{{dataList.OtherInfo}}</view>
</view>
<view class="pd-title">家庭背景</view>
......
pages/blindDate/postDetails.vue
View file @ 8fb80829
......@@ -20,6 +20,8 @@
line-height: 25px;
font-weight: bold;
margin-right: 10px;
display: flex;
flex-wrap: wrap;
}
.postDetails .details-info{
width: 100%;
......@@ -330,7 +332,13 @@
</view>
<view class="details">
<view style="display: flex;align-items: flex-start;justify-content: space-between;">
<view class="details-title"><u-tag :text="details.Label" mode="dark" :bg-color="mainColor" size="mini" v-if="details.Label!=null&& details.Label!=''" style='margin-right:5px ;'/>{{details.ActivityTitle}}</view>
<view class="details-title">
<u-tag :text="item" v-if="details.LabelList.length > 0" mode="dark" :bg-color="mainColor" size='mini' style='margin-right: 5px;'
v-for="(item, index) in details.LabelList" :key="index" />
{{details.ActivityTitle}}
</view>
<view style="width: 30px;" @click="fxshow=true">
<image src="@/static/images/icon/icon-share.png" class="share-icon" />
</view>
......
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