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

project.config.json

@@ -28,7 +28,7 @@
 		},
 		"bundle": false,
 		"useIsolateContext": true,
-		"useCompilerModule": false,
+		"useCompilerModule": true,
 		"userConfirmedUseCompilerModuleSwitch": false,
 		"useMultiFrameRuntime": false,
 		"useApiHook": true,

src/components/NavHeader/index.jsx

@@ -8,7 +8,7 @@ export default function NavHeader (props) {
 
   const [MarginTop, setMarginTop] = useState(0)
   const [LineHeight, setLineHeight] = useState(0)
-  const { BgColor = '#fff', IsFixed = false, Title = '香颂蔚澜' } = props
+  const { BgColor = '#fff', IsFixed = false, Title = '香颂蔚澜', Color = '#fff', Border = false } = props
 
   if (MarginTop === 0) {
     setMarginTop(Taro.getMenuButtonBoundingClientRect().top)
@@ -19,7 +19,7 @@ export default function NavHeader (props) {
 
   return (
     <view className='NavHeader' style={{ background: BgColor, position: IsFixed ? 'absolute' : 'relative' }}>
-      <text style={{ marginTop: `${MarginTop}px`, lineHeight: `${LineHeight}px` }}>{Title}</text>
+      <text style={{ marginTop: `${MarginTop}px`, lineHeight: `${LineHeight}px`, color: `${Color}`, borderBottom: Border ? `1px solid #ccc` : `none` }}>{Title}</text>
     </view>
   )
 }

src/components/RenZhengScreen/index.jsx

@@ -0,0 +1,23 @@
+import React, { useState } from 'react'
+import NavHeader from '@/components/NavHeader/index'
+import Taro from '@tarojs/taro'
+import '@/assets/css/reset.less'
+import '@/assets/css/iconfont.less'
+import './index.less'
+
+export default function RenZhengScreen (props) {
+
+  const { Show = false } = props
+
+  return (
+    <view className='RenZhengScreen' style={{display: Show ? 'block' : 'none'}}>
+      <NavHeader Title='业主认证' Color='#000'></NavHeader>
+      <view className='centerLabel'>
+        <text>请进行业主信息认证</text>
+        <view>
+          <text onClick={() => { Taro.navigateTo({ url: `/pages/WoDe/YeZhuRenZheng/index?from=popup` }) }}>去认证</text>
+        </view>
+      </view>
+    </view>
+  )
+}

src/components/RenZhengScreen/index.less

@@ -0,0 +1,38 @@
+.RenZhengScreen {
+  width: 100%;
+  position: fixed !important;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  z-index: 300000;
+  background: #fff;
+
+  >view.centerLabel {
+    width: 100%;
+
+    >text {
+      display: block;
+      font-size: 24px;
+      color: #666;
+      line-height: 40px;
+      text-align: center;
+    }
+
+    >view {
+      padding: 0 30px;
+      position: relative;
+      overflow: hidden;
+      margin-top: 40px;
+
+      >text {
+        display: block;
+        font-size: 28px;
+        color: #fff;
+        background: #f35844;
+        line-height: 80px;
+        text-align: center;
+        border-radius: 10px;
+      }
+    }
+  }
+}

src/layouts/index.jsx

@@ -5,6 +5,7 @@ import Spin from '@/components/Spin'
 import GetUserPhone from '@/components/GetUserPhone/index'
 import GetUserIcon from '@/components/GetUserIcon/index'
 import AdvLayer from '@/components/AdvLayer'
+import RenZhengScreen from '@/components/RenZhengScreen'
 import YeZhuRenZhengPopup from '@/components/YeZhuRenZhengPopup'
 import useMountTrack from '@/utils/hooks/useMountTrack'
 import { getPage } from '@/utils'
@@ -102,9 +103,10 @@ export default function (props) {
 
       {/* 广告 */}
       <AdvLayer></AdvLayer>
+      <RenZhengScreen Show={showAuthYeZhu}></RenZhengScreen>
       <GetUserIcon visible={showAuthBasic} onError={err => showError(`授权头像失败: ${err}`)} />
       <GetUserPhone visible={showAuthPhone} onError={err => showError(`授权手机失败: ${err}`)} />
-      <YeZhuRenZhengPopup Show={showAuthYeZhu} Close={() => { }}></YeZhuRenZhengPopup>
+      {/* <YeZhuRenZhengPopup Show={showAuthYeZhu} Close={() => { }}></YeZhuRenZhengPopup> */}
       {
         props.children
       }

src/pages/ShouYe/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react'
 import NavHeader from '@/components/NavHeader/index'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
+import RenZhengScreen from '@/components/RenZhengScreen/index'
 import { Swiper, SwiperItem, Text } from '@tarojs/components'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
@@ -128,6 +129,7 @@ export default function Index (props) {
   return (
     <Page>
       <view className='ShouYe flex-v'>
+        <RenZhengScreen></RenZhengScreen>
         <NavHeader BgColor='#f35844' Title='首页'></NavHeader>
         <view className='flex-item'>
 

src/pages/WoDe/YeZhuRenZheng/index.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import { Input, Picker } from '@tarojs/components'
-import Taro from '@tarojs/taro'
+import Taro, { Current } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import Page from '@/layouts'
 import { useModel } from '@/store'
@@ -10,6 +10,7 @@ import './index.less'
 
 export default function YeZhuRenZheng () {
 
+  const [PageFrom] = useState(Current.router.params.from)
   const { user } = useModel('user')
   const [FormData, setFormData] = useState({ RealName: '', IdCard: '', Phone: '' })
   const [PhoneCode, setPhoneCode] = useState('')
@@ -70,11 +71,24 @@ export default function YeZhuRenZheng () {
     return /^1(3\d|4\d|5\d|6\d|7\d|8\d|9\d)\d{8}$/g.test(FormData.Phone)
   }
 
+  const CheckIdCard = () => { // 校验身份证
+    const regIdCard = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+    if (!regIdCard.test(FormData.IdCard)) {
+      return false
+    } else {
+      return true
+    }
+  }
+
   const ToGetPhoneCode = () => {
     if (!CheckPhone()) {
       Taro.showToast({ title: '手机号填写错误', icon: 'none' })
       return false
     }
+    if (!CheckIdCard()) {
+      Taro.showToast({ title: '身份证号填写错误', icon: 'none' })
+      return false
+    }
     if (CodeTimerNum - 0 === 60) {
       request({ ...apis.getPhoneCode, params: { tel: FormData.Phone } }).then(() => {
         Taro.showToast({ title: '验证码已发送', icon: 'none' })
@@ -142,7 +156,12 @@ export default function YeZhuRenZheng () {
           }
         }).then((res) => {
           Taro.showToast({ title: '添加认证成功', icon: 'none' })
-          Taro.navigateTo({ url: `/pages/WoDe/YeZhuShenHe/index?id=${res.id}` })
+          if (PageFrom === 'popup') {
+            setUser({ ...user, verifyStatus: 'certification_in_progress' })
+            Taro.navigateBack({ delta: 1 })
+          } else {
+            Taro.navigateTo({ url: `/pages/WoDe/YeZhuShenHe/index?id=${res.id}` })
+          }
           setDataLock(false)
         }).catch((res) => {
           Taro.showToast({ title: res, icon: 'none' })