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

src/components/RenZhengScreen/index.jsx

@@ -31,7 +31,7 @@ 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>
           {

src/layouts/index.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import Taro, { useDidShow, Current } from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 import AdvLayer from '@/components/AdvLayer'
 import GetUserIcon from '@/components/GetUserIcon/index'
 import GetUserPhone from '@/components/GetUserPhone/index'
@@ -41,7 +41,6 @@ export default function (props) {
 
   useDidShow(() => {
     setPage(getPage())
-    console.log(Current, `Current`)
   })
 
   useEffect(() => {
@@ -72,8 +71,8 @@ export default function (props) {
   // 认证业主
   useEffect(() => {
     // 如果当前是认证业务页面
-    console.log(page)
     if (page.isYeZhuRenZheng) {
+      setShowAuthYeZhu(false)
       return
     }
 
@@ -82,7 +81,7 @@ export default function (props) {
     } else {
       setShowAuthYeZhu(false)
     }
-  }, [needAuthYeZhu, isAuthedPhone, page])
+  }, [needAuthYeZhu, isAuthedPhone, page, isAuthedYeZhu])
 
   // 授权头像
   useEffect(() => {

src/pages/WoDe/WoDeRenZheng/index.jsx

@@ -10,6 +10,7 @@ import { useModel } from '@/store'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
+import { useEffect } from 'react'
 
 export default function WoDeRenZheng () {
 
@@ -36,6 +37,12 @@ export default function WoDeRenZheng () {
     }
   })
 
+  // useEffect(() => {
+  //   if (user.verifyStatus === 'certified') {
+  //     setReset(true)
+  //   }
+  // }, [user])
+
   const Refresh = (e) => { // 下拉刷新
     if (e.length > 0) {
       setIsEmpty(false)

src/pages/WoDe/YeZhuRenZheng/index.jsx

@@ -185,7 +185,9 @@ export default function YeZhuRenZheng () {
           if (PageFrom === 'popup') {
             // 获取审核详情
             request({ ...apis.getRenZhengDetail, args: { id: res.id } }).then((cRes) => {
-              setUser({ ...user, verifyStatus: cRes.verifyStatus - 0 === 0 ? 'certification_in_progress' : cRes.verifyStatus - 0 === 1 ? 'certified' : 'certification_failed' })
+              let NewUser = { ...user, verifyStatus: cRes.verifyStatus - 0 === 0 ? 'certification_in_progress' : cRes.verifyStatus - 0 === 1 ? 'certified' : 'certification_failed' }
+              console.log(NewUser, `NewUser`)
+              setUser({ ...NewUser })
               Taro.navigateBack({ delta: 1 })
             })
           } else {

src/pages/WuYe/index.jsx

@@ -6,7 +6,7 @@ import WuYeFuWu from '@/components/WuYeFuWu/index'
 import WuYeBaoXiu from '@/components/WuYeBaoXiu/index'
 import WuYeJiaoFei from '@/components/WuYeJiaoFei/index'
 import Page from '@/layouts'
-import Taro from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 import { useModel } from '@/store'
 import request, { apis } from '@/utils/request'
 import '@/assets/css/reset.less'
@@ -19,26 +19,39 @@ export default function WuYe () {
   const [NavList] = useState([{ name: '公告', id: 1 }, { name: '服务', id: 2 }, { name: '报修', id: 3 }, { name: '缴费', id: 4 }])
   const [CurrentNavId, setCurrentNavId] = useState(null)
 
-  useEffect(() => {
-    if (user.verifyStatus === 'certified') {
-      if (CurrentNavId === null) {
-        if (Taro.getStorageSync('WuYeNavId')) {
-          setCurrentNavId(Taro.getStorageSync('WuYeNavId') - 0)
-        } else {
-          setCurrentNavId(1)
-        }
-      }
-    } else {
+  useDidShow(() => {
+    if (user.verifyStatus !== 'certified') {
       Taro.login({
         success: res => {
           if (res.errMsg === 'login:ok') {
             request({ ...apis.login, params: { code: res.code, from: '', recommender: '', scene: '', mpOpenId: '' } }).then((cRes) => {
               setUser({ ...user, ...cRes.person })
+              if (cRes.person.verifyStatus === 'certified') {
+                if (CurrentNavId === null) {
+                  if (Taro.getStorageSync('WuYeNavId')) {
+                    setCurrentNavId(Taro.getStorageSync('WuYeNavId') - 0)
+                  } else {
+                    setCurrentNavId(1)
+                  }
+                }
+              }
             })
           }
         }
       })
     }
+  })
+
+  useEffect(() => {
+    if (user.verifyStatus === 'certified') {
+      if (CurrentNavId === null) {
+        if (Taro.getStorageSync('WuYeNavId')) {
+          setCurrentNavId(Taro.getStorageSync('WuYeNavId') - 0)
+        } else {
+          setCurrentNavId(1)
+        }
+      }
+    }
   }, [CurrentNavId])
 
   useEffect(() => {