静态页面

src/components/RenZhengScreen/index.jsx

@@ -17,11 +17,11 @@ export default function RenZhengScreen (props) {
       <view className='centerLabel'>
         {
           user !== null &&
-          <text className='Tips'>{user.verifyStatus === 'not_certified' ? '请进行业主信息认证' : user.verifyStatus === 'certification_in_progress' ? '业主认证中,请等待物业审核' : '业主验证未通过，请重新验证'}</text>
+          <text className='Tips'>{user.verifyStatus === 'not_certified' ? '请进行业主信息认证' : user.verifyStatus === 'certification_in_progress' ? '业主认证中,请等待物业审核' : user.verifyStatus === 'certified' ? '未授权手机号' : '业主验证未通过，请重新验证'}</text>
         }
         <view>
           {
-            user !== null && user.verifyStatus !== 'certification_in_progress' &&
+            user !== null && user.verifyStatus !== 'certification_in_progress' && user.verifyStatus !== 'certified' &&
             <text onClick={() => { Taro.navigateTo({ url: `/pages/WoDe/YeZhuRenZheng/index?from=popup` }) }}>去认证</text>
           }
         </view>

src/layouts/index.jsx

@@ -1,12 +1,10 @@
 import React, { useEffect, useState } from 'react'
 import Taro, { useDidShow } from '@tarojs/taro'
-
 import AdvLayer from '@/components/AdvLayer'
 import GetUserIcon from '@/components/GetUserIcon/index'
 import GetUserPhone from '@/components/GetUserPhone/index'
 import RenZhengScreen from '@/components/RenZhengScreen'
 import Spin from '@/components/Spin'
-import YeZhuRenZhengPopup from '@/components/YeZhuRenZhengPopup'
 import { getPage } from '@/utils'
 import { useModel } from '@/store'
 import useMountTrack from '@/utils/hooks/useMountTrack'
@@ -51,7 +49,7 @@ export default function (props) {
     setIsAuthedPhone(user && user.phone)
     setIsAuthedYeZhu(user && user.verifyStatus === 'certified')
   }, [user])
-  
+
   useEffect(() => {
     setNeedAuthBasic((page.auth || []).indexOf('avatar') > -1)
     setNeedAuthPhone((page.auth || []).indexOf('phone') > -1)
@@ -77,11 +75,17 @@ export default function (props) {
       return
     }
 
-    if (isAuthedPhone && !isAuthedYeZhu && needAuthYeZhu) {
+    if (!isAuthedYeZhu && needAuthYeZhu) {
       setShowAuthYeZhu(true)
     } else {
       setShowAuthYeZhu(false)
     }
+
+    // if (isAuthedPhone && !isAuthedYeZhu && needAuthYeZhu) {
+    //   setShowAuthYeZhu(true)
+    // } else {
+    //   setShowAuthYeZhu(false)
+    // }
   }, [needAuthYeZhu, isAuthedPhone, page])
 
   // 授权头像
@@ -107,7 +111,7 @@ export default function (props) {
       <AdvLayer></AdvLayer>
       <RenZhengScreen Show={showAuthYeZhu}></RenZhengScreen>
       <GetUserIcon visible={showAuthBasic} onError={err => showError(`授权头像失败: ${err}`)} onCancel={goback} />
-      <GetUserPhone visible={showAuthPhone} onError={err => showError(`授权手机失败: ${err}`)}  onCancel={goback} />
+      <GetUserPhone visible={showAuthPhone} onError={err => showError(`授权手机失败: ${err}`)} onCancel={goback} />
       {/* <YeZhuRenZhengPopup Show={showAuthYeZhu} Close={() => { }}></YeZhuRenZhengPopup> */}
       {
         props.children