diff --git a/src/constant/statusMap.js b/src/constant/statusMap.js index 3197446..2d5cde7 100644 --- a/src/constant/statusMap.js +++ b/src/constant/statusMap.js @@ -454,6 +454,22 @@ export const userAuthStatusList = [ { value: 3, label: '审核不通过',listClass: listClass.danger}, ] +export const userFilterCarStatusList = [ + { value: 1, label: '要求经济型以上配置车辆'}, + { value: 2, label: '要求中档型以上配置车辆'}, + { value: 3, label: '要求豪车型车辆'}, +] + +export const userFilterChildStatusList = [ + { value: 1, label: '只接受无小孩'}, + { value: 2, label: '不介意小孩,但不能住一起'}, +] + +export const userFilterHouseStatusList = [ + { value: 1, label: '必须有房无贷款'}, + { value: 2, label: '必须有房(不介意贷款)'}, +] + // 1-正常 2-已过期 3-已取消 export const userVipStatusList = [ diff --git a/src/views/xq/user/user-info-dialog.vue b/src/views/xq/user/user-info-dialog.vue index cf4a984..1622130 100644 --- a/src/views/xq/user/user-info-dialog.vue +++ b/src/views/xq/user/user-info-dialog.vue @@ -175,7 +175,7 @@ 不限 - + 不限 @@ -187,15 +187,15 @@ 不限 - + 不限 - + 不限 - + @@ -241,7 +241,7 @@ import { userDrinkStatusList, userEducationList, userFamilyBackgroundList, - userFamilyRankingList, + userFamilyRankingList, userFilterCarStatusList, userFilterChildStatusList, userFilterHouseStatusList, userFindTagList, userForPersonalsList, userHousingStatusList, @@ -270,6 +270,7 @@ export default { userLoveAtDistanceList,userWhenMarriageList,userWantChildList,userLiveAtParentList, userFindTagList,appUserTypeList, videoStatusList,onlineStatusList,memberTypeList, + userFilterCarStatusList,userFilterChildStatusList,userFilterHouseStatusList, booleanList, activeName:['base','account','userAlbums'], CS: { diff --git a/src/views/xq/userInfo/index.vue b/src/views/xq/userInfo/index.vue index eedbe71..77d08ba 100644 --- a/src/views/xq/userInfo/index.vue +++ b/src/views/xq/userInfo/index.vue @@ -199,7 +199,7 @@ @@ -210,17 +210,17 @@ @@ -270,7 +270,7 @@ import { userDrinkStatusList, userEducationList, userFamilyBackgroundList, - userFamilyRankingList, + userFamilyRankingList, userFilterCarStatusList, userFilterChildStatusList, userFilterHouseStatusList, userFindTagList, userForPersonalsList, userHousingStatusList, @@ -298,6 +298,7 @@ export default { userLiveAtParentList, userLoveAtDistanceList, userSmokeStatusList, userSomatotypeList,userMarriageList,userAnnualIncomeList,userZodiacList, userWantChildList, userWhenMarriageList,userFindTagList,userSignList, + userFilterCarStatusList,userFilterChildStatusList,userFilterHouseStatusList, updateUserInfoDialogVisible: false, userInfoDialogVisible: false, updateUserFilterInfoDialogVisible: false, diff --git a/src/views/xq/userInfo/update-user-filter-info-dialog.vue b/src/views/xq/userInfo/update-user-filter-info-dialog.vue index 1ebab86..e46b74d 100644 --- a/src/views/xq/userInfo/update-user-filter-info-dialog.vue +++ b/src/views/xq/userInfo/update-user-filter-info-dialog.vue @@ -78,14 +78,19 @@ - - - + + 不限 + + + + + + @@ -106,7 +111,7 @@ parseInt(i)) + }else{ + this.form.filterEducationBx = true + this.form.filterEducation = undefined + } this.form.filterAnnualIncome = response.data.filterAnnualIncome; this.form.filterChildStatus = response.data.filterChildStatus; this.form.filterHousingStatus = response.data.filterHousingStatus; @@ -279,7 +292,7 @@ export default { filterHeight : this.form.heightBx ? "" : this.form.heightFilter.join("-"), filterSomatotype : this.form.somatotypeFilterBx ? "" : this.form.somatotypeFilter.join("&"), filterMarriage : this.form.marriageFilterBx ? "" : this.form.marriageFilter.join("&"), - filterEducation: this.form.filterEducation, + filterEducation: this.form.filterEducationBx ? "" : this.form.filterEducation.join("&"), filterAnnualIncome: this.form.filterAnnualIncome, filterChildStatus: this.form.filterChildStatus, filterHousingStatus: this.form.filterHousingStatus,