Selaa lähdekoodia

Merge branch 'master' of http://git.ycjcjy.com/xiangsong/miniapp into master

1002884655 4 vuotta sitten
vanhempi
commit
f77b8ef118
2 muutettua tiedostoa jossa 6 lisäystä ja 16 poistoa
  1. 6
    6
      src/layouts/index.jsx
  2. 0
    10
      yarn.lock

+ 6
- 6
src/layouts/index.jsx Näytä tiedosto

49
     setIsAuthedBasic(user && user.avatarurl && user.nickname)
49
     setIsAuthedBasic(user && user.avatarurl && user.nickname)
50
     setIsAuthedPhone(user && user.phone)
50
     setIsAuthedPhone(user && user.phone)
51
     setIsAuthedYeZhu(user && user.verifyStatus === 'certified')
51
     setIsAuthedYeZhu(user && user.verifyStatus === 'certified')
52
-    setShowAuthYeZhu(user && (user.verifyStatus === 'not_certified' || user.verifyStatus === 'certification_in_progress' || user.verifyStatus === 'certification_failed'))
53
   }, [user])
52
   }, [user])
54
 
53
 
55
   useEffect(() => {
54
   useEffect(() => {
73
   // 认证业主
72
   // 认证业主
74
   useEffect(() => {
73
   useEffect(() => {
75
     // 如果当前是认证业务页面
74
     // 如果当前是认证业务页面
75
+    console.log(page)
76
     if (page.isYeZhuRenZheng) {
76
     if (page.isYeZhuRenZheng) {
77
       return
77
       return
78
     }
78
     }
79
 
79
 
80
-    // if (isAuthedPhone && !isAuthedYeZhu && needAuthYeZhu) {
81
-    //   setShowAuthYeZhu(true)
82
-    // } else {
83
-    //   setShowAuthYeZhu(false)
84
-    // }
80
+    if (isAuthedPhone && !isAuthedYeZhu && needAuthYeZhu) {
81
+      setShowAuthYeZhu(true)
82
+    } else {
83
+      setShowAuthYeZhu(false)
84
+    }
85
   }, [needAuthYeZhu, isAuthedPhone, page])
85
   }, [needAuthYeZhu, isAuthedPhone, page])
86
 
86
 
87
   // 授权头像
87
   // 授权头像

+ 0
- 10
yarn.lock Näytä tiedosto

2
 # yarn lockfile v1
2
 # yarn lockfile v1
3
 
3
 
4
 
4
 
5
-"-@^0.0.1":
6
-  version "0.0.1"
7
-  resolved "https://registry.npm.taobao.org/-/download/--0.0.1.tgz#db6db7cd866142880dd03e5b8781d1b4fac0e5bd"
8
-  integrity sha1-2223zYZhQogN0D5bh4HRtPrA5b0=
9
-
10
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.8.3":
5
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.8.3":
11
   version "7.10.4"
6
   version "7.10.4"
12
   resolved "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
7
   resolved "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
1788
   resolved "https://registry.npm.taobao.org/@xtuc/long/download/@xtuc/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
1783
   resolved "https://registry.npm.taobao.org/@xtuc/long/download/@xtuc/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
1789
   integrity sha1-0pHGpOl5ibXGHZrPOWrk/hM6cY0=
1784
   integrity sha1-0pHGpOl5ibXGHZrPOWrk/hM6cY0=
1790
 
1785
 
1791
-D@^1.0.0:
1792
-  version "1.0.0"
1793
-  resolved "https://registry.npm.taobao.org/D/download/D-1.0.0.tgz#c348a4e034f72847be51206fc530fc089e9cc2a9"
1794
-  integrity sha1-w0ik4DT3KEe+USBvxTD8CJ6cwqk=
1795
-
1796
 abab@^2.0.0:
1786
 abab@^2.0.0:
1797
   version "2.0.5"
1787
   version "2.0.5"
1798
   resolved "https://registry.npm.taobao.org/abab/download/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
1788
   resolved "https://registry.npm.taobao.org/abab/download/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"