静态页面

src/pages.js

@@ -153,7 +153,7 @@ const Activity = [
   {
     name: '活动',
     page: 'pages/HuoDong/index',
-    auth: ['avatar'],
+    auth: ['avatar', 'yezhu'],
     track: {
       event: 'list',
       eventType: 'activity',
@@ -162,7 +162,7 @@ const Activity = [
   {
     name: '活动-活动详情',
     page: 'pages/HuoDong/HuoDongDetail/index',
-    auth: ['avatar', 'phone'],
+    auth: ['avatar', 'phone', 'yezhu'],
     track: {
       event: 'detail',
       eventType: 'activity',
@@ -171,7 +171,7 @@ const Activity = [
   {
     name: '活动-活动签到',
     page: 'pages/HuoDong/HuoDongSign/index',
-    auth: ['avatar'],
+    auth: ['avatar', 'yezhu'],
     track: {
       event: 'detail',
       eventType: 'activity',
@@ -192,7 +192,7 @@ const Shop = [
   {
     name: '福利',
     page: 'pages/FuLi/index',
-    auth: ['avatar'],
+    auth: ['avatar', 'yezhu'],
     track: {
       event: 'list',
       eventType: 'shop',
@@ -201,7 +201,7 @@ const Shop = [
   {
     name: '福利搜索',
     page: 'pages/FuLi/ShangPinFilter/index',
-    auth: ['avatar'],
+    auth: ['avatar', 'yezhu'],
     track: {
       event: 'list',
       eventType: 'shop',
@@ -210,7 +210,7 @@ const Shop = [
   {
     name: '福利-商品详情',
     page: 'pages/FuLi/ShangPinXiangQing/index',
-    auth: ['avatar'],
+    auth: ['avatar', 'yezhu'],
     track: {
       event: 'detail',
       eventType: 'shop',
@@ -219,7 +219,7 @@ const Shop = [
   {
     name: '福利-商品兑换',
     page: 'pages/FuLi/ShangPinDuiHuan/index',
-    auth: ['avatar'],
+    auth: ['avatar', 'yezhu'],
     track: {
       event: 'exchange',
       eventType: 'shop',
@@ -228,7 +228,7 @@ const Shop = [
   {
     name: '福利-积分规则',
     page: 'pages/FuLi/JiFenGuiZe/index',
-    auth: ['avatar'],
+    auth: ['avatar', 'yezhu'],
     track: {
       event: 'points_rule',
       eventType: 'shop',
@@ -237,7 +237,7 @@ const Shop = [
   {
     name: '福利-积分明细',
     page: 'pages/FuLi/JiFenMingXi/index',
-    auth: ['avatar'],
+    auth: ['avatar', 'yezhu'],
     track: {
       event: 'points_details',
       eventType: 'shop',
@@ -310,7 +310,7 @@ const Other = [
   {
     name: '我的-我的活动',
     page: 'pages/WoDe/WoDeHuoDong/index',
-    auth: ['avatar', 'phone'],
+    auth: ['avatar', 'phone', 'yezhu'],
     track: {
       event: 'list',
       eventType: 'activity',
@@ -319,7 +319,7 @@ const Other = [
   {
     name: '我的-推荐二维码',
     page: 'pages/WoDe/TuiJianErWeiMa/index',
-    auth: ['avatar', 'phone'],
+    auth: ['avatar', 'phone', 'yezhu'],
     track: {
       event: 'detail',
       eventType: 'other',
@@ -328,7 +328,7 @@ const Other = [
   {
     name: '我的-推荐分享',
     page: 'pages/WoDe/TuiJianFenXiang/index',
-    auth: ['avatar', 'phone'],
+    auth: ['avatar', 'phone', 'yezhu'],
     track: {
       event: 'detail',
       eventType: 'other',
@@ -337,7 +337,7 @@ const Other = [
   {
     name: '我的-我的订单',
     page: 'pages/WoDe/WoDeDingDan/index',
-    auth: ['avatar', 'phone'],
+    auth: ['avatar', 'phone', 'yezhu'],
     track: {
       event: 'list',
       eventType: 'other',

src/pages/HuoDong/HuoDongSign/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Taro, { Current, useRouter } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import Page from '@/layouts'
 import { useModel } from '@/store'
@@ -12,11 +12,18 @@ export default function HuoDongDetail () {
   const { user, setUser } = useModel('user')
   const [DataLock, setDataLock] = useState(false)
   const [HasSign, setHasSign] = useState(false)
+  const [ShowSign, setShowSign] = useState(false)
   const [CurrnetId, setCurrentId] = useState(useRouter().params.id) // 当前活动id
   const [CurrnetSceneId] = useState(useRouter().params.scene) // 当前活动id
   const [ActivityDetail, setActivityDetail] = useState(null) // 活动详情
   const [JoinInfo, setJoinInfo] = useState(null) // 参加活动详情
 
+  useEffect(() => {
+    if (user && user.verifyStatus === 'certified') {
+      setShowSign(true)
+    }
+  }, [user])
+
   useEffect(() => {
     if (CurrnetId !== null && CurrnetId !== undefined) {
       GetActivityDetail()
@@ -79,11 +86,11 @@ export default function HuoDongDetail () {
         <view className={HasSign ? 'SignBtn' : 'SignBtn active'}>
           <view>
             {
-              JoinInfo !== null && JoinInfo.enlist !== null &&
+              JoinInfo !== null && JoinInfo.enlist !== null && ShowSign &&
               <text className='centerLabel' onClick={ToSign}>{HasSign ? '已签到' : '签到'}</text>
             }
             {
-              JoinInfo !== null && JoinInfo.enlist === null &&
+              JoinInfo !== null && JoinInfo.enlist === null && ShowSign &&
               <text className='centerLabel' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${CurrnetId}` }) }}>去报名</text>
             }
           </view>

src/pages/ShouYe/YeZhuFanKui/index.jsx

@@ -19,6 +19,7 @@ export default function YeZhuFanKui () {
   const [HasNextPage, setHasNextPage] = useState(true)
   const [ScrollTop, setScrollTop] = useState(0)
   const [Timer, setTimer] = useState(null)
+  const [ScrollTimer, setScrollTimer] = useState(null)
 
   useEffect(() => {
     if (user !== null) {
@@ -29,6 +30,26 @@ export default function YeZhuFanKui () {
     }
   }, [user, PageNum])
 
+  useEffect(() => {
+    if (PageList.length && PageList[PageList.length - 1].isLocal) {
+      clearTimeout(Timer)
+      setTimer(setTimeout(() => {
+        setPageList(PageList.concat([{
+          avatar: user.avatarurl,
+          content: '亲爱的业主，感谢您的反馈，工作人员稍后将为您进行回复。',
+          createDate: Date.now(),
+          msgId: PageList.length ? PageList[0].msgId : '',
+          nickname: '物业管理',
+          userId: 1
+        }]))
+        clearTimeout(ScrollTimer)
+        setScrollTimer(setTimeout(() => {
+          setScrollTop(10000 + Date.now())
+        }, 300))
+      }, 300))
+    }
+  }, [PageList])
+
   const GetPageList = (bool = false) => {
     if (HasNextPage) {
       request({
@@ -38,13 +59,13 @@ export default function YeZhuFanKui () {
         let List = res.records || []
         let Arr = []
         List.map((item) => {
-          Arr.unshift({ ...item })
+          Arr.unshift({ ...item, isLocal: false })
         })
         setPageList(Arr.concat(PageList))
         setHasNextPage(res.current - 0 < res.pages - 0)
         if (bool) {
-          clearTimeout(Timer)
-          setTimer(setTimeout(() => {
+          clearTimeout(ScrollTimer)
+          setScrollTimer(setTimeout(() => {
             setScrollTop(10000 + Date.now())
           }, 300))
         }
@@ -69,8 +90,9 @@ export default function YeZhuFanKui () {
           msgId: PageList.length ? PageList[0].msgId : '',
           content: CommentText
         }
-      }).then((res) => {
+      }).then(() => {
         setPageList(PageList.concat([{
+          isLocal: true,
           avatar: user.avatarurl,
           content: CommentText,
           createDate: Date.now(),
@@ -79,8 +101,8 @@ export default function YeZhuFanKui () {
           userId: null
         }]))
         setCommentText('')
-        clearTimeout(Timer)
-        setTimer(setTimeout(() => {
+        clearTimeout(ScrollTimer)
+        setScrollTimer(setTimeout(() => {
           setScrollTop(10000 + Date.now())
         }, 300))
         setDataLock(false)

src/pages/ShouYe/index.jsx

@@ -24,12 +24,12 @@ export default function Index () {
     // { icon: require('@/assets/img/icon4.png'), name: '业主认证', id: 4, router: '/pages/WoDe/WoDeRenZheng/index', isTab: false },
     { icon: require('@/assets/img/icon5.png'), name: '生活管家', id: 5, router: '/pages/WuYe/ShengHuoGuanJia/index', isTab: false, bold: true }
   ])
-  const [NavList] = useState([
-    { icon: 'iconhuodong1', name: '活动', id: 1, router: '/pages/ShouYe/HuoDong/index', isTab: false },
-    { icon: 'iconfuli1', name: '福利', id: 2, router: '/pages/FuLi/index', setName: null, setValue: null, isTab: true },
-    { icon: 'iconfuwu', name: '服务', id: 3, router: '/pages/WuYe/index', setName: 'WuYeNavId', setValue: '2', isTab: true },
-    { icon: 'iconxinwen', name: '资讯', id: 4, router: '/pages/ShouYe/ZiXun/index', isTab: false }
-  ])
+  // const [NavList] = useState([
+  //   { icon: 'iconhuodong1', name: '活动', id: 1, router: '/pages/ShouYe/HuoDong/index', isTab: false },
+  //   { icon: 'iconfuli1', name: '福利', id: 2, router: '/pages/FuLi/index', setName: null, setValue: null, isTab: true },
+  //   { icon: 'iconfuwu', name: '服务', id: 3, router: '/pages/WuYe/index', setName: 'WuYeNavId', setValue: '2', isTab: true },
+  //   { icon: 'iconxinwen', name: '资讯', id: 4, router: '/pages/ShouYe/ZiXun/index', isTab: false }
+  // ])
   const [BannerList, setBannerList] = useState([])
   // const [ActivityList, setActivityList] = useState([])
   const [NewsList, setNewsList] = useState([])
@@ -153,20 +153,20 @@ export default function Index () {
     return num >= 3
   }
 
-  const NavClick = (item) => {
-    return () => {
-      if (item.isTab) {
-        if (item.setName !== null) {
-          Taro.setStorageSync(item.setName, item.setValue)
-          Taro.reLaunch({ url: item.router })
-        } else {
-          Taro.switchTab({ url: item.router })
-        }
-      } else {
-        Taro.navigateTo({ url: item.router })
-      }
-    }
-  }
+  // const NavClick = (item) => {
+  //   return () => {
+  //     if (item.isTab) {
+  //       if (item.setName !== null) {
+  //         Taro.setStorageSync(item.setName, item.setValue)
+  //         Taro.reLaunch({ url: item.router })
+  //       } else {
+  //         Taro.switchTab({ url: item.router })
+  //       }
+  //     } else {
+  //       Taro.navigateTo({ url: item.router })
+  //     }
+  //   }
+  // }
 
   const Refresh = (e) => { // 页面下拉刷新
     Init(e)