Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

src/pages/index/activityDetail/index.jsx

@@ -42,7 +42,7 @@ const activityStatusDict = {
 };
 
 export default withLayout((props) => {
-  console.log(props, "props");
+  
   const { id } = props.router.params;
   const [detail, setDetail] = useState({});
   const [canChoose, setCanChoose] = useState("none");

src/pages/index/components/HotRecommend/index.jsx

@@ -3,15 +3,17 @@ import { useSelector } from 'react-redux'
 import Taro from '@tarojs/taro'
 import { fetch } from '@/utils/request'
 import { API_ACTIVITY_LIST } from '@/constants/api'
+import { queryActivityList, getActNewList } from '@/services/activity'
 import './index.scss'
 import '../../../../assets/css/iconfont.css'
 
 export default function HotRecommend () {
 
   const city = useSelector(state => state.city)
-  const [MenuList] = useState([{ name: '热门活动', id: 1 }, { name: '热门团房', id: 2 }])
-  const [CurrentId, setCurrentId] = useState(1)
-  const [CurrentContentInfo, setCurrentContentInfo] = useState({ name: '#大运河孔雀城时代', desc: '5月30日六一儿童节表演赛案场展开！' })
+  const [MenuList] = useState([{ name: '热门活动', id: 'dymic' }, { name: '热门团房', id: 'house' }])
+  const [CurrentId, setCurrentId] = useState('dymic')
+  const [list,setList]=useState([])
+  const [CurrentContentInfo, setCurrentContentInfo] = useState({ title: '#大运河孔雀城时代', desc: '5月30日六一儿童节表演赛案场展开！' })
 
   useEffect(() => {
     if(city.curCity.name) {
@@ -20,21 +22,34 @@ export default function HotRecommend () {
   }, [city])
 
   const GetRecommendActivity = () => {
-    fetch({url: API_ACTIVITY_LIST, method: 'get', payload: {pageNum: 1, pageSize: 1, cityId: city.curCity.id}}).then((res) => {
-      
-    })
+    
+      queryActivityList({home:1}).then((res)=>{
+        console.log(res,'-----------------')
+        setList(res.list)
+      })
   }
 
+  useEffect(() => {
+    if(list.length>0) {
+      setCurrentContentInfo(list.filter(x=>x.type==CurrentId)[0])
+    }
+  }, [CurrentId,list])
+
   const CutMenu = (id) => {
     return () => {
       setCurrentId(id)
     }
   }
-
+// x?type=dymic' },
+//     { name: '团房信息', id: 8, icon: require('../../../../assets/index-icon12.png'), router: '/pages/index/activityList/index?type=house'
   const ToMore = () => {
     Taro.navigateTo({url: `/pages/index/activityList/index?type=${CurrentId}`})
   }
 
+  const toDetail = () => {
+    Taro.navigateTo({url: `/pages/index/activityDetail/index?id=${CurrentContentInfo.dynamicId}`})
+  }
+  // url: `/pages/index/activityDetail/index?id=${data.dynamicId}`
   return (
     <view className='components HotRecommend'>
       <view>
@@ -45,10 +60,11 @@ export default function HotRecommend () {
             ))
           }
         </view>
-        <view className='Content'>
+        {console.log(CurrentContentInfo,'CurrentContentInfo')}
+        <view className='Content' onClick={toDetail}>
           <view className='flex-h'>
-            <text className='flex-item'>{CurrentContentInfo.name}</text>
-            <text onClick={ToMore}>{CurrentId === 1 ? '更多活动' : '更多团房'}</text>
+            <text className='flex-item'>{CurrentContentInfo.title}</text>
+            <text onClick={ToMore}>{CurrentId === 'dymic' ? '更多活动' : '更多团房'}</text>
           </view>
           <text>{CurrentContentInfo.desc}</text>
         </view>

src/pages/index/components/LiveSale/index.jsx

@@ -47,7 +47,7 @@ export default function LiveSale () {
             {
               PageList.map((item, index) => (
                 <view className='ListItem' key={`List-${index}`} style={{display: CurrentId === 1 || (CurrentId === 2 && item.kind === 'notice') || (CurrentId === 3 && item.kind === 'live')  || (CurrentId === 4 && item.kind !== 'notice') ? 'inline-block' : 'none'}}>
-                  <Image mode='aspectFill' className='centerLabel' src={`${getImgURL(item.images)}`} />
+                  <Image mode='aspectFill' className='centerLabel' onClick={()=>{}} src={`${getImgURL(item.images)}`} />
                 </view>
               ))
             }

src/pages/index/components/NewsListItem/index.jsx

@@ -2,17 +2,20 @@ import React, { useState, useEffect } from 'react'
 import './index.scss'
 import { Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
+import { getImgURL } from "@/utils/image";
+import getDateFormat from "@/utils/chatDate";
 
 export default function NewsListItem (props) {
-  const { Data = {} } = props
+  const { data = {} } = props
+  console.log(data,'data')
   return (
-    <view className='components NewsListItem flex-h' onClick={() => { Taro.navigateTo({ url: `/pages/index/newsDetail/index?id=${Data.id}` }) }}>
+    <view className='components NewsListItem flex-h' onClick={() => { Taro.navigateTo({ url: `/pages/index/newsDetail/index?id=${data.newsId}` }) }}>
       <view className='Img'>
-        <Image mode='aspectFill' src={null} className='centerLabel'></Image>
+        <Image mode='aspectFill' src={getImgURL(data.newsImg)} className='centerLabel'></Image>
       </view>
       <view className='flex-item'>
-        <text>破晓·内容生态下半场的版权之道2019企业版权</text>
-        <text>于2019-12-12 14:20:30发布</text>
+        <text>{data.newsName}</text>
+        <text>于{getDateFormat(new Date(data.createDate).valueOf(), true,"yyyy-M-d")}发布</text>
       </view>
     </view>
   )

src/pages/index/newsDetail/index.jsx

@@ -1,68 +1,111 @@
-import React, { useState, useEffect } from 'react'
-import withLayout from '@/layout'
-import './index.scss'
-import { ScrollView } from '@tarojs/components'
-import '../../../assets/css/iconfont.css'
-import { Image, RichText } from '@tarojs/components'
+import React, { useState, useEffect } from "react";
+import Taro from "@tarojs/taro";
+import withLayout from "@/layout";
+import "./index.scss";
+import { ScrollView, Image, RichText,WebView } from "@tarojs/components";
+import "../../../assets/css/iconfont.css";
+import {
+  addNewsUv,
+  favorNews,
+  // addNewsShareNum,
+  queryNewsDetail,
+  cancelFavorNews,
+} from "@/services/news";
+import getDateFormat from "@/utils/chatDate";
 
 export default withLayout((props) => {
+  const { id } = props.router.params;
 
-  // const [PageProps] = useState(props)
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
-  const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
+  const [data, setData] = useState(null);
+  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]);
 
-  return (
-    <view className='Page newsDetail flex-v'>
-      <view className='flex-item'>
-        <view>
-          <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
-            <view className='PageContent'>
+  const getData = (params) => {
+    Taro.showLoading();
+    queryNewsDetail(params).then((res) => {
+  
+      setData(res);
+      Taro.hideLoading();
+    });
+  };
+
+  useEffect(() => {
+    if (id) {
+      getData(id);
+    }
+  }, [id]);
 
-              <view className='Info'>
-                <view>
-                  <text className='Title'>公积金又有新变化，附最新南京公积金贷款和提取方法。</text>
+  return (
+    <view className="Page newsDetail flex-v">
+      {data&& (data.newsDetailType === '0' ? <WebView src={data.newsDetail} /> :<>
+        <view className="flex-item">
+          <view>
+            <ScrollView
+              scroll-y={true}
+              refresher-enabled={true}
+              refresher-triggered={IsPull}
+              onrefresherrefresh={PageRefresh}
+              refresher-background="#fff"
+            >
+              <view className="PageContent">
+                <view className="Info">
                   <view>
-                    <text>阅读：28</text>
-                    <text>点赞15</text>
-                    <text>收藏22</text>
+                    <text className="Title">{data.newsName}</text>
+                    <view>
+                      <text>阅读：{data.pvNum || 0}</text>
+                      <text>点赞{data.favorNum || 0}</text>
+                      <text>收藏{data.saveNum || 0}</text>
+                    </view>
+                    <text className="Time">
+                      时间：
+                      {getDateFormat(
+                        new Date(data.createDate).valueOf(),
+                        true,
+                        "yyyy-M-d"
+                      )}{" "}
+                    </text>
+                    <text className="Share">分享好友</text>
                   </view>
-                  <text className='Time'>时间：2019-10-20 10:00 </text>
-                  <text className='Share'>分享好友</text>
                 </view>
-              </view>
 
-              <view className='Content'>
-                <RichText nodes={'<p>这是内容</p>'}></RichText>
+                <view className="Content">
+                  <RichText nodes={data.newsDetail}></RichText>
+                </view>
               </view>
-
-            </view>
-          </ScrollView>
-        </view>
-      </view>
-      <view className='Bottom'>
-        <view>
-          <Image mode='heightFix' src={require('../../../assets/buildingDetail-icon3.png')}></Image>
-          <text>生成海报</text>
+            </ScrollView>
+          </view>
         </view>
-        <view>
-          <text className='iconfont icon-shoucang'></text>
-          <text>收藏</text>
+        <view className="Bottom">
+          <view>
+            <Image
+              mode="heightFix"
+              src={require("../../../assets/buildingDetail-icon3.png")}
+            ></Image>
+            <text>生成海报</text>
+          </view>
+          <view>
+            <text className="iconfont icon-shoucang"></text>
+            <text>收藏</text>
+          </view>
         </view>
-      </view>
+      </>)}
     </view>
-  )
-})
+  );
+});

src/pages/index/newsList/index.jsx

@@ -4,11 +4,13 @@ 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 [PageProps] = useState(props)
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
+  const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
 
@@ -25,6 +27,64 @@ export default withLayout((props) => {
     }
   }, [IsPull])
 
+ 
+  // componentDidShow() {
+  //   // // this.onPullDownRefresh()
+  //   // console.log('----', this)
+  //   const pageSize = (Taro.getStorageSync('newsPageIndex') || 1) * 10
+  //   loadData(1, pageSize)
+  // }
+
+  // loadList(pageNumber, pageSize = 10) {
+  //   const { curCity: { id: cityId } } = this.props
+  //   const payload = { pageSize, pageNumber }
+
+  //   const { params: { buildingId, from } } = this.$router
+  //   if (cityId) {
+  //     payload.cityId = cityId
+  //   }
+  //   // 从个人中心过来
+  //   console.log(this.router, "from")
+  //   if (from === 'mine') {
+  //     payload.mine = true
+  //   }
+  //   // // 从项目详情过来
+  //   if (buildingId) {
+  //     payload.buildingId = buildingId
+  //   }
+  //   // return queryActivityList(payload)
+  //   return queryNewsList(payload)
+  // }
+
+  const loadData = (params) => {
+    // const currentPage = page || this.state.pageIndex
+
+    queryNewsList(params).then(res=>{
+      console.log(res,'queryNewsList')
+      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 || {}
+    //   const _list = records || list || []
+    //   const newList = current <= 1 ? _list : this.state.list.concat(_list)
+    //   console.log(res, '---res-------')
+    //   const pageNum = Math.max(Taro.getStorageSync('newsPageIndex'), current)
+    //   setPageList
+    //   this.setState({
+    //     list: newList,
+    //     isEmpty: total == 0,
+    //     hasMore: current * size < total,
+    //     pageIndex: pageNum,
+    //     // pageIndex: current >= pages ? pages : current,
+    //   })
+    // })
+  }
+  useEffect(()=>{
+    loadData({page : 0, pageSize : 10})
+  },[])
+
   return (
     <view className='Page newsList'>
 
@@ -33,7 +93,7 @@ export default withLayout((props) => {
 
           {
             PageList.map((item, index) => (
-              <NewsListItem></NewsListItem>
+              <NewsListItem data={item}></NewsListItem>
             ))
           }