信息修改

src/components/Auth/AuthPhone.jsx

@@ -11,6 +11,8 @@ export default (props) => {
     router,
     page,
     onCancel = (x => x),
+    onSuccess = () => {},
+    onError = () => {},
   } = props;
 
   const [loading, setLoading] = useState(false)
@@ -22,9 +24,11 @@ export default (props) => {
       setLoading(true)
       updatePhoneNumber(data).then(() => {
         setLoading(false)
+        onSuccess()
       }).catch((err) => {
         console.error(err)
         setLoading(false)
+        onError()
       })
     } else {
       console.error(errMsg);
@@ -33,6 +37,7 @@ export default (props) => {
         icon: 'none',
         duration: 2000
       })
+      onCancel()
     }
   }
 

src/pages/index/buildingAround/index.jsx

@@ -232,7 +232,10 @@ export default withLayout((props) => {
                         <view className='flex-item'>
                           <text>{item.name}</text>
                         </view>
-                        <text className='iconfont icon-dingwei'></text>
+                        {
+                          item.distance &&
+                          <text className='iconfont icon-dingwei'></text>
+                        }
                         {
                           item.distance &&
                           <text className='distance'>{`${item.distance || '-'}m`}</text>

src/pages/index/helpToFindHouse/components/BuyHouse/index.jsx

@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
-import { Image, Slider, Textarea, ScrollView } from '@tarojs/components'
+import { Image, Slider, Textarea, ScrollView, Form } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import './index.scss'
 import questions from './formData'
@@ -25,6 +25,15 @@ export default function BuyHouse (props) {
     change(StepId)
   }, [StepId])
 
+  useEffect(() => {
+    if(AreaInfo.id) {
+      const res = FormData.find((item) => { return item.key === 'intentArea' })
+      res.resultId = AreaInfo.id
+      res.result = AreaInfo.name
+      setFormData([...FormData])
+    }
+  }, [AreaInfo])
+
   const CutCheckboxs = (index, subItem, subIndex) => {
     return () => {
       let newFormData = [...FormData]

src/pages/index/helpToFindHouse/components/HousePurchasing/index.jsx

@@ -20,6 +20,15 @@ export default function HousePurchasing (props) {
     change(StepId)
   }, [StepId])
 
+  useEffect(() => {
+    if(AreaInfo.id) {
+      const res = FormData.find((item) => { return item.key === 'intentArea' })
+      res.resultId = AreaInfo.id
+      res.result = AreaInfo.name
+      setFormData([...FormData])
+    }
+  }, [AreaInfo])
+
   const CutCheckbox = (item, index) => {
     return () => {
       let newFormData = [...FormData]

src/pages/index/helpToFindHouse/components/RentingHouse/index.jsx

@@ -22,6 +22,15 @@ export default function RentingHouse (props) {
     change(StepId)
   }, [StepId])
 
+  useEffect(() => {
+    if(AreaInfo.id) {
+      const res = FormData.find((item) => { return item.key === 'intentArea' })
+      res.resultId = AreaInfo.id
+      res.result = AreaInfo.name
+      setFormData([...FormData])
+    }
+  }, [AreaInfo])
+
   const CutCheckboxs = (index, subItem, subIndex) => {
     return () => {
       let newFormData = [...FormData]

src/pages/index/helpToFindHouse/index.jsx

@@ -41,6 +41,7 @@ export default withLayout((props) => {
   }
 
   const AreaChange = (e) => {
+    console.log(e)
     setAreaInfo(e[2])
     setShowCitysPopup(false)
   }

src/pages/mine/addCustomer/components/BuildingPicker.jsx

@@ -12,7 +12,7 @@ export default (props) => {
   const [dicts, setDicts] = useState([])
 
   useEffect(() => {
-    if (type !== ROLE_CODE.CUSTOMER && type !== ROLE_CODE.DRIFT) {
+    if (type !== ROLE_CODE.CUSTOMER && type !== ROLE_CODE.DRIFT && type !== ROLE_CODE.CONSULTANT) {
       fetch({ url: API_GET_AGENT_BUILDINGS }).then((res) => {
         setDicts(res || [])
       })

src/pages/video/liveDetail/index.jsx

@@ -2,14 +2,15 @@ import { useState, useEffect, useRef } from "react";
 import Taro from "@tarojs/taro";
 import { savePoint } from '@/services/common'
 import withLayout from "@/layout";
-import { Image } from "@tarojs/components";
+import { Image, View } from "@tarojs/components";
 import { queryLiveDetail } from "@/services/item";
-import { fetch } from '@/utils/request'
-import { API_VIDEO_DETAIL } from '@/constants/api'
 import useParams from "@/utils/hooks/useParams";
 import useShare from "@/utils/hooks/useShare";
 import { getImgURL } from "@/utils/image";
 import { getLivingCode } from '@/services/activity'
+import Overlay from '@/components/Overlay'
+import AuthPhone from '@/components/Auth/AuthPhone'
+import { useSelector } from 'react-redux'
 import "@/assets/css/iconfont.css";
 import "./index.scss";
 
@@ -19,6 +20,8 @@ export default withLayout((props) => {
 
   const [data, setData] = useState({})
   const [CanPlay, setCanPlay] = useState(false)
+  const consultant = useSelector(s => s.system.consultant)
+  const [authPhone, setAuthPhone] = useState(false)
   // 直播间信息
   const livingRef = useRef()
 
@@ -70,39 +73,58 @@ export default withLayout((props) => {
     }
   }
 
-  const handleLive = () => {
-    if(type === 'live') {
-      if (!livingRef.current) {
-        Taro.showToast({
-          title: '查询直播凭证失败, 请退出重试',
-          icon: 'none',
-        })
-        return;
-      }
-  
-      // https://work.weixin.qq.com/api/doc/90000/90135/93635
-      const { livingCode, status } = livingRef.current
-  
-      //
-      if (status >= 3) {
-        Taro.showToast({
-          title: `直播活动已${status === 3 ? '过期' : '取消'}`,
-          icon: 'none',
-        })
-        return;
-      }
-  
-      // 如果已经结束的则播放回放
-      const replay = status === 2 ? '&replay=1' : ''
-  
-      // 跳转到直播
-      Taro.navigateToMiniProgram({
-        // 固定跳转到微信企业直播
-        appId: 'wx7424030d69bde86e',
-        path: `pages/watch/index?living_code=${encodeURIComponent(livingCode)}${replay}`,
+  const AuthPhoneSuccess = () => {
+    setAuthPhone(false)
+    ToLiving()
+  }
+
+  const AuthPhoneError = () => {
+    setAuthPhone(false)
+    ToLiving()
+  }
+
+  const AuthPhoneCancel = () => {
+    setAuthPhone(false)
+    ToLiving()
+  }
+
+  const ToLiving = () => {
+    if (!livingRef.current) {
+      Taro.showToast({
+        title: '查询直播凭证失败, 请退出重试',
+        icon: 'none',
       })
+      return;
+    }
+
+    // https://work.weixin.qq.com/api/doc/90000/90135/93635
+    const { livingCode, status } = livingRef.current
+
+    //
+    if (status >= 3) {
+      Taro.showToast({
+        title: `直播活动已${status === 3 ? '过期' : '取消'}`,
+        icon: 'none',
+      })
+      return;
+    }
+
+    // 如果已经结束的则播放回放
+    const replay = status === 2 ? '&replay=1' : ''
+
+    // 跳转到直播
+    Taro.navigateToMiniProgram({
+      // 固定跳转到微信企业直播
+      appId: 'wx7424030d69bde86e',
+      path: `pages/watch/index?living_code=${encodeURIComponent(livingCode)}${replay}`,
+    })
+  }
+
+  const handleLive = () => {
+    if(person.inited && !person.phone) {
+      setAuthPhone(true)
     } else {
-      setCanPlay(true)
+      ToLiving()
     }
   }
 
@@ -113,6 +135,13 @@ export default withLayout((props) => {
   }, [id]);
   //   
   return <view className="liveDetail">
+
+  {/* 授权手机 */}
+  <Overlay visible={authPhone} aligin='bottom'>
+    <View className='auth-wrapper'>
+      <AuthPhone consultant={consultant} router={router} page={page} onSuccess={(AuthPhoneSuccess)} onError={AuthPhoneError} onCancel={AuthPhoneCancel} />
+    </View>
+  </Overlay>
     {
       type === 'video' && data.videoUrl && CanPlay &&
       <view className="myVideo">

src/routes.js

@@ -244,7 +244,7 @@ const routes = [
     page: 'pages/video/liveDetail/index',
     pkg: 'main',
     type: 'live',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '视频详情',