Browse Source

静态页面

xcx 4 years ago
parent
commit
445c81f794

+ 13
- 13
src/pages.js View File

153
   {
153
   {
154
     name: '活动',
154
     name: '活动',
155
     page: 'pages/HuoDong/index',
155
     page: 'pages/HuoDong/index',
156
-    auth: ['avatar'],
156
+    auth: ['avatar', 'yezhu'],
157
     track: {
157
     track: {
158
       event: 'list',
158
       event: 'list',
159
       eventType: 'activity',
159
       eventType: 'activity',
162
   {
162
   {
163
     name: '活动-活动详情',
163
     name: '活动-活动详情',
164
     page: 'pages/HuoDong/HuoDongDetail/index',
164
     page: 'pages/HuoDong/HuoDongDetail/index',
165
-    auth: ['avatar', 'phone'],
165
+    auth: ['avatar', 'phone', 'yezhu'],
166
     track: {
166
     track: {
167
       event: 'detail',
167
       event: 'detail',
168
       eventType: 'activity',
168
       eventType: 'activity',
171
   {
171
   {
172
     name: '活动-活动签到',
172
     name: '活动-活动签到',
173
     page: 'pages/HuoDong/HuoDongSign/index',
173
     page: 'pages/HuoDong/HuoDongSign/index',
174
-    auth: ['avatar'],
174
+    auth: ['avatar', 'yezhu'],
175
     track: {
175
     track: {
176
       event: 'detail',
176
       event: 'detail',
177
       eventType: 'activity',
177
       eventType: 'activity',
192
   {
192
   {
193
     name: '福利',
193
     name: '福利',
194
     page: 'pages/FuLi/index',
194
     page: 'pages/FuLi/index',
195
-    auth: ['avatar'],
195
+    auth: ['avatar', 'yezhu'],
196
     track: {
196
     track: {
197
       event: 'list',
197
       event: 'list',
198
       eventType: 'shop',
198
       eventType: 'shop',
201
   {
201
   {
202
     name: '福利搜索',
202
     name: '福利搜索',
203
     page: 'pages/FuLi/ShangPinFilter/index',
203
     page: 'pages/FuLi/ShangPinFilter/index',
204
-    auth: ['avatar'],
204
+    auth: ['avatar', 'yezhu'],
205
     track: {
205
     track: {
206
       event: 'list',
206
       event: 'list',
207
       eventType: 'shop',
207
       eventType: 'shop',
210
   {
210
   {
211
     name: '福利-商品详情',
211
     name: '福利-商品详情',
212
     page: 'pages/FuLi/ShangPinXiangQing/index',
212
     page: 'pages/FuLi/ShangPinXiangQing/index',
213
-    auth: ['avatar'],
213
+    auth: ['avatar', 'yezhu'],
214
     track: {
214
     track: {
215
       event: 'detail',
215
       event: 'detail',
216
       eventType: 'shop',
216
       eventType: 'shop',
219
   {
219
   {
220
     name: '福利-商品兑换',
220
     name: '福利-商品兑换',
221
     page: 'pages/FuLi/ShangPinDuiHuan/index',
221
     page: 'pages/FuLi/ShangPinDuiHuan/index',
222
-    auth: ['avatar'],
222
+    auth: ['avatar', 'yezhu'],
223
     track: {
223
     track: {
224
       event: 'exchange',
224
       event: 'exchange',
225
       eventType: 'shop',
225
       eventType: 'shop',
228
   {
228
   {
229
     name: '福利-积分规则',
229
     name: '福利-积分规则',
230
     page: 'pages/FuLi/JiFenGuiZe/index',
230
     page: 'pages/FuLi/JiFenGuiZe/index',
231
-    auth: ['avatar'],
231
+    auth: ['avatar', 'yezhu'],
232
     track: {
232
     track: {
233
       event: 'points_rule',
233
       event: 'points_rule',
234
       eventType: 'shop',
234
       eventType: 'shop',
237
   {
237
   {
238
     name: '福利-积分明细',
238
     name: '福利-积分明细',
239
     page: 'pages/FuLi/JiFenMingXi/index',
239
     page: 'pages/FuLi/JiFenMingXi/index',
240
-    auth: ['avatar'],
240
+    auth: ['avatar', 'yezhu'],
241
     track: {
241
     track: {
242
       event: 'points_details',
242
       event: 'points_details',
243
       eventType: 'shop',
243
       eventType: 'shop',
310
   {
310
   {
311
     name: '我的-我的活动',
311
     name: '我的-我的活动',
312
     page: 'pages/WoDe/WoDeHuoDong/index',
312
     page: 'pages/WoDe/WoDeHuoDong/index',
313
-    auth: ['avatar', 'phone'],
313
+    auth: ['avatar', 'phone', 'yezhu'],
314
     track: {
314
     track: {
315
       event: 'list',
315
       event: 'list',
316
       eventType: 'activity',
316
       eventType: 'activity',
319
   {
319
   {
320
     name: '我的-推荐二维码',
320
     name: '我的-推荐二维码',
321
     page: 'pages/WoDe/TuiJianErWeiMa/index',
321
     page: 'pages/WoDe/TuiJianErWeiMa/index',
322
-    auth: ['avatar', 'phone'],
322
+    auth: ['avatar', 'phone', 'yezhu'],
323
     track: {
323
     track: {
324
       event: 'detail',
324
       event: 'detail',
325
       eventType: 'other',
325
       eventType: 'other',
328
   {
328
   {
329
     name: '我的-推荐分享',
329
     name: '我的-推荐分享',
330
     page: 'pages/WoDe/TuiJianFenXiang/index',
330
     page: 'pages/WoDe/TuiJianFenXiang/index',
331
-    auth: ['avatar', 'phone'],
331
+    auth: ['avatar', 'phone', 'yezhu'],
332
     track: {
332
     track: {
333
       event: 'detail',
333
       event: 'detail',
334
       eventType: 'other',
334
       eventType: 'other',
337
   {
337
   {
338
     name: '我的-我的订单',
338
     name: '我的-我的订单',
339
     page: 'pages/WoDe/WoDeDingDan/index',
339
     page: 'pages/WoDe/WoDeDingDan/index',
340
-    auth: ['avatar', 'phone'],
340
+    auth: ['avatar', 'phone', 'yezhu'],
341
     track: {
341
     track: {
342
       event: 'list',
342
       event: 'list',
343
       eventType: 'other',
343
       eventType: 'other',

+ 10
- 3
src/pages/HuoDong/HuoDongSign/index.jsx View File

1
 import React, { useState, useEffect } from 'react'
1
 import React, { useState, useEffect } from 'react'
2
-import Taro, { Current, useRouter } from '@tarojs/taro'
2
+import Taro, { useRouter } from '@tarojs/taro'
3
 import request, { apis } from '@/utils/request'
3
 import request, { apis } from '@/utils/request'
4
 import Page from '@/layouts'
4
 import Page from '@/layouts'
5
 import { useModel } from '@/store'
5
 import { useModel } from '@/store'
12
   const { user, setUser } = useModel('user')
12
   const { user, setUser } = useModel('user')
13
   const [DataLock, setDataLock] = useState(false)
13
   const [DataLock, setDataLock] = useState(false)
14
   const [HasSign, setHasSign] = useState(false)
14
   const [HasSign, setHasSign] = useState(false)
15
+  const [ShowSign, setShowSign] = useState(false)
15
   const [CurrnetId, setCurrentId] = useState(useRouter().params.id) // 当前活动id
16
   const [CurrnetId, setCurrentId] = useState(useRouter().params.id) // 当前活动id
16
   const [CurrnetSceneId] = useState(useRouter().params.scene) // 当前活动id
17
   const [CurrnetSceneId] = useState(useRouter().params.scene) // 当前活动id
17
   const [ActivityDetail, setActivityDetail] = useState(null) // 活动详情
18
   const [ActivityDetail, setActivityDetail] = useState(null) // 活动详情
18
   const [JoinInfo, setJoinInfo] = useState(null) // 参加活动详情
19
   const [JoinInfo, setJoinInfo] = useState(null) // 参加活动详情
19
 
20
 
21
+  useEffect(() => {
22
+    if (user && user.verifyStatus === 'certified') {
23
+      setShowSign(true)
24
+    }
25
+  }, [user])
26
+
20
   useEffect(() => {
27
   useEffect(() => {
21
     if (CurrnetId !== null && CurrnetId !== undefined) {
28
     if (CurrnetId !== null && CurrnetId !== undefined) {
22
       GetActivityDetail()
29
       GetActivityDetail()
79
         <view className={HasSign ? 'SignBtn' : 'SignBtn active'}>
86
         <view className={HasSign ? 'SignBtn' : 'SignBtn active'}>
80
           <view>
87
           <view>
81
             {
88
             {
82
-              JoinInfo !== null && JoinInfo.enlist !== null &&
89
+              JoinInfo !== null && JoinInfo.enlist !== null && ShowSign &&
83
               <text className='centerLabel' onClick={ToSign}>{HasSign ? '已签到' : '签到'}</text>
90
               <text className='centerLabel' onClick={ToSign}>{HasSign ? '已签到' : '签到'}</text>
84
             }
91
             }
85
             {
92
             {
86
-              JoinInfo !== null && JoinInfo.enlist === null &&
93
+              JoinInfo !== null && JoinInfo.enlist === null && ShowSign &&
87
               <text className='centerLabel' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${CurrnetId}` }) }}>去报名</text>
94
               <text className='centerLabel' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${CurrnetId}` }) }}>去报名</text>
88
             }
95
             }
89
           </view>
96
           </view>

+ 28
- 6
src/pages/ShouYe/YeZhuFanKui/index.jsx View File

19
   const [HasNextPage, setHasNextPage] = useState(true)
19
   const [HasNextPage, setHasNextPage] = useState(true)
20
   const [ScrollTop, setScrollTop] = useState(0)
20
   const [ScrollTop, setScrollTop] = useState(0)
21
   const [Timer, setTimer] = useState(null)
21
   const [Timer, setTimer] = useState(null)
22
+  const [ScrollTimer, setScrollTimer] = useState(null)
22
 
23
 
23
   useEffect(() => {
24
   useEffect(() => {
24
     if (user !== null) {
25
     if (user !== null) {
29
     }
30
     }
30
   }, [user, PageNum])
31
   }, [user, PageNum])
31
 
32
 
33
+  useEffect(() => {
34
+    if (PageList.length && PageList[PageList.length - 1].isLocal) {
35
+      clearTimeout(Timer)
36
+      setTimer(setTimeout(() => {
37
+        setPageList(PageList.concat([{
38
+          avatar: user.avatarurl,
39
+          content: '亲爱的业主,感谢您的反馈,工作人员稍后将为您进行回复。',
40
+          createDate: Date.now(),
41
+          msgId: PageList.length ? PageList[0].msgId : '',
42
+          nickname: '物业管理',
43
+          userId: 1
44
+        }]))
45
+        clearTimeout(ScrollTimer)
46
+        setScrollTimer(setTimeout(() => {
47
+          setScrollTop(10000 + Date.now())
48
+        }, 300))
49
+      }, 300))
50
+    }
51
+  }, [PageList])
52
+
32
   const GetPageList = (bool = false) => {
53
   const GetPageList = (bool = false) => {
33
     if (HasNextPage) {
54
     if (HasNextPage) {
34
       request({
55
       request({
38
         let List = res.records || []
59
         let List = res.records || []
39
         let Arr = []
60
         let Arr = []
40
         List.map((item) => {
61
         List.map((item) => {
41
-          Arr.unshift({ ...item })
62
+          Arr.unshift({ ...item, isLocal: false })
42
         })
63
         })
43
         setPageList(Arr.concat(PageList))
64
         setPageList(Arr.concat(PageList))
44
         setHasNextPage(res.current - 0 < res.pages - 0)
65
         setHasNextPage(res.current - 0 < res.pages - 0)
45
         if (bool) {
66
         if (bool) {
46
-          clearTimeout(Timer)
47
-          setTimer(setTimeout(() => {
67
+          clearTimeout(ScrollTimer)
68
+          setScrollTimer(setTimeout(() => {
48
             setScrollTop(10000 + Date.now())
69
             setScrollTop(10000 + Date.now())
49
           }, 300))
70
           }, 300))
50
         }
71
         }
69
           msgId: PageList.length ? PageList[0].msgId : '',
90
           msgId: PageList.length ? PageList[0].msgId : '',
70
           content: CommentText
91
           content: CommentText
71
         }
92
         }
72
-      }).then((res) => {
93
+      }).then(() => {
73
         setPageList(PageList.concat([{
94
         setPageList(PageList.concat([{
95
+          isLocal: true,
74
           avatar: user.avatarurl,
96
           avatar: user.avatarurl,
75
           content: CommentText,
97
           content: CommentText,
76
           createDate: Date.now(),
98
           createDate: Date.now(),
79
           userId: null
101
           userId: null
80
         }]))
102
         }]))
81
         setCommentText('')
103
         setCommentText('')
82
-        clearTimeout(Timer)
83
-        setTimer(setTimeout(() => {
104
+        clearTimeout(ScrollTimer)
105
+        setScrollTimer(setTimeout(() => {
84
           setScrollTop(10000 + Date.now())
106
           setScrollTop(10000 + Date.now())
85
         }, 300))
107
         }, 300))
86
         setDataLock(false)
108
         setDataLock(false)

+ 20
- 20
src/pages/ShouYe/index.jsx View File

24
     // { icon: require('@/assets/img/icon4.png'), name: '业主认证', id: 4, router: '/pages/WoDe/WoDeRenZheng/index', isTab: false },
24
     // { icon: require('@/assets/img/icon4.png'), name: '业主认证', id: 4, router: '/pages/WoDe/WoDeRenZheng/index', isTab: false },
25
     { icon: require('@/assets/img/icon5.png'), name: '生活管家', id: 5, router: '/pages/WuYe/ShengHuoGuanJia/index', isTab: false, bold: true }
25
     { icon: require('@/assets/img/icon5.png'), name: '生活管家', id: 5, router: '/pages/WuYe/ShengHuoGuanJia/index', isTab: false, bold: true }
26
   ])
26
   ])
27
-  const [NavList] = useState([
28
-    { icon: 'iconhuodong1', name: '活动', id: 1, router: '/pages/ShouYe/HuoDong/index', isTab: false },
29
-    { icon: 'iconfuli1', name: '福利', id: 2, router: '/pages/FuLi/index', setName: null, setValue: null, isTab: true },
30
-    { icon: 'iconfuwu', name: '服务', id: 3, router: '/pages/WuYe/index', setName: 'WuYeNavId', setValue: '2', isTab: true },
31
-    { icon: 'iconxinwen', name: '资讯', id: 4, router: '/pages/ShouYe/ZiXun/index', isTab: false }
32
-  ])
27
+  // const [NavList] = useState([
28
+  //   { icon: 'iconhuodong1', name: '活动', id: 1, router: '/pages/ShouYe/HuoDong/index', isTab: false },
29
+  //   { icon: 'iconfuli1', name: '福利', id: 2, router: '/pages/FuLi/index', setName: null, setValue: null, isTab: true },
30
+  //   { icon: 'iconfuwu', name: '服务', id: 3, router: '/pages/WuYe/index', setName: 'WuYeNavId', setValue: '2', isTab: true },
31
+  //   { icon: 'iconxinwen', name: '资讯', id: 4, router: '/pages/ShouYe/ZiXun/index', isTab: false }
32
+  // ])
33
   const [BannerList, setBannerList] = useState([])
33
   const [BannerList, setBannerList] = useState([])
34
   // const [ActivityList, setActivityList] = useState([])
34
   // const [ActivityList, setActivityList] = useState([])
35
   const [NewsList, setNewsList] = useState([])
35
   const [NewsList, setNewsList] = useState([])
153
     return num >= 3
153
     return num >= 3
154
   }
154
   }
155
 
155
 
156
-  const NavClick = (item) => {
157
-    return () => {
158
-      if (item.isTab) {
159
-        if (item.setName !== null) {
160
-          Taro.setStorageSync(item.setName, item.setValue)
161
-          Taro.reLaunch({ url: item.router })
162
-        } else {
163
-          Taro.switchTab({ url: item.router })
164
-        }
165
-      } else {
166
-        Taro.navigateTo({ url: item.router })
167
-      }
168
-    }
169
-  }
156
+  // const NavClick = (item) => {
157
+  //   return () => {
158
+  //     if (item.isTab) {
159
+  //       if (item.setName !== null) {
160
+  //         Taro.setStorageSync(item.setName, item.setValue)
161
+  //         Taro.reLaunch({ url: item.router })
162
+  //       } else {
163
+  //         Taro.switchTab({ url: item.router })
164
+  //       }
165
+  //     } else {
166
+  //       Taro.navigateTo({ url: item.router })
167
+  //     }
168
+  //   }
169
+  // }
170
 
170
 
171
   const Refresh = (e) => { // 页面下拉刷新
171
   const Refresh = (e) => { // 页面下拉刷新
172
     Init(e)
172
     Init(e)