Skip to content

M
mallapp
Commit 90be156b authored by Mac's avatar Mac
Browse files
Options

修改

parent 261f0cf1
Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 25 deletions
components/miaiactivityCustom/style5.vue
View file @ 90be156b
......@@ -85,14 +85,14 @@
margin-bottom:0!important;
}
.good-five-stydy .img-box {
width: 360rpx;
width: 300rpx;
height: 100px;
border-radius: 4px;
overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2;
}
.good-five-stydy .img-box2 {
width: 360rpx;
width: 300rpx;
height: 100px;
border-radius: 4px;
overflow: hidden;
......
node_modules/uview-ui/components/u-radio-group/u-radio-group.vue
View file @ 90be156b
......@@ -59,6 +59,7 @@
<style lang="scss" scoped>
.u-radio-group {
display: inline-flex;
display: flex;
flex-wrap: wrap;
}
</style>
pages/blindDate/userList.vue
View file @ 90be156b
......@@ -32,7 +32,7 @@
length="90%"
height='100%'
>
<view class="popupbox">
<view class="popupbox" :style="{'padding-bottom':cHeight+'px'}">
<text class="popupbox_text" style="margin-top: 15px;">布局模式</text>
<view class="popup_item">
......@@ -49,7 +49,7 @@
</u-radio-group>
</view>
<text class="popupbox_text" style="margin-top: 15px;">年龄
<text style="margin-left: 15px;">{{msg.Age}}~{{msg.EndAge}}</text>
<text style="margin-left: 15px;">{{msg.Age}}~{{msg.EndAge}}岁</text>
</text>
<!-- 区间滑块 -->
<view class="popup_item" style="margin-top: 0;">
......@@ -87,6 +87,73 @@
:block-size="36" :active-color="mainColor" min="0" max="500" @rangechange="rangechange4"
:values="YearMoeys"></rangeSlider>
</view>
<text class="popupbox_text" style="margin-top: 0px;">学历</text>
<view class="popup_item" >
<text v-if='education.length==0' style="width: 100%;display: flex;align-items: center;justify-content: center;color: #999999;">暂无数据</text>
<u-radio-group v-model="msg.EducationType" v-if='education.length>0'>
<u-radio
shape="circle"
style='margin-bottom: 5px;'
v-for="(item, index) in education" :key="index"
:name="item.Id"
:active-color='mainColor'
>
{{item.Name}}
</u-radio>
</u-radio-group>
</view>
<text class="popupbox_text" style="margin-top: 10px;">婚姻</text>
<view class="popup_item" >
<text v-if='marriage.length==0' style="width: 100%;display: flex;align-items: center;justify-content: center;color: #999999;">暂无数据</text>
<u-radio-group v-model="msg.Marriage" v-if='marriage.length>0'>
<u-radio
shape="circle"
style='margin-bottom: 5px;'
v-for="(item, index) in marriage" :key="index"
:name="item.Id"
:active-color='mainColor'
>
{{item.Name}}
</u-radio>
</u-radio-group>
</view>
<text class="popupbox_text" style="margin-top: 10px;">房产</text>
<view class="popup_item" >
<text v-if='house.length==0' style="width: 100%;display: flex;align-items: center;justify-content: center;color: #999999;">暂无数据</text>
<u-radio-group v-model="msg.HouseInfo" v-if='house.length>0'>
<u-radio
shape="circle"
style='margin-bottom: 5px;'
v-for="(item, index) in house" :key="index"
:name="item.Id"
:active-color='mainColor'
>
{{item.Name}}
</u-radio>
</u-radio-group>
</view>
<text class="popupbox_text" style="margin-top: 10px;">车产</text>
<view class="popup_item" style="margin-bottom: 10px;">
<text v-if='car.length==0' style="width: 100%;display: flex;align-items: center;justify-content: center;color: #999999;">暂无数据</text>
<u-radio-group v-model="msg.CarInfo" v-if='car.length>0'>
<u-radio
shape="circle"
style='margin-bottom: 5px;'
v-for="(item, index) in car" :key="index"
:name="item.Id"
:active-color='mainColor'
>
{{item.Name}}
</u-radio>
</u-radio-group>
</view>
......@@ -121,10 +188,10 @@
Stylelist:[{Name:'列表模式',Id:-1},{Name:'瀑布流',Id:1}],
Styletype:-1,
msg:{
QueryId:0,
pageIndex:1,
pageSize:20,
Sex:0,
Sex:1,
Age:0,
EndAge:100,
Height:0,
......@@ -133,6 +200,10 @@
EndWeight:200,
YearMoney:0,
EndYearMoney:500,
CarInfo:0,
HouseInfo:0,
EducationType:0,
Marriage:0,
},
loadText: {
loadmore: "轻轻上拉，加载更多",
......@@ -151,21 +222,27 @@
Heights:[0,230],//身高
Weights:[0,200],//体重
YearMoeys:[0,500],//年收入
education:[],
marriage:[],
house:[],
car:[],
queryList:[],//获取刷选的数据
};
},
onLoad(options) {
if(options && options.listStyle){
this.data.listStyle = options.listStyle
}
if(options && options.Sex){
this.msg.Sex = options.Sex
}
this.cHeight = this.$uiConfig.is_bang ? 60 : 52;
this.init();
this.getEnumList();
this.getMarriage();
// 4-14
if(uni.getStorageSync('blindDate_listStyle')){//从缓存里获取图片模式
this.data.listStyle = uni.getStorageSync('blindDate_listStyle').style;
this.Styletype = uni.getStorageSync('blindDate_listStyle').style;
}else{
uni.setStorageSync("blindDate_listStyle",{style:this.data.listStyle});//吧当前时间存起来
}
this.GetBaseInfoQueryList()//获取筛选数据
this.getEnumList();//学历
this.getMarriage();//婚姻
this.GetHouseList()//获取房屋枚举
this.GetCarList()//获取车辆枚举
},
......@@ -180,7 +257,47 @@
},
methods: {
GetBaseInfoQueryList(){
this.request2(
{
url: '/api/AppletMiai/GetBaseInfoQueryList',
data: {}
},
res => {
if(res.resultCode==1){
this.queryList = res.data;
this.getscreen(this.queryList)
}
}
);
},
getscreen(){
if(this.queryList.length>0){
this.queryList.map(x=>{
if(x.Sex == this.msg.Sex){
this.msg.QueryId = x.Id;
this.msg.Age = x.Age;
this.msg.EndAge = x.EndAge;
this.msg.Height = x.Height;
this.msg.EndHeight = x.EndHeight;
this.msg.Weight = x.Weight;
this.msg.EndWeight = x.EndWeight;
this.msg.YearMoney = x.YearMoney;
this.msg.EndYearMoney = x.EndYearMoney;
this.msg.CarInfo = x.CarInfo;
this.msg.HouseInfo = x.HouseInfo;
this.msg.EducationType = x.EducationType;
this.msg.Marriage = x.Marriage;
this.ages=[x.Age,x.EndAge];//年龄
this.Heights=[x.Height,x.EndHeight];//身高
this.Weights=[x.Weight,x.EndWeight];//体重
this.YearMoeys=[x.YearMoney,x.EndYearMoney];//年收入
}
})
}
this.init();//获取了筛选条件再调用接口
},
init() {
this.request2(
{
......@@ -214,10 +331,43 @@
this.msg.Sex = this.typeList[i].Id;
this.msg.pageIndex = 1;
this.data.list= [];
this.getscreen(this.queryList)
},
goreset(){//重置
let data = {
QueryId:this.msg.QueryId,
pageIndex:1,
pageSize:20,
Sex:this.msg.Sex,
Age:0,
EndAge:100,
Height:0,
EndHeight:230,
Weight:0,
EndWeight:200,
YearMoney:0,
EndYearMoney:500,
CarInfo:0,
HouseInfo:0,
EducationType:0,
Marriage:0,
}
this.ages=[0,100];//年龄
this.Heights=[0,230];//身高
this.Weights=[0,200];//体重
this.YearMoeys=[0,500];//年收入
this.msg = data;
this.data.list= [];
this.init();
this.show = false
},
determine(){//确定
console.log(this.Styletype)
this.msg.pageIndex = 1;
this.data.list= [];
this.data.listStyle = this.Styletype
uni.setStorageSync("blindDate_listStyle",{style:this.data.listStyle});//吧当前时间存起来
this.init();
this.show = false
},
rangechange(e){//年龄
this.msg.Age = e.minValue;
......@@ -244,7 +394,8 @@
res => {
if(res.resultCode==1){
if(res.data.length > 0){
this.education = res.data
this.education.unshift({Name:'不限','Id':0})
}
}
}
......@@ -259,7 +410,8 @@
res => {
if(res.resultCode==1){
if(res.data.length > 0){
this.marriage = res.data
this.marriage.unshift({Name:'不限','Id':0})
}
}
}
......@@ -274,7 +426,8 @@
res => {
if(res.resultCode==1){
if(res.data.length > 0){
this.house = res.data
this.house.unshift({Name:'不限','Id':0})
}
}
}
......@@ -289,7 +442,8 @@
res => {
if(res.resultCode==1){
if(res.data.length > 0){
this.car = res.data
this.car.unshift({Name:'不限','Id':0})
}
}
}
......@@ -303,7 +457,7 @@
<style>
.userListstyle {
position: relative;
margin-bottom: 12px;
padding-bottom: 12px;
border: 1rpx solid transparent;
border-radius: 10rpx;
overflow: hidden;
......@@ -400,6 +554,7 @@
display: flex;
flex-direction: column;
position: relative;
overflow-y: auto;
}
.userListstyle .popupbox_text{
......@@ -424,7 +579,7 @@
}
.userListstyle .popup_b{
width: 100%;
position: absolute;
position: fixed;
left: 0;
bottom: 0;
display: flex;
......
pages/share/time/choiceDate.vue
View file @ 90be156b
......@@ -45,9 +45,9 @@
methods:{
selectDate(data){
console.log(data)
if(data.dayNum>30){
if(data.dayNum>31){
uni.showToast({
title: '时间不能超过30天',
title: '时间不能超过31天',
icon:'none',
duration: 2000
});
......
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