瀏覽代碼

静态页面

xcx 4 年之前
父節點
當前提交
21674e77cc
共有 2 個文件被更改,包括 11 次插入7 次删除
  1. 2
    2
      src/components/RenZhengScreen/index.jsx
  2. 9
    5
      src/layouts/index.jsx

+ 2
- 2
src/components/RenZhengScreen/index.jsx 查看文件

17
       <view className='centerLabel'>
17
       <view className='centerLabel'>
18
         {
18
         {
19
           user !== null &&
19
           user !== null &&
20
-          <text className='Tips'>{user.verifyStatus === 'not_certified' ? '请进行业主信息认证' : user.verifyStatus === 'certification_in_progress' ? '业主认证中,请等待物业审核' : '业主验证未通过,请重新验证'}</text>
20
+          <text className='Tips'>{user.verifyStatus === 'not_certified' ? '请进行业主信息认证' : user.verifyStatus === 'certification_in_progress' ? '业主认证中,请等待物业审核' : user.verifyStatus === 'certified' ? '未授权手机号' : '业主验证未通过,请重新验证'}</text>
21
         }
21
         }
22
         <view>
22
         <view>
23
           {
23
           {
24
-            user !== null && user.verifyStatus !== 'certification_in_progress' &&
24
+            user !== null && user.verifyStatus !== 'certification_in_progress' && user.verifyStatus !== 'certified' &&
25
             <text onClick={() => { Taro.navigateTo({ url: `/pages/WoDe/YeZhuRenZheng/index?from=popup` }) }}>去认证</text>
25
             <text onClick={() => { Taro.navigateTo({ url: `/pages/WoDe/YeZhuRenZheng/index?from=popup` }) }}>去认证</text>
26
           }
26
           }
27
         </view>
27
         </view>

+ 9
- 5
src/layouts/index.jsx 查看文件

1
 import React, { useEffect, useState } from 'react'
1
 import React, { useEffect, useState } from 'react'
2
 import Taro, { useDidShow } from '@tarojs/taro'
2
 import Taro, { useDidShow } from '@tarojs/taro'
3
-
4
 import AdvLayer from '@/components/AdvLayer'
3
 import AdvLayer from '@/components/AdvLayer'
5
 import GetUserIcon from '@/components/GetUserIcon/index'
4
 import GetUserIcon from '@/components/GetUserIcon/index'
6
 import GetUserPhone from '@/components/GetUserPhone/index'
5
 import GetUserPhone from '@/components/GetUserPhone/index'
7
 import RenZhengScreen from '@/components/RenZhengScreen'
6
 import RenZhengScreen from '@/components/RenZhengScreen'
8
 import Spin from '@/components/Spin'
7
 import Spin from '@/components/Spin'
9
-import YeZhuRenZhengPopup from '@/components/YeZhuRenZhengPopup'
10
 import { getPage } from '@/utils'
8
 import { getPage } from '@/utils'
11
 import { useModel } from '@/store'
9
 import { useModel } from '@/store'
12
 import useMountTrack from '@/utils/hooks/useMountTrack'
10
 import useMountTrack from '@/utils/hooks/useMountTrack'
51
     setIsAuthedPhone(user && user.phone)
49
     setIsAuthedPhone(user && user.phone)
52
     setIsAuthedYeZhu(user && user.verifyStatus === 'certified')
50
     setIsAuthedYeZhu(user && user.verifyStatus === 'certified')
53
   }, [user])
51
   }, [user])
54
-  
52
+
55
   useEffect(() => {
53
   useEffect(() => {
56
     setNeedAuthBasic((page.auth || []).indexOf('avatar') > -1)
54
     setNeedAuthBasic((page.auth || []).indexOf('avatar') > -1)
57
     setNeedAuthPhone((page.auth || []).indexOf('phone') > -1)
55
     setNeedAuthPhone((page.auth || []).indexOf('phone') > -1)
77
       return
75
       return
78
     }
76
     }
79
 
77
 
80
-    if (isAuthedPhone && !isAuthedYeZhu && needAuthYeZhu) {
78
+    if (!isAuthedYeZhu && needAuthYeZhu) {
81
       setShowAuthYeZhu(true)
79
       setShowAuthYeZhu(true)
82
     } else {
80
     } else {
83
       setShowAuthYeZhu(false)
81
       setShowAuthYeZhu(false)
84
     }
82
     }
83
+
84
+    // if (isAuthedPhone && !isAuthedYeZhu && needAuthYeZhu) {
85
+    //   setShowAuthYeZhu(true)
86
+    // } else {
87
+    //   setShowAuthYeZhu(false)
88
+    // }
85
   }, [needAuthYeZhu, isAuthedPhone, page])
89
   }, [needAuthYeZhu, isAuthedPhone, page])
86
 
90
 
87
   // 授权头像
91
   // 授权头像
107
       <AdvLayer></AdvLayer>
111
       <AdvLayer></AdvLayer>
108
       <RenZhengScreen Show={showAuthYeZhu}></RenZhengScreen>
112
       <RenZhengScreen Show={showAuthYeZhu}></RenZhengScreen>
109
       <GetUserIcon visible={showAuthBasic} onError={err => showError(`授权头像失败: ${err}`)} onCancel={goback} />
113
       <GetUserIcon visible={showAuthBasic} onError={err => showError(`授权头像失败: ${err}`)} onCancel={goback} />
110
-      <GetUserPhone visible={showAuthPhone} onError={err => showError(`授权手机失败: ${err}`)}  onCancel={goback} />
114
+      <GetUserPhone visible={showAuthPhone} onError={err => showError(`授权手机失败: ${err}`)} onCancel={goback} />
111
       {/* <YeZhuRenZhengPopup Show={showAuthYeZhu} Close={() => { }}></YeZhuRenZhengPopup> */}
115
       {/* <YeZhuRenZhengPopup Show={showAuthYeZhu} Close={() => { }}></YeZhuRenZhengPopup> */}
112
       {
116
       {
113
         props.children
117
         props.children