张延森 3 lat temu
rodzic
commit
ef79e8a2bb

+ 2
- 2
config/dev.js Wyświetl plik

3
     NODE_ENV: '"development"'
3
     NODE_ENV: '"development"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    HOST: '"https://xlk.njyz.tech"',
7
-    // HOST: '"http://127.0.0.1:8088"',
6
+    // HOST: '"https://xlk.njyz.tech"',
7
+    HOST: '"http://127.0.0.1:8088"',
8
     WSS_HOST: '"wss://xlk.njyz.tech"',
8
     WSS_HOST: '"wss://xlk.njyz.tech"',
9
     OSS_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
9
     OSS_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
10
     OSS_FAST_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
10
     OSS_FAST_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',

+ 1
- 3
src/pages/index/buildingDetail/components/HouseTypeIntro/index.jsx Wyświetl plik

17
 
17
 
18
       <view className='Title flex-h'>
18
       <view className='Title flex-h'>
19
         <view className='flex-item'>
19
         <view className='flex-item'>
20
-          <text>户型介绍({Info.length})</text>
20
+          <text>户型介绍</text>
21
         </view>
21
         </view>
22
-        <text>更多</text>
23
-        <text className='iconfont icon-jiantouright'></text>
24
       </view>
22
       </view>
25
 
23
 
26
       <view className='ProjectList'>
24
       <view className='ProjectList'>

+ 22
- 5
src/pages/index/buildingDetail/components/MarketingActivity/index.jsx Wyświetl plik

1
-
1
+import { useEffect, useState } from 'react'
2
+import Taro from '@tarojs/taro'
2
 import { Swiper, SwiperItem, Image } from '@tarojs/components'
3
 import { Swiper, SwiperItem, Image } from '@tarojs/components'
3
 import { getImgURL } from '@/utils/image'
4
 import { getImgURL } from '@/utils/image'
5
+import { queryActivityList } from '@/services/activity'
4
 import '@/assets/css/iconfont.css'
6
 import '@/assets/css/iconfont.css'
5
 import './index.scss'
7
 import './index.scss'
6
 
8
 
7
 export default function MarketingActivity (props) {
9
 export default function MarketingActivity (props) {
8
-  const { List = [] } = props
9
-  return (
10
+  const { Info } = props
11
+  const { buildingId } = Info || {}
12
+
13
+  const [dataList, setDataList] = useState([])
14
+
15
+  const goMore = () => Taro.navigateTo({ url: `/pages/index/activityList/index?type=house&buildingId=${buildingId}` })
16
+
17
+  useEffect(() => {
18
+    queryActivityList({ buildingId, pageSize: 3 }).then((res) => {
19
+      const { list } = res || {}
20
+      setDataList(list || [])
21
+    })
22
+  }, [buildingId])
23
+
24
+  console.log('----------->', dataList)
25
+
26
+  return dataList.length > 0 && (
10
     <view className='components MarketingActivity'>
27
     <view className='components MarketingActivity'>
11
 
28
 
12
       <view className='Title flex-h'>
29
       <view className='Title flex-h'>
13
         <view className='flex-item'>
30
         <view className='flex-item'>
14
           <text>营销活动</text>
31
           <text>营销活动</text>
15
         </view>
32
         </view>
16
-        <text>更多</text>
33
+        <text onClick={goMore}>更多</text>
17
         <text className='iconfont icon-jiantouright'></text>
34
         <text className='iconfont icon-jiantouright'></text>
18
       </view>
35
       </view>
19
 
36
 
21
         <view>
38
         <view>
22
           <Swiper autoplay interval={2000} indicator-dots>
39
           <Swiper autoplay interval={2000} indicator-dots>
23
             {
40
             {
24
-              List.map((item, index) => (
41
+              dataList.map((item, index) => (
25
                 <SwiperItem key={`Banner-${index}`}>
42
                 <SwiperItem key={`Banner-${index}`}>
26
                   <view className='swiper-item'>
43
                   <view className='swiper-item'>
27
                     <Image mode='aspectFill' className='centerLabel' src={getImgURL(item.bannerListImg || item.image || item.url || item.img || item.imgUrl || item.detailImg)} />
44
                     <Image mode='aspectFill' className='centerLabel' src={getImgURL(item.bannerListImg || item.image || item.url || item.img || item.imgUrl || item.detailImg)} />

+ 2
- 11
src/pages/index/buildingDetail/index.jsx Wyświetl plik

24
   const { id } = props.router.params
24
   const { id } = props.router.params
25
 
25
 
26
   const [DetailInfo, setDetailInfo] = useState({})
26
   const [DetailInfo, setDetailInfo] = useState({})
27
-  const [ActivityList, setActivityList] = useState([])
28
   const [PictureList, setPictureList] = useState([])
27
   const [PictureList, setPictureList] = useState([])
29
   const [NewsList, setNewsList] = useState([])
28
   const [NewsList, setNewsList] = useState([])
30
 
29
 
45
     })
44
     })
46
 
45
 
47
     // 获取资讯列表
46
     // 获取资讯列表
48
-    fetch({ url: API_NEWS_LIST, params: { buildingId: id, pageSize: 2, pageNum: 1 } }).then((res) => {
47
+    fetch({ url: API_NEWS_LIST, payload: { buildingId: id, pageSize: 2, pageNum: 1 } }).then((res) => {
49
       setNewsList(res.records || [])
48
       setNewsList(res.records || [])
50
     })
49
     })
51
-    GetActivityList()
52
   }, [id])
50
   }, [id])
53
 
51
 
54
-  const GetActivityList = () => { // 获取活动列表
55
-    fetch({ url: `${API_ACTIVITY_GROUP}?buildingId=${props.router.params.id}`, method: 'get' }).then((res) => {
56
-      const ResArr = res || []
57
-      setActivityList(ResArr.filter((item) => { return item.type !== 'help' && item.type !== 'group' }))
58
-    })
59
-  }
60
-
61
   const PageRefresh = () => { // 页面下拉刷新回调
52
   const PageRefresh = () => { // 页面下拉刷新回调
62
     setPull(true)
53
     setPull(true)
63
   }
54
   }
122
 
113
 
123
                 {/* 营销活动 */}
114
                 {/* 营销活动 */}
124
                 <view className='MarketingActivity' style={{minHeight: 0}}>
115
                 <view className='MarketingActivity' style={{minHeight: 0}}>
125
-                  <MarketingActivity List={ActivityList}></MarketingActivity>
116
+                  <MarketingActivity Info={DetailInfo}></MarketingActivity>
126
                 </view>
117
                 </view>
127
 
118
 
128
                 {/* 直播活动 */}
119
                 {/* 直播活动 */}

+ 3
- 5
src/utils/request.js Wyświetl plik

85
 }
85
 }
86
 
86
 
87
 export function optionBuilder(options) {
87
 export function optionBuilder(options) {
88
-  const { url, params = {}, payload = {}, method = 'GET', showToast = true, autoLogin = true, header, spin = false } = options
88
+  const { url, payload = {}, method = 'GET', showToast = true, autoLogin = true, header, spin = false } = options
89
   const showMessage = Object.prototype.hasOwnProperty.call(payload, 'showToast') ? payload.showToast : showToast
89
   const showMessage = Object.prototype.hasOwnProperty.call(payload, 'showToast') ? payload.showToast : showToast
90
   const consultant = Taro.getStorageSync('consultantId') || ''
90
   const consultant = Taro.getStorageSync('consultantId') || ''
91
   const recommender = Taro.getStorageSync('recommender') || ''
91
   const recommender = Taro.getStorageSync('recommender') || ''
92
-  const queryStr = Object.keys(params).map((key) => `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`).join('&')
93
-  const apiURL = queryStr ? `${url}${url.indexOf('?') > -1 ? '&' : '?'}${queryStr}` : url
94
-
92
+  
95
   return [
93
   return [
96
     {
94
     {
97
-      url: apiURL,
95
+      url,
98
       method,
96
       method,
99
       data: payload,
97
       data: payload,
100
       header: {
98
       header: {