fix

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"https://xlk.njyz.tech"',
-    HOST: '"http://127.0.0.1:8081"',
+    HOST: '"https://xlk.njyz.tech"',
+    // HOST: '"http://127.0.0.1:8081"',
     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/activityList/index.jsx

@@ -10,9 +10,9 @@ import ActivityListItem from '../components/ActivityListItem/index'
 import './index.scss'
 
 export default function MyCollectForActivity (props) {
- const router=useRouter()
 
-   const { type } = router.params;
+ const router=useRouter()
+   const { type,buildingId } = router.params;
   const city = useSelector(state => state.city)
  
   const [PageList, setPageList] = useState([])
@@ -35,16 +35,22 @@ export default function MyCollectForActivity (props) {
   
 
  const getList = (params) => {
-  queryActivityList({...params,type,cityId: city.curCity.id}).then((res)=>{
+  params.cityId = city.curCity.id;
+  if(buildingId){
+    params.buildingId = buildingId;
+  }else{
+    params.cityId = city?.curCity?.id;
+  }
+  queryActivityList({...params,type}).then((res)=>{
     setPageList(res.list)
   })
   }
   useEffect(()=>{
-    if(city?.curCity?.id){
+ 
       getList({page :0, pageSize : 10})
-    }
+
    
-  },[city])
+  },[])
   // useDidShow(() => {
   //   getList({page :0, pageSize : 10})
   // })

src/pages/index/newsList/index.jsx

@@ -1,33 +1,40 @@
-import React, { useState, useEffect } from 'react'
-import withLayout from '@/layout'
-import './index.scss'
-import { ScrollView } from '@tarojs/components'
-import '@/assets/css/iconfont.css'
-import NewsListItem from '../components/NewsListItem/index'
-import { useDidShow } from '@tarojs/taro'
-import { queryNewsList } from '@/services/news'
+import React, { useState, useEffect } from "react";
+import { useRouter } from "@tarojs/taro";
+import { useSelector } from "react-redux";
+import withLayout from "@/layout";
+import "./index.scss";
+import { ScrollView } from "@tarojs/components";
+import "@/assets/css/iconfont.css";
+import NewsListItem from "../components/NewsListItem/index";
+import { useDidShow } from "@tarojs/taro";
+import { queryNewsList } from "@/services/news";
 
 export default withLayout((props) => {
-
+  const router = useRouter();
+  const { buildingId, from } = router.params;
+  const city = useSelector((state) => state.city);
   // const [PageProps] = useState(props)
-  const [PageList, setPageList] = useState([])
-  const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
+  const [PageList, setPageList] = useState([]);
+  const [IsPull, setPull] = useState(false);
+  const [PullTimer, setPullTimer] = useState(null);
 
-  const PageRefresh = () => { // 页面下拉刷新回调
-    setPull(true)
-  }
+  const PageRefresh = () => {
+    // 页面下拉刷新回调
+    setPull(true);
+  };
 
-  useEffect(() => { // 下拉刷新触发
+  useEffect(() => {
+    // 下拉刷新触发
     if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+      clearTimeout(PullTimer);
+      setPullTimer(
+        setTimeout(() => {
+          setPull(false);
+        }, 2000)
+      );
     }
-  }, [IsPull])
+  }, [IsPull]);
 
- 
   // componentDidShow() {
   //   // // this.onPullDownRefresh()
   //   // console.log('----', this)
@@ -58,12 +65,23 @@ export default withLayout((props) => {
 
   const loadData = (params) => {
     // const currentPage = page || this.state.pageIndex
+    // const { curCity: { id: cityId } } = this.props
+
+ 
+    // if (from === "mine") {
+    //   params.mine = true;
+    // }
+    // // 从项目详情过来
+    if (buildingId) {
+      params.buildingId = buildingId;
+    }else if(city?.curCity?.id){
+      params.cityId = city.curCity.id;
+    }
 
-    queryNewsList(params).then(res=>{
-      console.log(res,'queryNewsList')
-      const { records, list, total, current, pages, size } = res || {}
-      setPageList([...PageList, ...records])
-    })
+    queryNewsList(params).then((res) => {
+      const { records, list, total, current, pages, size } = res || {};
+      setPageList([...PageList, ...records]);
+    });
 
     // this.loadList(currentPage, pageSize).then(res => {
     //   const { records, list, total, current, pages, size } = res || {}
@@ -80,31 +98,31 @@ export default withLayout((props) => {
     //     // pageIndex: current >= pages ? pages : current,
     //   })
     // })
-  }
-  useEffect(()=>{
-    loadData({page : 0, pageSize : 10})
-  },[])
+  };
+  useEffect(() => {
+    loadData({ page: 0, pageSize: 10 });
+  }, []);
 
   return (
-    <view className='Page newsList'>
-
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
-        <view className='PageContent'>
-
-          {
-            PageList.map((item, index) => (
-              <NewsListItem data={item}></NewsListItem>
-            ))
-          }
+    <view className="Page newsList">
+      <ScrollView
+        scroll-y={true}
+        refresher-enabled={true}
+        refresher-triggered={IsPull}
+        onrefresherrefresh={PageRefresh}
+        refresher-background="#fff"
+      >
+        <view className="PageContent">
+          {PageList.map((item, index) => (
+            <NewsListItem data={item}></NewsListItem>
+          ))}
 
           {/* bottom */}
-          <view className='PageBottom'>
+          <view className="PageBottom">
             <text>已经到底了~</text>
           </view>
-
         </view>
       </ScrollView>
-
     </view>
-  )
-})
+  );
+});