feats

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"http://127.0.0.1:8088"',
+    // HOST: '"https://xlk.njyz.tech"',
+    HOST: '"http://127.0.0.1:8088"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',

src/pages/index/buildingDetail/components/HouseTypeIntro/index.jsx

@@ -17,10 +17,8 @@ export default function HouseTypeIntro (props) {
 
       <view className='Title flex-h'>
         <view className='flex-item'>
-          <text>户型介绍（{Info.length}）</text>
+          <text>户型介绍</text>
         </view>
-        <text>更多</text>
-        <text className='iconfont icon-jiantouright'></text>
       </view>
 
       <view className='ProjectList'>

src/pages/index/buildingDetail/components/MarketingActivity/index.jsx

@@ -1,19 +1,36 @@
-
+import { useEffect, useState } from 'react'
+import Taro from '@tarojs/taro'
 import { Swiper, SwiperItem, Image } from '@tarojs/components'
 import { getImgURL } from '@/utils/image'
+import { queryActivityList } from '@/services/activity'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
 export default function MarketingActivity (props) {
-  const { List = [] } = props
-  return (
+  const { Info } = props
+  const { buildingId } = Info || {}
+
+  const [dataList, setDataList] = useState([])
+
+  const goMore = () => Taro.navigateTo({ url: `/pages/index/activityList/index?type=house&buildingId=${buildingId}` })
+
+  useEffect(() => {
+    queryActivityList({ buildingId, pageSize: 3 }).then((res) => {
+      const { list } = res || {}
+      setDataList(list || [])
+    })
+  }, [buildingId])
+
+  console.log('----------->', dataList)
+
+  return dataList.length > 0 && (
     <view className='components MarketingActivity'>
 
       <view className='Title flex-h'>
         <view className='flex-item'>
           <text>营销活动</text>
         </view>
-        <text>更多</text>
+        <text onClick={goMore}>更多</text>
         <text className='iconfont icon-jiantouright'></text>
       </view>
 
@@ -21,7 +38,7 @@ export default function MarketingActivity (props) {
         <view>
           <Swiper autoplay interval={2000} indicator-dots>
             {
-              List.map((item, index) => (
+              dataList.map((item, index) => (
                 <SwiperItem key={`Banner-${index}`}>
                   <view className='swiper-item'>
                     <Image mode='aspectFill' className='centerLabel' src={getImgURL(item.bannerListImg || item.image || item.url || item.img || item.imgUrl || item.detailImg)} />

src/pages/index/buildingDetail/index.jsx

@@ -24,7 +24,6 @@ export default withLayout((props) => {
   const { id } = props.router.params
 
   const [DetailInfo, setDetailInfo] = useState({})
-  const [ActivityList, setActivityList] = useState([])
   const [PictureList, setPictureList] = useState([])
   const [NewsList, setNewsList] = useState([])
 
@@ -45,19 +44,11 @@ export default withLayout((props) => {
     })
 
     // 获取资讯列表
-    fetch({ url: API_NEWS_LIST, params: { buildingId: id, pageSize: 2, pageNum: 1 } }).then((res) => {
+    fetch({ url: API_NEWS_LIST, payload: { buildingId: id, pageSize: 2, pageNum: 1 } }).then((res) => {
       setNewsList(res.records || [])
     })
-    GetActivityList()
   }, [id])
 
-  const GetActivityList = () => { // 获取活动列表
-    fetch({ url: `${API_ACTIVITY_GROUP}?buildingId=${props.router.params.id}`, method: 'get' }).then((res) => {
-      const ResArr = res || []
-      setActivityList(ResArr.filter((item) => { return item.type !== 'help' && item.type !== 'group' }))
-    })
-  }
-
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
@@ -122,7 +113,7 @@ export default withLayout((props) => {
 
                 {/* 营销活动 */}
                 <view className='MarketingActivity' style={{minHeight: 0}}>
-                  <MarketingActivity List={ActivityList}></MarketingActivity>
+                  <MarketingActivity Info={DetailInfo}></MarketingActivity>
                 </view>
 
                 {/* 直播活动 */}

src/utils/request.js

@@ -85,16 +85,14 @@ export const uploadFiles = async (files) => {
 }
 
 export function optionBuilder(options) {
-  const { url, params = {}, payload = {}, method = 'GET', showToast = true, autoLogin = true, header, spin = false } = options
+  const { url, payload = {}, method = 'GET', showToast = true, autoLogin = true, header, spin = false } = options
   const showMessage = Object.prototype.hasOwnProperty.call(payload, 'showToast') ? payload.showToast : showToast
   const consultant = Taro.getStorageSync('consultantId') || ''
   const recommender = Taro.getStorageSync('recommender') || ''
-  const queryStr = Object.keys(params).map((key) => `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`).join('&')
-  const apiURL = queryStr ? `${url}${url.indexOf('?') > -1 ? '&' : '?'}${queryStr}` : url
-
+  
   return [
     {
-      url: apiURL,
+      url,
       method,
       data: payload,
       header: {