Skip to content

M
mallapp
Commit 20deaaed authored by Mac's avatar Mac
Browse files
Options

修改一些样式

parent b0defafe
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 61 deletions
components/matchmaking/index.vue
View file @ 20deaaed
......@@ -12,7 +12,7 @@
<view class="box-name">{{item.name}}</view>
</view>
<view class="row">
<view class="boxtc-b-item">{{item.Age}}岁</view>
<view class="boxtc-b-item" v-if="item.Age>0">{{item.Age}}岁</view>
</view>
</view>
</view>
......@@ -29,7 +29,7 @@
<view class="box-name">{{item.name}}</view>
</view>
<view class="row">
<view class="boxtc-b-item">{{item.Age}}岁</view>
<view class="boxtc-b-item" v-if="item.Age>0">{{item.Age}}岁</view>
<view class="boxtc-b-item">{{item.Education}}</view>
<view class="boxtc-b-item">{{item.Marriage}}</view>
</view>
......
pages/blindDate/editData.vue
View file @ 20deaaed
......@@ -99,10 +99,32 @@
</view>
</view>
<view class="conBox" v-if="item.type==3">
<textarea v-model="data[item.field]" class="textareaBox" :placeholder="item.placehloder" />
<textarea v-model="data[item.field]" class="textareaBox" maxlength='450' :placeholder="item.placehloder" />
</view>
</view>
</view>
<view style="font-size: 17px;color:#111111;font-weight: bold;">请上传身份证正反面</view>
<view class="sfz">
<view>
<view class="sfz-l-title">头像面</view>
<view class="sfz-l-c">上传您的身份证头像面</view>
</view>
<view class="sfz-r" @click="upimg(1)">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/sfz-z.png" style="width: 100%;Height: 100%;" v-if="data.IDCard==''"></image>
<image :src="data.IDCard" style="width: 100%;Height: 100%;" v-else></image>
</view>
</view>
<view class="sfz">
<view>
<view class="sfz-l-title">国徽面</view>
<view class="sfz-l-c">上传您的身份证国徽面</view>
</view>
<view class="sfz-r" @click="upimg(2)">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/sfz-f.png" style="width: 100%;Height: 100%;" v-if="data.IDCardBack==''"></image>
<image :src="data.IDCardBack" style="width: 100%;Height: 100%;" v-else></image>
</view>
</view>
</view>
<view class="saveBtn" :style="{'background-color': `${mainColor}`}" @click="saveData">
......@@ -184,14 +206,6 @@
mode:"selector",
disabled:false,
must:true,
},{
name:"毕业院校",
field:"SchoolInfo",
placehloder:"请填写毕业院校",
subType:1,
showType:"text",
disabled:false,
},{
name:"婚姻",
field:"MarriageStr",
......@@ -201,29 +215,6 @@
mode:"selector",
disabled:false,
must:true,
},{
name:"工作单位",
field:"WorkUnit",
placehloder:"请填写工作单位",
subType:1,
showType:"text",
disabled:false
},{
name:"职位",
field:"Job",
placehloder:"请填写职位",
subType:1,
showType:"text",
disabled:false
},{
name:"年收入",
field:"YearMoney",
placehloder:"请填写年收入",
subType:1,
unit:"万",
showType:"number",
disabled:false,
must:true,
},{
name:"房屋",
field:"HouseInfoStr",
......@@ -242,6 +233,37 @@
mode:"selector",
disabled:false,
must:true,
},{
name:"年收入",
field:"YearMoney",
placehloder:"请填写年收入",
subType:1,
unit:"万",
showType:"number",
disabled:false,
must:true,
},{
name:"毕业院校",
field:"SchoolInfo",
placehloder:"请填写毕业院校",
subType:1,
showType:"text",
disabled:false,
},{
name:"工作单位",
field:"WorkUnit",
placehloder:"请填写工作单位",
subType:1,
showType:"text",
disabled:false
},{
name:"职位",
field:"Job",
placehloder:"请填写职位",
subType:1,
showType:"text",
disabled:false
},{
name:"籍贯",
field:"nativePlace",
......@@ -249,16 +271,23 @@
subType:3,
array:[],
mode:"region"
},{
name:"资产",
field:"OtherInfo",
placehloder:"请填写资产",
subType:1,
showType:"text",
disabled:false
}],
},
// {
// name:"资产",
// field:"OtherInfo",
// placehloder:"请填写资产",
// subType:1,
// showType:"text",
// disabled:false
// },
],
type:2
},{
name:"自我介绍",
field:"About",
placehloder:"介绍自己",
type:3
},{
name:"家庭背景",
field:"FamilyInfo",
placehloder:"家庭成员、工作、成长环境等",
......@@ -268,6 +297,11 @@
field:"Hobby",
placehloder:"唱歌、跳街舞、拍照、旅游、看电影、画画、自驾游、等",
type:3
},{
name:"活动区域",
field:"ActivityRegion",
placehloder:"自己最近的活动区域",
type:3
},{
name:"喜欢的食物",
field:"LikeFood",
......@@ -303,11 +337,6 @@
field:"SingleReason",
placehloder:"写下自己单身的原因",
type:3
},{
name:"自我介绍",
field:"About",
placehloder:"介绍自己",
type:3
},{
name:"希望的TA是...",
field:"HopeYou",
......@@ -379,6 +408,10 @@
Age:0,
HouseInfo:0,//房屋信息
CarInfo:0,//车辆信息
IDCardNo:'',//身份证号
ActivityRegion:'',//活动区域
IDCard:'',//身份证信息正面
IDCardBack:'',//反面
},
//控制图片显示
AlbumListShow:{
......@@ -748,6 +781,53 @@
delta: 1,
});
},
upimg(type){//身份证上传
var that = this;
uni.chooseImage({
count: 1, //默认9
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
success: function (res) {
that.upFile(res.tempFilePaths[0],type)
}
});
},
upFile(img,type){
//图片上传
var that = this;
wx.showLoading({ title: '上传中' })
let MallBaseId = uni.getStorageSync("mall_UserInfo").MallBaseId ? uni.getStorageSync("mall_UserInfo").MallBaseId :1;
let action = that.host2 + '/api/File/UploadTencent?MallBaseId=' + MallBaseId
uni.uploadFile({
url: action,
filePath: img,
name: 'file',
formData: {
user: 'test'
},
success: (uploadFileRes) => {
uni.hideLoading()
if (uploadFileRes.statusCode == 200) {
let data = JSON.parse(uploadFileRes.data)
if(type==1){
that.data.IDCard = data.data
}else{
that.data.IDCardBack = data.data
}
}
},
fail: function(res) {
console.log(res)
wx.showToast({
title: '上传失败!',
icon: 'none',
duration: 1000
})
}
});
},
},
onLoad(options) {
this.UserId = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").UserId:null;
......@@ -908,19 +988,19 @@
border-bottom: 1rpx solid #E2E2E2FF;
.subName{
width: 130rpx;
font-size: 24rpx;
font-size: 26rpx;
font-weight: 500;
color: #666666;
}
.subInput{
flex-grow: 5;
font-size: 24rpx;
font-size: 26rpx;
font-weight: bold;
color: #111111;
}
.subpicker{
flex-grow: 5;
font-size: 24rpx;
font-size: 26rpx;
font-weight: bold;
color: #111111;
// background-color: #008000;
......@@ -972,5 +1052,31 @@
right: -10px;
top: -10px;
}
.page .sfz{
width: 100%;
Height: 130px;
border-radius: 10px;
margin-top: 15px;
background: #F8F8F8;
display: flex;
flex-direction: row;
padding: 17px 20px;
justify-content: space-between;
}
.page .sfz-l-title{
font-size: 17px;
color: #111111;
font-weight: bold;
margin-top: 10px;
}
.page .sfz-l-c{
font-size: 12px;
color: #999999;
margin-top: 10px;
}
.page .sfz-r{
width: 286upx;
Height: 97px;
}
</style>
pages/blindDate/persondetails.vue
View file @ 20deaaed
......@@ -98,7 +98,7 @@
line-height: 25px;
}
.persondetails .pd-title{
margin-top: 20px;
margin-top: 15px;
font-size: 15px;
color: #111111;
}
......@@ -122,7 +122,7 @@
font-size: 12px;
color: #000000;
padding: 15px;
margin-top: 15px;
margin-top: 10px;
background: #EDEDED;
}
.persondetails .zhezao{
......@@ -303,7 +303,7 @@
<view class="pd-bubble">
<view class="bubble" v-if="dataList.SexStr">{{dataList.SexStr}}</view>
<view class="bubble" v-if="dataList.Birthday">{{dataList.Birthday}}</view>
<view class="bubble" v-if="dataList.Age">{{dataList.Age}}</view>
<view class="bubble" v-if="dataList.Age">{{dataList.Age}}岁</view>
<view class="bubble" v-if="dataList.ShenXiao">{{dataList.ShenXiao}}</view>
<view class="bubble" v-if="dataList.ConoldBaseInfostellation">{{dataList.ConoldBaseInfostellation}}</view>
<view class="bubble" v-if="dataList.Height">{{dataList.Height}}cm</view>
......@@ -325,6 +325,20 @@
<view class="bubble" v-if="dataList.OtherInfo">资产:{{dataList.OtherInfo}}万</view>
</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.About==''" nodes="无"></rich-text>
<rich-text v-if="dataList.About!=''" :nodes="dataList.About" 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.ActivityRegion==''" nodes="无"></rich-text>
<rich-text v-if="dataList.ActivityRegion!=''" :nodes="dataList.ActivityRegion" 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='展开查看全部'>
......@@ -389,13 +403,7 @@
</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.About==''" nodes="无"></rich-text>
<rich-text v-if="dataList.About!=''" :nodes="dataList.About" style="font-size: 12px;color: #000;"></rich-text>
</u-read-more>
</view>
<view class="pd-title">希望的TA是...</view>
<view class="pd-abouthim">
<u-read-more show-height="100" :toggle="true" :shadow-style="shadowStyle" close-text='展开查看全部'>
......
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