静态页面

src/components/AddYeZhuRenZheng/index.jsx

@@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react'
 import { Input, Picker } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
-import Page from '@/layouts'
 import { useModel } from '@/store'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
@@ -30,6 +29,7 @@ export default function AddYeZhuRenZheng (props) {
   const [Level6List, setLevel6List] = useState([])
 
   useEffect(() => {
+    console.log(user, `user`)
     GetLevel2List()
   }, [Level1Value])
 
@@ -254,74 +254,72 @@ export default function AddYeZhuRenZheng (props) {
   }
 
   return (
-    <Page>
-      <view className='AddYeZhuRenZheng'>
-        <view className='Close'>
-          <text className='iconfont iconguanbi' onClick={Close}></text>
+    <view className='AddYeZhuRenZheng'>
+      <view className='Close'>
+        <text className='iconfont iconguanbi' onClick={Close}></text>
+      </view>
+      <view className='Form'>
+        <view className='flex-h'>
+          <text className='iconfont iconxingming'></text>
+          <Input className='flex-item' placeholder='请输入您的姓名' value={FormData.RealName} onInput={(e) => { setFormData({ ...FormData, RealName: e.detail.value }) }}></Input>
         </view>
-        <view className='Form'>
-          <view className='flex-h'>
-            <text className='iconfont iconxingming'></text>
-            <Input className='flex-item' placeholder='请输入您的姓名' value={FormData.RealName} onInput={(e) => { setFormData({ ...FormData, RealName: e.detail.value }) }}></Input>
-          </view>
-          <view className='flex-h'>
-            <text className='iconfont iconshenfenzheng'></text>
-            <Input type='idcard' className='flex-item' placeholder='请输入您的身份证号码' value={FormData.IdCard} onInput={(e) => { setFormData({ ...FormData, IdCard: e.detail.value }) }}></Input>
-          </view>
-          <view className='flex-h'>
-            <text className='iconfont iconshouji'></text>
-            <Input type='idcard' className='flex-item' placeholder='请输入您的手机号码' value={FormData.Phone} onInput={(e) => { setFormData({ ...FormData, Phone: e.detail.value }) }}></Input>
-          </view>
-          <view className='flex-h'>
-            <text className='iconfont iconyanzhengma'></text>
-            <Input type='idcard' className='flex-item' placeholder='请输入验证码' value={PhoneCode} onInput={(e) => { setPhoneCode(e.detail.value) }}></Input>
-            <text className={CodeTimerNum - 0 === 60 ? 'active' : ''} onClick={ToGetPhoneCode}>{CodeTimerNum - 0 === 60 ? `获取验证码` : `${CodeTimerNum > 9 ? `${CodeTimerNum}s后再次获取` : `0${CodeTimerNum}s后再次获取`}`}</text>
-          </view>
-          <view className='flex-h'>
-            <text>期号</text>
-            <view className='flex-item'>
-              <Picker value={Level2Value} range-key='name' range={Level2List} onChange={Level2Change}>
-                <view className='PickerText'>{Level2List.length > 0 && Level2Value !== null ? Level2List[Level2Value].name : '请选择期号'}</view>
-              </Picker>
-            </view>
-          </view>
-          <view className='flex-h'>
-            <text>楼栋</text>
-            <view className='flex-item'>
-              <Picker value={Level3Value} range-key='name' range={Level3List} onChange={Level3Change}>
-                <view className='PickerText'>{Level3List.length > 0 && Level3Value !== null ? Level3List[Level3Value].name : '请选择楼栋'}</view>
-              </Picker>
-            </view>
+        <view className='flex-h'>
+          <text className='iconfont iconshenfenzheng'></text>
+          <Input type='idcard' className='flex-item' placeholder='请输入您的身份证号码' value={FormData.IdCard} onInput={(e) => { setFormData({ ...FormData, IdCard: e.detail.value }) }}></Input>
+        </view>
+        <view className='flex-h'>
+          <text className='iconfont iconshouji'></text>
+          <Input type='idcard' className='flex-item' placeholder='请输入您的手机号码' value={FormData.Phone} onInput={(e) => { setFormData({ ...FormData, Phone: e.detail.value }) }}></Input>
+        </view>
+        <view className='flex-h'>
+          <text className='iconfont iconyanzhengma'></text>
+          <Input type='idcard' className='flex-item' placeholder='请输入验证码' value={PhoneCode} onInput={(e) => { setPhoneCode(e.detail.value) }}></Input>
+          <text className={CodeTimerNum - 0 === 60 ? 'active' : ''} onClick={ToGetPhoneCode}>{CodeTimerNum - 0 === 60 ? `获取验证码` : `${CodeTimerNum > 9 ? `${CodeTimerNum}s后再次获取` : `0${CodeTimerNum}s后再次获取`}`}</text>
+        </view>
+        <view className='flex-h'>
+          <text>期号</text>
+          <view className='flex-item'>
+            <Picker value={Level2Value} range-key='name' range={Level2List} onChange={Level2Change}>
+              <view className='PickerText'>{Level2List.length > 0 && Level2Value !== null ? Level2List[Level2Value].name : '请选择期号'}</view>
+            </Picker>
           </view>
-          <view className='flex-h'>
-            <text>单元</text>
-            <view className='flex-item'>
-              <Picker value={Level4Value} range-key='name' range={Level4List} onChange={Level4Change}>
-                <view className='PickerText'>{Level4List.length > 0 && Level4Value !== null ? Level4List[Level4Value].name : '请选择单元'}</view>
-              </Picker>
-            </view>
+        </view>
+        <view className='flex-h'>
+          <text>楼栋</text>
+          <view className='flex-item'>
+            <Picker value={Level3Value} range-key='name' range={Level3List} onChange={Level3Change}>
+              <view className='PickerText'>{Level3List.length > 0 && Level3Value !== null ? Level3List[Level3Value].name : '请选择楼栋'}</view>
+            </Picker>
           </view>
-          <view className='flex-h'>
-            <text>楼层</text>
-            <view className='flex-item'>
-              <Picker value={Level5Value} range-key='name' range={Level5List} onChange={Level5Change}>
-                <view className='PickerText'>{Level5List.length > 0 && Level5Value !== null ? Level5List[Level5Value].name : '请选择楼层'}</view>
-              </Picker>
-            </view>
+        </view>
+        <view className='flex-h'>
+          <text>单元</text>
+          <view className='flex-item'>
+            <Picker value={Level4Value} range-key='name' range={Level4List} onChange={Level4Change}>
+              <view className='PickerText'>{Level4List.length > 0 && Level4Value !== null ? Level4List[Level4Value].name : '请选择单元'}</view>
+            </Picker>
           </view>
-          <view className='flex-h'>
-            <text>房号</text>
-            <view className='flex-item'>
-              <Picker value={Level6Value} range-key='name' range={Level6List} onChange={Level6Change}>
-                <view className='PickerText'>{Level6List.length > 0 && Level6Value !== null ? Level6List[Level6Value].name : '请选择房号'}</view>
-              </Picker>
-            </view>
+        </view>
+        <view className='flex-h'>
+          <text>楼层</text>
+          <view className='flex-item'>
+            <Picker value={Level5Value} range-key='name' range={Level5List} onChange={Level5Change}>
+              <view className='PickerText'>{Level5List.length > 0 && Level5Value !== null ? Level5List[Level5Value].name : '请选择楼层'}</view>
+            </Picker>
           </view>
         </view>
-        <view className='BottomBtn' onClick={Submit}>
-          <text>提交</text>
+        <view className='flex-h'>
+          <text>房号</text>
+          <view className='flex-item'>
+            <Picker value={Level6Value} range-key='name' range={Level6List} onChange={Level6Change}>
+              <view className='PickerText'>{Level6List.length > 0 && Level6Value !== null ? Level6List[Level6Value].name : '请选择房号'}</view>
+            </Picker>
+          </view>
         </view>
       </view>
-    </Page>
+      <view className='BottomBtn' onClick={Submit}>
+        <text>提交</text>
+      </view>
+    </view>
   )
 }

src/components/YeZhuRenZhengPopup/index.css

@@ -0,0 +1,44 @@
+.YeZhuRenZhengPopup {
+  width: 100%;
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.8);
+  display: none;
+  z-index: 200000;
+}
+.YeZhuRenZhengPopup.active {
+  display: block;
+}
+.YeZhuRenZhengPopup > view {
+  width: 100%;
+}
+.YeZhuRenZhengPopup > view > view {
+  padding: 0 30px;
+  position: relative;
+  overflow: hidden;
+}
+.YeZhuRenZhengPopup > view > view scroll-view {
+  padding: 30px 0;
+  background: #fff;
+  border-radius: 10px;
+  position: relative;
+  max-height: 90vh;
+  overflow-y: scroll;
+  -webkit-overflow-scrolling: touch;
+}
+.YeZhuRenZhengPopup > view > view .Checking {
+  padding: 30px 0;
+  width: 50%;
+  background: #fff;
+  border-radius: 10px;
+  position: relative;
+  margin: 0 auto;
+}
+.YeZhuRenZhengPopup > view > view .Checking text {
+  font-size: 28px;
+  display: block;
+  text-align: center;
+  line-height: 40px;
+}

src/components/YeZhuRenZhengPopup/index.jsx

@@ -1,23 +1,35 @@
-import React, { useState } from 'react'
+import React, { } from 'react'
 import AddYeZhuRenZheng from '@/components/AddYeZhuRenZheng'
+import { ScrollView } from '@tarojs/components'
+import { useModel } from '@/store'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
 
 export default function YeZhuRenZhengPopup (props) {
 
+  const { user } = useModel('user')
   const { Show = false, Close = () => { } } = props
 
   return (
     <view className={Show ? 'YeZhuRenZhengPopup active' : 'YeZhuRenZhengPopup'}>
       <view className='centerLabel'>
         <view>
-          <scroll-view scroll-y='true'>
-            {
-              Show &&
-              <AddYeZhuRenZheng Close={Close}></AddYeZhuRenZheng>
-            }
-          </scroll-view>
+          {
+            user.verifyStatus !== 'certified' && user.verifyStatus !== 'certification_in_progress' &&
+            <ScrollView scroll-y='true'>
+              {
+                Show &&
+                <AddYeZhuRenZheng Close={Close}></AddYeZhuRenZheng>
+              }
+            </ScrollView>
+          }
+          {
+            user.verifyStatus === 'certification_in_progress' &&
+            <view className='Checking'>
+              <text>认证正在审核中</text>
+            </view>
+          }
         </view>
       </view>
     </view>

src/components/YeZhuRenZhengPopup/index.less

@@ -6,6 +6,7 @@
   bottom: 0;
   background: rgba(0, 0, 0, 0.8);
   display: none;
+  z-index: 200000;
 
   &.active {
     display: block;
@@ -19,7 +20,7 @@
       position: relative;
       overflow: hidden;
 
-      >scroll-view {
+      scroll-view {
         padding: 30px 0;
         background: #fff;
         border-radius: 10px;
@@ -28,6 +29,22 @@
         overflow-y: scroll;
         -webkit-overflow-scrolling: touch;
       }
+
+      .Checking {
+        padding: 30px 0;
+        width: 50%;
+        background: #fff;
+        border-radius: 10px;
+        position: relative;
+        margin: 0 auto;
+
+        text {
+          font-size: 28px;
+          display: block;
+          text-align: center;
+          line-height: 40px;
+        }
+      }
     }
   }
 }

src/layouts/index.jsx

@@ -24,12 +24,12 @@ export default function (props) {
   const [showAuthBasic, setShowAuthBasic] = useState(false)
   const [showAuthYeZhu, setShowAuthYeZhu] = useState(false)
   const [showAuthPhone, setShowAuthPhone] = useState(false)
-  const { user, setUser } = useModel('user')
+  const { user } = useModel('user')
 
   const loading = !user || !user.personId
   const isAuthedBasic = user && user.avatarurl && user.nickname
   const isAuthedPhone = user && user.phone
-  const isAuthedYeZhu = user
+  const isAuthedYeZhu = user && user.verifyStatus === 'certified'
 
   const page = getPage()
   const needAuthBasic = (page.auth || []).indexOf('avatar') > -1
@@ -81,6 +81,13 @@ 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}>
 
@@ -88,7 +95,7 @@ export default function (props) {
       <AdvLayer></AdvLayer>
       <GetUserIcon visible={showAuthBasic} onError={err => showError(`授权头像失败: ${err}`)} />
       <GetUserPhone visible={showAuthPhone} onError={err => showError(`授权手机失败: ${err}`)} />
-      <YeZhuRenZhengPopup Show={showAuthYeZhu} Close={() => { setShowAuthYeZhu(false) }}></YeZhuRenZhengPopup>
+      <YeZhuRenZhengPopup Show={user !== null && user.verifyStatus !== 'certified'} Close={() => { }}></YeZhuRenZhengPopup>
       {
         props.children
       }

src/pages/WoDe/WoDeRenZheng/index.jsx

@@ -37,7 +37,7 @@ export default function WoDeRenZheng () {
                       <text>{toolclass.FormatDate(item.createDate)}</text>
                     </view>
                     <view>
-                      <text className={item.verifyStatus === 'certification_in_progress' ? '' : item.verifyStatus === 'certified' ? 'Green' : 'Red'}>{item.verifyStatus === 'certification_in_progress' ? '审核中' : item.verifyStatus === 'certified' ? '审核通过' : item.verifyStatus === 'not_certified' ? '未认证' : '审核未通过'}</text>
+                      <text className={item.verifyStatus - 0 === 0 ? '' : item.verifyStatus - 0 === 1 ? 'Green' : 'Red'}>{item.verifyStatus - 0 === 0 ? '审核中' : item.verifyStatus - 0 === 1 ? '审核通过' : '审核未通过'}</text>
                     </view>
                   </view>
                 </view>

src/pages/WoDe/YeZhuShenHe/index.jsx

@@ -67,7 +67,7 @@ export default function YeZhuShenHe () {
 
             {/* 审核中 */}
             {
-              Detail.verifyStatus === 'certification_in_progress' &&
+              Detail.verifyStatus - 0 === 0 &&
               <view className='CheckStatus Checking'>
                 <view className='Status'>
                   <text className='iconfont iconshenhezhong'></text>
@@ -90,7 +90,7 @@ export default function YeZhuShenHe () {
 
             {/* 审核通过 */}
             {
-              Detail.verifyStatus === 'certified' &&
+              Detail.verifyStatus - 0 === 1 &&
               <view className='CheckStatus Pass'>
                 <view className='Status'>
                   <text className='iconfont iconyitongguo'></text>
@@ -112,7 +112,7 @@ export default function YeZhuShenHe () {
 
             {/* 审核未通过 */}
             {
-              Detail.verifyStatus === 'certification_failed' &&
+              Detail.verifyStatus - 0 === 2 &&
               <view className='CheckStatus NoPass'>
                 <view className='Status'>
                   <text className='iconfont iconweitongguo'></text>