feats

config/prod.js

   defineConstants: {
     HOST: '"https://xlj.newlandsh.com"', //正式
     WSS_HOST: '"wss://xlj.newlandsh.com"',
+    // HOST: '"https://xlk.njyz.tech"', //正式
+    // WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',

src/components/FirstScreen/index.jsx

 
   }
 
-  console.log('---------info------>', info, visible)
-
   return (
     <view className='components Adv' style={{display: visible ? 'block' : 'none'}}>
       <view className='centerLabel'>

src/constants/api.js

 export const API_MY_COLLECT_COURSE_LIST = resolvePath('curriculum/save') // 我收藏的课程列表
 
 // 特价房源
-export const API_SPECIAL_ROOM_LIST = resolvePath('buildingSpecialRoom') // 特价房源列表
+export const API_SPECIAL_ROOM_LIST = resolvePath('buildingSpecialRoom/building') // 特价房源列表
 
 // 项目动态
 export const API_PROJECT_TREND_LIST = resolvePath('trendList') // 项目动态

src/layout/useScreen.js

 
   const show = canShow && firstScreen
 
-  console.log('------showshow--------->', show)
-
   return [firstScreen, show, toggle]
 }

src/pages/index/buildingList/index.jsx

 
 export default withLayout((props) => {
   const { router } = props
-  const { isRecentOpening } = router.params
+  const { isRecentOpening, isCommerce } = router.params
 
   const city = useSelector(state => state.city)
   const [PageList, setPageList] = useState([])
         Data[key] = FilterData[key]
       }
     }
-    fetch({ url: API_ITEMS_LIST, method: 'get', payload: { cityId: city.curCity.id, pageNumber, pageSize, isRecentOpening, ...Data } }).then((res) => {
+    fetch({ url: API_ITEMS_LIST, method: 'get', payload: { cityId: city.curCity.id, pageNumber, pageSize, isRecentOpening, isCommerce, ...Data } }).then((res) => {
       setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)

src/pages/index/components/Menu/index.jsx

     { name: '团房信息', id: 8, icon: require('../../../../assets/index-icon12.png'), router: '/pages/index/activityList/index?type=house' },
     { name: '特价房', id: 9, icon: require('../../../../assets/index-icon11.png'), router: '/pages/index/specialPriceHouse/index' },
     { name: '康养', id: 10, icon: require('../../../../assets/index-icon7.png'), router: '/pages/index/recovered/index' },
-    { name: '文旅商办', id: 11, icon: require('../../../../assets/index-icon13.png'), router: `/pages/index/buildingList/index?type=3` },
+    { name: '文旅商办', id: 11, icon: require('../../../../assets/index-icon13.png'), router: `/pages/index/buildingList/index?isCommerce=1` },
     { name: '新闻资讯', id: 12, icon: require('../../../../assets/index-icon15.png'), router: '/pages/index/newsList/index' },
     { name: '购房百科', id: 13, icon: require('../../../../assets/index-icon4.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
     { name: '房贷计算', id: 14, icon: require('../../../../assets/index-icon3.png'), router: '/pages/index/mortgageCalculation/index' }

src/pages/index/specialPriceHouse/index.jsx

-import { useState } from 'react'
+import { useEffect, useState } from 'react'
+import Taro from '@tarojs/taro'
 import withLayout from '@/layout'
 import { ScrollView, Image } from '@tarojs/components'
 import Disclaimer from '@/components/Disclaimer'
+import { getSpecialRoomList } from '@/services/project'
+import { getImgURL } from '@/utils/image'
+import { formateLeftTime } from '@/utils/tools'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
 const defaultRuleImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg'
 
-export default withLayout(() => {
+export default withLayout((props) => {
+  const { city } = props
 
+  const [list, setList] = useState([])
 
-  const [PageList, setPageList] = useState(['', '', ''])
+  const getRoomList = (params) => {
+    Taro.showLoading()
+    getSpecialRoomList({
+      cityId: city?.id,
+      ...params,
+    }).then((res) => {
+      const { records } = res
+      setList(records || [])
+      Taro.hideLoading()
+    }).catch((err) => {
+      console.error(err)
+      Taro.hideLoading()
+    })
+  }
+
+  const goto = (it) => {
+    Taro.navigateTo({
+      url: `/pages/index/buildingDetail/index?id=${it.buildingId}`
+    })
+  }
+
+  useEffect(() => {
+    console.log('------params---->', city, city?.id)
+    if (city?.id) {
+      getRoomList({ pageNum: 1 })
+    }
+  }, [city?.id])
 
   return (
     <view className='Page specialPriceHouse'>
           {/* 列表 */}
           <view className='List'>
             {
-              PageList.map((item, index) => (
-                <view key={`ListItem-${index}`}>
-
-                  <view className='Title'>
-                    <view>
-                      <text className='iconfont icon-shoucang'></text>
-                      <text>{index + 1 > 9 ? index + 1 : `0${index + 1}`}</text>
-                      <text className='iconfont icon-shoucang'></text>
-                    </view>
-                  </view>
+              list.map((item, index) => {
+                const mainImg = getImgURL(item?.buildingListImg?.length ? item.buildingListImg[0].url : null)
+                const price = item.price || '价格待定'
+                const shareNum = item.shareList?.total || 0
+                const uvNum = item.uvList?.length || 0
 
-                  <view className='InfoContent'>
-                    <view className='Img'>
-                      <Image mode='scaleToFill' src={null} className='centerLabel'></Image>
-                    </view>
-                    <view className='Name flex-h'>
-                      <view className='flex-item'>
-                        <text>奥园金基天著尚居</text>
+                // 最多6个
+                const tags = (item.buildingTag || []).map(x => x.tagName).slice(0, 6)
+
+                //
+                const specialRoomList = item.specialRoomList || []
+                
+                return (
+                  <view key={item.buildingId}>
+                    <view className='Title'>
+                      <view>
+                        <text className='iconfont icon-shoucang'></text>
+                        <text>{index + 1 > 9 ? index + 1 : `0${index + 1}`}</text>
+                        <text className='iconfont icon-shoucang'></text>
                       </view>
-                      <text>约</text>
-                      <text>20000/㎡</text>
-                    </view>
-                    <text className='Address'>江宁禄口云熙99路号（诚信大道）</text>
-                    <view className='Tag'>
-                      <text>纯新盘</text>
-                      <text>纯新盘</text>
-                      <text>纯新盘</text>
                     </view>
-                    <view className='Views flex-h'>
-                      <view className='flex-item'>
-                        <text className='iconfont icon-fenxiang'></text>
-                        <text>3次分享</text>
+
+                    <view className='InfoContent'>
+                      <view className='Img' onClick={() => goto(item)}>
+                        <Image mode='scaleToFill' src={mainImg} className='centerLabel'></Image>
                       </view>
-                      <view className='Icons'>
-                        <view>
-                          <Image mode='scaleToFill' src={null} className='centerLabel'></Image>
-                        </view>
-                        <view>
-                          <Image mode='scaleToFill' src={null} className='centerLabel'></Image>
-                        </view>
-                        <view>
-                          <Image mode='scaleToFill' src={null} className='centerLabel'></Image>
+                      <view className='Name flex-h' onClick={() => goto(item)}>
+                        <view className='flex-item'>
+                          <text>{item.buildingName}</text>
                         </view>
+                        <text></text>
+                        <text>{price}</text>
                       </view>
-                      <text>...9人围观</text>
-                    </view>
-                    <view className='SpecialList'>
-                      <ScrollView scrollX>
+                      <text className='Address' onClick={() => goto(item)}>{item.address}</text>
+                      <view className='Tag' onClick={() => goto(item)}>
+                        {
+                          tags.map((x) => (<text key={x}>{x}</text>))
+                        }
+                      </view>
+                      <view className='Views flex-h' onClick={() => goto(item)}>
+                        <view className='flex-item'>
+                          <text className='iconfont icon-fenxiang'></text>
+                          <text>{`${shareNum} 次分享`}</text>
+                        </view>
                         {
-                          [{}, {}].map((subItem, subIndex) => (
-                            <view className='ListItem' key={`List-${subIndex}`}>
-                              <text className='Tips'>省17.6万</text>
-                              <view className='Price'>
-                                <text>879万</text>
-                                <text>932万</text>
-                              </view>
-                              <text className='Time'>距结束06天10时14分</text>
-                              <text className='HouseType'>4室2厅2卫 234/㎡</text>
-                              <text className='DoorNumber'>1#-5单元-401</text>
+                          uvNum > 0 && (
+                            <view className='Icons'>
+                              {
+                                item.uvList.map((x) => (
+                                  <view key={x.uvId}>
+                                    <Image mode='scaleToFill' src={getImgURL(x.photoOravatar)} className='centerLabel'></Image>
+                                  </view>
+                                ))
+                              }
                             </view>
-                          ))
+                          )
                         }
-                      </ScrollView>
+                        <text>{`...${uvNum}人围观`}</text>
+                      </view>
+                      <view className='SpecialList'>
+                        <ScrollView scrollX>
+                          {
+                            specialRoomList.map((it) => {
+                              const unitPrice = it.area ? it.currentPrice / it.area : undefined
+                              const unitW = unitPrice ? `${Number(unitPrice).toFixed(0)}/㎡` : '单价待定'
+                              const currentW = it.currentPrice ? `${Number(it.currentPrice / 10000).toFixed(1)}万` : '待定'
+                              const originalW = it.originalPrice ? `${Number(it.originalPrice / 10000).toFixed(1)}万` : '待定'
+                              const thriftW = it.thriftPrice ? `省${Number(it.thriftPrice / 10000).toFixed(1)}万` : '待定'
+                              const leftTime = formateLeftTime(new Date(it.endTime) - new Date(), 'min');
+
+                              return (
+                                <view className='ListItem' key={it.specialRoomId}>
+                                  <text className='Tips'>{thriftW}</text>
+                                  <view className='Price'>
+                                    <text>{currentW}</text>
+                                    <text>{originalW}</text>
+                                  </view>
+                                  <text className='Time'>{`距结束 ${leftTime}`}</text>
+                                  <text className='HouseType'>{`${it.unitType} ${unitW}`}</text>
+                                  <text className='DoorNumber'>{it.roomName}</text>
+                                </view>
+                              )
+                            })
+                          }
+                        </ScrollView>
+                      </view>
                     </view>
-                  </view>
 
-                </view>
-              ))
+                  </view>
+                )
+              })
             }
           </view>
 

src/services/project.js

   API_CONTRACT_MANUAL,
   API_CONTRACT_CHECK,
   API_INDEX_CUSTOMER,
+  API_SPECIAL_ROOM_LIST,
 } from '@/constants/api'
 
 
  */
 export const contractCheck = payload => fetch({ url: API_CONTRACT_CHECK, payload, method: 'POST' })
 
-
-
+/**
+ * 获取特价房列表
+ * @param {*} payload 
+ * @returns 
+ */
+export const getSpecialRoomList = payload => fetch({ url: API_SPECIAL_ROOM_LIST, payload })

src/utils/request.js

   const recommender = Taro.getStorageSync('recommender') || ''
 
   // 去掉 null 跟 undefined 字段
-  const data = typeof payload === 'Object'
+  const data = typeof payload === 'object'
     ? Object.keys(payload).reduce((acc, key) => {
         const val = payload[key]
         if (val === null || val === undefined) {