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

src/pages/index/activityDetail/index.scss

@@ -327,8 +327,8 @@
             position: relative;
             overflow: hidden;
             margin-top: 40px;
+            padding: 0 30px;
             >.Title {
-              padding: 0 30px;
               position: relative;
               overflow: hidden;
               text-align: center;

src/pages/index/addedValueService/formData.js

@@ -9,7 +9,7 @@ const questions = [
   },
   {
     question: '房屋现状？',
-    key: 'status',
+    key: 'houseStatus',
     type: 'checkbox',
     result: '',
     resultId: null,

src/pages/index/addedValueService/index.jsx

@@ -36,7 +36,7 @@ export default function AddedValueService () {
     data.map((item) => {
       if(item.key === 'budget') {
         params.push({...item, key: 'minPrice', result: item.options[0] * 10000})
-        params.push({...item, key: 'maxPrice', result: item.result * 10000})
+        params.push({...item, key: 'maxPrice', result: item.result !== '' ? item.result * 10000 : 5000000})
       } else {
         if(item.result !== '' || item.resultId !== null) {
           params.push(item)

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

@@ -1,4 +1,4 @@
-import { useState } from 'react'
+
 import Taro from '@tarojs/taro'
 import { ScrollView, Image } from '@tarojs/components'
 import AuthRole from '@/components/Auth/AuthRole'
@@ -48,41 +48,44 @@ export default function BasicInfo (props) {
       </view>
 
       {/* 项目列表 */}
-      <view className='ProjectList'>
-        <ScrollView scroll-x>
-          {
-            (Info.buildingProjectType || []).map((item, index) => (
-              <view className='ListItem' key={`List-${index}`}>
-                <Image mode='heightFix' src={require('@/assets/buildingDetail-icon4.jpg')} />
-                <view>
-                  <view>
-                    <text>项目类型：</text>
-                    <text className='active black'>{item.buildingTypeName}</text>
-                  </view>
-                  <view>
-                    <text>房屋产权：</text>
-                    <text className='active'>{item.rightsYear}年</text>
-                    <text>装修标准：</text>
-                    <text className='active'>{item.decoration || '暂无'}</text>
-                  </view>
+      {
+        (Info.buildingProjectType || []).length > 0 &&
+        <view className='ProjectList'>
+          <ScrollView scroll-x>
+            {
+              (Info.buildingProjectType || []).map((item, index) => (
+                <view className='ListItem' key={`List-${index}`}>
+                  <Image mode='heightFix' src={require('@/assets/buildingDetail-icon4.jpg')} />
                   <view>
-                    <text>项目参考价格：</text>
-                    {
-                      (item.startPrice || item.endPrice) &&
-                      <text className='active'>约{item.startPrice}-{item.endPrice}万/套</text>
-                    }
-                    {
-                      !(item.startPrice || item.endPrice) &&
-                      <text className='active'>暂无数据</text>
-                    }
+                    <view>
+                      <text>项目类型：</text>
+                      <text className='active black'>{item.buildingTypeName}</text>
+                    </view>
+                    <view>
+                      <text>房屋产权：</text>
+                      <text className='active'>{item.rightsYear}年</text>
+                      <text>装修标准：</text>
+                      <text className='active'>{item.decoration || '暂无'}</text>
+                    </view>
+                    <view>
+                      <text>项目参考价格：</text>
+                      {
+                        (item.startPrice || item.endPrice) &&
+                        <text className='active'>约{item.startPrice}-{item.endPrice}万/套</text>
+                      }
+                      {
+                        !(item.startPrice || item.endPrice) &&
+                        <text className='active'>暂无数据</text>
+                      }
+                    </view>
+                    <text className='SaleStatus active'>{item.marketStatus}</text>
                   </view>
-                  <text className='SaleStatus active'>{item.marketStatus}</text>
                 </view>
-              </view>
-            ))
-          }
-        </ScrollView>
-      </view>
+              ))
+            }
+          </ScrollView>
+        </view>
+      }
 
       {/* 隔断 */}
       <view className='CutLine'></view>
@@ -151,20 +154,20 @@ export default function BasicInfo (props) {
 
       {/* 围观 */}
       <view className='Views flex-h'>
-          <text>{Info.pvNum || 0}人围观</text>
-          <view className='flex-item'>
-            {
-              (Info?.uvList?.records || []).slice(0, 8).map((item, index) => (
-                <view key={`ViewsItem-${index}`}>
-                  <Image mode='aspectFill' className='centerLabel' src={item.photoOravatar} />
-                </view>
-              ))
-            }
-            {
-              (Info?.uvList?.records || []).length > 8 &&
-              <text>...</text>
-            }
-          </view>
+        <text>{Info.pvNum || 0}人围观</text>
+        <view className='flex-item'>
+          {
+            (Info?.uvList?.records || []).slice(0, 8).map((item, index) => (
+              <view key={`ViewsItem-${index}`}>
+                <Image mode='aspectFill' className='centerLabel' src={item.photoOravatar} />
+              </view>
+            ))
+          }
+          {
+            (Info?.uvList?.records || []).length > 8 &&
+            <text>...</text>
+          }
+        </view>
       </view>
 
       {/* 互动 */}

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

@@ -2,15 +2,14 @@ import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import { useSelector } from 'react-redux'
 import { Image } from '@tarojs/components'
-import AuthRole from '@/components/Auth/AuthRole'
-// import Poster from '@/components/Poster'
 import { queryActivityList } from '@/services/activity'
-import { ROLE_CODE } from '@/constants/user'
 import './index.scss'
 
 export default function DetailBottom (props) {
   const { Info = {}, onPoster } = props
 
+  const user = useSelector(state => state.user)
+
   // 当前推荐置业
   const { consultant } = useSelector(s => s.system)
   // const [showPoster, setShowPoster] = useState(false)
@@ -40,19 +39,27 @@ export default function DetailBottom (props) {
   }
 
   const handleRecommender = () => {
-    const params = `buildingId=${Info?.buildingId}&buildingName=${Info?.buildingName}`
+    if (user.userInfo.person.personType === 'Realty Consultant') {
+      const params = `buildingId=${Info?.buildingId}&buildingName=${Info?.buildingName}`
 
-    Taro.navigateTo({
-      url: `/pages/mine/recommendUser/index?${params}`
-    })
+      Taro.navigateTo({
+        url: `/pages/mine/recommendUser/index?${params}`
+      })
+    } else {
+      Taro.showToast({ title: '该功能暂不能为您提供服务', icon: 'none', duration: 2000 })
+    }
   }
 
   const handleTuanfang = () => {
-    const id = actList[0].dynamicId
+    if ((actList || []).length > 0) {
+      const id = actList[0].dynamicId
 
-    Taro.navigateTo({
-      url: `/pages/index/activityDetail/index?id=${id}`
-    })
+      Taro.navigateTo({
+        url: `/pages/index/activityDetail/index?id=${id}`
+      })
+    } else {
+      Taro.showToast({ title: '该功能暂不能为您提供服务', icon: 'none', duration: 2000 })
+    }
   }
 
   useEffect(() => {
@@ -75,20 +82,14 @@ export default function DetailBottom (props) {
             <Image mode='heightFix' src={require('@/assets/buildingDetail-icon3.png')}></Image>
             <text>一键海报</text>
           </view>
-          {
-            actList.length > 0 && (
-              <view className='Item' onClick={handleTuanfang}>
-                <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>
+          <view className='Item' onClick={handleTuanfang}>
+            <Image mode='heightFix' src={require('@/assets/buildingDetail-icon1.png')}></Image>
+            <text>一键带看</text>
+          </view>
+          <view className='Item' onClick={handleRecommender}>
+            <Image mode='heightFix' src={require('@/assets/buildingDetail-icon2.png')}></Image>
+            <text>一键推荐</text>
+          </view>
         </view>
         <view className='Btn'>
           <text onClick={handleChat}>一键咨询</text>

src/pages/index/buildingDetail/index.jsx

@@ -92,19 +92,28 @@ export default withLayout((props) => {
                 </view>
 
                 {/* 特价房源 */}
-                <view className='SpecialPriceHouse' style={{minHeight: 0}}>
-                  <SpecialPriceHouse List={DetailInfo?.specialRoomList}></SpecialPriceHouse>
-                </view>
+                {
+                  (DetailInfo?.specialRoomList || []).length > 0 &&
+                  <view className='SpecialPriceHouse' style={{minHeight: 0}}>
+                    <SpecialPriceHouse List={DetailInfo?.specialRoomList}></SpecialPriceHouse>
+                  </view>
+                }
 
                 {/* 项目动态 */}
-                <view className='ProjectDynamic' style={{minHeight: 0}}>
-                  <ProjectDynamic List={DetailInfo?.trendList}></ProjectDynamic>
-                </view>
+                {
+                  (DetailInfo?.trendList || []).length > 0 &&
+                  <view className='ProjectDynamic' style={{minHeight: 0}}>
+                    <ProjectDynamic List={DetailInfo?.trendList}></ProjectDynamic>
+                  </view>
+                }
 
                 {/* 置业顾问 */}
-                <view className='PropertyConsultant' style={{minHeight: 0}}>
-                  <PropertyConsultant Info={DetailInfo}></PropertyConsultant>
-                </view>
+                {
+                  (DetailInfo?.consultants || []).length > 0 &&
+                  <view className='PropertyConsultant' style={{minHeight: 0}}>
+                    <PropertyConsultant Info={DetailInfo}></PropertyConsultant>
+                  </view>
+                }
 
                 {/* 位置及周边 */}
                 <view className='Periphery' style={{minHeight: 0}}>
@@ -112,9 +121,12 @@ export default withLayout((props) => {
                 </view>
 
                 {/* 户型介绍 */}
-                <view className='HouseTypeIntro' style={{minHeight: 0}}>
-                  <HouseTypeIntro Info={houseTypeImages}></HouseTypeIntro>
-                </view>
+                {
+                  (houseTypeImages.length || []) > 0 &&
+                  <view className='HouseTypeIntro' style={{minHeight: 0}}>
+                    <HouseTypeIntro Info={houseTypeImages}></HouseTypeIntro>
+                  </view>
+                }
 
                 {/* 营销活动 */}
                 <view className='MarketingActivity' style={{minHeight: 0}}>
@@ -122,9 +134,12 @@ export default withLayout((props) => {
                 </view>
 
                 {/* 直播活动 */}
-                <view className='LivingActivity' style={{minHeight: 0}}>
-                  <LivingActivity Info={DetailInfo}></LivingActivity>
-                </view>
+                {
+                  (DetailInfo?.liveActivityList || []).length > 0 &&
+                  <view className='LivingActivity' style={{minHeight: 0}}>
+                    <LivingActivity Info={DetailInfo}></LivingActivity>
+                  </view>
+                }
 
                 {/* 新鲜资讯 */}
                 <view className='News' style={{minHeight: 0}}>
@@ -132,9 +147,12 @@ export default withLayout((props) => {
                 </view>
 
                 {/* 相册 */}
-                <view className='Pictures' style={{ display: PictureList.length ? 'block' : 'none' }}>
-                  <Pictures List={PictureList}></Pictures>
-                </view>
+                {
+                  (PictureList || []).length > 0 &&
+                  <view className='Pictures'>
+                    <Pictures List={PictureList}></Pictures>
+                  </view>
+                }
 
                 {/* 免责声明 */}
                 <Disclaimer />

src/pages/index/helpToFindHouse/index.jsx

@@ -48,7 +48,7 @@ export default withLayout(() => {
     data.map((item) => {
       if (item.key === 'budget') {
         params.push({ ...item, key: 'minPrice', result: CurrentDemandId === 2 ? item.options[0] : item.options[0] * 10000 })
-        params.push({ ...item, key: 'maxPrice', result: CurrentDemandId === 2 ? item.result : item.result * 10000 })
+        params.push({ ...item, key: 'maxPrice', result: CurrentDemandId === 2 ? item.result === '' ? 5000000 : item.result : item.result === '' ? 5000000 : item.result * 10000 })
       } else {
         if (item.result !== '' || item.resultId !== null) {
           params.push(item)
@@ -56,7 +56,9 @@ export default withLayout(() => {
       }
     })
     params.push({ question: '创建人小程序人员', result: user?.userInfo?.person?.personId, key: 'personId' })
-    params.push({ question: '意向区域', result: AreaInfo.id, key: 'intentArea' })
+    if(CurrentDemandId !== 3) {
+      params.push({ question: '意向区域', result: AreaInfo.id, key: 'intentArea' })
+    }
     let payload = {}
     params.map((item) => {
       payload[item.key] = item.result || item.resultId

src/pages/mine/addCustomer/index.jsx

@@ -62,9 +62,11 @@ export default withLayout((props) => {
         params = { ...FormData, sex: SexId, intention: BuildingId, realtyConsultant: CardId }
       }
       fetch({ url, method: 'post', payload: params }).then(() => {
-        Taro.showToast({ title: '添加成功', icon: 'none' })
-        Taro.navigateBack({ delta: 1 })
-        setCanSubmit(false)
+        Taro.showToast({ title: '添加成功', icon: 'none', duration: 2000 })
+        setTimeout(() => {
+          Taro.navigateBack({ delta: 1 })
+          setCanSubmit(false)
+        }, 2000)
       }).catch(() => {
         setCanSubmit(false)
       })