feas

src/components/FixedConsultant/index.jsx

@@ -1,4 +1,5 @@
 import { useState } from 'react'
+import classNames from 'classnames'
 import Taro from '@tarojs/taro'
 import { Image } from '@tarojs/components'
 import { getImgURL } from '@/utils/image'
@@ -10,6 +11,10 @@ export default function FixedCard (props) {
 
   const [Show, setShow] = useState(false)
 
+  const toggleVisible = () => {
+    setShow(!Show)
+  }
+
   const handleChat = () => {
     Taro.navigateTo({
       url: `/pages/chat/chatDetail/index?targetPerson=${consultantId}}`
@@ -26,13 +31,13 @@ export default function FixedCard (props) {
   }
 
   return !!consultantId && (
-    <view className='components FixedCard'>
-      <view className='Icon' onClick={() => setShow(true)}>
+    <view className={classNames('components FixedCard', { spread: Show })}>
+      <view className='Icon' onClick={toggleVisible}>
         <Image mode='aspectFill' src={getImgURL(picture||avatar)}></Image>
       </view>
-      <view className='Name'>
+      <view className='Name' onClick={toggleVisible}>
         <text>{name}</text>
-        <text style={{display: Show ? 'block' : 'none'}}>{company}</text>
+        {/* <text style={{display: Show ? 'block' : 'none'}}>{company}</text> */}
       </view>
       <text
         style={{display: Show ? 'inline-block' : 'none'}}
@@ -49,7 +54,7 @@ export default function FixedCard (props) {
       <text
         style={{display: Show ? 'inline-block' : 'none'}}
         className='iconfont icon-guanbi Btn'
-        onClick={() => setShow(false)}
+        onClick={toggleVisible}
       ></text>
 
       <text

src/components/FixedConsultant/index.scss

@@ -1,6 +1,6 @@
 .components.FixedCard {
-  transition: all .2s ease-out;
-  -webkit-transition: all .2s ease-out;
+  transition: width .2s ease-out;
+  -webkit-transition: width .2s ease-out;
   position: fixed;
   right: 0;
   background: #fff;
@@ -11,6 +11,13 @@
   font-size: 0;
   white-space: nowrap;
   border-radius: 94px 0 0 94px;
+  box-sizing: border-box;
+  width: 222rpx;
+
+  &.spread {
+    width: 452rpx;
+  }
+
   >view {
     display: inline-block;
     vertical-align: middle;
@@ -34,12 +41,12 @@
         white-space: nowrap;
         line-height: 32px;
         display: block;
-        &:last-child {
-          font-weight: normal;
-          font-size: 20px;
-          line-height: 1;
-          color: #202020;
-        }
+        // &:last-child {
+        //   font-weight: normal;
+        //   font-size: 20px;
+        //   line-height: 1;
+        //   color: #202020;
+        // }
       }
     }
   }

src/layout/index.js

@@ -7,6 +7,7 @@ import Loading from '@/components/Loading'
 import AuthAvatar from '@/components/Auth/AuthAvatar'
 import AuthPhone from '@/components/Auth/AuthPhone'
 import Spin from '@/components/Spin/Spin2'
+import FixedConsultant from '@/components/FixedConsultant'
 import { ROLE_CODE } from '@/constants/user'
 import useAuth from './useAuth'
 import { routes } from '../routes'
@@ -23,6 +24,7 @@ export default (ChildComponent) => (props) => {
   const [authPhone, authAvatar] = useAuth(person, page)
 
   const { id } = router.params
+  const showConsultant = page.shortcut && page.shortcut.consultant
 
   // 页面分享
   const [shareContent, setShareContent] = useState({})
@@ -80,8 +82,8 @@ export default (ChildComponent) => (props) => {
       </Overlay>
       <Spin size={32} spinning={spinning} />
       {
-        person && person.personId
-        ? <ChildComponent
+        person && !!person.personId && (
+          <ChildComponent
             person={person}
             router={router}
             consultant={consultant}
@@ -90,8 +92,11 @@ export default (ChildComponent) => (props) => {
             trackData={trackData}
             {...props}
             {...extInfo}
-        />
-        : null
+          />
+        )
+      }
+      {
+        !!showConsultant && (<FixedConsultant consultant={consultant} />)
       }
     </>
   )

src/pages/index/buildingDetail/components/BuildingDetailBanner/index.jsx

@@ -10,7 +10,7 @@ const getImage = item => getImgURL(item.image || item.coverImg || item.url || it
 export default function BuildingDetailBanner (props) {
   const { Info } = props
   const { buildingImg, panoramaList, videoUrl, videoImage } = Info || {}
-  const videoPoster = videoImage ? videoImage[0] : undefined
+  const videoPoster = videoImage ? videoImage[0].url : undefined
 
   const showPicBtn = buildingImg && buildingImg.length > 0
   const showVRBtn = panoramaList && panoramaList.length > 0

src/pages/index/buildingDetail/components/DetailBottom/index.jsx

@@ -92,12 +92,6 @@ export default function DetailBottom (props) {
               <Image mode='heightFix' src={require('@/assets/buildingDetail-icon1.png')}></Image>
               <text>一键带看</text>
             </view>
-            <AuthRole role={ROLE_CODE.CONSULTANT}>
-              <view className='Item' onClick={handleRecommender}>
-                <Image mode='heightFix' src={require('@/assets/buildingDetail-icon2.png')}></Image>
-                <text>一键推荐</text>
-              </view>
-            </AuthRole>
           </AuthRole>
         </view>
         <view className='Btn'>

src/pages/index/buildingRules/index.jsx

@@ -36,7 +36,7 @@ export default withLayout(() => {
               </view>
               <view>
                 <text>&emsp;&emsp;以上价格仅供参考,具体一房一价的信息以售楼处展示为准。房屋位置交通、医疗、教育、商业等配套信息，来源于第三方不作为要约,仅供参考,双方具体权利义务应以法律规定及买卖合同约定为准。本平台对项目周边文化教育的介绍旨在提供相关信息1 意味着信息发布方对就学安排作出承诺。相关教育资首页信息存在调整的可能,应以政府教育主管部门门及办学颁布的政策规定为准。详情请仔细阅读</text>
-                <text className='active'>《新联家使用免责条款》</text>
+                <text className='active'>《新联宝使用免责条款》</text>
               </view>
             </view>
           </view>

src/pages/index/buildingTakeLook/index.jsx

@@ -100,7 +100,7 @@ export default withLayout((props) => {
               </view>
               <view>
                 <text>&emsp;&emsp;以上价格仅供参考,具体一房一价的信息以售楼处展示为准。房屋位置交通、医疗、教育、商业等配套信息，来源于第三方不作为要约,仅供参考,双方具体权利义务应以法律规定及买卖合同约定为准。本平台对项目周边文化教育的介绍旨在提供相关信息1 意味着信息发布方对就学安排作出承诺。相关教育资首页信息存在调整的可能,应以政府教育主管部门门及办学颁布的政策规定为准。详情请仔细阅读</text>
-                <text className='active'>《新联家使用免责条款》</text>
+                <text className='active'>《新联宝使用免责条款》</text>
               </view>
             </view>
           </view>

src/pages/index/index.config.js

@@ -1,3 +1,3 @@
 export default {
-  navigationBarTitleText: '新联家'
+  navigationBarTitleText: '新联宝'
 }

src/pages/index/specialPriceHouse/index.jsx

@@ -103,7 +103,7 @@ export default withLayout(() => {
               </view>
               <view>
                 <text>&emsp;&emsp;以上价格仅供参考,具体一房一价的信息以售楼处展示为准。房屋位置交通、医疗、教育、商业等配套信息，来源于第三方不作为要约,仅供参考,双方具体权利义务应以法律规定及买卖合同约定为准。本平台对项目周边文化教育的介绍旨在提供相关信息1 意味着信息发布方对就学安排作出承诺。相关教育资首页信息存在调整的可能,应以政府教育主管部门门及办学颁布的政策规定为准。详情请仔细阅读</text>
-                <text className='active'>《新联家使用免责条款》</text>
+                <text className='active'>《新联宝使用免责条款》</text>
               </view>
             </view>
           </view>

src/pages/index/webview/index.config.js

@@ -1,3 +1,3 @@
 export default {
-  navigationBarTitleText: '新联家全景'
+  navigationBarTitleText: '新联宝全景'
 }

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

@@ -21,7 +21,7 @@ export default function Banner (props) {
           </view>
           <view>
             <text>以上价格仅供参考,具体一房一价的信息以售楼处展示为准。房屋位置交通、医疗、教育、商业等配套信息，来源于第三方不作为要约,仅供参考,双方具体权利义务应以法律规定及买卖合同约定为准。本平台对项目周边文化教育的介绍旨在提供相关信息1 意味着信息发布方对就学安排作出承诺。相关教育资首页信息存在调整的可能,应以政府教育主管部门门及办学颁布的政策规定为准。详情请仔细阅读</text>
-            <text className='active'>《新联家使用免责条款》</text>
+            <text className='active'>《新联宝使用免责条款》</text>
           </view>
         </view>
       </view>

src/pages/mine/myHomepage/index.jsx

@@ -163,10 +163,6 @@ export default withLayout(() => {
             <text>已经到底了~</text>
           </view>
 
-          <view className='Share'>
-            <text onClick={() => { setShowPopup(true) }}>生成海报分享好友</text>
-          </view>
-
         </view>
       </ScrollView>
 

src/routes.js

@@ -10,6 +10,10 @@ const routes = [
     pkg: 'main',
     isTab: true,
     type: 'main',
+    shortcut: {
+      chat: false,
+      consultant: true,
+    },
     // auth: ['phone', 'avatar']
   },
   {
@@ -81,6 +85,10 @@ const routes = [
     pkg: 'main',
     type: 'building',
     auth: ['phone', 'avatar'],
+    shortcut: {
+      chat: false,
+      consultant: true,
+    },
   },
   {
     name: '全景看房',

src/services/common.js

@@ -24,7 +24,7 @@ export const getPreloadData = payload =>
  *
  */
 export const getMiniQrcode = payload =>
-  fetch({ url: API_QRCODE, payload, method: "POST" });
+  fetch({ url: API_QRCODE, payload, method: "POST", showToast: false });
 
 /**
  * 获取二维码参数