230320a303 1 年間 前
コミット
de67006df6
3 ファイル変更22 行追加6 行削除
  1. 3 0
      src/api/house.js
  2. 14 5
      src/pagesRoom/roomPriceXk.jsx
  3. 5 1
      src/utils/http.js

+ 3 - 0
src/api/house.js

@@ -111,6 +111,9 @@ export default {
   apiestatelotterypricelist: params => { // 一房一价列表
     return request('/api/estate/lottery/price/list', params)
   },
+  apiestatelotterypricelist2: params => { // 一房一价列表
+    return request('/api/estate/lottery/price/list', params, 'allData')
+  },
   apiestatelotterypriceedit: params => { // 一房一价 编辑
     return request('/api/estate/lottery/price/edit', params)
   },

+ 14 - 5
src/pagesRoom/roomPriceXk.jsx

@@ -36,6 +36,7 @@ class Index extends Component {
       houseSaleStateArr: ['未售', '小定', '已定', '已售', '洪楼售'],
       isDtlShow: false,
       buildingNumList: [],
+      allData: {},
     }
   }
 
@@ -80,13 +81,14 @@ class Index extends Component {
   getDtl = () => {
     const { curNav, buildingNumList } = this.state
     const {eId, name, id} = this.$router.params
-    Taro.api.house.apiestatelotterypricelist({
+    Taro.api.house.apiestatelotterypricelist2({
       estate_id: eId,
       lottery_id: buildingNumList[curNav].id,
       building_num: buildingNumList[curNav].title,
     }).then(res => {
       this.setState({
-        roomArr: res || []
+        allData: res || {},
+        roomArr: res.data || []
       })
       if (this.subChat) {
         this.subChat.getData({name, id: eId}, 'pt')
@@ -120,7 +122,11 @@ class Index extends Component {
   renderTop () {
     const {eId, id, name} = this.$router.params
     const curParams = `eId=${eId}&id=${id}&name=${name}`
-    const { curObj, curNav, buildingNumList } = this.state
+    const { allData, curObj, curNav, buildingNumList } = this.state
+    let newTabList = JSON.parse(JSON.stringify(buildingNumList))
+    if (newTabList[curNav] && newTabList[curNav].title) {
+      newTabList[curNav].title = `${newTabList[curNav].title}(${allData.avg_price}/㎡)`
+    }
     const nameIcon = require('./img/yfyj/yfyj04.png')
     const i1 = require('./img/yfyj/yfyj05.png')
     const i2 = require('./img/yfyj/yfyj06.png')
@@ -162,7 +168,7 @@ class Index extends Component {
           <AtTabs
             current={curNav}
             scroll
-            tabList={buildingNumList}
+            tabList={newTabList}
             onClick={this.navClick.bind(this)}>
           </AtTabs>
         </View>
@@ -207,7 +213,9 @@ class Index extends Component {
   }
 
   renderInfo () {
-    const { roomArr } = this.state
+    const { roomArr, allData } = this.state
+    const house_type_total = allData.house_type_total || {}
+    const htaArr = house_type_total.house_type_avg || []
     let cArr = roomArr || []
     const htArr = cArr[0] ? cArr[0].data : []
     const htArrIndex = htArr.length
@@ -225,6 +233,7 @@ class Index extends Component {
             </View>
             <View className="p1">{item.house_type}</View>
             <View className="p2">{item.built}㎡</View>
+            <View className="p2">¥{htaArr[index]}/㎡</View>
             {
               item.house_rate === '100%'
               ? ''

+ 5 - 1
src/utils/http.js

@@ -56,7 +56,11 @@ const Http = (options = { data: {} }) => {
           const { errno } = data
           switch (errno) {
             case 0:
-              return resolve(noEmpty(data.data) ? data.data : data)
+              if (options.loadingStr === 'allData') {
+                return resolve(data)
+              } else {
+                return resolve(noEmpty(data.data) ? data.data : data)
+              }
               break
             case 333:
               Taro.$msgConfirm(`根据相关政策规定,匿名微信用户,请先前往修改个人资料`, () => {