230320a303 5 місяців тому
батько
коміт
ebe0d6117b

+ 43 - 19
src/pagesRoom/estateTrend.jsx

@@ -19,6 +19,8 @@ class Index extends Component {
       curNav: 1,
       isDShow: false,
       curObj: {},
+      priceRange1: '',
+      priceRange2: '',
     }
   }
 
@@ -36,20 +38,37 @@ class Index extends Component {
   componentDidHide () { }
 
 
+  inputComChange (str, e) {
+    this.setState({
+      [str]: e.detail.value
+    })
+  }
+
 
   renderSearch () {
-    const { searchKey } = this.state
+    const { searchKey, priceRange1, priceRange2 } = this.state
     let placeholderText = '模糊搜索楼盘名称'
     return (
-      <View>
-        <AtSearchBar
-          fixed={true}
-          value={searchKey}
-          placeholder={placeholderText}
-          onChange={this.onSeachChange.bind(this)}
-          onClear={this.onClearHandle.bind(this)}
-          onActionClick={this.onSelectActionClick.bind(this)}
-        />
+      <View className='scoped-header'>
+        <View className='scoped-input-box'>
+          <View className="sib-content">
+            <View className='t t2'>总价</View>
+            <Input type="number" value={priceRange1} onInput={this.inputComChange.bind(this, 'priceRange1')}  className="i" placeholder="__" />
+            <View className='t'>至</View>
+            <Input type="number" value={priceRange2} onInput={this.inputComChange.bind(this, 'priceRange2')}  className="i" placeholder="__" />
+            <View className='t'>万</View>
+          </View>
+        </View>
+        <View className="sh-search">
+          <AtSearchBar
+            showActionButton="true"
+            value={searchKey}
+            placeholder={placeholderText}
+            onChange={this.onSeachChange.bind(this)}
+            onClear={this.onClearHandle.bind(this)}
+            onActionClick={this.onSelectActionClick.bind(this)}
+          />
+        </View>
       </View>
     )
   }
@@ -78,11 +97,16 @@ class Index extends Component {
 
   getDataList () {
     let { page_size, page, dataList, isListEmpty, searchKey } = this.state
-    Taro.api.other.apiestatehousedynamiclist({
+    const { priceRange1, priceRange2 } = this.state
+    let params = {
       page,
       page_size,
-      estate_name: searchKey
-    }).then(res => {
+      estate_name: searchKey,
+    }
+    if (priceRange1 && priceRange2) {
+      params.price_range = `${priceRange1}-${priceRange2}`
+    }
+    Taro.api.other.apiestatehousedynamiclist(params).then(res => {
       const curData = res.list || []
       let isListEnd = false
       if (curData.length > 0) {
@@ -140,7 +164,7 @@ class Index extends Component {
             </View>
             <View className="p-one">
               <View className="po-l">价格区间:</View>
-              <View className="po-r t1">{item.price_min}元-{item.price_max}元
+              <View className="po-r t1">¥{item.price_min}万-{item.price_max > 0 ? item.price_max+'万' : '上限未知'}
                 <View className="por-more" onClick={this.linkRecord.bind(this, item)}>历史记录</View>
               </View>
             </View>
@@ -166,23 +190,23 @@ class Index extends Component {
               <View className="more">
                 <View className="p-one">
                   <View className="po-l">现场折扣:</View>
-                  <View className="po-r">{item.scene_discount || '未知'}</View>
+                  <View className="po-r">{item.scene_discount && item.scene_discount == 'null' ? '未知' : item.scene_discount}</View>
                 </View>
                 <View className="p-one">
                   <View className="po-l">实际折扣:</View>
-                  <View className="po-r">{item.actual_discount || '未知'}</View>
+                  <View className="po-r">{item.actual_discount && item.actual_discount == 'null' ? '未知' : item.actual_discount}</View>
                 </View>
                 <View className="p-one">
                   <View className="po-l">在售楼栋:</View>
-                  <View className="po-r">{item.on_sale || '未知'}</View>
+                  <View className="po-r">{item.on_sale && item.on_sale == 'null' ? '未知' : item.on_sale}</View>
                 </View>
                 <View className="p-one">
                   <View className="po-l">待售楼栋:</View>
-                  <View className="po-r">{item.for_sale || '未知'}</View>
+                  <View className="po-r">{item.for_sale && item.for_sale == 'null' ? '未知' : item.for_sale}</View>
                 </View>
                 <View className="p-one">
                   <View className="po-l">推荐房源:</View>
-                  <View className="po-r">{item.recommend || '未知'}</View>
+                  <View className="po-r">{item.recommend && item.recommend == 'null' ? '未知' : item.recommend}</View>
                 </View>
               </View>
               : ''

+ 42 - 1
src/pagesRoom/estateTrend.scss

@@ -91,4 +91,45 @@ page {
       }
     }
   }
-}
+}
+
+
+
+.scoped-header {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 900;
+  background: #fff;
+  display: flex;
+  .sh-search {
+    display: inline-block;
+    min-width: 450px;
+  }
+}
+.scoped-input-box {
+  display: inline-block;
+  .sib-content {
+    display: flex;
+    background: #fff;
+    .i {
+      width: 70px;
+      font-size: 28px;
+      line-height: 90px;
+      height: 90px;
+      text-align: center;
+    }
+    .t {
+      width: 50px;
+      font-size: 28px;
+      color: #999;
+      line-height: 90px;
+      height: 90px;
+      text-align: center;
+      &.t2 {
+        width: 70px;
+      }
+    }
+  }
+}

+ 6 - 6
src/pagesRoom/estateTrendRecord.jsx

@@ -140,7 +140,7 @@ class Index extends Component {
             <View className="p1">[{item.create_by}]{item.create_at}</View>
             <View className="p-one">
               <View className="po-l">价格区间:</View>
-              <View className="po-r t1">{item.price_min}元-{item.price_max}元</View>
+              <View className="po-r t1">¥{item.price_min}万-{item.price_max > 0 ? item.price_max+'万' : '上限未知'}</View>
             </View>
             <View className="p-one">
               <View className="po-l">最新动态:</View>
@@ -164,23 +164,23 @@ class Index extends Component {
               <View className="more">
                 <View className="p-one">
                   <View className="po-l">现场折扣:</View>
-                  <View className="po-r">{item.scene_discount || '未知'}</View>
+                  <View className="po-r">{item.scene_discount && item.scene_discount == 'null' ? '未知' : item.scene_discount}</View>
                 </View>
                 <View className="p-one">
                   <View className="po-l">实际折扣:</View>
-                  <View className="po-r">{item.actual_discount || '未知'}</View>
+                  <View className="po-r">{item.actual_discount && item.actual_discount == 'null' ? '未知' : item.actual_discount}</View>
                 </View>
                 <View className="p-one">
                   <View className="po-l">在售楼栋:</View>
-                  <View className="po-r">{item.on_sale || '未知'}</View>
+                  <View className="po-r">{item.on_sale && item.on_sale == 'null' ? '未知' : item.on_sale}</View>
                 </View>
                 <View className="p-one">
                   <View className="po-l">待售楼栋:</View>
-                  <View className="po-r">{item.for_sale || '未知'}</View>
+                  <View className="po-r">{item.for_sale && item.for_sale == 'null' ? '未知' : item.for_sale}</View>
                 </View>
                 <View className="p-one">
                   <View className="po-l">推荐房源:</View>
-                  <View className="po-r">{item.recommend || '未知'}</View>
+                  <View className="po-r">{item.recommend && item.recommend == 'null' ? '未知' : item.recommend}</View>
                 </View>
               </View>
               : ''

+ 9 - 8
src/pagesRoom/estateTrendUpdate.jsx

@@ -30,6 +30,7 @@ class Index extends Component {
     setTimeout(() => {
       Taro.api.other.apiestatehousedynamicdetail({id}).then(res => {
         const rObj = res || {}
+        console.log(res)
         this.setState({
           formObj: rObj,
           // imgArr: rObj.dynamic_img ? rObj.dynamic_img.split(',') : [],
@@ -53,13 +54,13 @@ class Index extends Component {
         id,
         price_min: formObj.price_min,
         price_max: formObj.price_max,
-        dynamic: feedback_count,
+        dynamic: feedback_count || '',
         dynamic_img: imgArr.join(','),
-        scene_discount: formObj.scene_discount,
-        actual_discount: formObj.actual_discount,
-        on_sale: formObj.on_sale,
-        for_sale: formObj.for_sale,
-        recommend: formObj.recommend,
+        scene_discount: formObj.scene_discount || '',
+        actual_discount: formObj.actual_discount || '',
+        on_sale: formObj.on_sale || '',
+        for_sale: formObj.for_sale || '',
+        recommend: formObj.recommend || '',
       }).then(res => {
         this.setState({
           feedback_count: '',
@@ -168,7 +169,7 @@ class Index extends Component {
             keyStr="起价(必填)"
             keyStr2="请输入起价"
             typeStr="inputFont"
-            inputFont=""
+            inputFont=""
             bc={this.baseFormChange.bind(this)}
           />
         </View>
@@ -179,7 +180,7 @@ class Index extends Component {
             keyStr="封顶价"
             keyStr2="请输入封顶价"
             typeStr="inputFont"
-            inputFont=""
+            inputFont=""
             bc={this.baseFormChange.bind(this)}
           />
         </View>