diff --git a/img/user-collect-selected.png b/img/user-collect-selected.png new file mode 100644 index 0000000..9576334 Binary files /dev/null and b/img/user-collect-selected.png differ diff --git a/img/user-collect-tab.png b/img/user-collect-tab.png new file mode 100644 index 0000000..4be72e4 Binary files /dev/null and b/img/user-collect-tab.png differ diff --git a/img/user-collect-unselected.svg b/img/user-collect-unselected.svg new file mode 100644 index 0000000..e4f6eb5 --- /dev/null +++ b/img/user-collect-unselected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/user-issue-selected.png b/img/user-issue-selected.png new file mode 100644 index 0000000..9f75f63 Binary files /dev/null and b/img/user-issue-selected.png differ diff --git a/img/user-issue-unselected.svg b/img/user-issue-unselected.svg new file mode 100644 index 0000000..f44dbf5 --- /dev/null +++ b/img/user-issue-unselected.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/pages/askHousing/askHousing.js b/pages/askHousing/askHousing.js index 8cb52ed..cea9505 100644 --- a/pages/askHousing/askHousing.js +++ b/pages/askHousing/askHousing.js @@ -202,8 +202,9 @@ Page({ field: "type" }, rentalduration: { - popUpIs: 'AListOF', - popUpStepState: 1, + // popUpIs: 'AListOF', + popUpIs: 'leaseTime', + popUpStepState: 2, it: 'basic', field: "rentalduration" }, @@ -314,6 +315,25 @@ Page({ propertyObj: {}, // 房屋类型的配置数据 floorObj: {}, // 房屋类型的配置数据 sunshineareaObj: {}, // 房屋类型的配置数据 + estimatedValue: { + rent: { + min: 1000, + max: 50000, + rate: 490, + defaultMin: 50, + defaultMax: 80, + step: 100, + for: 491 + }, + acreage: { + min: 100, + max: 3000, + rate: 29, + defaultMin: 150, + defaultMax: 500, + step: 10, + } + } }, // 开始滑动 @@ -323,6 +343,7 @@ Page({ if (idx === 1) { // dW是当前操作的slider所能占据的最大宽度百分数 var dW = (popUpdate.slider2Value - popUpdate.min) / popUpdate.rate + // var dW = (popUpdate.slider2Value - popUpdate.min) / 490 this.setData({ ['popUpdate.slider1W']: dW, ['popUpdate.slider2W']: 100 - dW, @@ -332,6 +353,7 @@ Page({ }) } else if (idx === 2) { var dw = (popUpdate.max - popUpdate.slider1Value) / popUpdate.rate + // var dw = (popUpdate.max - popUpdate.slider1Value) / 490 this.setData({ ['popUpdate.slider2W']: dw, ['popUpdate.slider1W']: 100 - dw, @@ -525,7 +547,6 @@ Page({ let aa = this.data.aa let locationObj = {} - for (const key in data.fieldinfo) { let choices = null data.fieldinfo[key].forEach(element => { @@ -538,38 +559,69 @@ Page({ if (element.field == "rent" || element.field == "acreage") { + let estimatedValue = this.data.estimatedValue || {} fieldinfoNew[element.field]['change'] = false - fieldinfoNew[element.field]['max'] = 10000 - fieldinfoNew[element.field]['min'] = 0 - fieldinfoNew[element.field]['rate'] = 100 - fieldinfoNew[element.field]['slider1Max'] = 10000 + // fieldinfoNew[element.field]['max'] = 10000 + // fieldinfoNew[element.field]['step'] = estimatedValue[element.field].step + // fieldinfoNew[element.field]['max'] = estimatedValue[element.field].max + // fieldinfoNew[element.field]['min'] = estimatedValue[element.field].min + // fieldinfoNew[element.field]['rate'] = estimatedValue[element.field].rate + // fieldinfoNew[element.field]['slider1Max'] = estimatedValue[element.field].max + + // fieldinfoNew[element.field]['slider2Min'] = estimatedValue[element.field].min + // fieldinfoNew[element.field]['slider1W'] = 100 + // fieldinfoNew[element.field]['slider2W'] = 0 - fieldinfoNew[element.field]['slider2Min'] = 0 - fieldinfoNew[element.field]['slider1W'] = 100 - fieldinfoNew[element.field]['slider2W'] = 0 if (Array.isArray(data.info[element.field]) && data.info[element.field].length == 0) { - fieldinfoNew[element.field]['slider1Value'] = 0 - fieldinfoNew[element.field]['slider2Value'] = 10000 - fieldinfoNew[element.field]['leftSliderPriceWidthX'] = '0%' - fieldinfoNew[element.field]['rightSliderPriceWidthX'] = '0%' + let value = data.info[element.field] + let targetValue = [(value[0] - 1000) / 100, (value[1] - 1000) / 100] + fieldinfoNew[element.field]['value'] = targetValue + data.info[element.field] = targetValue + + + // fieldinfoNew[element.field]['slider1Value'] = estimatedValue[element.field].defaultMin + // fieldinfoNew[element.field]['slider2Value'] = estimatedValue[element.field].defaultMax + + // fieldinfoNew[element.field]['slider1Max'] = estimatedValue[element.field].defaultMin + // fieldinfoNew[element.field]['slider2Min'] = estimatedValue[element.field].defaultMin + + + // fieldinfoNew[element.field]['leftSliderPriceWidthX'] = '12%' + // fieldinfoNew[element.field]['rightSliderPriceWidthX'] = '82%' + // let dw = (estimatedValue[element.field].defaultMin - estimatedValue[element.field].min) / estimatedValue[element.field].rate + // fieldinfoNew[element.field]['slider2W'] = 100 - dw + // fieldinfoNew[element.field]['slider1W'] = dw + + + // fieldinfoNew[element.field]['slider1Value'] = 0 + // fieldinfoNew[element.field]['slider2Value'] = 10000 + // fieldinfoNew[element.field]['leftSliderPriceWidthX'] = '0%' + // fieldinfoNew[element.field]['rightSliderPriceWidthX'] = '0%' } else { - let dw = (Number(data.info[element.field][0]) - fieldinfoNew[element.field]['min']) / fieldinfoNew[element.field]['rate'] - fieldinfoNew[element.field]['slider1W'] = dw - fieldinfoNew[element.field]['slider1Max'] = Number(data.info[element.field][0]) - fieldinfoNew[element.field]['slider1Value'] = Number(data.info[element.field][0]) - fieldinfoNew[element.field]['slider2Value'] = Number(data.info[element.field][1]) - fieldinfoNew[element.field]['slider2Min'] = Number(data.info[element.field][0]) - fieldinfoNew[element.field]['slider2W'] = 100 - dw + let targetValue = [estimatedValue[element.field].defaultMin, estimatedValue[element.field].defaultMax] + fieldinfoNew[element.field]['value'] = targetValue + data.info[element.field] = targetValue - fieldinfoNew[element.field]['leftSliderPriceWidthX'] = (Number(data.info[element.field][0]) / fieldinfoNew[element.field]['max'] * 100) + '%' + // let dw = (Number(data.info[element.field][0]) - fieldinfoNew[element.field]['min']) / fieldinfoNew[element.field]['rate'] + // fieldinfoNew[element.field]['slider1W'] = dw + // fieldinfoNew[element.field]['slider1Max'] = Number(data.info[element.field][0]) + // fieldinfoNew[element.field]['slider1Value'] = Number(data.info[element.field][0]) + // fieldinfoNew[element.field]['slider2Value'] = Number(data.info[element.field][1]) + // fieldinfoNew[element.field]['slider2Min'] = Number(data.info[element.field][0]) + // fieldinfoNew[element.field]['slider2W'] = 100 - dw + + // fieldinfoNew[element.field]['leftSliderPriceWidthX'] = (Number(data.info[element.field][0]) / fieldinfoNew[element.field]['max'] * 100) + '%' } + + + } else { + fieldinfoNew[element.field]['value'] = data.info[element.field] } - fieldinfoNew[element.field]['value'] = data.info[element.field] if (element.field == 'type') { let choices = element.choices @@ -623,14 +675,15 @@ Page({ }) } let obj = { - choices: [{ - field: element.field, - value: "不限租期", - }, { - field: element.field, - value: "选择租期", - choices: element.choices, - }], + choices: element.choices, + // choices: [{ + // field: element.field, + // value: "不限租期", + // }, { + // field: element.field, + // value: "选择租期", + // choices: element.choices, + // }], field: element.field, title: element.title, type: element.type, @@ -787,7 +840,7 @@ Page({ this.data.pitchday = leasetimeTime.getDate() } - if (data.info.rentalduration == 0) data.info.rentalduration = '不限租期' + // if (data.info.rentalduration == 0) data.info.rentalduration = '不限租期' // if (data.info.rent == 0) data.info.rent = data.info.rent.toString() @@ -993,7 +1046,7 @@ Page({ }) } } - + if (data.data.info.point && data.data.info.point.length == 2) { that.data.latitude = data.data.info.point[0]; that.data.longitude = data.data.info.point[1]; @@ -1059,7 +1112,7 @@ Page({ images.push(that.data.imgs[i].aid) } } - + let info = { images, point: [] @@ -1440,6 +1493,9 @@ Page({ it } = e.currentTarget.dataset + console.log("0", field); + console.log("fieldinfoNew", this.data.fieldinfoNew.rentalduration); + let popUpIs = "" let popUpStepState = "" let fieldinfoNew = this.data.fieldinfoNew @@ -1465,10 +1521,15 @@ Page({ if (popUpIs == 'unilineInput' || popUpIs == 'multilineInput' || popUpIs == 'multilineInput1') this.data.focustitle = field if ((field == "acreage" || field == "rent") && this.data.newinfo[field].length < 2) { - this.data.newinfo[field] = [0, 10000] - this.data.fieldinfoNew[field]['value'] = [0, 10000] - this.data.fieldinfoNew[field]['slider1Value'] = 0 - this.data.fieldinfoNew[field]['slider2Value'] = 10000 + let estimatedValue = this.data.estimatedValue + this.data.newinfo[field] = [estimatedValue[field].defaultMin, estimatedValue[field].defaultMax] + this.data.fieldinfoNew[field]['value'] = [estimatedValue[field].defaultMin, estimatedValue[field].defaultMax] + this.data.fieldinfoNew[field]['slider1Value'] = estimatedValue[field].defaultMin + this.data.fieldinfoNew[field]['slider2Value'] = estimatedValue[field].defaultMax + // this.data.newinfo[field] = [0, 10000] + // this.data.fieldinfoNew[field]['value'] = [0, 10000] + // this.data.fieldinfoNew[field]['slider1Value'] = 0 + // this.data.fieldinfoNew[field]['slider2Value'] = 10000 } else if ((field == "floor" || field == "property" || field == 'sunshinearea') && this.data.newinfo[field].length == 0) { this.data.newinfo[field] = [0] this.data.fieldinfoNew[field]['value'] = [0] @@ -1509,6 +1570,7 @@ Page({ let popUpSubtitle = "" if (choices) { popUpSubtitle = value + console.log("popUpSubtitle0", popUpSubtitle); popUpIs = this.data.popUpIs let popUpStepState = this.data.popUpStepState @@ -1569,7 +1631,8 @@ Page({ let field = popUpdate.field if (this.data.newinfo[field] != null && this.data.newinfo[field] != "") { this.setData({ - popUpIs: "" + popUpIs: "", + popUpSubtitle }) return } @@ -1611,7 +1674,6 @@ Page({ this.data.newinfo.leasetime = calculateOfDateList.year + '-' + calculateOfDateList.month + '-' + new Date().getDate() } - this.setData({ popUpSubtitle, popUpTitle, @@ -1667,9 +1729,8 @@ Page({ }) } - if (this.data.newinfo.leasetime == "选择日期") { - this.data.newinfo.leasetime = "" - } + if (this.data.newinfo.leasetime == "选择日期") this.data.newinfo.leasetime = "" + let popUpdate = this.data.popUpdate let leaseTimeValue = this.data.leaseTimeValue @@ -1880,10 +1941,14 @@ Page({ if (field == "acreage" && this.data.newinfo[field].length < 2) { - this.data.newinfo[field] = [0, 10000] - popUpdate['value'] = [0, 10000] - popUpdate['slider1Value'] = 0 - popUpdate['slider2Value'] = 10000 + this.data.newinfo[field] = [estimatedValue[field].defaultMin, estimatedValue[field].defaultMax] + popUpdate['value'] = [estimatedValue[field].defaultMin, estimatedValue[field].defaultMax] + popUpdate['slider1Value'] = estimatedValue[field].defaultMax + popUpdate['slider2Value'] = estimatedValue[field].defaultMax + // this.data.newinfo[field] = [0, 10000] + // popUpdate['value'] = [0, 10000] + // popUpdate['slider1Value'] = 0 + // popUpdate['slider2Value'] = 10000 } else if ((field == "floor" || field == "property" || field == 'sunshinearea') && this.data.newinfo[field].length == 0) { this.setData({ [`newinfo.${field}`]: [0] @@ -1991,7 +2056,7 @@ Page({ newinfo.images = this.data.imgs if (newinfo.latitude) newinfo['point'] = [newinfo.latitude, newinfo.longitude] - + // 判断附近学校是否为空 if (this.data.nearSchoolList.length > 0) { @@ -2008,15 +2073,28 @@ Page({ newinfo.school = this.data.nearSchoolList - if (newinfo.rentalduration == '不限租期') newinfo.rentalduration = 0 + // if (newinfo.rentalduration == '不限租期') newinfo.rentalduration = 0 + + // 检查是否有填写联系方式 + if (!newinfo['tel'] && !newinfo['whatsapp'] && !newinfo['wechatdata']['aid'] && status == 1) { + this.issubmit = false + wx.hideLoading() + wx.showModal({ + title: '提示', + content: '请填写联系方式' + }) + + this.calculateTargetPopup('wechat') + return + } if (newinfo.leasetime == '随时') newinfo.leasetime = 0 - for (const key in fieldinfo) { fieldinfo[key].forEach(element => { if (!element) return + console.log("element.field", element.field); // 出租方式 if (element.field == "type") { let fieldinfoNew = this.data.fieldinfoNew @@ -2249,10 +2327,14 @@ Page({ let popUpdate = this.data.fieldinfoNew[field] if (field == "rent" && this.data.newinfo[field].length < 2) { - this.data.newinfo[field] = [0, 10000] - popUpdate['value'] = [0, 10000] - popUpdate['slider1Value'] = 0 - popUpdate['slider2Value'] = 10000 + this.data.newinfo[field] = [estimatedValue[field].defaultMin, estimatedValue[field].defaultMax] + popUpdate['value'] = [estimatedValue[field].defaultMin, estimatedValue[field].defaultMax] + popUpdate['slider1Value'] = estimatedValue[field].defaultMin + popUpdate['slider2Value'] = estimatedValue[field].defaultMax + // this.data.newinfo[field] = [0, 10000] + // popUpdate['value'] = [0, 10000] + // popUpdate['slider1Value'] = 0 + // popUpdate['slider2Value'] = 10000 } for (const key in fieldinfo) { @@ -2372,7 +2454,18 @@ Page({ ['popUpdate.value']: location, }) - } + }, + + // 房租预算和面积的 公共方法 + bindChangeRent(e) { + let value = e.detail.value + console.log(value, this.data.popUpdate); + let popUpdate = this.data.popUpdate + this.setData({ + [`newinfo.${popUpdate.field}`]: value, + [`popUpdate.value`]: value + }) + }, }) \ No newline at end of file diff --git a/pages/askHousing/askHousing.wxml b/pages/askHousing/askHousing.wxml index 588c6e6..81127be 100644 --- a/pages/askHousing/askHousing.wxml +++ b/pages/askHousing/askHousing.wxml @@ -106,7 +106,7 @@ 您还可以发布 {{ allowpublishednum }} 条普通房源 - + 了解更多 @@ -741,20 +741,30 @@ {{ item.unit }}/月 {{ item.unit }} - + + + + {{ 1000 + (it * 100) }} + + + {{ 1000 + (it * 100) }} + + + + diff --git a/pages/askHousing/askHousing.wxss b/pages/askHousing/askHousing.wxss index 53ec21f..67aec52 100644 --- a/pages/askHousing/askHousing.wxss +++ b/pages/askHousing/askHousing.wxss @@ -1388,7 +1388,47 @@ align-self: flex-end; } +.rent-budget .rent-budget-picker { + height: 130rpx; + line-height: 130rpx; + background-color: rgba(98, 177, 255, 0.145098039215686); + width: 100%; + /* border-radius: 50rpx; */ + display: inline-flex; + justify-content: center; + align-items: center; + border: none; + color: #c40000; +} +.rent-budget .rent-budget-picker { + position: relative; +} + +.rent-budget .rent-budget-picker::after, +.rent-budget .rent-budget-picker::before { + content: ""; + height: 1px; + width: 100%; + position: absolute; + top: -1000px; + left: 0; +} + +.rent-budget .pickerpitch { + font-size: 35rpx; + font-weight: bolder; +} + +.rent-budget .picker-view-column { + text-align: center; + margin: 0 75rpx 200rpx; + margin: 0 auto; +} + +.rent-budget .picker-view-column view { + line-height: 50px; +} /* 标记 */ diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml index f93bde4..829c1b6 100644 --- a/pages/edit/edit.wxml +++ b/pages/edit/edit.wxml @@ -86,7 +86,7 @@ 您还可以发布 {{ allowpublishednum }} 条普通房源 - + 了解更多 diff --git a/pages/restOfWorld/houseItem/houseItem.wxml b/pages/restOfWorld/houseItem/houseItem.wxml index 0fc9240..e17169a 100644 --- a/pages/restOfWorld/houseItem/houseItem.wxml +++ b/pages/restOfWorld/houseItem/houseItem.wxml @@ -3,12 +3,20 @@ - - + + {{ item.subject }} + + + + + {{ item.head }} > {{ item.end }} + + + - {{ item.city }} + {{ item.rtype }} {{ item.type }} {{ item.acreage }}平方米 {{ item.gender }} @@ -16,12 +24,12 @@ - + - {{ item.currency || '港元' }} + {{ item.currency || '港元' }} {{ item.rent }} /{{ item.rentalperiod || '月' }} @@ -29,12 +37,12 @@ {{ item.intermediary_text }} - - {{ item.count_view}} - - - {{ item.count_fav }} - + + {{ item.count_view}} + + + {{ item.count_fav }} + diff --git a/pages/restOfWorld/houseItem/houseItem.wxss b/pages/restOfWorld/houseItem/houseItem.wxss index 566fcdc..d5dc4ad 100644 --- a/pages/restOfWorld/houseItem/houseItem.wxss +++ b/pages/restOfWorld/houseItem/houseItem.wxss @@ -1,22 +1,28 @@ /* pages/restOfWorld/houseItem/houseItem.wxss */ -.item{ +@import '/app.wxss'; + +.item { border-bottom: 1px solid #e8e8e8; padding: 44rpx 30rpx; background: #fff; } -.item.search-item{ + +.item.search-item { border-bottom-width: 1px; } -.top{ + +.top { display: flex; justify-content: space-between; } -.top .l{ + +.top .l { display: inline-flex; flex: 1; flex-direction: column; } -.top .l .title{ + +.top .l .title { display: block; color: #000; font-size: 30rpx; @@ -26,17 +32,20 @@ word-break: break-word; } -.top .info{ + +.top .info { display: block; color: #999; - font-size:0; + font-size: 0; } -.top .info .i{ + +.top .info .i { font-size: 24rpx; display: inline-block; } -.top .info .i:not(:last-child)::after{ + +.top .info .i:not(:last-child)::after { display: inline-block; vertical-align: middle; content: ""; @@ -47,39 +56,45 @@ border-radius: 50%; } -.top .r{ + +.top .r { width: 280rpx; height: 200rpx; border-radius: 10rpx; margin-top: 8rpx; max-height: 200rpx; } -.footer{ + +.footer { font-size: 28rpx; margin-top: 28rpx; display: flex; justify-content: space-between; } -.footer .l{ + +.footer .l { display: inline-flex; align-items: flex-end } -.currency{ +.currency { /* font-size: 24rpx; */ } -.price{ + +.price { /* font-size: 28rpx; */ color: #C63E3A; display: inline-block; margin: 0 6rpx; } -.unit{ + +.unit { /* font-size: 20rpx; */ } -.agent{ + +.agent { display: inline-flex; justify-content: center; background: #f2f2f2; @@ -92,61 +107,103 @@ padding: 0 16rpx; } -.footer{ + +.footer { font-size: 28rpx; margin-top: 30rpx; align-items: center; } -.footer .r{ + +.footer .r { right: 0; -display: flex; -justify-content: flex-end; -font-size: 22rpx; + display: flex; + justify-content: flex-end; + font-size: 22rpx; } - .footer .see image { - width: 23rpx; - height: 15rpx; - margin-right: 4px; + +.footer .see image { + width: 23rpx; + height: 15rpx; + margin-right: 4px; } -.see{ + +.see { display: inline-flex; align-items: center; } - .stars{ + +.stars { margin-left: 16rpx; display: inline-flex; align-items: center - } -.stars image{ +.stars image { width: 21rpx; height: 20rpx; margin-right: 4px; } -.apartment{ + +.apartment { margin-right: 8rpx; display: inline-block; - width:124rpx; - height:28rpx; + width: 124rpx; + height: 28rpx; vertical-align: middle; } -.newbtn{ - width:57rpx; - height: 19rpx; - display: inline-block; + +.newbtn { + width: 57rpx; + height: 19rpx; + display: inline-block; margin-right: 8rpx; /*margin-right: 10rpx;*/ vertical-align: middle; } -.hotbtn{ - width:49rpx; - height:19rpx; - display: inline-block; + +.hotbtn { + width: 49rpx; + height: 19rpx; + display: inline-block; margin-right: 8rpx; vertical-align: middle; +} + + +.area-list { + flex-wrap: wrap; + margin-bottom: 15rpx; +} + +.area-list .area-item { + font-size: 24rpx; + color: #555; + padding: 0 12rpx; + background-color: rgba(242, 242, 242, 1); + border-radius: 15rpx; + height: 44rpx; + line-height: 44rpx; + margin-right: 15rpx; + margin-bottom: 15rpx; +} + +.area-list .area-icon { + width: 27rpx; + height: 27rpx; + margin-right: 8rpx; +} + +.area-list .area-vertical { + width: 1rpx; + height: 24rpx; + background-color: #D7D7D7; + margin: 0 10rpx; +} + +.area-list .area-distance { + color: #50E3C2; } \ No newline at end of file diff --git a/pages/restOfWorld/restOfWorld.js b/pages/restOfWorld/restOfWorld.js index 9ca2347..0c4079b 100644 --- a/pages/restOfWorld/restOfWorld.js +++ b/pages/restOfWorld/restOfWorld.js @@ -59,6 +59,9 @@ Page({ alias: '' }, hascondition: true, + + langs: {}, // 语言包 + }, onPageScroll(e) { if (e.scrollTop > 1000 && !this.data.showTOTOP) { @@ -90,6 +93,9 @@ Page({ }) this.get_config() this.firstInpage = false; + + app.globalData['langs'] ? this.data.langs = app.globalData['langs'] : this.getDtailsLangs() + }, firstInpage: true, onShow() { @@ -242,6 +248,9 @@ Page({ loading: false, page: data.page }) + + that.handleDetailData() + wx.hideLoading() }).catch(res => {}) @@ -399,6 +408,61 @@ Page({ list: this.data.list }) miucms.closeAD(e.detail.id) - } + }, + + // 获取语言包 保存全局 + getDtailsLangs() { + miucms.request(`${app.globalData.baseURL}/tenement/v2/api/details/langs`).then(res => { + if (res.code != 200) return + let data = res.data + this.setData({ + langs: data + }) + app.globalData['langs'] = data + }) + }, + + // 专门梳理v4出现的 语音包 及 不同房源值的处理 + handleDetailData() { + let langs = this.data.langs || {} + if (Object.keys(langs).length == 0) { + setTimeout(() => { + this.handleDetailData() + }, 300) + } else { + let list = this.data.list + + list.forEach(element => { + let location = langs.location // 遍历替换区域的值 所有房源 + let pendingData = element['location'] + let locationList = [] + for (const key in location) { + if (pendingData.indexOf(key) != -1 && Math.trunc(key) != key) { + locationList.push({ + head: location[Math.trunc(key)], + end: location[key], + }) + } + } + + element['locationList'] = locationList + }) + + this.setData({ + list + }) + + + } + + }, + + + // 跳转求房源发布页面 + goAskHousing() { + wx.navigateTo({ + url: '/pages/askHousing/askHousing', + }) + }, }) \ No newline at end of file diff --git a/pages/restOfWorld/restOfWorld.wxml b/pages/restOfWorld/restOfWorld.wxml index bde1332..87d63eb 100644 --- a/pages/restOfWorld/restOfWorld.wxml +++ b/pages/restOfWorld/restOfWorld.wxml @@ -1,12 +1,12 @@ - 求房源 - + 求房源 + - {{ item['keyword'] }} + {{ item['keyword'] }} @@ -40,23 +40,28 @@ - - + + - - + - + + + + + 求房源 + \ No newline at end of file diff --git a/pages/restOfWorld/restOfWorld.wxss b/pages/restOfWorld/restOfWorld.wxss index 03366ab..b78a207 100644 --- a/pages/restOfWorld/restOfWorld.wxss +++ b/pages/restOfWorld/restOfWorld.wxss @@ -1,37 +1,43 @@ /* pages/restOfWorld/restOfWorld.wxss */ -.hot-text{ - padding: 40rpx 30rpx ; +.hot-text { + padding: 40rpx 30rpx; display: flex; flex-wrap: wrap; } -.hot-text .item{ + +.hot-text .item { display: inline-flex; padding: 16rpx 20rpx; - margin: 20rpx 20rpx 0 0; + margin: 20rpx 20rpx 0 0; box-sizing: border-box; border-radius: 8rpx; background: rgb(245, 245, 245); - border:1px solid rgb(245, 245, 245); + border: 1px solid rgb(245, 245, 245); font-size: 22rpx; color: #999; align-items: center; justify-content: center; } -.hot-text .item.active{ + +.hot-text .item.active { color: #74cdc1; border-color: #74cdc1; background: #fff; } -.condition-box .navigator{ + +.condition-box .navigator { line-height: 80rpx; } -.condition-box .bold{ + +.condition-box .bold { font-weight: bold; } -.hot-text-box{ + +.hot-text-box { min-height: 1px; } -.condition-box{ + +.condition-box { display: flex; padding: 50rpx 30rpx 40rpx; justify-content: space-between; @@ -40,45 +46,51 @@ border-top: 1px solid #e8e8e8; height: 84rpx; } -.condition-box .condition-tab{ + +.condition-box .condition-tab { display: flex; flex: 1; height: 80rpx; - border:1px solid #e8e8e8; + border: 1px solid #e8e8e8; border-radius: 10rpx; - justify-content:space-evenly; + justify-content: space-evenly; align-items: center; overflow: hidden; box-sizing: border-box; } -.condition-box .condition-tab .divide{ + +.condition-box .condition-tab .divide { display: inline-flex; - flex:0 0 2rpx; + flex: 0 0 2rpx; height: 26rpx; - background: rgb(225, 225, 225) -} -.condition-box .tab .tobottom{ - width: 12rpx; - height: 7rpx; - margin-left:8rpx; - /* transform: rotateZ(180deg) */ -} -.condition-box .tab .filtrate{ - width: 16rpx; - height: 18rpx; - margin-left:8rpx; -} -.condition-box .tab .order{ - width: 18rpx; - height: 20rpx; - margin-left:8rpx; + background: rgb(225, 225, 225) } -.condition-box .tab.active .tobottom{ +.condition-box .tab .tobottom { + width: 12rpx; + height: 7rpx; + margin-left: 8rpx; + /* transform: rotateZ(180deg) */ +} + +.condition-box .tab .filtrate { + width: 16rpx; + height: 18rpx; + margin-left: 8rpx; +} + +.condition-box .tab .order { + width: 18rpx; + height: 20rpx; + margin-left: 8rpx; +} + +.condition-box .tab.active .tobottom { transform: rotateZ(0) } -.condition-box .tab{ - display: inline-flex; + +.condition-box .tab { + display: inline-flex; position: relative; justify-content: center; align-items: center; @@ -86,22 +98,24 @@ font-size: 24rpx; box-sizing: border-box; } -.condition-box .tab.active{ + +.condition-box .tab.active { font-weight: bold; color: #333; font-size: 22rpx; } -.triangle{ +.triangle { display: inline-flex; width: 40rpx; height: 40rpx; } -.triangle.descend{ + +.triangle.descend { transform: rotateZ(180deg) } -.condition-box .more{ +.condition-box .more { display: inline-flex; flex: 0 0 138rpx; height: 80rpx; @@ -111,52 +125,80 @@ border-radius: 80rpx; font-size: 30rpx; box-sizing: border-box; - border:1px solid #e8e8e8; + border: 1px solid #e8e8e8; } -.condition-box .more image{ + +.condition-box .more image { display: inline-flex; width: 26rpx; height: 26rpx; margin-left: 4rpx; } -.condition-box .more.hascondition{ + +.condition-box .more.hascondition { font-weight: bold; } -.condition-box .search{ + +.condition-box .search { display: inline-flex; width: 80rpx; flex: 0 0 80rpx; height: 80rpx; - border:1px solid #e8e8e8; + border: 1px solid #e8e8e8; border-radius: 50%; align-items: center; justify-content: center; box-sizing: border-box } -.condition-box .search image{ + +.condition-box .search image { display: inline-flex; - flex:0 0 24rpx; + flex: 0 0 24rpx; height: 24rpx; } -.conditionFixed{ + +.conditionFixed { position: fixed; left: 0; background: #fff; width: 100vw; z-index: 12 } -.list{ + +.list { padding-bottom: 40rpx; } -.nocontent{ + +.nocontent { text-align: center; font-size: 28rpx; - padding: 200rpx 0 ; + padding: 200rpx 0; color: #999 } -.nocontent .file{ + +.nocontent .file { width: 40rpx; height: 46rpx; display: block; margin: 0 auto 20rpx; +} + +.ask-housing-btn { + width: 100rpx; + height: 100rpx; + border-radius: 50%; + background-color: rgba(253, 218, 98, 1); + position: fixed; + right: 20rpx; + bottom: 300rpx; + font-size: 25rpx; + color: #000000; + flex-direction: column; +} + +.ask-housing-btn .ask-housing-btn-icon { + width: 28rpx; + height: 28rpx; + margin-bottom: 4rpx; + box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.0784313725490196); } \ No newline at end of file diff --git a/pages/show/show.wxss b/pages/show/show.wxss index 5153e5b..b4f5e8d 100644 --- a/pages/show/show.wxss +++ b/pages/show/show.wxss @@ -24,10 +24,11 @@ canvas { } .container { - padding-bottom: 130rpx; + /* padding-bottom: 130rpx; */ width: 100vw; box-sizing: border-box; overflow: hidden; + padding-bottom: 240rpx; } .toptips { @@ -656,9 +657,9 @@ map .clickmap { } .certification { - background-color: rgba(238, 239, 242, 1); + /* background-color: rgba(238, 239, 242, 1); */ min-height: 100vh; - padding-bottom: 120rpx; + /* margin-bottom: 240rpx; */ } .certification .header { diff --git a/pages/user/user.json b/pages/user/user.json index 28407c4..1f51f7e 100644 --- a/pages/user/user.json +++ b/pages/user/user.json @@ -5,6 +5,7 @@ "header-nav": "../../template/headerNav/index", "to-top": "../../template/toTop/toTop", "fix-footer": "../../template/fixFooter/fixFooter", - "announcement-popup": "../../template/announcementPopup/announcementPopup" + "announcement-popup": "../../template/announcementPopup/announcementPopup", + "common-list": "/template/commonList/commonList" } } \ No newline at end of file diff --git a/pages/user/user.wxml b/pages/user/user.wxml index 7c755de..4a6d647 100644 --- a/pages/user/user.wxml +++ b/pages/user/user.wxml @@ -1,7 +1,7 @@ - + 寄托香港租房 @@ -13,47 +13,69 @@ - - - - - + + + + + + + + - + + + + + + 消息提醒 + + + + + + 发布房源 - - - - - - - - 消息提醒 - - - - - - 发布房源 - - - - - - - - - 收藏 - - + + + + + + + + + 收藏 + + + + 发布 + + + + + 共收藏 8 个房源 + + + + + + + + + + + + @@ -347,7 +369,10 @@ - + + + + diff --git a/pages/user/user.wxss b/pages/user/user.wxss index a3f3f9d..5937c03 100644 --- a/pages/user/user.wxss +++ b/pages/user/user.wxss @@ -3,6 +3,7 @@ .container { padding-bottom: 150rpx; + position: relative; } .header { @@ -796,13 +797,17 @@ .header-new { background: linear-gradient(21.8146326062447deg, rgba(224, 240, 255, 1) 21%, rgba(98, 177, 255, 1) 141%); padding-top: 253.5rpx; - padding-bottom: 36rpx; + padding-bottom: 50rpx; } .header-new .header-message { justify-content: space-between; } +.header-new .header-message .header-user-message { + z-index: 2; +} + .header-new .header-message .header-user-info { color: #000000; flex-direction: column; @@ -875,4 +880,93 @@ .header-new .header-btn .issue-housing .header-btn-icon { width: 24rpx; height: 24rpx; +} + +.round1 { + width: 378rpx; + height: 378rpx; + background-color: rgba(255, 255, 255, 0.2); + border-radius: 50%; + position: absolute; + top: -99rpx; + left: -140rpx; + z-index: 1; +} + +.round2 { + width: 396rpx; + height: 396rpx; + background-color: rgba(255, 255, 255, 0.2); + border-radius: 50%; + position: absolute; + right: -106rpx; + top: -198rpx; +} + +.list-new { + margin-top: -14rpx; + position: relative; + z-index: 11; +} + +.list-new .list-new-top { + height: 95rpx; + font-size: 30rpx; + font-weight: 650; + color: #fff; + position: relative; + align-items: flex-end; +} + +.list-new .list-new-top .list-new-top-bg { + position: absolute; + background-color: rgba(98, 177, 255, 1); + bottom: 0; + width: 100%; + height: 111rpx; + z-index: -1; + border-radius: 20rpx 20rpx 0 0; +} + +.list-new .list-new-top .list-new-top-item { + width: 375rpx; + height: 111rpx; +} + +.list-new .list-new-top .list-new-top-item.selected { + height: 125rpx; + background-color: #f6f6f6; + color: #000; + border-radius: 0 25rpx 0 0; + +} + +.list-new .list-new-top .list-new-top-icon { + width: 36rpx; + height: 36rpx; + margin-right: 6rpx; +} + +.list-new .list-new-content { + background-color: #f6f6f6; + width: 100%; + border-radius: 0 20rpx 0 0; + padding-top: 35rpx; +} + +.list-new .list-new-content .list-new-content-total { + font-size: 23rpx; + color: #555555; + padding: 0 30rpx; + margin-bottom: 30rpx; +} + +.list-new .list-new-content .list-new-content-total .list-new-content-total-num { + font-weight: 650; + color: #000000; + margin: 0 15rpx; +} + +.list-new .list-new-content .list-new-content-item { + margin-bottom: 24rpx; } \ No newline at end of file diff --git a/template/commonList/commonList.wxml b/template/commonList/commonList.wxml index 6914985..77f3254 100644 --- a/template/commonList/commonList.wxml +++ b/template/commonList/commonList.wxml @@ -1,5 +1,4 @@ - @@ -39,14 +38,20 @@ - - - - 李玲 - 中介 - 男生 - + + + + 李玲 + 中介 + 男生 + + + + + + + \ No newline at end of file diff --git a/template/commonList/commonList.wxss b/template/commonList/commonList.wxss index 42f5c9e..accb634 100644 --- a/template/commonList/commonList.wxss +++ b/template/commonList/commonList.wxss @@ -186,4 +186,9 @@ height: 36rpx; margin-right: 15rpx; margin-left: 6rpx; +} + +.footer .footer-collect { + width: 36rpx; + height: 35.4rpx; } \ No newline at end of file