diff --git a/pages/askHousing/askHousing.js b/pages/askHousing/askHousing.js index 396f7b5..eacf117 100644 --- a/pages/askHousing/askHousing.js +++ b/pages/askHousing/askHousing.js @@ -402,6 +402,7 @@ Page({ */ onLoad: function (options) { this.calculateOfDate() + wx.showLoading({ title: '加载中', }) @@ -563,15 +564,25 @@ Page({ fieldinfoNew[element.field]['slider2Min'] = 0 fieldinfoNew[element.field]['slider1W'] = 100 fieldinfoNew[element.field]['slider2W'] = 0 - fieldinfoNew[element.field]['leftSliderPriceWidthX'] = '0%' - fieldinfoNew[element.field]['rightSliderPriceWidthX'] = '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%' + } else { - fieldinfoNew[element.field]['slider1Value'] = data.info[element.field][0] - fieldinfoNew[element.field]['slider2Value'] = data.info[element.field][1] + + 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) + '%' + } } @@ -686,7 +697,7 @@ Page({ if (element.field == 'property' || element.field == 'gender' || element.field == 'intermediary' || element.field == 'elevator' || element.field == 'sunshinearea' || element.field == 'publishergender' || element.field == 'floor') { choices = [] if (element.choices.length >= 0) { - if ((this.data.types == 'edit' || this.data.types == 'edit1') && element.field != 'floor' && element.field != 'sunshinearea') { + if ((this.data.types == 'edit' || this.data.types == 'edit1') && element.field != 'floor' && element.field != 'sunshinearea' && element.field != 'property') { element.choices.forEach(el => { if (el.key == data.info[element.field]) data.info[element.field] = el.value }) @@ -779,8 +790,11 @@ Page({ } - if (data.type == "edit") this.data.contactInformationState = data.info.iswechattype - else data.info.iswechattype = 0 + // if (data.type == "edit") this.data.contactInformationState = data.info.iswechattype + // else data.info.iswechattype = 0 + + if (data.info.wechatdata.aid != 0) this.data.contactInformationState = 2 + // else data.info.iswechattype = 0 if (data.info.leasetime == 0) data.info.leasetime = '随时' else if (data.info.leasetime && data.info.leasetime.length > 2) { @@ -805,8 +819,16 @@ Page({ // data.fieldinfo['status'] = [data.fieldinfo['identity'][1]] || [] // data.fieldinfo['identity'].splice(1, 1) + // + // if (data.info.rent.length == 2) { + // data.info.rent[0] = Number(data.info.rent[0]) + // data.info.rent[] = Number(data.info.rent[1]) + // } + this.setData({ + id: data.id, fieldinfo: data.fieldinfo, + offshelftime: data.offshelftime, fieldinfoNew, newcity: data.city, newinfo: data.info, @@ -1446,7 +1468,6 @@ Page({ }) } }) - }, bindopensetting(res) { var status = res.detail.authSetting['scope.userLocation'], @@ -2513,6 +2534,13 @@ Page({ name: 'files', header: app.globalData.header, success: function (res) { + if (res.statusCode == 500) { + wx.hideLoading() + wx.showToast({ + icon: "none", + title: '上传失败!', + }) + } var res = JSON.parse(res.data); if (res.code == 200) { that.setData({ diff --git a/pages/askHousing/askHousing.wxml b/pages/askHousing/askHousing.wxml index 0bed4ac..eab0920 100644 --- a/pages/askHousing/askHousing.wxml +++ b/pages/askHousing/askHousing.wxml @@ -86,6 +86,7 @@ + @@ -94,6 +95,15 @@ 求房源 + + 房源ID:{{ id }} + + + 未发布 + 下架:{{ offshelftime }} + + + 您还可以发布 {{ allowpublishednum }} 条普通房源 @@ -232,7 +242,7 @@ - + 保存并退出 马上发布 @@ -825,7 +835,7 @@ 保存并退出 - {{ newStatus }} 保存并退出 + 保存并退出 下一步 diff --git a/pages/askHousing/askHousing.wxss b/pages/askHousing/askHousing.wxss index c0b406c..b84b8ea 100644 --- a/pages/askHousing/askHousing.wxss +++ b/pages/askHousing/askHousing.wxss @@ -1683,4 +1683,24 @@ wx-slider .wx-slider-handle-wrapper { width: 30rpx; height: 30rpx; margin-right: 9rpx; +} + +.housing-message { + border-bottom: 1rpx solid #ebebeb; + padding-bottom: 36rpx; + margin: 60rpx 30rpx 30rpx; + margin-bottom: 30rpx; +} + +.housing-message .housing-message-vertical { + width: 2rpx; + height: 30rpx; + border-left: 1rpx dotted #d7d7d7; + margin: 0 15rpx; +} + +.housing-message .housing-message-item { + color: #7f7f7f; + line-height: 36rpx; + font-size: 21rpx; } \ No newline at end of file diff --git a/pages/edit/edit.js b/pages/edit/edit.js index 50b790f..22d6ad5 100644 --- a/pages/edit/edit.js +++ b/pages/edit/edit.js @@ -811,7 +811,9 @@ Page({ data.fieldinfo['identity'].splice(1, 1) this.setData({ + id: data.id, fieldinfo: data.fieldinfo, + offshelftime: data.offshelftime, fieldinfoNew, newcity: data.city, newinfo: data.info, diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml index db924fb..687955c 100644 --- a/pages/edit/edit.wxml +++ b/pages/edit/edit.wxml @@ -66,7 +66,7 @@ - + 香港 @@ -74,6 +74,16 @@ 求房源 + + 房源ID:{{ id }} + + + + 未发布 + 下架:{{ offshelftime }} + + + 您还可以发布 {{ allowpublishednum }} 条普通房源 @@ -211,7 +221,7 @@ - + 保存并退出 马上发布 diff --git a/pages/edit/edit.wxss b/pages/edit/edit.wxss index 8a1eddb..3ee95b4 100644 --- a/pages/edit/edit.wxss +++ b/pages/edit/edit.wxss @@ -1631,4 +1631,24 @@ wx-slider .wx-slider-handle-wrapper { width: 30rpx; height: 30rpx; margin-right: 9rpx; +} + +.housing-message { + border-bottom: 1rpx solid #ebebeb; + padding-bottom: 36rpx; + margin: 60rpx 30rpx 30rpx; + margin-bottom: 30rpx; +} + +.housing-message .housing-message-vertical { + width: 2rpx; + height: 30rpx; + border-left: 1rpx dotted #d7d7d7; + margin: 0 15rpx; +} + +.housing-message .housing-message-item { + color: #7f7f7f; + line-height: 36rpx; + font-size: 21rpx; } \ No newline at end of file diff --git a/pages/irentList/irentList.wxml b/pages/irentList/irentList.wxml index e9117a4..c22a763 100644 --- a/pages/irentList/irentList.wxml +++ b/pages/irentList/irentList.wxml @@ -58,7 +58,7 @@ - + 星淮酒店 diff --git a/pages/personList/personList.wxml b/pages/personList/personList.wxml index 44396d6..aed864f 100644 --- a/pages/personList/personList.wxml +++ b/pages/personList/personList.wxml @@ -51,7 +51,7 @@ - +