feats

src/layouts/index.jsx

@@ -1,14 +1,15 @@
-import React, { useState, useEffect } from 'react'
+import React, { useEffect, useState } from 'react'
 import Taro, { useDidShow } from '@tarojs/taro'
-import { useModel } from '@/store'
-import Spin from '@/components/Spin'
-import GetUserPhone from '@/components/GetUserPhone/index'
-import GetUserIcon from '@/components/GetUserIcon/index'
+
 import AdvLayer from '@/components/AdvLayer'
+import GetUserIcon from '@/components/GetUserIcon/index'
+import GetUserPhone from '@/components/GetUserPhone/index'
 import RenZhengScreen from '@/components/RenZhengScreen'
+import Spin from '@/components/Spin'
 import YeZhuRenZhengPopup from '@/components/YeZhuRenZhengPopup'
-import useMountTrack from '@/utils/hooks/useMountTrack'
 import { getPage } from '@/utils'
+import { useModel } from '@/store'
+import useMountTrack from '@/utils/hooks/useMountTrack'
 import './index.less'
 
 const pages = require('../pages')

src/pages/ShouYe/index.jsx

@@ -29,9 +29,12 @@ export default function Index (props) {
     { icon: 'iconxinwen', name: '资讯', id: 4, router: '/pages/ShouYe/ZiXun/index', isTab: false }
   ])
   const [BannerList, setBannerList] = useState([])
-  const [ActivityList, setActivityList] = useState([])
+  // const [ActivityList, setActivityList] = useState([])
   const [NewsList, setNewsList] = useState([])
 
+  // 宣传位
+  const [propagandaList, setPropagandaList] = useState([])
+
   useUserMounted(() => {
     Init()
   })
@@ -44,12 +47,19 @@ export default function Index (props) {
         done()
       }
     })
-    GetActivityList(() => { // 获取活动列表
+
+    GetPropagandaList(() => { // 宣传位
       DownCount += 1
       if (CheckDownCount(DownCount)) {
         done()
       }
     })
+    // GetActivityList(() => { // 获取活动列表
+    //   DownCount += 1
+    //   if (CheckDownCount(DownCount)) {
+    //     done()
+    //   }
+    // })
     GetNewsList(() => { // 获取资讯列表
       DownCount += 1
       if (CheckDownCount(DownCount)) {
@@ -68,14 +78,22 @@ export default function Index (props) {
     })
   }
 
-  const GetActivityList = (done = () => { }) => { // 获取活动列表
-    setActivityList([])
-    request({ ...apis.getActivityList, params: { pageNum: 1, pageSize: 1 } }).then((res) => {
-      setActivityList([...res.list])
-      done()
-    }).catch(() => {
+  // const GetActivityList = (done = () => { }) => { // 获取活动列表
+  //   setActivityList([])
+  //   request({ ...apis.getActivityList, params: { pageNum: 1, pageSize: 1 } }).then((res) => {
+  //     setActivityList([...res.list])
+  //     done()
+  //   }).catch(() => {
+  //     done()
+  //   })
+  // }
+
+  const GetPropagandaList = (done = () => {}) => {
+    setPropagandaList([])
+    request({...apis.getIndexAdv, params: {pageNum: 1, pageSize: 1, showType: 'propaganda'}}).then(res => {
+      setPropagandaList([...(res || [])])
       done()
-    })
+    }).catch(() => done())
   }
 
   const GetNewsList = (done = () => { }) => { // 获取资讯列表
@@ -183,15 +201,15 @@ export default function Index (props) {
 
                   {/* 热门活动 */}
                   {
-                    ActivityList.length > 0 &&
+                    propagandaList.length > 0 &&
                     <view className='HotActivityContainer'>
                       <view>
                         <view className='Title'>
-                          <Text onClick={() => { Taro.navigateTo({ url: '/pages/ShouYe/HuoDong/index' }) }}>热门活动</Text>
-                          <Text className='iconfont icongengduo' onClick={() => { Taro.navigateTo({ url: '/pages/ShouYe/HuoDong/index' }) }}></Text>
+                          <Text>热门活动</Text>
+                          <Text className='iconfont icongengduo'></Text>
                         </view>
-                        <view className='Activity' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${ActivityList[0].dynamicId}` }) }}>
-                          <image className='centerLabel' mode='aspectFill' src={ActivityList[0].imgUrl}></image>
+                        <view className='Activity' onClick={() => nav2detail({type: propagandaList[0].contentType, id: propagandaList[0].targetId})}>
+                          <image className='centerLabel' mode='aspectFill' src={propagandaList[0].image}></image>
                         </view>
                       </view>
                     </view>

src/pages/WoDe/YeZhuRenZheng/index.jsx

@@ -176,7 +176,8 @@ export default function YeZhuRenZheng () {
             roomNoId: Level6List[Level6Value].id,
             phone: FormData.Phone,
             ownerName: FormData.RealName,
-            idCard: FormData.IdCard
+            idCard: FormData.IdCard,
+            roleName: CurrentRoleName
           }
         }).then((res) => {
           Taro.showToast({ title: '添加认证成功', icon: 'none' })