Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

src/components/Auth/AuthPage.jsx

@@ -1,10 +0,0 @@
-import React from 'react'
-import './style.scss'
-
-export default (props) => {
-  return (
-    <View>
-
-    </View>
-  )
-}

src/components/Auth/AuthPage/index.jsx

@@ -0,0 +1,54 @@
+import React, { useState, useEffect } from 'react'
+import Taro from '@tarojs/taro'
+import { View, Image } from '@tarojs/components'
+import Disclaimer from '@/components/Disclaimer'
+import '@/assets/css/iconfont.css'
+import useAuth from '../useAuth'
+import './index.scss'
+
+export default (props) => {
+
+  const [loading, setLoading] = useState(false)
+  const { updateUserInfo } = useAuth()
+  
+  const handleGetUserInfo = () => {
+    Taro.getUserProfile({
+      lang: 'zh_CN',
+      desc: '用于完成平台注册',
+      success: (res) => {
+        const { errMsg, ...data } = res || {}
+        if (errMsg === 'getUserProfile:ok') {
+          setLoading(true)
+          updateUserInfo(data).then(() => {
+            setLoading(false)
+          }).catch((err) => {
+            console.error(err)
+            setLoading(false)
+          })
+        } else {
+          console.error(errMsg);
+          Taro.showToast({
+            title: '授权头像失败',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }
+    })
+  }
+
+  return (
+    <View className='components NeedLogin flex-v'>
+      <View className='Logo'>
+        <Image mode='aspectFit' className='centerLabel' src={require('@/assets/logo.png')} />
+      </View>
+      <View className='LoginBtn'>
+        <button loading={loading} onClick={handleGetUserInfo}>微信登录</button>
+      </View>
+      <View className='flex-item'></View>
+      <View className='Bottom'>
+        <Disclaimer />
+      </View>
+    </View>
+  )
+}

src/pages/mine/components/NeedLogin/index.scss → src/components/Auth/AuthPage/index.scss

@@ -19,7 +19,7 @@
     position: relative;
     overflow: hidden;
     margin-top: 195px;
-    >text {
+    >button {
       display: block;
       text-align: center;
       font-size: 32px;

src/layout/index.js

@@ -6,6 +6,7 @@ import Overlay from '@/components/Overlay'
 import Loading from '@/components/Loading'
 import AuthAvatar from '@/components/Auth/AuthAvatar'
 import AuthPhone from '@/components/Auth/AuthPhone'
+import AuthPage from '@/components/Auth/AuthPage'
 import Spin from '@/components/Spin/Spin2'
 import FixedConsultant from '@/components/FixedConsultant'
 import FirstScreen from '@/components/FirstScreen'
@@ -26,7 +27,7 @@ export default (ChildComponent) => (props) => {
   const router = useRouter()
   const page = routes.filter((r) => (router.path.indexOf(r.page) > -1))[0]
   const [loading, setLoading] = useState(false)
-  const [authPhone, authAvatar] = useAuth(person, page)
+  const [authPhone, authAvatar, authPage] = useAuth(person, page)
 
   const { id } = router.params
   const showConsultant = page.shortcut && page.shortcut.consultant
@@ -93,6 +94,7 @@ export default (ChildComponent) => (props) => {
           <AuthAvatar />
         </View>
       </Overlay>
+      { authPage && <AuthPage /> }
       <Spin size={32} spinning={spinning} />
       {
         person && !!person.personId && (

src/layout/useAuth.js

@@ -3,6 +3,7 @@ import { useState, useEffect } from 'react'
 export default function useAuth(person, page) {
   const [authPhone, setAuthPhone] = useState(false)
   const [authAvatar, setAuthAvatar] = useState(false)
+  const [authPage, setAuthPage] = useState(false)
 
   useEffect(() => {
     if (page && page.auth && page.auth.length) {
@@ -23,11 +24,21 @@ export default function useAuth(person, page) {
           setAuthAvatar(false)
         }
       }
+
+      // 如果需要授权头像
+      if (page.auth.indexOf('page') > -1) {
+        if (person.inited && (!person.avatarurl || person.avatarurl.indexOf('default_avatar') > -1)) {
+          setAuthPage(true)
+        } else {
+          setAuthPage(false)
+        }
+      }
     } else {
       setAuthPhone(false)
       setAuthAvatar(false)
+      setAuthPage(false)
     }
   }, [person, page])
 
-  return [authPhone, authAvatar]
+  return [authPhone, authAvatar, authPage]
 }

src/pages/mine/components/NeedLogin/index.jsx

@@ -1,30 +0,0 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
-import { Image } from '@tarojs/components'
-import '@/assets/css/iconfont.css'
-
-export default function Banner (props) {
-  return (
-    <view className='components NeedLogin flex-v'>
-      <view className='Logo'>
-        <Image mode='aspectFit' className='centerLabel' src={require('@/assets/logo.png')} />
-      </view>
-      <view className='LoginBtn'>
-        <text>微信登录</text>
-      </view>
-      <view className='flex-item'></view>
-      <view className='Bottom'>
-        <view>
-          <view>
-            <text className='iconfont icon-shengming'></text>
-            <text>免责声明</text>
-          </view>
-          <view>
-            <text>以上价格仅供参考,具体一房一价的信息以售楼处展示为准。房屋位置交通、医疗、教育、商业等配套信息，来源于第三方不作为要约,仅供参考,双方具体权利义务应以法律规定及买卖合同约定为准。本平台对项目周边文化教育的介绍旨在提供相关信息1 意味着信息发布方对就学安排作出承诺。相关教育资首页信息存在调整的可能,应以政府教育主管部门门及办学颁布的政策规定为准。详情请仔细阅读</text>
-            <text className='active'>《新联家使用免责条款》</text>
-          </view>
-        </view>
-      </view>
-    </view>
-  )
-}

src/pages/mine/index.jsx

@@ -10,7 +10,6 @@ import { getImgURL } from '@/utils/image'
 import { UPDATE_USER_INFO, ROLE_CODE } from '@/constants/user'
 import store from '@/store'
 import './index.scss'
-import NeedLogin from './components/NeedLogin'
 import MineMenuList from './tabData'
 
 const defaultRuleImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon18.jpg'
@@ -23,11 +22,9 @@ export default withLayout(() => {
   const user = useSelector(state => state.user)
   const [UserRole, setUserRole] = useState(null) // 1-普通用户 2-经纪人 3-置业顾问 4-驻场管理
   const [MenuList, setMenuList] = useState([])
-  const [ShowLogin, setShowLogin] = useState(false)
   const { dispatch } = store
 
   useEffect(() => {
-    setShowLogin(false)
     if (user?.userInfo?.person?.personId) {
       const person = user.userInfo.person
       setUserRole(person.personType === ROLE_CODE.CUSTOMER || person.personType === ROLE_CODE.DRIFT ? 1 : person.personType === ROLE_CODE.CHANNEL_AGENT ? 2 : person.personType === ROLE_CODE.CONSULTANT ? 3 : 4)
@@ -70,16 +67,6 @@ export default withLayout(() => {
 
       <ScrollView scroll-y>
         <view className='PageContent'>
-
-          {/* 需要登录 */}
-          {
-            ShowLogin &&
-            <NeedLogin></NeedLogin>
-          }
-
-          {/* 登录后 */}
-          {
-            !ShowLogin &&
             <view className='Content'>
 
               {/* 用户信息 */}
@@ -127,7 +114,6 @@ export default withLayout(() => {
               </view>
 
             </view>
-          }
         </view>
 
         <view className='copyright'>

src/routes.js

@@ -36,6 +36,7 @@ const routes = [
     pkg: 'main',
     isTab: true,
     type: 'mine',
+    auth: ['page'],
   },
 
   // 聊天
@@ -254,6 +255,7 @@ const routes = [
     page: 'pages/mine/myRecommendCode/index',
     pkg: 'main',
     type: 'mine',
+    auth: ['phone'],
   },
   {
     name: '房贷计算器',
@@ -266,18 +268,21 @@ const routes = [
     page: 'pages/mine/userInfo/index',
     pkg: 'main',
     type: 'mine',
+    auth: ['phone', 'avatar'],
   },
   {
     name: '成为驻场管理',
     page: 'pages/mine/toBeManager/index',
     pkg: 'main',
     type: 'mine',
+    auth: ['phone'],
   },
   {
     name: '成为经纪人',
     page: 'pages/mine/toBeAgent/index',
     pkg: 'main',
     type: 'mine',
+    auth: ['phone'],
   },
   {
     name: '我的分享',
@@ -290,6 +295,7 @@ const routes = [
     page: 'pages/mine/myCourse/index',
     pkg: 'main',
     type: 'curriculum',
+    auth: ['phone'],
   },
   {
     name: '我的活动',
@@ -302,12 +308,14 @@ const routes = [
     page: 'pages/mine/myCustomer/index',
     pkg: 'main',
     type: 'mine',
+    auth: ['phone'],
   },
   {
     name: '客户详情',
     page: 'pages/mine/myCustomerDetail/index',
     pkg: 'main',
     type: 'mine',
+    auth: ['phone'],
   },
   {
     name: '我的收藏',
@@ -320,54 +328,63 @@ const routes = [
     page: 'pages/channel/partnerChannel/index',
     pkg: 'subpackages',
     type: 'mine',
+    auth: ['phone'],
   },
   {
     name: '添加客户',
     page: 'pages/mine/addCustomer/index',
     pkg: 'main',
     type: 'mine',
+    auth: ['phone'],
   },
   {
     name: '驻场管理',
     page: 'pages/marketing/residentManager/index',
     pkg: 'subpackages',
     type: 'mine',
+    auth: ['phone'],
   },
   {
     name: '确认到访',
     page: 'pages/marketing/sureVisit/index',
     pkg: 'subpackages',
     type: 'mine',
+    auth: ['phone'],
   },
   {
     name: '变更交易节点',
     page: 'pages/marketing/changeVisit/index',
     pkg: 'subpackages',
     type: 'mine',
+    auth: ['phone'],
   },
   {
     name: '盘客工具',
     page: 'pages/consultant/statCustomer/index',
     pkg: 'subpackages',
     type: 'mine',
+    auth: ['phone'],
   },
   {
     name: '客户信息',
     page: 'pages/mine/customerDetail/index',
     pkg: 'main',
     type: 'mine',
+    auth: ['phone'],
   },
   {
     name: '客户分析',
     page: 'pages/consultant/customerAnalyse/index',
     pkg: 'subpackages',
     type: 'mine',
+    auth: ['phone'],
   },
   {
     name: '个人主页',
     page: 'pages/consultant/myHomepage/index',
     pkg: 'subpackages',
     type: 'mine',
+    auth: ['phone'],
   },
   {
     name: '意见反馈',