Ver código fonte

静态页面

1002884655 4 anos atrás
pai
commit
bcc97ae8c2
2 arquivos alterados com 45 adições e 15 exclusões
  1. 13
    9
      src/pages/WoDe/WoDeRenZheng/index.jsx
  2. 32
    6
      src/pages/WuYe/index.jsx

+ 13
- 9
src/pages/WoDe/WoDeRenZheng/index.jsx Ver arquivo

@@ -20,16 +20,20 @@ export default function WoDeRenZheng () {
20 20
   const [Reset, setReset] = useState(false)
21 21
 
22 22
   useDidShow(() => {
23
-    Taro.login({
24
-      success: res => {
25
-        if (res.errMsg === 'login:ok') {
26
-          request({ ...apis.login, params: { code: res.code, from: '', recommender: '', scene: '', mpOpenId: '' } }).then((cRes) => {
27
-            setUser({ ...user, ...cRes.person })
28
-            setReset(true)
29
-          })
23
+    if (user.verifyStatus === 'certified') {
24
+      setReset(true)
25
+    } else {
26
+      Taro.login({
27
+        success: res => {
28
+          if (res.errMsg === 'login:ok') {
29
+            request({ ...apis.login, params: { code: res.code, from: '', recommender: '', scene: '', mpOpenId: '' } }).then((cRes) => {
30
+              setUser({ ...user, ...cRes.person })
31
+              setReset(true)
32
+            })
33
+          }
30 34
         }
31
-      }
32
-    })
35
+      })
36
+    }
33 37
   })
34 38
 
35 39
   const Refresh = (e) => { // 下拉刷新

+ 32
- 6
src/pages/WuYe/index.jsx Ver arquivo

@@ -7,26 +7,52 @@ import WuYeBaoXiu from '@/components/WuYeBaoXiu/index'
7 7
 import WuYeJiaoFei from '@/components/WuYeJiaoFei/index'
8 8
 import Page from '@/layouts'
9 9
 import Taro from '@tarojs/taro'
10
+import { useModel } from '@/store'
11
+import request, { apis } from '@/utils/request'
10 12
 import '@/assets/css/reset.less'
11 13
 import '@/assets/css/iconfont.less'
12 14
 import './index.less'
13 15
 
14 16
 export default function WuYe () {
15 17
 
18
+  const { user, setUser } = useModel('user')
16 19
   const [NavList] = useState([{ name: '公告', id: 1 }, { name: '服务', id: 2 }, { name: '报修', id: 3 }, { name: '缴费', id: 4 }])
17 20
   const [CurrentNavId, setCurrentNavId] = useState(null)
18 21
 
19 22
   useEffect(() => {
20
-    if (CurrentNavId === null) {
21
-      console.log(Taro.getStorageSync('WuYeNavId'), `111`)
22
-      if (Taro.getStorageSync('WuYeNavId')) {
23
-        setCurrentNavId(Taro.getStorageSync('WuYeNavId') - 0)
24
-      } else {
25
-        setCurrentNavId(1)
23
+    if (user.verifyStatus === 'certified') {
24
+      if (CurrentNavId === null) {
25
+        if (Taro.getStorageSync('WuYeNavId')) {
26
+          setCurrentNavId(Taro.getStorageSync('WuYeNavId') - 0)
27
+        } else {
28
+          setCurrentNavId(1)
29
+        }
26 30
       }
31
+    } else {
32
+      Taro.login({
33
+        success: res => {
34
+          if (res.errMsg === 'login:ok') {
35
+            request({ ...apis.login, params: { code: res.code, from: '', recommender: '', scene: '', mpOpenId: '' } }).then((cRes) => {
36
+              setUser({ ...user, ...cRes.person })
37
+            })
38
+          }
39
+        }
40
+      })
27 41
     }
28 42
   }, [CurrentNavId])
29 43
 
44
+  useEffect(() => {
45
+    if (user.verifyStatus === 'certified') {
46
+      if (CurrentNavId === null) {
47
+        if (Taro.getStorageSync('WuYeNavId')) {
48
+          setCurrentNavId(Taro.getStorageSync('WuYeNavId') - 0)
49
+        } else {
50
+          setCurrentNavId(1)
51
+        }
52
+      }
53
+    }
54
+  }, [user])
55
+
30 56
   const NavChange = (e) => {
31 57
     return () => {
32 58
       setCurrentNavId(e.id)