静态页面

src/components/AddYeZhuRenZheng/index.jsx

@@ -62,7 +62,7 @@ export default function AddYeZhuRenZheng (props) {
   }, [CodeTimerNum])
 
   const CheckPhone = () => { // 校验手机号
-    return /^1(3\d|4\d|5\d|6\d|7\d|8\d|9\d)\d{8}$/g.test(FormData.Phone)
+    return FormData.Phone && FormData.Phone.indexOf('1') === 0 && FormData.Phone.length === 11
   }
 
   const ToGetPhoneCode = () => {

src/components/WuYeBaoXiu/index.jsx

@@ -19,7 +19,7 @@ export default function WuYeBaoXiu () {
   }, [])
 
   const GetBanner = (done = () => { }) => { // 获取轮播图
-    request({ ...apis.getBanner, params: { contentType: `news`, pageNum: 1, pageSize: 1 } }).then((res) => {
+    request({ ...apis.getBanner, params: { showPosition: `property`, showType: 'banner', pageSize: 1 } }).then((res) => {
       setBannerList([...(res || [])])
       done()
     }).catch(() => {

src/components/WuYeFuWu/index.jsx

@@ -19,7 +19,7 @@ export default function WuYeFuWu () {
   }, [])
 
   const GetBanner = (done = () => { }) => { // 获取轮播图
-    request({ ...apis.getBanner, params: { contentType: `news`, pageNum: 1, pageSize: 1 } }).then((res) => {
+    request({ ...apis.getBanner, params: { showPosition: `property`, showType: 'banner', pageNum: 1, pageSize: 1 } }).then((res) => {
       setBannerList([...(res || [])])
       done()
     }).catch(() => {

src/components/WuYeGongGao/index.jsx

@@ -19,7 +19,7 @@ export default function WuYeGongGao () {
   }, [])
 
   const GetBanner = (done = () => { }) => { // 获取轮播图
-    request({ ...apis.getBanner, params: { contentType: `news`, pageNum: 1, pageSize: 1 } }).then((res) => {
+    request({ ...apis.getBanner, params: { showPosition: `property`, showType: 'banner', pageNum: 1, pageSize: 1 } }).then((res) => {
       setBannerList([...(res || [])])
       done()
     }).catch(() => {

src/components/WuYeJiaoFei/index.jsx

@@ -64,7 +64,7 @@ export default function WuYeJiaoFei () {
   }, [])
 
   const GetBanner = (done = () => { }) => { // 获取轮播图
-    request({ ...apis.getBanner, params: { contentType: `news`, pageNum: 1, pageSize: 1 } }).then((res) => {
+    request({ ...apis.getBanner, params: { showPosition: `property`, showType: 'banner', pageNum: 1, pageSize: 1 } }).then((res) => {
       setBannerList([...(res || [])])
       done()
     }).catch(() => {

src/layouts/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Taro, { } from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 import { useModel } from '@/store'
 import Spin from '@/components/Spin'
 import GetUserPhone from '@/components/GetUserPhone/index'
@@ -21,20 +21,38 @@ const showError = err => {
 }
 
 export default function (props) {
+  const { user } = useModel('user')
+
+  const [page, setPage] = useState({})
+  const [loading, setLoading] = useState(true)
   const [showAuthBasic, setShowAuthBasic] = useState(false)
   const [showAuthYeZhu, setShowAuthYeZhu] = useState(false)
   const [showAuthPhone, setShowAuthPhone] = useState(false)
-  const { user } = useModel('user')
 
-  const loading = !user || !user.personId
-  const isAuthedBasic = user && user.avatarurl && user.nickname
-  const isAuthedPhone = user && user.phone
-  const isAuthedYeZhu = user && user.verifyStatus === 'certified'
+  const [isAuthedBasic, setIsAuthedBasic] = useState(false)
+  const [isAuthedPhone, setIsAuthedPhone] = useState(false)
+  const [isAuthedYeZhu, setIsAuthedYeZhu] = useState(false)
 
-  const page = getPage()
-  const needAuthBasic = (page.auth || []).indexOf('avatar') > -1
-  const needAuthYeZhu = (page.auth || []).indexOf('yezhu') > -1
-  const needAuthPhone = (page.auth || []).indexOf('phone') > -1
+  const [needAuthBasic, setNeedAuthBasic] = useState(false)
+  const [needAuthPhone, setNeedAuthPhone] = useState(false)
+  const [needAuthYeZhu, setNeedAuthYeZhu] = useState(false)
+
+  useDidShow(() => {
+    setPage(getPage())
+  })
+
+  useEffect(() => {
+    setLoading(!user || !user.personId)
+    setIsAuthedBasic(user && user.avatarurl && user.nickname)
+    setIsAuthedPhone(user && user.phone)
+    setIsAuthedYeZhu(user && user.verifyStatus === 'certified')
+  }, [user])
+  
+  useEffect(() => {
+    setNeedAuthBasic((page.auth || []).indexOf('avatar') > -1)
+    setNeedAuthPhone((page.auth || []).indexOf('phone') > -1)
+    setNeedAuthYeZhu((page.auth || []).indexOf('yezhu') > -1)
+  }, [page])
 
   // 埋点
   useMountTrack()
@@ -55,12 +73,10 @@ export default function (props) {
       return
     }
 
-    if (isAuthedPhone && !isAuthedYeZhu) {
-      const renZhengPage = pages.filter(x => x.isYeZhuRenZheng)[0]
-      if (renZhengPage) {
-        // 跳转到业主认证页面
-        // to = renZhengPage.page
-      }
+    if (isAuthedPhone && !isAuthedYeZhu && needAuthYeZhu) {
+      setShowAuthYeZhu(true)
+    } else {
+      setShowAuthYeZhu(false)
     }
   }, [needAuthYeZhu, isAuthedPhone, page])
 
@@ -81,13 +97,6 @@ export default function (props) {
     setShowAuthBasic(needShow)
   }, [isAuthedBasic, needAuthBasic, isAuthedPhone, isAuthedYeZhu, needAuthYeZhu])
 
-  // 业主认证状态
-  useEffect(() => {
-    if (user !== null && user.verifyStatus !== 'certified') {
-      setShowAuthYeZhu(true)
-    }
-  }, [user])
-
   return (
     <Spin loading={loading}>
 
@@ -95,7 +104,7 @@ export default function (props) {
       <AdvLayer></AdvLayer>
       <GetUserIcon visible={showAuthBasic} onError={err => showError(`授权头像失败: ${err}`)} />
       <GetUserPhone visible={showAuthPhone} onError={err => showError(`授权手机失败: ${err}`)} />
-      <YeZhuRenZhengPopup Show={user !== null && user.verifyStatus !== 'certified' && page.track.event !== 'index'} Close={() => { }}></YeZhuRenZhengPopup>
+      <YeZhuRenZhengPopup Show={showAuthYeZhu} Close={() => { }}></YeZhuRenZhengPopup>
       {
         props.children
       }