diff --git a/pages/askHousing/askHousing.js b/pages/askHousing/askHousing.js
index cea9505..d389f35 100644
--- a/pages/askHousing/askHousing.js
+++ b/pages/askHousing/askHousing.js
@@ -320,7 +320,7 @@ Page({
min: 1000,
max: 50000,
rate: 490,
- defaultMin: 50,
+ defaultMin: 50, //
defaultMax: 80,
step: 100,
for: 491
@@ -329,9 +329,10 @@ Page({
min: 100,
max: 3000,
rate: 29,
- defaultMin: 150,
- defaultMax: 500,
+ defaultMin: 5,
+ defaultMax: 40,
step: 10,
+ for: 291
}
}
},
@@ -551,6 +552,7 @@ Page({
let choices = null
data.fieldinfo[key].forEach(element => {
if (!element) return
+
fieldinfoNew[element.field] = {}
if (aa[element.field]) {
fieldinfoNew[element.field]['popUpIs'] = aa[element.field].popUpIs
@@ -559,62 +561,31 @@ Page({
if (element.field == "rent" || element.field == "acreage") {
- let estimatedValue = this.data.estimatedValue || {}
+ let estimatedValue = this.data.estimatedValue[element.field]
+
+
fieldinfoNew[element.field]['change'] = false
- // 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]['for'] = estimatedValue.for
+ fieldinfoNew[element.field]['min'] = estimatedValue.min
+ fieldinfoNew[element.field]['step'] = estimatedValue.step
- // fieldinfoNew[element.field]['slider2Min'] = estimatedValue[element.field].min
- // fieldinfoNew[element.field]['slider1W'] = 100
- // fieldinfoNew[element.field]['slider2W'] = 0
-
-
- if (Array.isArray(data.info[element.field]) && data.info[element.field].length == 0) {
+ // 默认值
+ if (Array.isArray(data.info[element.field]) && data.info[element.field].length != 0) {
let value = data.info[element.field]
- let targetValue = [(value[0] - 1000) / 100, (value[1] - 1000) / 100]
+ let targetValue = []
+
+ targetValue = [(value[0] - estimatedValue['min']) / estimatedValue['step'], (value[1] - estimatedValue['min']) / estimatedValue['step']]
+
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 targetValue = []
+
+ targetValue = [estimatedValue.defaultMin, estimatedValue.defaultMax]
- let targetValue = [estimatedValue[element.field].defaultMin, estimatedValue[element.field].defaultMax]
fieldinfoNew[element.field]['value'] = targetValue
- data.info[element.field] = targetValue
-
- // 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) + '%'
-
+ // data.info[element.field] = targetValue
}
@@ -1493,9 +1464,6 @@ 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
@@ -1526,10 +1494,6 @@ Page({
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]
@@ -1640,9 +1604,7 @@ Page({
popUpIs = popUpdate.popUpIs
popUpTitle = popUpdate.title
popUpStepState = popUpdate.popUpStepState
- if (popUpIs == 'unilineInput' || popUpIs == 'multilineInput' || popUpIs == 'multilineInput1') {
- this.data.focustitle = popUpdate.field
- }
+ if (popUpIs == 'unilineInput' || popUpIs == 'multilineInput' || popUpIs == 'multilineInput1') this.data.focustitle = popUpdate.field
if (popUpdate.field == "sunshinearea" && this.data.newinfo['sunshinearea'].length == 0) {
this.data.newinfo['sunshinearea'] = [0]
@@ -1674,6 +1636,18 @@ Page({
this.data.newinfo.leasetime = calculateOfDateList.year + '-' + calculateOfDateList.month + '-' + new Date().getDate()
}
+ if (popUpIs == "rent-budget") {
+ let popUpdate = this.data.popUpdate
+ this.setData({
+ [`newinfo.${popUpdate.field}`]: popUpdate['value']
+ })
+
+ console.log("newinfo", this.data.newinfo);
+
+ }
+
+ // console.log("1popUpIs0", this.data.popUpdate);
+
this.setData({
popUpSubtitle,
popUpTitle,
@@ -1941,14 +1915,13 @@ Page({
if (field == "acreage" && this.data.newinfo[field].length < 2) {
- 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
+ // let estimatedValue = this.data.estimatedValue[field]
+ // this.data.newinfo[field] = [estimatedValue.defaultMin, estimatedValue.defaultMax]
+ // popUpdate['value'] = [estimatedValue.defaultMin, estimatedValue.defaultMax]
+ this.setData({
+ [`newinfo.${field}`]: popUpdate['value']
+ })
+
} else if ((field == "floor" || field == "property" || field == 'sunshinearea') && this.data.newinfo[field].length == 0) {
this.setData({
[`newinfo.${field}`]: [0]
@@ -2088,13 +2061,25 @@ Page({
return
}
+ if (!newinfo['wechatdata']['aid']) newinfo.iswechattype = 0
+
+
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 == "rent" || element.field == 'acreage') && newinfo[element.field] && newinfo[element.field].length != 0) {
+
+ let estimatedValue = this.data.estimatedValue[element.field]
+ let value = newinfo[element.field]
+ value = value.sort(function (a, b) {
+ return a - b;
+ })
+ value = [(value[0] * estimatedValue['step'] + estimatedValue['min']), value[1] * estimatedValue['step'] + estimatedValue['min']]
+ newinfo[element.field] = value
+ }
// 出租方式
if (element.field == "type") {
let fieldinfoNew = this.data.fieldinfoNew
@@ -2134,8 +2119,6 @@ Page({
})
}
- // return
-
// miucms.request(app.globalData.baseURL + '/tenement/publish/submit', {
miucms.request(app.globalData.baseURL + '/tenement/v2/api/publish/submit', {
info: newinfo,
@@ -2327,14 +2310,24 @@ Page({
let popUpdate = this.data.fieldinfoNew[field]
if (field == "rent" && this.data.newinfo[field].length < 2) {
- 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
+ // 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.setData({
+ [`nnewinfo${field}`]: popUpdate['value']
+ })
+
+ }
+
+ if ((field == "floor" || field == "property" || field == 'sunshinearea') && this.data.newinfo[field].length == 0) {
+ this.data.newinfo[field] = [0]
+ this.data.fieldinfoNew[field]['value'] = [0]
+ this.setData({
+ newinfo: this.data.newinfo,
+ fieldinfoNew: this.data.fieldinfoNew
+ })
}
for (const key in fieldinfo) {
diff --git a/pages/askHousing/askHousing.wxml b/pages/askHousing/askHousing.wxml
index 81127be..d9642e6 100644
--- a/pages/askHousing/askHousing.wxml
+++ b/pages/askHousing/askHousing.wxml
@@ -283,7 +283,7 @@
- {{ newinfo[item.field][0] + '~' + newinfo[item.field][1] + '' + fieldinfoNew[item.field].unit + '/月' }}
+ {{ (newinfo[item.field][0] * 100 + 1000) + '~' + (newinfo[item.field][1] * 100 + 1000) + '' + fieldinfoNew[item.field].unit + '/月' }}
@@ -317,7 +317,8 @@
{{ item.title }}*
-
+
+
{{ item.unit }}
@@ -744,10 +745,13 @@
- {{ 1000 + (it * 100) }}
+ {{ item.min + (it * item.step) }}
+
+ ~
+
- {{ 1000 + (it * 100) }}
+ {{ item.min + (it * item.step) }}
@@ -810,7 +814,7 @@
-
+
{{ index + 1}}
{{ locationObj[m1.floor(item)] + '>' + locationObj[item] }}
diff --git a/pages/askHousing/askHousing.wxss b/pages/askHousing/askHousing.wxss
index 67aec52..c2b4181 100644
--- a/pages/askHousing/askHousing.wxss
+++ b/pages/askHousing/askHousing.wxss
@@ -1430,6 +1430,15 @@
line-height: 50px;
}
+.rent-budget .rent-budget-tilde {}
+
+.rent-budget .rent-budget-tilde view {
+ line-height: 50px;
+ background-color: rgba(98, 177, 255, 0.145098039215686);
+
+}
+
+
/* 标记 */
wx-slider {