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

config/dev.js

@@ -3,12 +3,12 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"https://xlk.njyz.tech"',
-    HOST: '"https://xlj.newlandsh.com"',
+    HOST: '"https://xlk.njyz.tech"',
+    // HOST: '"https://www.newhousehold.cn"',
     // HOST: '"http://127.0.0.1:8567"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
-    OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
-    OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
+    OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
+    OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
     Version: '"V0.0.20"'
   },

config/prod.js

@@ -3,14 +3,14 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    // HOST: '"https://xlj.newlandsh.com"', //正式
-    // WSS_HOST: '"wss://xlj.newlandsh.com"',
-    HOST: '"https://xlk.njyz.tech"', //正式
-    WSS_HOST: '"wss://xlk.njyz.tech"',
-    OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
-    OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
+    HOST: '"https://www.newhousehold.cn"', //正式
+    WSS_HOST: '"wss://www.newhousehold.cn"',
+    // HOST: '"https://xlk.njyz.tech"', //正式
+    // WSS_HOST: '"wss://xlk.njyz.tech"',
+    OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
+    OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
-    Version: '"V0.0.53-20210813"'
+    Version: '"V0.0.58-20210819"'
   },
   mini: {},
   h5: {

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "miniapp",
 	"description": "",
-	"appid": "wxc96058d57e77f373",
+	"appid": "wxe44244d1a5ea3364",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,
@@ -27,7 +27,7 @@
 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",

src/constants/api.js

@@ -74,6 +74,7 @@ export const API_UPLOAD_IMAGE = resolvePath('image')
 export const API_CHAT_READED = resolvePath('chat/message')
 export const API_CHAT_UNREADED = resolvePath('chat/unReaded')
 
+export const API_CONSULTANT = resolvePath('consultant')
 
 // card
 export const API_CARDS_LIST = resolvePath('cards')

src/pages/chat/index.jsx

@@ -70,7 +70,7 @@ export default withLayout((props) => {
                 <view className='flex-item'>
                   <view className='flex-h'>
                     <text className='flex-item'>{item.name}</text>
-                    <text>{formatDate(item.createDate, 'yyyy/M/d')}</text>
+                    <text>{formatDate(item.createDate, 'yyyy/MM/dd')}</text>
                   </view>
                   <view className='Msg'>
                     <text>{item.messageType === 'text' ? item.message : '[图片]'}</text>

src/pages/index/activityDetail/CountDown.jsx

@@ -7,7 +7,7 @@ export default (props) => {
 
   return (
     <view className='CountDown'>
-      <text>距离结束还有</text>
+      <text>距离报名结束还有</text>
       <text className='Red'>{CountDown[1]||0}</text>
       <text>天</text>
       <text className='Number' style={{ marginLeft: '40rpx' }}>{CountDown[2]||0}</text>

src/pages/index/activityDetail/index.jsx

@@ -100,7 +100,8 @@ export default withLayout((props) => {
     {
       title: shareContent.shareContentTitle || detail?.title,
       path: `${router.path}?${paramsRef.current}`,
-      image: shareContent.shareContentImg || getImgURL(detail?.imgUrl),
+      // image: shareContent.shareContentImg || getImgURL(detail?.imgUrl),
+      image: '',
     },
     fullTrackData
   );
@@ -164,20 +165,20 @@ export default withLayout((props) => {
         </view>
         <text className='Time'>
           报名截止时间：
-          {formatDate(detail.enlistEnd, 'yyyy/M/d')}
+          {formatDate(detail.enlistEnd, 'yyyy/MM/dd')}
         </text>
         <text className='Name'>{detail.title}</text>
         <view className='flex-h Address'>
-          <text>地址：</text>
+          <text>活动地址：</text>
           <view className='flex-item'>
             <text>{detail.address}</text>
           </view>
         </view>
         <view className='flex-h Date'>
-          <text>时间：</text>
+          <text>活动时间：</text>
           <view className='flex-item'>
             <text>
-              {`${formatDate(detail.startDate, 'yyyy/M/d')} - ${formatDate(detail.endDate, 'yyyy/M/d')}`}
+              {`${formatDate(detail.startDate, 'yyyy/MM/dd')} - ${formatDate(detail.endDate, 'yyyy/MM/dd')}`}
             </text>
           </view>
         </view>
@@ -204,7 +205,7 @@ export default withLayout((props) => {
             </view>
           </view>
           <text className='Price'>{detail.groupBuyPrice || '价格待定'}</text>
-          <text className='Time'>时间：{formatDate(detail.startDate, 'yyyy/M/d')} - {formatDate(detail.endDate, 'yyyy/M/d')}</text>
+          <text className='Time'>活动时间：{formatDate(detail.startDate, 'yyyy/MM/dd')} - {formatDate(detail.endDate, 'yyyy/MM/dd')}</text>
         </view>
         <view className='Option'>
           <view>

src/pages/index/addedValueService/formData.js

@@ -15,9 +15,9 @@ const questions = [
     resultId: null,
     options: [
       { name: '毛坯', id: 1 },
-      { name: '旧房装修5年以内', id: 2 },
-      { name: '旧房装修5-10年', id: 3 },
-      { name: '旧房装修10年以上', id: 4 }
+      { name: '旧房装修\n5年以内', id: 2 },
+      { name: '旧房装修\n5-10年', id: 3 },
+      { name: '旧房装修\n10年以上', id: 4 }
     ]
   },
   {
@@ -46,9 +46,9 @@ const questions = [
     options: [
       { name: '只做设计', id: 1 },
       { name: '材料全包', id: 2 },
-      { name: '包施工 不包材料', id: 3 },
-      { name: '施工包辅材 不包主材', id: 4 },
-      { name: '全包（设计/施工/主材..）', id: 5 }
+      { name: '包施工\n不包材料', id: 3 },
+      { name: '施工包辅材\n不包主材', id: 4 },
+      { name: '全包（设计\n/施工/主材..）', id: 5 }
     ]
   },
   {
@@ -93,10 +93,10 @@ const questions = [
     result: [],
     resultId: null,
     options: [
-      { name: '设计凸显个性', id: 1, selected: false },
-      { name: '智能家居齐全', id: 2, selected: false },
-      { name: '强大的收纳功能', id: 3, selected: false },
-      { name: '方便清洁和整理', id: 4, selected: false },
+      { name: '设计凸显\n个性', id: 1, selected: false },
+      { name: '智能家居\n齐全', id: 2, selected: false },
+      { name: '强大的\n收纳功能', id: 3, selected: false },
+      { name: '方便清洁\n和整理', id: 4, selected: false },
       { name: '温馨舒适', id: 5, selected: false },
       { name: '品质生活', id: 6, selected: false },
       { name: '其他', id: 7, selected: false }
@@ -129,11 +129,11 @@ const questions = [
     resultId: null,
     options: [
       { name: '会', id: 1 },
-      { name: '非常实用高效', id: 2 },
-      { name: '会选择感兴趣部分', id: 3 },
+      { name: '非常实用\n高效', id: 2 },
+      { name: '会选择感\n兴趣部分', id: 3 },
       { name: '不会选择', id: 4 },
-      { name: '新奇多过实用', id: 5 },
-      { name: '暂时不了解智能家居', id: 6 },
+      { name: '新奇多过\n实用', id: 5 },
+      { name: '暂时不了解\n智能家居', id: 6 },
       { name: '其他', id: 7 }
     ]
   }

src/pages/index/addedValueService/index.jsx

@@ -4,6 +4,7 @@ import { Image, Slider, Textarea, ScrollView } from '@tarojs/components'
 import { fetch } from '@/utils/request'
 import { API_HELP_FIND_HOUSE_SUBMIT } from '@/constants/api'
 import { useSelector } from 'react-redux'
+import Taro from '@tarojs/taro'
 import './index.scss'
 import questions from './formData'
 import SubmitBuyHouseResult from '../helpToFindHouse/components/SubmitBuyHouseResult/index'
@@ -36,7 +37,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 !== '' ? item.result * 10000 : 5000000 })
+        params.push({ ...item, key: 'maxPrice', result: item.result !== '' ? item.result * 10000 : 10000000 })
       } else {
         if (item.result !== '' || item.resultId !== null) {
           params.push(item)
@@ -49,7 +50,7 @@ export default function AddedValueService () {
       payload[item.key] = item.result || item.resultId
     })
     fetch({ url: API_HELP_FIND_HOUSE_SUBMIT, method: 'post', payload: { ...payload, questionnaire: JSON.stringify(params), type: 4 } }).then((res) => {
-      setResultList(res.taBuildingList || [])
+      setResultList(res?.taBuildingList || [])
       setShowPopup(true)
     })
   }
@@ -90,20 +91,34 @@ export default function AddedValueService () {
   }
 
   const NextStep = () => {
-    if (StepId < 4) {
-      setStepId(StepId + 1)
-    } else {
-      let Arr = [...FormData]
-      Arr.map((item) => {
-        if (item.type === 'checkboxs') {
-          item.options.map((subItem) => {
-            if (subItem.selected) {
-              item.result.push(subItem.name)
-            }
-          })
+    let Bool = true
+    let IndexArr = []
+    FormData.map((item, index) => {
+      if(index >= StepRange[0] && index < StepRange[1]) {
+        if(!!item.required && item.result === '') {
+          Bool = false
+          IndexArr.push(index)
         }
-      })
-      SubmitForm(Arr)
+      }
+    })
+    if(Bool) {
+      if (StepId < 4) {
+        setStepId(StepId + 1)
+      } else {
+        let Arr = [...FormData]
+        Arr.map((item) => {
+          if (item.type === 'checkboxs') {
+            item.options.map((subItem) => {
+              if (subItem.selected) {
+                item.result.push(subItem.name)
+              }
+            })
+          }
+        })
+        SubmitForm(Arr)
+      }
+    } else {
+      Taro.showToast({title: `请选择${FormData[IndexArr[0]].question}`, icon: 'none'})
     }
   }
 
@@ -114,79 +129,83 @@ export default function AddedValueService () {
   }
 
   return (
-    <view className='components AddedValueService'>
+    <view className='components AddedValueService flex-v'>
       {
         ShowPopup &&
-        <SubmitBuyHouseResult List={ResultList.slice(0, 1)} ShowResult={false}></SubmitBuyHouseResult>
+        <SubmitBuyHouseResult List={ResultList} ShowResult={false}></SubmitBuyHouseResult>
       }
-      <ScrollView scroll-y>
-        <view className='PageContent'>
-          {
-            FormData.map((item, index) => (
-              <view className='Step' key={`Form-${index}`}>
-                {
-                  index >= StepRange[0] && index < StepRange[1] &&
-                  <view>
-                    <text>{item.question}</text>
+      <view className='flex-item'>
+        <view>
+          <ScrollView scrollY>
+            <view className='SubContent'>
+              {
+                FormData.map((item, index) => (
+                  <view className='Step' key={`Form-${index}`}>
                     {
-                      item.type === 'checkboxs' &&
-                      <view className='CheckList'>
+                      index >= StepRange[0] && index < StepRange[1] &&
+                      <view>
+                        <text>{item.question}</text>
                         {
-                          item.options.map((subItem, subIndex) => (
-                            <view key={`${item.key}-${subIndex}`} className={subItem.selected ? 'active' : ''} onClick={CutCheckboxs(index, subItem, subIndex)}>
-                              <text>{subItem.name}</text>
-                              <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
-                            </view>
-                          ))
+                          item.type === 'checkboxs' &&
+                          <view className='CheckList'>
+                            {
+                              item.options.map((subItem, subIndex) => (
+                                <view key={`${item.key}-${subIndex}`} className={subItem.selected ? 'active' : ''} onClick={CutCheckboxs(index, subItem, subIndex)}>
+                                  <text className='centerLabel'>{subItem.name}</text>
+                                  <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
+                                </view>
+                              ))
+                            }
+                          </view>
+                        }
+                        {
+                          item.type === 'checkbox' &&
+                          <view className='CheckList'>
+                            {
+                              item.options.map((subItem, subIndex) => (
+                                <view key={`${item.key}-${subIndex}`} className={item.resultId === subItem.id ? 'active' : ''} onClick={CutCheckbox(subItem, index)}>
+                                  <text className='centerLabel'>{subItem.name}</text>
+                                  <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
+                                </view>
+                              ))
+                            }
+                          </view>
+                        }
+                        {
+                          item.type === 'checkbox' && item.remark !== undefined &&
+                          <view className='Textarea'>
+                            <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { remarkInput(e, index) }} />
+                          </view>
                         }
-                      </view>
-                    }
-                    {
-                      item.type === 'checkbox' &&
-                      <view className='CheckList'>
                         {
-                          item.options.map((subItem, subIndex) => (
-                            <view key={`${item.key}-${subIndex}`} className={item.resultId === subItem.id ? 'active' : ''} onClick={CutCheckbox(subItem, index)}>
-                              <text>{subItem.name}</text>
-                              <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
+                          item.type === 'range' &&
+                          <view className='RangeList flex-h'>
+                            <view className='flex-item'>
+                              <Slider activeColor='#193C83' block-color='#fff' value={item.result - 0} onChange={(e) => { Rangehange(e, index) }} min={item.options[0]} max={item.options[1]} show-value />
                             </view>
-                          ))
+                            <text>万</text>
+                          </view>
+                        }
+                        {
+                          item.type === 'textarea' &&
+                          <view className='Textarea'>
+                            <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { textareaInput(e, index) }} />
+                          </view>
                         }
-                      </view>
-                    }
-                    {
-                      item.type === 'checkbox' && item.remark !== undefined &&
-                      <view className='Textarea'>
-                        <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { remarkInput(e, index) }} />
-                      </view>
-                    }
-                    {
-                      item.type === 'range' &&
-                      <view className='RangeList flex-h'>
-                        <view className='flex-item'>
-                          <Slider activeColor='#193C83' block-color='#fff' onChange={(e) => { Rangehange(e, index) }} min={item.options[0]} max={item.options[1]} show-value />
-                        </view>
-                        <text>万</text>
-                      </view>
-                    }
-                    {
-                      item.type === 'textarea' &&
-                      <view className='Textarea'>
-                        <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { textareaInput(e, index) }} />
                       </view>
                     }
                   </view>
-                }
-              </view>
-            ))
-          }
-
-          <view className='Btn'>
-            <text className='active' onClick={NextStep}>下一步</text>
-            <text onClick={PrevStep}>返回</text>
-          </view>
+                ))
+              }
+            </view>
+          </ScrollView>
         </view>
-      </ScrollView>
+      </view>
+
+      <view className='Btn'>
+        <text className='active' onClick={NextStep}>下一步</text>
+        <text onClick={PrevStep}>返回</text>
+      </view>
     </view>
   )
 }

src/pages/index/addedValueService/index.scss

@@ -1,183 +1,191 @@
 .components.AddedValueService {
-  width: 100%;
-  height: 100%;
   position: relative;
   overflow: hidden;
-  > scroll-view {
-    width: 100%;
-    height: 100%;
+  margin-top: 0 !important;
+  z-index: 1;
+  height: 100%;
+  > .flex-item {
     position: relative;
-    .PageContent {
-      position: relative;
+    overflow: hidden;
+    > view {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 0;
+      bottom: 0;
       overflow: hidden;
-      padding: 0 30px;
-      > .Step {
-        position: relative;
-        overflow: hidden;
-        > view {
+      > scroll-view {
+        width: 100%;
+        height: 100%;
+        .SubContent {
           position: relative;
           overflow: hidden;
-          margin-top: 30px;
-          > text {
-            display: block;
-            font-size: 34px;
-            font-weight: bold;
-            color: #333;
-            line-height: 40px;
-            letter-spacing: 4px;
-          }
-          > view {
+          padding: 0 30px 30px;
+          >.Step {
             position: relative;
             overflow: hidden;
-            margin-top: 20px;
-          }
-          > .Area {
             > view {
-              align-items: center;
-              background: #f8f8f8;
-              border-radius: 12px;
-              padding: 24px 20px;
+              position: relative;
+              overflow: hidden;
+              margin-top: 40px;
               > text {
-                font-size: 26px;
+                display: block;
+                font-size: 30px;
+                font-weight: bold;
                 color: #333;
                 line-height: 40px;
-                margin-left: 20px;
-                &:first-child {
-                  margin-left: 0;
-                  color: #193c83;
-                }
+                letter-spacing: 4px;
               }
-            }
-          }
-          > .Purpose {
-            > view {
-              align-items: center;
-              background: #f8f8f8;
-              border-radius: 12px;
-              padding: 24px 20px;
-              > input {
-                font-size: 26px;
-                color: #333;
-                line-height: 40px;
-                display: block;
-                width: 100%;
-                background: none;
+              > view {
+                position: relative;
+                overflow: hidden;
+                margin-top: 30px;
               }
-            }
-          }
-          > .CheckList {
-            font-size: 0;
-            margin-top: 0;
-            > view {
-              display: inline-block;
-              vertical-align: middle;
-              height: 80px;
-              width: 194px;
-              box-sizing: border-box;
-              border: 2px solid #193c83;
-              border-radius: 4px;
-              margin-right: 54px;
-              position: relative;
-              overflow: hidden;
-              margin-top: 20px;
-              text-align: center;
-              &::after {
-                content: '';
-                display: inline-block;
-                vertical-align: middle;
-                width: 0;
-                height: 100%;
+              > .Area {
+                > view {
+                  align-items: center;
+                  background: #f8f8f8;
+                  border-radius: 12px;
+                  padding: 24px 20px;
+                  > text {
+                    font-size: 26px;
+                    color: #333;
+                    line-height: 40px;
+                    margin-left: 20px;
+                    &:first-child {
+                      margin-left: 0;
+                      color: #193c83;
+                    }
+                  }
+                }
               }
-              &:nth-child(3n + 3) {
-                margin-right: 0;
+              > .Purpose {
+                > view {
+                  align-items: center;
+                  background: #f8f8f8;
+                  border-radius: 12px;
+                  padding: 24px 20px;
+                  > input {
+                    font-size: 26px;
+                    color: #333;
+                    line-height: 40px;
+                    display: block;
+                    width: 100%;
+                    background: none;
+                  }
+                }
               }
-              &.active {
-                > image {
-                  display: block;
+              > .CheckList {
+                font-size: 0;
+                margin-top: 0;
+                > view {
+                  display: inline-block;
+                  vertical-align: middle;
+                  height: 80px;
+                  width: 194px;
+                  box-sizing: border-box;
+                  border: 2px solid #f8f8f8;
+                  border-radius: 8px;
+                  margin-right: 54px;
+                  position: relative;
+                  overflow: hidden;
+                  margin-top: 20px;
+                  background: #f8f8f8;
+                  &:nth-child(3n + 3) {
+                    margin-right: 0;
+                  }
+                  &.active {
+                    border: 2px solid #193c83;
+                    background: #fff;
+                    > image {
+                      display: block;
+                    }
+                  }
+                  > image {
+                    display: none;
+                    width: 36px;
+                    height: 36px;
+                    position: absolute;
+                    right: -2px;
+                    bottom: -2px;
+                  }
+                  >text {
+                    font-size: 28px;
+                    color: #333;
+                    line-height: 40px;
+                    text-align: center;
+                    width: 96%;
+                    word-break: break-all;
+                  }
                 }
               }
-              > image {
-                display: none;
-                width: 36px;
-                height: 36px;
-                position: absolute;
-                right: -2px;
-                bottom: -2px;
+              > .RangeList {
+                align-items: center;
+                > text {
+                  color: #999;
+                  font-size: 28px;
+                  transform: translateX(-30px);
+                }
               }
-              > text {
-                font-size: 30px;
-                font-weight: 600;
-                color: #333;
-                display: inline-block;
-                max-width: 96%;
-                word-break: break-all;
-                line-height: 30px;
-                vertical-align: middle;
+              > .PriceRange {
+                > view {
+                  align-items: center;
+                  background: #f8f8f8;
+                  border-radius: 12px;
+                  padding: 24px 0;
+                  > view {
+                    > input {
+                      font-size: 26px;
+                      color: #333;
+                      line-height: 40px;
+                      display: block;
+                      width: 100%;
+                      background: none;
+                      text-align: center;
+                    }
+                  }
+                }
               }
-            }
-          }
-          > .RangeList {
-            align-items: center;
-            > text {
-              color: #999;
-              font-size: 28px;
-              transform: translateX(-30px);
-            }
-          }
-          > .PriceRange {
-            > view {
-              align-items: center;
-              background: #f8f8f8;
-              border-radius: 12px;
-              padding: 24px 0;
-              > view {
-                > input {
+              > .Textarea {
+                background: #f8f8f8;
+                border-radius: 12px;
+                padding: 20px;
+                > textarea {
                   font-size: 26px;
                   color: #333;
                   line-height: 40px;
                   display: block;
                   width: 100%;
                   background: none;
-                  text-align: center;
                 }
               }
             }
           }
-          > .Textarea {
-            background: #f8f8f8;
-            border-radius: 12px;
-            padding: 20px;
-            > textarea {
-              font-size: 26px;
-              color: #333;
-              line-height: 40px;
-              display: block;
-              width: 100%;
-              background: none;
-            }
-          }
         }
       }
-      > .Btn {
-        padding: 0 30px;
-        margin: 150px auto 60px;
-        > text {
-          display: block;
-          text-align: center;
-          font-size: 32px;
-          line-height: 92px;
-          box-sizing: border-box;
-          border: 2px solid #193c83;
-          color: #193c83;
-          border-radius: 92px;
-          margin-top: 20px;
-          text-indent: 0;
-          font-weight: normal;
-          &.active {
-            background: #193c83;
-            color: #fff;
-          }
-        }
+    }
+  }
+  > .Btn {
+    padding: 0 30px 20px;
+    background: #fff;
+    box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.03);
+    position: relative;
+    z-index: 2;
+    > text {
+      display: block;
+      text-align: center;
+      font-size: 32px;
+      line-height: 92px;
+      box-sizing: border-box;
+      border: 2px solid #193c83;
+      color: #193c83;
+      border-radius: 92px;
+      margin-top: 20px;
+      text-indent: 0;
+      font-weight: normal;
+      &.active {
+        background: #193c83;
+        color: #fff;
       }
     }
   }

src/pages/index/buildingAround/index.jsx

@@ -14,7 +14,7 @@ export default withLayout((props) => {
   const [DetailInfo, setDetailInfo] = useState({})
   const [loc, setLoc] = useState([])
   const [NavList, setNavList] = useState([])
-  const [CurrentNavId, setCurrentNavId] = useState(1)
+  const [CurrentNavId, setCurrentNavId] = useState(0)
   const [List, setList] = useState([])
   const [OtherList, setOtherList] = useState([])
   const [markers, setMarkers] = useState([])

src/pages/index/buildingList/components/FilterForPrice/index.jsx

@@ -21,13 +21,13 @@ export default function FilterForPrice (props) {
   ])
   const [TotalList] = useState([
     { name: '不限', id: '-' },
-    { name: '100万以下', id: '0-1000000' },
-    { name: '100-150万', id: '1000000-1500000' },
-    { name: '150-200万', id: '1500000-2000000' },
-    { name: '200-250万', id: '2000000-2500000' },
-    { name: '250-500万', id: '2500000-5000000' },
-    { name: '500-1000万', id: '5000000-10000000' },
-    { name: '1000万以上', id: '10000000-' },
+    { name: '100万以下', id: '0-100' },
+    { name: '100-150万', id: '100-150' },
+    { name: '150-200万', id: '150-200' },
+    { name: '200-250万', id: '200-250' },
+    { name: '250-500万', id: '250-500' },
+    { name: '500-1000万', id: '500-1000' },
+    { name: '1000万以上', id: '1000-' },
   ])
   const [CurrentId, setCurrentId] = useState(price || '-')
 

src/pages/index/buildingList/index.jsx

@@ -147,6 +147,7 @@ export default withLayout((props) => {
     for (let key in e) {
       Data[key] = e[key]
     }
+    console.log(Data)
     setFilterData({...Data})
   }
 

src/pages/index/buildingTakeLook/index.jsx

@@ -59,7 +59,7 @@ export default withLayout((props) => {
             </view>
 
             <view className='CountDown'>
-              <text>距离结束还有</text>
+              <text>距离报名结束还有</text>
               <text className='Red'>7</text>
               <text>天</text>
               <text className='Number' style={{ marginLeft: '40rpx' }}>7</text>

src/pages/index/components/ActivityListItem/index.jsx

@@ -38,7 +38,7 @@ export default function ActivityListItem (props) {
           <text className={activityStatusDict[data.activityStatus]?.className}>{activityStatusDict[data.activityStatus]?.text}</text>
         </view>
         <view className='Time'>
-          <text>活动时间：{formatDate(data.startDate, 'yyyy/M/d')} - {formatDate(data.endDate, 'yyyy/M/d')}</text>
+          <text>报名时间：{formatDate(data.enlistStart, 'yyyy/MM/dd')} - {formatDate(data.enlistEnd, 'yyyy/MM/dd')}</text>
         </view>
       </view>
     </view>

src/pages/index/helpToFindHouse/components/BuyHouse/formData.js

@@ -3,9 +3,9 @@ const questions = [
     question: '你的购房预算是多少？',
     key: 'budget',
     type: 'range',
-    result: '',
+    result: 300,
     resultId: null,
-    options: [100, 500]
+    options: [100, 2000]
   },
   {
     question: '你想购买的是新房还是二手房？',
@@ -20,20 +20,20 @@ const questions = [
     ]
   },
   {
-    question: '你想住几居室的房子？',
-    key: 'layout',
+    question: '你想买多大面积？',
+    key: 'area',
     type: 'checkbox',
     result: '',
     resultId: null,
+    required: true,
     options: [
-      { name: '一室一厅', id: 1 },
-      { name: '二室一厅', id: 2 },
-      { name: '二室二厅', id: 3 },
-      { name: '三室一厅', id: 4 },
-      { name: '三室二厅', id: 5 },
-      { name: '四室一厅', id: 6 },
-      { name: '四室二厅', id: 7 },
-      { name: '五室及以上', id: 8 }
+      { name: '60㎡以下', id: 1 },
+      { name: '60-90㎡', id: 2 },
+      { name: '90-110㎡', id: 3 },
+      { name: '110-130㎡', id: 4 },
+      { name: '130-150㎡', id: 5 },
+      { name: '150-200㎡', id: 6 },
+      { name: '200㎡以上', id: 7 }
     ]
   },
   {
@@ -62,8 +62,8 @@ const questions = [
   {
     question: '你更注重项目的哪些优势？',
     key: 'advantage',
-    type: 'checkbox',
-    result: '',
+    type: 'checkboxs',
+    result: [],
     resultId: null,
     options: [
       { name: '发展规划', id: 1 },
@@ -76,8 +76,8 @@ const questions = [
   {
     question: '你对小区物业管理和社区设施有什么要求？',
     key: 'facility',
-    type: 'checkbox',
-    result: '',
+    type: 'checkboxs',
+    result: [],
     resultId: null,
     remark: '',
     options: [
@@ -87,20 +87,22 @@ const questions = [
       { name: '会所功能', id: 4 }
     ]
   },
+  // 不要轻易修改此处的字典设置, 必须要跟 java 端保持一致
   {
-    question: '你想买多大面积？',
-    key: 'area',
+    question: '你想住几居室的房子？',
+    key: 'layout',
     type: 'checkbox',
     result: '',
     resultId: null,
     options: [
-      { name: '60㎡以下', id: 1 },
-      { name: '60-90㎡', id: 2 },
-      { name: '90-110㎡', id: 3 },
-      { name: '110-130㎡', id: 4 },
-      { name: '130-150㎡', id: 5 },
-      { name: '150-200㎡', id: 6 },
-      { name: '200㎡以上', id: 7 }
+      { name: '一室一厅', id: 1 },
+      { name: '二室一厅', id: 2 },
+      { name: '二室二厅', id: 3 },
+      { name: '三室一厅', id: 4 },
+      { name: '三室二厅', id: 5 },
+      { name: '四室一厅', id: 6 },
+      { name: '四室二厅', id: 7 },
+      { name: '五室及以上', id: 8 }
     ]
   },
   {
@@ -114,7 +116,8 @@ const questions = [
       { name: '朝南', id: 2 },
       { name: '朝西', id: 3 },
       { name: '朝北', id: 4 },
-      { name: '南北通透', id: 5 }
+      { name: '南北通透', id: 5 },
+      { name: '都可以', id: 6 }
     ]
   },
   {

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

@@ -1,14 +1,14 @@
 import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
-import { Image, Slider, Textarea } from '@tarojs/components'
+import { Image, Slider, Textarea, ScrollView } from '@tarojs/components'
+import Taro from '@tarojs/taro'
 import './index.scss'
 import questions from './formData'
 
 export default function BuyHouse (props) {
-  const { change = () => { }, toSubmit = () => { }, AreaInfo = {}, selectArea = () => {} } = props
+  const { children = null, change = () => { }, toSubmit = () => { }, AreaInfo = {}, selectArea = () => { } } = props
 
   const [FormData, setFormData] = useState(questions)
-
   const [StepId, setStepId] = useState(1)
   const [StepRange, setStepRange] = useState([0, 4])
 
@@ -25,6 +25,14 @@ export default function BuyHouse (props) {
     change(StepId)
   }, [StepId])
 
+  const CutCheckboxs = (index, subItem, subIndex) => {
+    return () => {
+      let newFormData = [...FormData]
+      newFormData[index].options[subIndex].selected = !subItem.selected
+      setFormData([...newFormData])
+    }
+  }
+
   const CutCheckbox = (item, index) => {
     return () => {
       let newFormData = [...FormData]
@@ -53,10 +61,24 @@ export default function BuyHouse (props) {
   }
 
   const NextStep = () => {
-    if (StepId < 4) {
-      setStepId(StepId + 1)
+    let Bool = true
+    let IndexArr = []
+    FormData.map((item, index) => {
+      if (index >= StepRange[0] && index < StepRange[1]) {
+        if (!!item.required && item.result === '') {
+          Bool = false
+          IndexArr.push(index)
+        }
+      }
+    })
+    if (Bool) {
+      if (StepId < 4) {
+        setStepId(StepId + 1)
+      } else {
+        toSubmit(FormData)
+      }
     } else {
-      toSubmit(FormData)
+      Taro.showToast({ title: `请选择${FormData[IndexArr[0]].question}`, icon: 'none' })
     }
   }
 
@@ -67,67 +89,91 @@ export default function BuyHouse (props) {
   }
 
   return (
-    <view className='components BuyHouse'>
-      {
-        FormData.map((item, index) => (
-          <view className='Step' key={`Form-${index}`}>
-            {
-              index >= StepRange[0] && index < StepRange[1] &&
-              <view>
-                <text>{item.question}</text>
-                {
-                  item.type === 'checkbox' &&
-                  <view className='CheckList'>
+    <view className='components BuyHouse flex-v'>
+      <view className='flex-item'>
+        <view>
+          <ScrollView scrollY>
+            <view className='SubContent'>
+              {
+                children
+              }
+              {
+                FormData.map((item, index) => (
+                  <view className='Step' key={`Form-${index}`}>
                     {
-                      item.options.map((subItem, subIndex) => (
-                        <view key={`${item.key}-${subIndex}`} className={item.resultId === subItem.id ? 'active' : ''} onClick={CutCheckbox(subItem, index)}>
-                          {subItem.name}
-                          <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
-                        </view>
-                      ))
+                      index >= StepRange[0] && index < StepRange[1] &&
+                      <view>
+                        <text>{item.question}</text>
+                        {
+                          item.type === 'checkboxs' &&
+                          <view className='CheckList'>
+                            {
+                              item.options.map((subItem, subIndex) => (
+                                <view key={`${item.key}-${subIndex}`} className={subItem.selected ? 'active' : ''} onClick={CutCheckboxs(index, subItem, subIndex)}>
+                                  <text>{subItem.name}</text>
+                                  <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
+                                </view>
+                              ))
+                            }
+                          </view>
+                        }
+                        {
+                          item.type === 'checkbox' &&
+                          <view className='CheckList'>
+                            {
+                              item.options.map((subItem, subIndex) => (
+                                <view key={`${item.key}-${subIndex}`} className={item.resultId === subItem.id ? 'active' : ''} onClick={CutCheckbox(subItem, index)}>
+                                  {subItem.name}
+                                  <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
+                                </view>
+                              ))
+                            }
+                          </view>
+                        }
+                        {
+                          item.type === 'checkbox' && item.remark !== undefined &&
+                          <view className='Textarea'>
+                            <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { remarkInput(e, index) }} />
+                          </view>
+                        }
+                        {
+                          item.type === 'range' &&
+                          <view className='RangeList flex-h'>
+                            <view className='flex-item'>
+                              <Slider activeColor='#193C83' block-color='#fff' value={item.result - 0} onChange={(e) => { Rangehange(e, index) }} min={item.options[0]} max={item.options[1]} show-value />
+                            </view>
+                            <text>万</text>
+                          </view>
+                        }
+                        {
+                          item.type === 'select' &&
+                          <view className='Area'>
+                            <view className='flex-h' onClick={selectArea}>
+                              {
+                                item.key === 'intentArea' &&
+                                <text className='iconfont icon-dingwei'></text>
+                              }
+                              <text>{AreaInfo.name || '不限'}</text>
+                              <view className='flex-item'></view>
+                              <text className='iconfont icon-jiantoudown'></text>
+                            </view>
+                          </view>
+                        }
+                        {
+                          item.type === 'textarea' &&
+                          <view className='Textarea'>
+                            <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { textareaInput(e, index) }} />
+                          </view>
+                        }
+                      </view>
                     }
                   </view>
-                }
-                {
-                  item.type === 'checkbox' && item.remark !== undefined &&
-                  <view className='Textarea'>
-                    <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { remarkInput(e, index) }} />
-                  </view>
-                }
-                {
-                  item.type === 'range' &&
-                  <view className='RangeList flex-h'>
-                    <view className='flex-item'>
-                      <Slider activeColor='#193C83' block-color='#fff' onChange={(e) => { Rangehange(e, index) }} min={item.options[0]} max={item.options[1]} show-value />
-                    </view>
-                    <text>万</text>
-                  </view>
-                }
-                {
-                  item.type === 'select' &&
-                  <view className='Area'>
-                    <view className='flex-h' onClick={selectArea}>
-                      {
-                        item.key === 'intentArea' &&
-                        <text className='iconfont icon-dingwei'></text>
-                      }
-                      <text>{AreaInfo.name || '不限'}</text>
-                      <view className='flex-item'></view>
-                      <text className='iconfont icon-jiantoudown'></text>
-                    </view>
-                  </view>
-                }
-                {
-                  item.type === 'textarea' &&
-                  <view className='Textarea'>
-                    <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { textareaInput(e, index) }} />
-                  </view>
-                }
-              </view>
-            }
-          </view>
-        ))
-      }
+                ))
+              }
+            </view>
+          </ScrollView>
+        </view>
+      </view>
 
       <view className='Btn'>
         <text className='active' onClick={NextStep}>下一步</text>

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

@@ -3,144 +3,171 @@
   overflow: hidden;
   margin-top: 0 !important;
   z-index: 1;
-  > .Step {
+  height: 100%;
+  > .flex-item {
     position: relative;
     overflow: hidden;
     > view {
-      position: relative;
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 0;
+      bottom: 0;
       overflow: hidden;
-      margin-top: 36px;
-      > text {
-        display: block;
-        font-size: 34px;
-        font-weight: bold;
-        color: #333;
-        line-height: 40px;
-        letter-spacing: 4px;
-      }
-      > view {
-        position: relative;
-        overflow: hidden;
-        margin-top: 30px;
-      }
-      > .Area {
-        > view {
-          align-items: center;
-          background: #f8f8f8;
-          border-radius: 12px;
-          padding: 24px 20px;
-          > text {
-            font-size: 26px;
-            color: #333;
-            line-height: 40px;
-            margin-left: 20px;
-            &:first-child {
-              margin-left: 0;
-              color: #193c83;
-            }
-          }
-        }
-      }
-      > .Purpose {
-        > view {
-          align-items: center;
-          background: #f8f8f8;
-          border-radius: 12px;
-          padding: 24px 20px;
-          > input {
-            font-size: 26px;
-            color: #333;
-            line-height: 40px;
-            display: block;
-            width: 100%;
-            background: none;
-          }
-        }
-      }
-      > .CheckList {
-        font-size: 0;
-        margin-top: 0;
-        > view {
-          display: inline-block;
-          vertical-align: middle;
-          font-size: 30px;
-          font-weight: 600;
-          color: #333;
-          line-height: 40px;
-          padding: 20px 0;
-          min-width: 194px;
-          box-sizing: border-box;
-          white-space: nowrap;
-          text-align: center;
-          border: 2px solid #193c83;
-          border-radius: 4px;
-          margin-right: 54px;
+      > scroll-view {
+        width: 100%;
+        height: 100%;
+        .SubContent {
           position: relative;
           overflow: hidden;
-          margin-top: 20px;
-          &:nth-child(3n+3) {
-            margin-right: 0;
-          }
-          &.active {
-            > image {
-              display: block;
-            }
-          }
-          > image {
-            display: none;
-            width: 36px;
-            height: 36px;
-            position: absolute;
-            right: -2px;
-            bottom: -2px;
-          }
-        }
-      }
-      >.RangeList {
-        align-items: center;
-        >text {
-          color: #999;
-          font-size: 28px;
-          transform: translateX(-30px);
-        }
-      }
-      > .PriceRange {
-        > view {
-          align-items: center;
-          background: #f8f8f8;
-          border-radius: 12px;
-          padding: 24px 0;
-          > view {
-            > input {
-              font-size: 26px;
-              color: #333;
-              line-height: 40px;
-              display: block;
-              width: 100%;
-              background: none;
-              text-align: center;
+          padding: 0 30px 30px;
+          >.Step {
+            position: relative;
+            overflow: hidden;
+            > view {
+              position: relative;
+              overflow: hidden;
+              margin-top: 40px;
+              > text {
+                display: block;
+                font-size: 30px;
+                font-weight: bold;
+                color: #333;
+                line-height: 40px;
+                letter-spacing: 4px;
+              }
+              > view {
+                position: relative;
+                overflow: hidden;
+                margin-top: 30px;
+              }
+              > .Area {
+                > view {
+                  align-items: center;
+                  background: #f8f8f8;
+                  border-radius: 12px;
+                  padding: 24px 20px;
+                  > text {
+                    font-size: 26px;
+                    color: #333;
+                    line-height: 40px;
+                    margin-left: 20px;
+                    &:first-child {
+                      margin-left: 0;
+                      color: #193c83;
+                    }
+                  }
+                }
+              }
+              > .Purpose {
+                > view {
+                  align-items: center;
+                  background: #f8f8f8;
+                  border-radius: 12px;
+                  padding: 24px 20px;
+                  > input {
+                    font-size: 26px;
+                    color: #333;
+                    line-height: 40px;
+                    display: block;
+                    width: 100%;
+                    background: none;
+                  }
+                }
+              }
+              > .CheckList {
+                font-size: 0;
+                margin-top: 0;
+                > view {
+                  display: inline-block;
+                  vertical-align: middle;
+                  font-size: 28px;
+                  color: #333;
+                  line-height: 40px;
+                  padding: 20px 0;
+                  min-width: 156px;
+                  box-sizing: border-box;
+                  white-space: nowrap;
+                  text-align: center;
+                  border: 2px solid #f8f8f8;
+                  border-radius: 8px;
+                  margin-right: 20px;
+                  position: relative;
+                  overflow: hidden;
+                  margin-top: 20px;
+                  background: #f8f8f8;
+                  &:nth-child(4n + 4) {
+                    margin-right: 0;
+                  }
+                  &.active {
+                    border: 2px solid #193c83;
+                    background: #fff;
+                    > image {
+                      display: block;
+                    }
+                  }
+                  > image {
+                    display: none;
+                    width: 36px;
+                    height: 36px;
+                    position: absolute;
+                    right: -2px;
+                    bottom: -2px;
+                  }
+                }
+              }
+              > .RangeList {
+                align-items: center;
+                > text {
+                  color: #999;
+                  font-size: 28px;
+                  transform: translateX(-30px);
+                }
+              }
+              > .PriceRange {
+                > view {
+                  align-items: center;
+                  background: #f8f8f8;
+                  border-radius: 12px;
+                  padding: 24px 0;
+                  > view {
+                    > input {
+                      font-size: 26px;
+                      color: #333;
+                      line-height: 40px;
+                      display: block;
+                      width: 100%;
+                      background: none;
+                      text-align: center;
+                    }
+                  }
+                }
+              }
+              > .Textarea {
+                background: #f8f8f8;
+                border-radius: 12px;
+                padding: 20px;
+                > textarea {
+                  font-size: 26px;
+                  color: #333;
+                  line-height: 40px;
+                  display: block;
+                  width: 100%;
+                  background: none;
+                }
+              }
             }
           }
         }
       }
-      >.Textarea {
-        background: #f8f8f8;
-        border-radius: 12px;
-        padding: 20px;
-        >textarea {
-          font-size: 26px;
-          color: #333;
-          line-height: 40px;
-          display: block;
-          width: 100%;
-          background: none;
-        }
-      }
     }
   }
-  >.Btn {
-    padding: 0 30px;
-    margin: 74px auto 60px;
+  > .Btn {
+    padding: 0 30px 20px;
+    background: #fff;
+    box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.03);
+    position: relative;
+    z-index: 2;
     > text {
       display: block;
       text-align: center;

src/pages/index/helpToFindHouse/components/HousePurchasing/formData.js

@@ -12,7 +12,7 @@ const questions = [
     type: 'range',
     result: '',
     resultId: null,
-    options: [100, 500]
+    options: [100, 2000]
   },
   {
     question: '优先选择的房屋类型是？',

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

@@ -1,11 +1,12 @@
 import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
-import { Image, Slider, Textarea } from '@tarojs/components'
+import { Image, Slider, Textarea, ScrollView } from '@tarojs/components'
+import Taro from '@tarojs/taro'
 import './index.scss'
 import questions from './formData'
 
 export default function HousePurchasing (props) {
-  const { change = () => { }, toSubmit = () => {}, AreaInfo = {}, selectArea = () => {} } = props
+  const { children = null, change = () => { }, toSubmit = () => {}, AreaInfo = {}, selectArea = () => {} } = props
 
   const [FormData, setFormData] = useState(questions)
 
@@ -47,10 +48,24 @@ export default function HousePurchasing (props) {
   }
 
   const NextStep = () => {
-    if (StepId < 1) {
-      setStepId(StepId + 1)
+    let Bool = true
+    let IndexArr = []
+    FormData.map((item, index) => {
+      if(index >= StepRange[0] && index < StepRange[1]) {
+        if(!!item.required && item.result === '') {
+          Bool = false
+          IndexArr.push(index)
+        }
+      }
+    })
+    if(Bool) {
+      if (StepId < 1) {
+        setStepId(StepId + 1)
+      } else {
+        toSubmit(FormData)
+      }
     } else {
-      toSubmit(FormData)
+      Taro.showToast({title: `请选择${FormData[IndexArr[0]].question}`, icon: 'none'})
     }
   }
 
@@ -61,67 +76,78 @@ export default function HousePurchasing (props) {
   }
 
   return (
-    <view className='components BuyHouse'>
-      {
-        FormData.map((item, index) => (
-          <view className='Step' key={`Form-${index}`}>
-            {
-              index >= StepRange[0] && index < StepRange[1] &&
-              <view>
-                <text>{item.question}</text>
-                {
-                  item.type === 'checkbox' &&
-                  <view className='CheckList'>
+    <view className='components BuyHouse flex-v'>
+      <view className='flex-item'>
+        <view>
+          <ScrollView scrollY>
+            <view className='SubContent'>
+              {
+                children
+              }
+              {
+                FormData.map((item, index) => (
+                  <view className='Step' key={`Form-${index}`}>
                     {
-                      item.options.map((subItem, subIndex) => (
-                        <view key={`${item.key}-${subIndex}`} className={item.resultId === subItem.id ? 'active' : ''} onClick={CutCheckbox(subItem, index)}>
-                          {subItem.name}
-                          <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
-                        </view>
-                      ))
+                      index >= StepRange[0] && index < StepRange[1] &&
+                      <view>
+                        <text>{item.question}</text>
+                        {
+                          item.type === 'checkbox' &&
+                          <view className='CheckList'>
+                            {
+                              item.options.map((subItem, subIndex) => (
+                                <view key={`${item.key}-${subIndex}`} className={item.resultId === subItem.id ? 'active' : ''} onClick={CutCheckbox(subItem, index)}>
+                                  {subItem.name}
+                                  <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
+                                </view>
+                              ))
+                            }
+                          </view>
+                        }
+                        {
+                          item.type === 'checkbox' && item.remark !== undefined &&
+                          <view className='Textarea'>
+                            <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { remarkInput(e, index) }} />
+                          </view>
+                        }
+                        {
+                          item.type === 'range' &&
+                          <view className='RangeList flex-h'>
+                            <view className='flex-item'>
+                              <Slider activeColor='#193C83' block-color='#fff' value={item.result - 0} onChange={(e) => { Rangehange(e, index) }} min={item.options[0]} max={item.options[1]} show-value />
+                            </view>
+                            <text>万</text>
+                          </view>
+                        }
+                        {
+                          item.type === 'select' &&
+                          <view className='Area'>
+                            <view className='flex-h' onClick={selectArea}>
+                              {
+                                item.key === 'intentArea' &&
+                                <text className='iconfont icon-dingwei'></text>
+                              }
+                              <text>{AreaInfo.name || '不限'}</text>
+                              <view className='flex-item'></view>
+                              <text className='iconfont icon-jiantoudown'></text>
+                            </view>
+                          </view>
+                        }
+                        {
+                          item.type === 'textarea' &&
+                          <view className='Textarea'>
+                            <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { textareaInput(e, index) }} />
+                          </view>
+                        }
+                      </view>
                     }
                   </view>
-                }
-                {
-                  item.type === 'checkbox' && item.remark !== undefined &&
-                  <view className='Textarea'>
-                    <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => {remarkInput(e, index)}} />
-                  </view>
-                }
-                {
-                  item.type === 'range' &&
-                  <view className='RangeList flex-h'>
-                    <view className='flex-item'>
-                      <Slider activeColor='#193C83' block-color='#fff' onChange={(e) => { Rangehange(e, index) }} min={item.options[0]} max={item.options[1]} show-value />
-                    </view>
-                    <text>万</text>
-                  </view>
-                }
-                {
-                  item.type === 'select' &&
-                  <view className='Area'>
-                    <view className='flex-h' onClick={selectArea}>
-                      {
-                        item.key === 'district' &&
-                        <text className='iconfont icon-dingwei'></text>
-                      }
-                      <text>{AreaInfo.name || '不限'}</text>
-                      <view className='flex-item'></view>
-                      <text className='iconfont icon-jiantoudown'></text>
-                    </view>
-                  </view>
-                }
-                {
-                  item.type === 'textarea' &&
-                  <view className='Textarea'>
-                    <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => {textareaInput(e, index)}} />
-                  </view>
-                }
-              </view>
-            }
-          </view>
-        ))
-      }
+                ))
+              }
+            </view>
+          </ScrollView>
+        </view>
+      </view>
 
       <view className='Btn'>
         <text className='active' onClick={NextStep}>下一步</text>

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

@@ -1,146 +1,173 @@
-.components.HousePurchasing {
+.components.BuyHouse {
   position: relative;
   overflow: hidden;
   margin-top: 0 !important;
   z-index: 1;
-  > .Step {
+  height: 100%;
+  > .flex-item {
     position: relative;
     overflow: hidden;
     > view {
-      position: relative;
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 0;
+      bottom: 0;
       overflow: hidden;
-      margin-top: 36px;
-      > text {
-        display: block;
-        font-size: 34px;
-        font-weight: bold;
-        color: #333;
-        line-height: 40px;
-        letter-spacing: 4px;
-      }
-      > view {
-        position: relative;
-        overflow: hidden;
-        margin-top: 30px;
-      }
-      > .Area {
-        > view {
-          align-items: center;
-          background: #f8f8f8;
-          border-radius: 12px;
-          padding: 24px 20px;
-          > text {
-            font-size: 26px;
-            color: #333;
-            line-height: 40px;
-            margin-left: 20px;
-            &:first-child {
-              margin-left: 0;
-              color: #193c83;
-            }
-          }
-        }
-      }
-      > .Purpose {
-        > view {
-          align-items: center;
-          background: #f8f8f8;
-          border-radius: 12px;
-          padding: 24px 20px;
-          > input {
-            font-size: 26px;
-            color: #333;
-            line-height: 40px;
-            display: block;
-            width: 100%;
-            background: none;
-          }
-        }
-      }
-      > .CheckList {
-        font-size: 0;
-        margin-top: 0;
-        > view {
-          display: inline-block;
-          vertical-align: middle;
-          font-size: 30px;
-          font-weight: 600;
-          color: #333;
-          line-height: 40px;
-          padding: 20px 0;
-          min-width: 194px;
-          box-sizing: border-box;
-          white-space: nowrap;
-          text-align: center;
-          border: 2px solid #193c83;
-          border-radius: 4px;
-          margin-right: 54px;
+      > scroll-view {
+        width: 100%;
+        height: 100%;
+        .SubContent {
           position: relative;
           overflow: hidden;
-          margin-top: 20px;
-          &:nth-child(3n+3) {
-            margin-right: 0;
-          }
-          &.active {
-            > image {
-              display: block;
-            }
-          }
-          > image {
-            display: none;
-            width: 36px;
-            height: 36px;
-            position: absolute;
-            right: -2px;
-            bottom: -2px;
-          }
-        }
-      }
-      >.RangeList {
-        align-items: center;
-        >text {
-          color: #999;
-          font-size: 28px;
-          transform: translateX(-30px);
-        }
-      }
-      > .PriceRange {
-        > view {
-          align-items: center;
-          background: #f8f8f8;
-          border-radius: 12px;
-          padding: 24px 0;
-          > view {
-            > input {
-              font-size: 26px;
-              color: #333;
-              line-height: 40px;
-              display: block;
-              width: 100%;
-              background: none;
-              text-align: center;
+          padding: 0 30px 30px;
+          >.Step {
+            position: relative;
+            overflow: hidden;
+            > view {
+              position: relative;
+              overflow: hidden;
+              margin-top: 40px;
+              > text {
+                display: block;
+                font-size: 30px;
+                font-weight: bold;
+                color: #333;
+                line-height: 40px;
+                letter-spacing: 4px;
+              }
+              > view {
+                position: relative;
+                overflow: hidden;
+                margin-top: 30px;
+              }
+              > .Area {
+                > view {
+                  align-items: center;
+                  background: #f8f8f8;
+                  border-radius: 12px;
+                  padding: 24px 20px;
+                  > text {
+                    font-size: 26px;
+                    color: #333;
+                    line-height: 40px;
+                    margin-left: 20px;
+                    &:first-child {
+                      margin-left: 0;
+                      color: #193c83;
+                    }
+                  }
+                }
+              }
+              > .Purpose {
+                > view {
+                  align-items: center;
+                  background: #f8f8f8;
+                  border-radius: 12px;
+                  padding: 24px 20px;
+                  > input {
+                    font-size: 26px;
+                    color: #333;
+                    line-height: 40px;
+                    display: block;
+                    width: 100%;
+                    background: none;
+                  }
+                }
+              }
+              > .CheckList {
+                font-size: 0;
+                margin-top: 0;
+                > view {
+                  display: inline-block;
+                  vertical-align: middle;
+                  font-size: 28px;
+                  color: #333;
+                  line-height: 40px;
+                  padding: 20px 0;
+                  min-width: 156px;
+                  box-sizing: border-box;
+                  white-space: nowrap;
+                  text-align: center;
+                  border: 2px solid #f8f8f8;
+                  border-radius: 8px;
+                  margin-right: 20px;
+                  position: relative;
+                  overflow: hidden;
+                  margin-top: 20px;
+                  background: #f8f8f8;
+                  &:nth-child(4n + 4) {
+                    margin-right: 0;
+                  }
+                  &.active {
+                    border: 2px solid #193c83;
+                    background: #fff;
+                    > image {
+                      display: block;
+                    }
+                  }
+                  > image {
+                    display: none;
+                    width: 36px;
+                    height: 36px;
+                    position: absolute;
+                    right: -2px;
+                    bottom: -2px;
+                  }
+                }
+              }
+              > .RangeList {
+                align-items: center;
+                > text {
+                  color: #999;
+                  font-size: 28px;
+                  transform: translateX(-30px);
+                }
+              }
+              > .PriceRange {
+                > view {
+                  align-items: center;
+                  background: #f8f8f8;
+                  border-radius: 12px;
+                  padding: 24px 0;
+                  > view {
+                    > input {
+                      font-size: 26px;
+                      color: #333;
+                      line-height: 40px;
+                      display: block;
+                      width: 100%;
+                      background: none;
+                      text-align: center;
+                    }
+                  }
+                }
+              }
+              > .Textarea {
+                background: #f8f8f8;
+                border-radius: 12px;
+                padding: 20px;
+                > textarea {
+                  font-size: 26px;
+                  color: #333;
+                  line-height: 40px;
+                  display: block;
+                  width: 100%;
+                  background: none;
+                }
+              }
             }
           }
         }
       }
-      >.Textarea {
-        background: #f8f8f8;
-        border-radius: 12px;
-        padding: 20px;
-        >textarea {
-          font-size: 26px;
-          color: #333;
-          line-height: 40px;
-          display: block;
-          width: 100%;
-          background: none;
-        }
-      }
     }
   }
-  >.Btn {
-    padding: 0 30px;
-    margin: 74px auto 60px;
+  > .Btn {
+    padding: 0 30px 20px;
+    background: #fff;
+    box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.03);
+    position: relative;
+    z-index: 2;
     > text {
       display: block;
       text-align: center;

src/pages/index/helpToFindHouse/components/RentingHouse/formData.js

@@ -5,7 +5,7 @@ const questions = [
     type: 'range',
     result: '',
     resultId: null,
-    options: [500, 4500]
+    options: [500, 20000]
   },
   {
     question: '你的租房偏好？',

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

@@ -1,11 +1,12 @@
 import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
-import { Image, Slider, Textarea } from '@tarojs/components'
+import { Image, Slider, Textarea, ScrollView } from '@tarojs/components'
+import Taro from '@tarojs/taro'
 import './index.scss'
 import questions from './formData'
 
 export default function RentingHouse (props) {
-  const { change = () => { }, toSubmit = () => { }, AreaInfo = {}, selectArea = () => { } } = props
+  const { children = null, change = () => { }, toSubmit = () => { }, AreaInfo = {}, selectArea = () => { } } = props
 
   const [FormData, setFormData] = useState(questions)
 
@@ -57,20 +58,34 @@ export default function RentingHouse (props) {
   }
 
   const NextStep = () => {
-    if (StepId < 2) {
-      setStepId(StepId + 1)
-    } else {
-      let Arr = [...FormData]
-      Arr.map((item) => {
-        if (item.type === 'checkbox') {
-          item.options.map((subItem) => {
-            if (subItem.selected) {
-              item.result.push(subItem.name)
-            }
-          })
+    let Bool = true
+    let IndexArr = []
+    FormData.map((item, index) => {
+      if (index >= StepRange[0] && index < StepRange[1]) {
+        if (!!item.required && item.result === '') {
+          Bool = false
+          IndexArr.push(index)
         }
-      })
-      toSubmit(Arr)
+      }
+    })
+    if (Bool) {
+      if (StepId < 2) {
+        setStepId(StepId + 1)
+      } else {
+        let Arr = [...FormData]
+        Arr.map((item) => {
+          if (item.type === 'checkbox') {
+            item.options.map((subItem) => {
+              if (subItem.selected) {
+                item.result.push(subItem.name)
+              }
+            })
+          }
+        })
+        toSubmit(Arr)
+      }
+    } else {
+      Taro.showToast({ title: `请选择${FormData[IndexArr[0]].question}`, icon: 'none' })
     }
   }
 
@@ -81,80 +96,91 @@ export default function RentingHouse (props) {
   }
 
   return (
-    <view className='components BuyHouse'>
-      {
-        FormData.map((item, index) => (
-          <view className='Step' key={`Form-${index}`}>
-            {
-              index >= StepRange[0] && index < StepRange[1] &&
-              <view>
-                <text>{item.question}</text>
-                {
-                  item.type === 'checkbox' &&
-                  <view className='CheckList'>
-                    {
-                      item.options.map((subItem, subIndex) => (
-                        <view key={`${item.key}-${subIndex}`} className={subItem.selected ? 'active' : ''} onClick={CutCheckboxs(index, subItem, subIndex)}>
-                          {subItem.name}
-                          <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
-                        </view>
-                      ))
-                    }
-                  </view>
-                }
-                {
-                  item.type === 'radio' &&
-                  <view className='CheckList'>
+    <view className='components BuyHouse flex-v'>
+      <view className='flex-item'>
+        <view>
+          <ScrollView scrollY>
+            <view className='SubContent'>
+              {
+                children
+              }
+              {
+                FormData.map((item, index) => (
+                  <view className='Step' key={`Form-${index}`}>
                     {
-                      item.options.map((subItem, subIndex) => (
-                        <view key={`${item.key}-${subIndex}`} className={item.resultId === subItem.id ? 'active' : ''} onClick={CutCheckbox(subItem, index)}>
-                          {subItem.name}
-                          <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
-                        </view>
-                      ))
+                      index >= StepRange[0] && index < StepRange[1] &&
+                      <view>
+                        <text>{item.question}</text>
+                        {
+                          item.type === 'checkbox' &&
+                          <view className='CheckList'>
+                            {
+                              item.options.map((subItem, subIndex) => (
+                                <view key={`${item.key}-${subIndex}`} className={subItem.selected ? 'active' : ''} onClick={CutCheckboxs(index, subItem, subIndex)}>
+                                  {subItem.name}
+                                  <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
+                                </view>
+                              ))
+                            }
+                          </view>
+                        }
+                        {
+                          item.type === 'radio' &&
+                          <view className='CheckList'>
+                            {
+                              item.options.map((subItem, subIndex) => (
+                                <view key={`${item.key}-${subIndex}`} className={item.resultId === subItem.id ? 'active' : ''} onClick={CutCheckbox(subItem, index)}>
+                                  {subItem.name}
+                                  <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
+                                </view>
+                              ))
+                            }
+                          </view>
+                        }
+                        {
+                          item.type === 'radio' && item.remark !== undefined &&
+                          <view className='Textarea'>
+                            <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { remarkInput(e, index) }} />
+                          </view>
+                        }
+                        {
+                          item.type === 'range' &&
+                          <view className='RangeList flex-h'>
+                            <view className='flex-item'>
+                              <Slider activeColor='#193C83' block-color='#fff' onChange={(e) => { Rangehange(e, index) }} min={item.options[0]} max={item.options[1]} show-value />
+                            </view>
+                            <text>元</text>
+                          </view>
+                        }
+                        {
+                          item.type === 'select' &&
+                          <view className='Area'>
+                            <view className='flex-h' onClick={selectArea}>
+                              {
+                                item.key === 'district' &&
+                                <text className='iconfont icon-dingwei'></text>
+                              }
+                              <text>{AreaInfo.name || '不限'}</text>
+                              <view className='flex-item'></view>
+                              <text className='iconfont icon-jiantoudown'></text>
+                            </view>
+                          </view>
+                        }
+                        {
+                          item.type === 'textarea' &&
+                          <view className='Textarea'>
+                            <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { textareaInput(e, index) }} />
+                          </view>
+                        }
+                      </view>
                     }
                   </view>
-                }
-                {
-                  item.type === 'radio' && item.remark !== undefined &&
-                  <view className='Textarea'>
-                    <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { remarkInput(e, index) }} />
-                  </view>
-                }
-                {
-                  item.type === 'range' &&
-                  <view className='RangeList flex-h'>
-                    <view className='flex-item'>
-                      <Slider activeColor='#193C83' block-color='#fff' onChange={(e) => { Rangehange(e, index) }} min={item.options[0]} max={item.options[1]} show-value />
-                    </view>
-                    <text>元</text>
-                  </view>
-                }
-                {
-                  item.type === 'select' &&
-                  <view className='Area'>
-                    <view className='flex-h' onClick={selectArea}>
-                      {
-                        item.key === 'district' &&
-                        <text className='iconfont icon-dingwei'></text>
-                      }
-                      <text>{AreaInfo.name || '不限'}</text>
-                      <view className='flex-item'></view>
-                      <text className='iconfont icon-jiantoudown'></text>
-                    </view>
-                  </view>
-                }
-                {
-                  item.type === 'textarea' &&
-                  <view className='Textarea'>
-                    <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { textareaInput(e, index) }} />
-                  </view>
-                }
-              </view>
-            }
-          </view>
-        ))
-      }
+                ))
+              }
+            </view>
+          </ScrollView>
+        </view>
+      </view>
 
       <view className='Btn'>
         <text className='active' onClick={NextStep}>下一步</text>

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

@@ -1,147 +1,173 @@
-.components.RentingHouse {
+.components.BuyHouse {
   position: relative;
   overflow: hidden;
   margin-top: 0 !important;
   z-index: 1;
-  > .Step {
+  height: 100%;
+  > .flex-item {
     position: relative;
     overflow: hidden;
     > view {
-      position: relative;
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 0;
+      bottom: 0;
       overflow: hidden;
-      margin-top: 36px;
-      > text {
-        display: block;
-        font-size: 34px;
-        font-weight: bold;
-        color: #333;
-        line-height: 40px;
-        letter-spacing: 4px;
-      }
-      > view {
-        position: relative;
-        overflow: hidden;
-        margin-top: 30px;
-      }
-      > .Area {
-        > view {
-          align-items: center;
-          background: #f8f8f8;
-          border-radius: 12px;
-          padding: 24px 20px;
-          > text {
-            font-size: 26px;
-            color: #333;
-            line-height: 40px;
-            margin-left: 20px;
-            &:first-child {
-              margin-left: 0;
-              color: #193c83;
-            }
-          }
-        }
-      }
-      > .Purpose {
-        > view {
-          align-items: center;
-          background: #f8f8f8;
-          border-radius: 12px;
-          padding: 24px 20px;
-          > input {
-            font-size: 26px;
-            color: #333;
-            line-height: 40px;
-            display: block;
-            width: 100%;
-            background: none;
-          }
-        }
-      }
-      > .CheckList {
-        font-size: 0;
-        margin-top: 0;
-        > view {
-          display: inline-block;
-          vertical-align: middle;
-          font-size: 30px;
-          font-weight: 600;
-          color: #333;
-          line-height: 40px;
-          padding: 20px 0;
-          min-width: 194px;
-          box-sizing: border-box;
-          white-space: nowrap;
-          text-align: center;
-          border: 2px solid #193c83;
-          border-radius: 4px;
-          margin-right: 54px;
+      > scroll-view {
+        width: 100%;
+        height: 100%;
+        .SubContent {
           position: relative;
           overflow: hidden;
-          margin-top: 20px;
-          &:nth-child(3n+3) {
-            margin-right: 0;
-          }
-          &.active {
-            > image {
-              opacity: 1;
-            }
-          }
-          > image {
-            display: block;
-            width: 36px;
-            height: 36px;
-            position: absolute;
-            right: -2px;
-            bottom: -2px;
-            opacity: 0;
-          }
-        }
-      }
-      >.RangeList {
-        align-items: center;
-        >text {
-          color: #999;
-          font-size: 28px;
-          transform: translateX(-30px);
-        }
-      }
-      > .PriceRange {
-        > view {
-          align-items: center;
-          background: #f8f8f8;
-          border-radius: 12px;
-          padding: 24px 0;
-          > view {
-            > input {
-              font-size: 26px;
-              color: #333;
-              line-height: 40px;
-              display: block;
-              width: 100%;
-              background: none;
-              text-align: center;
+          padding: 0 30px 30px;
+          >.Step {
+            position: relative;
+            overflow: hidden;
+            > view {
+              position: relative;
+              overflow: hidden;
+              margin-top: 40px;
+              > text {
+                display: block;
+                font-size: 30px;
+                font-weight: bold;
+                color: #333;
+                line-height: 40px;
+                letter-spacing: 4px;
+              }
+              > view {
+                position: relative;
+                overflow: hidden;
+                margin-top: 30px;
+              }
+              > .Area {
+                > view {
+                  align-items: center;
+                  background: #f8f8f8;
+                  border-radius: 12px;
+                  padding: 24px 20px;
+                  > text {
+                    font-size: 26px;
+                    color: #333;
+                    line-height: 40px;
+                    margin-left: 20px;
+                    &:first-child {
+                      margin-left: 0;
+                      color: #193c83;
+                    }
+                  }
+                }
+              }
+              > .Purpose {
+                > view {
+                  align-items: center;
+                  background: #f8f8f8;
+                  border-radius: 12px;
+                  padding: 24px 20px;
+                  > input {
+                    font-size: 26px;
+                    color: #333;
+                    line-height: 40px;
+                    display: block;
+                    width: 100%;
+                    background: none;
+                  }
+                }
+              }
+              > .CheckList {
+                font-size: 0;
+                margin-top: 0;
+                > view {
+                  display: inline-block;
+                  vertical-align: middle;
+                  font-size: 28px;
+                  color: #333;
+                  line-height: 40px;
+                  padding: 20px 0;
+                  min-width: 156px;
+                  box-sizing: border-box;
+                  white-space: nowrap;
+                  text-align: center;
+                  border: 2px solid #f8f8f8;
+                  border-radius: 8px;
+                  margin-right: 20px;
+                  position: relative;
+                  overflow: hidden;
+                  margin-top: 20px;
+                  background: #f8f8f8;
+                  &:nth-child(4n + 4) {
+                    margin-right: 0;
+                  }
+                  &.active {
+                    border: 2px solid #193c83;
+                    background: #fff;
+                    > image {
+                      display: block;
+                    }
+                  }
+                  > image {
+                    display: none;
+                    width: 36px;
+                    height: 36px;
+                    position: absolute;
+                    right: -2px;
+                    bottom: -2px;
+                  }
+                }
+              }
+              > .RangeList {
+                align-items: center;
+                > text {
+                  color: #999;
+                  font-size: 28px;
+                  transform: translateX(-30px);
+                }
+              }
+              > .PriceRange {
+                > view {
+                  align-items: center;
+                  background: #f8f8f8;
+                  border-radius: 12px;
+                  padding: 24px 0;
+                  > view {
+                    > input {
+                      font-size: 26px;
+                      color: #333;
+                      line-height: 40px;
+                      display: block;
+                      width: 100%;
+                      background: none;
+                      text-align: center;
+                    }
+                  }
+                }
+              }
+              > .Textarea {
+                background: #f8f8f8;
+                border-radius: 12px;
+                padding: 20px;
+                > textarea {
+                  font-size: 26px;
+                  color: #333;
+                  line-height: 40px;
+                  display: block;
+                  width: 100%;
+                  background: none;
+                }
+              }
             }
           }
         }
       }
-      >.Textarea {
-        background: #f8f8f8;
-        border-radius: 12px;
-        padding: 20px;
-        >textarea {
-          font-size: 26px;
-          color: #333;
-          line-height: 40px;
-          display: block;
-          width: 100%;
-          background: none;
-        }
-      }
     }
   }
-  >.Btn {
-    padding: 0 30px;
-    margin: 74px auto 60px;
+  > .Btn {
+    padding: 0 30px 20px;
+    background: #fff;
+    box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.03);
+    position: relative;
+    z-index: 2;
     > text {
       display: block;
       text-align: center;

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

@@ -1,8 +1,9 @@
 
 import { useState } from 'react'
 import Taro from '@tarojs/taro'
-import { Image, Block } from '@tarojs/components'
+import { Image, Block, ScrollView } from '@tarojs/components'
 import { getImgURL } from '@/utils/image'
+import ProjectItemCard from '@/components/ProjectItemCard/index'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
@@ -46,34 +47,37 @@ export default function SubmitBuyHouseResult (props) {
 
             {/* 匹配楼盘 */}
             {
-              !!List.length && ShowResult &&
+              List.length > 0 && ShowResult &&
               <view className='Recommend'>
                 <view className='Title'>
                   <view>
                     <text>匹配楼盘</text>
                   </view>
                 </view>
-                {
-                  List.slice(0, 1).map((item, index) => (
-                    <Block key={`ListItem-${index}`}>
-                      {/* <view className='PlanTitle'>“方案一”</view> */}
-                      <view className='RecommendBuildingItem' onClick={() => {Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${item.buildingId}` })}}>
-                        <view>
-                          <view className='Img'>
-                            <Image mode='aspectFill' src={getImgURL(item.poster || item.preSalePermit)} className='centerLabel'></Image>
-                          </view>
-                          <view className='Title flex-h'>
-                            <view className='flex-item'>
-                              <text>{item.name}</text>
+                <view className={List.length === 1 ? 'ScrollViewX active' : 'ScrollViewX'}>
+                  <ScrollView scrollX>
+                    <view className='ListContainer'>
+                      {
+                        List.map((item, index) => (
+                          <view className='RecommendBuildingItem' key={`item-${index}`} onClick={() => { Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${item.buildingId}` }) }}>
+                            <view>
+                              <view className='Img'>
+                                <Image mode='aspectFill' src={getImgURL(item.poster || item.preSalePermit)} className='centerLabel'></Image>
+                              </view>
+                              <view className='Title flex-h'>
+                                <view className='flex-item'>
+                                  <text>{item.name}</text>
+                                </view>
+                                <view className='Price'><text>{item.price}</text></view>
+                              </view>
+                              <text className='Address'>{item.address}</text>
                             </view>
-                            <view className='Price'><text>{item.price}</text></view>
                           </view>
-                          <text className='Address'>{item.address}</text>
-                        </view>
-                      </view>
-                    </Block>
-                  ))
-                }
+                        ))
+                      }
+                    </view>
+                  </ScrollView>
+                </view>
               </view>
             }
 

src/pages/index/helpToFindHouse/components/SubmitBuyHouseResult/index.scss

@@ -8,25 +8,25 @@
   margin: 0 !important;
   padding: 0 !important;
   z-index: 100 !important;
-  >view {
+  > view {
     width: 100%;
-    >view {
+    > view {
       padding: 0 30px;
       position: relative;
       overflow: hidden;
-      >view {
+      > view {
         position: relative;
         overflow: hidden;
         min-height: 80px;
         background: #fff;
         border-radius: 24px;
-        >.Status {
+        > .Status {
           text-align: center;
           margin-top: 40px;
-          >text {
+          > text {
             font-size: 34px;
             font-weight: bold;
-            color: #193C83;
+            color: #193c83;
             display: block;
             text-align: center;
             line-height: 34px;
@@ -38,11 +38,11 @@
             }
           }
         }
-        >.Tips {
+        > .Tips {
           position: relative;
           overflow: hidden;
           margin-top: 30px;
-          >text {
+          > text {
             display: block;
             text-align: center;
             font-size: 26px;
@@ -51,42 +51,43 @@
             white-space: nowrap;
           }
         }
-        >.Btn {
+        > .Btn {
           padding: 0 80px;
           position: relative;
           overflow: hidden;
           margin-top: 40px;
           align-items: center;
           margin-bottom: 60px;
-          >text, button {
+          > text,
+          button {
             padding: 0;
             font-size: 30px;
             line-height: 78px;
             border-radius: 78px;
             margin-left: 60px;
             text-align: center;
-            border: 2px solid #193C83;
+            border: 2px solid #193c83;
             box-sizing: border-box;
-            color: #193C83;
+            color: #193c83;
             font-weight: bold;
             &:first-child {
               margin-left: 0;
             }
             &.active {
-              background: #193C83;
+              background: #193c83;
               color: #fff;
             }
           }
         }
-        >.Recommend {
+        > .Recommend {
           padding: 0 30px;
           position: relative;
           overflow: hidden;
-          >.Title {
+          > .Title {
             position: relative;
             overflow: hidden;
             &::after {
-              content: '';
+              content: "";
               width: 100%;
               display: block;
               position: absolute;
@@ -96,7 +97,7 @@
               background: rgba(0, 0, 0, 0.12);
               z-index: 1;
             }
-            >view {
+            > view {
               display: block;
               position: relative;
               z-index: 2;
@@ -106,7 +107,7 @@
               text-align: center;
               font-size: 0;
               &::after {
-                content: '';
+                content: "";
                 width: 100%;
                 display: block;
                 position: absolute;
@@ -116,7 +117,7 @@
                 z-index: 2;
                 border-bottom: 2px dashed #333;
               }
-              >text {
+              > text {
                 display: inline-block;
                 position: relative;
                 z-index: 3;
@@ -129,67 +130,99 @@
               }
             }
           }
-          >.PlanTitle {
-            font-size: 30px;
-            font-weight: bold;
-            white-space: nowrap;
+          > .ScrollViewX {
+            width: 100%;
+            height: 400px;
             position: relative;
             overflow: hidden;
-            margin-top: 40px;
-            text-align: center;
-            >text {
-              color: #FC3838;
-            }
-          }
-          >.RecommendBuildingItem {
-            position: relative;
-            overflow: hidden;
-            padding: 0 60px;
             margin-top: 30px;
             margin-bottom: 50px;
-            >view {
-              position: relative;
-              overflow: hidden;
-              >.Img {
-                width: 100%;
-                padding-bottom: 60%;
-                position: relative;
-                overflow: hidden;
-                background: #eee;
-                >image {
-                  width: 100%;
-                  height: 100%;
-                }
-              }
-              >.Title {
-                align-items: flex-start;
-                margin-top: 24px;
-                >.flex-item {
-                  >text {
-                    display: block;
-                    font-size: 32px;
-                    font-weight: bold;
-                    color: #333;
-                    line-height: 40px;
+            &.active {
+              height: 470px;
+            }
+            > scroll-view {
+              width: 100%;
+              height: 100%;
+              .ListContainer {
+                min-width: 100%;
+                white-space: nowrap;
+                font-size: 0;
+                > .RecommendBuildingItem {
+                  &:only-child {
+                    width: 100%;
+                    margin-right: 0;
                   }
-                }
-                >.Price {
-                  font-size: 22px;
-                  font-weight: bold;
-                  color: #333;
-                  margin-left: 10px;
-                  line-height: 40px;
-                  >text {
-                    color: #FC2C2C;
+                  position: relative;
+                  overflow: hidden;
+                  display: inline-block;
+                  vertical-align: middle;
+                  width: 500px;
+                  margin-right: 30px;
+                  > view {
+                    position: relative;
+                    overflow: hidden;
+                    > .Img {
+                      width: 100%;
+                      padding-bottom: 60%;
+                      position: relative;
+                      overflow: hidden;
+                      background: #eee;
+                      > image {
+                        width: 100%;
+                        height: 100%;
+                      }
+                    }
+                    > .Title {
+                      align-items: flex-start;
+                      margin-top: 24px;
+                      > .flex-item {
+                        > text {
+                          display: block;
+                          font-size: 32px;
+                          font-weight: bold;
+                          color: #333;
+                          line-height: 40px;
+                          overflow: hidden;
+                          white-space: nowrap;
+                          text-overflow: ellipsis;
+                        }
+                      }
+                      > .Price {
+                        font-size: 22px;
+                        font-weight: bold;
+                        color: #333;
+                        margin-left: 10px;
+                        line-height: 40px;
+                        max-width: 50%;
+                        overflow: hidden;
+                        white-space: nowrap;
+                        text-overflow: ellipsis;
+                        > text {
+                          color: #fc2c2c;
+                        }
+                      }
+                    }
+                    > .Address {
+                      font-size: 22px;
+                      color: #666;
+                      line-height: 30px;
+                      margin-top: 20px;
+                    }
                   }
                 }
               }
-              >.Address {
-                font-size: 22px;
-                color: #666;
-                line-height: 30px;
-                margin-top: 20px;
-              }
+            }
+          }
+          > .PlanTitle {
+            font-size: 30px;
+            font-weight: bold;
+            white-space: nowrap;
+            position: relative;
+            overflow: hidden;
+            margin-top: 40px;
+            text-align: center;
+            > text {
+              color: #fc3838;
             }
           }
         }

src/pages/index/helpToFindHouse/index.jsx

@@ -13,7 +13,8 @@ import RentingHouse from './components/RentingHouse/index'
 import HousePurchasing from './components/HousePurchasing/index'
 import SubmitBuyHouseResult from './components/SubmitBuyHouseResult/index'
 
-export default withLayout(() => {
+export default withLayout((props) => {
+  const { city } = props
 
   const user = useSelector(state => state.user)
   const [DemandList] = useState([
@@ -47,27 +48,56 @@ export default withLayout(() => {
   const submitForm = (data) => {
     data = data || []
     let params = []
+    let areaResultId;
     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 === '' ? 5000000 : item.result : item.result === '' ? 5000000 : item.result * 10000 })
+        // 用户选择 200, 则区间为 [100, 300]
+        // 用户选择 300, 则区间为 [200, 400]
+        const price = item.result === '' ? 300 : item.result - 0;
+        const min = price < 100 ? 100 : price - 100;
+        const max = price + 100;
+
+        params.push({ ...item, key: 'minPrice', result: CurrentDemandId === 2 ? min : min * 10000 })
+        params.push({ ...item, key: 'maxPrice', result: CurrentDemandId === 2 ? max : max * 10000 })
       } else {
+        if (CurrentDemandId === 1) {
+          if (item.key === 'area') {
+            areaResultId = item.resultId
+          }
+        }
+
         if (item.result !== '' || item.resultId !== null) {
           params.push(item)
         }
       }
     })
     params.push({ question: '创建人小程序人员', result: user?.userInfo?.person?.personId, key: 'personId' })
-    if(CurrentDemandId !== 3) {
+    if (CurrentDemandId !== 3) {
       params.push({ question: '意向区域', result: AreaInfo.id, key: 'intentArea' })
     }
     let payload = {}
     params.map((item) => {
       payload[item.key] = item.result || item.resultId
     })
-    fetch({ url: API_HELP_FIND_HOUSE_SUBMIT, method: 'post', payload: { ...payload, questionnaire: JSON.stringify(params), type: CurrentDemandId } }).then((res) => {
-      if(CurrentDemandId === 1) {
-        setResultList(res.taBuildingList || [])
+    fetch({
+      url: API_HELP_FIND_HOUSE_SUBMIT,
+      method: 'post',
+      payload: {
+        ...payload,
+        questionnaire: JSON.stringify(params),
+        type: CurrentDemandId,
+        // 只有买房需要智能推荐
+        needRecommend: CurrentDemandId === 1,
+        cityId: city?.id,
+        areaResultId,
+      },
+    }).then((res) => {
+      if (CurrentDemandId === 1) {
+        data.map((item) => {
+          if(item.key === 'isNew' && item.resultId - 0 !== 2) { // 选择非二手房时显示推荐
+            setResultList(res.taBuildingList || [])
+          }
+        })
       }
       setShowPopup(true)
     })
@@ -77,6 +107,23 @@ export default withLayout(() => {
     getFeedbackSetting().then((res) => setSetting(res))
   }, [])
 
+  const TopDom = (
+    <view className='DemandContainer'>
+      <text>选择您的需求</text>
+      <view className='Demand flex-h' style='margin-top: 10px;'>
+        {
+          DemandList.map((item, index) => (
+            <view key={`DemandItem-${index}`} className={CurrentDemandId === item.id ? 'flex-item active' : 'flex-item'} onClick={CutDemandId(item.id)}>
+              <Image mode='heightFix' src={item.icon || null}></Image>
+              <text>{item.name}</text>
+              <text>{item.spell}</text>
+            </view>
+          ))
+        }
+      </view>
+    </view>
+  )
+
   return (
     <view className='Page helpToFindHouse'>
 
@@ -87,47 +134,43 @@ export default withLayout(() => {
         <SubmitBuyHouseResult setting={setting} List={ResultList}></SubmitBuyHouseResult>
       }
 
-      <ScrollView scroll-y refresher-enabled={false}>
-        <view className='PageContent'>
+      <view className='PageContent flex-v'>
 
-          {
-            ShowDemand &&
-            <view>
-              <text>选择您的需求</text>
-              <view className='Demand flex-h' style='margin-top: 10px;'>
-                {
-                  DemandList.map((item, index) => (
-                    <view key={`DemandItem-${index}`} className={CurrentDemandId === item.id ? 'flex-item active' : 'flex-item'} onClick={CutDemandId(item.id)}>
-                      <Image mode='heightFix' src={item.icon || null}></Image>
-                      <text>{item.name}</text>
-                      <text>{item.spell}</text>
-                    </view>
-                  ))
-                }
-              </view>
-            </view>
-          }
+        <view className='flex-item'>
 
           {/* 买房 */}
           {
             CurrentDemandId === 1 &&
-            <BuyHouse change={StepChange} toSubmit={submitForm} AreaInfo={AreaInfo} selectArea={() => { setShowCitysPopup(true) }}></BuyHouse>
+            <BuyHouse change={StepChange} toSubmit={submitForm} AreaInfo={AreaInfo} selectArea={() => { setShowCitysPopup(true) }}>
+              {
+                ShowDemand && TopDom
+              }
+            </BuyHouse>
           }
 
           {/* 租房 */}
           {
             CurrentDemandId === 2 &&
-            <RentingHouse change={StepChange} toSubmit={submitForm} AreaInfo={AreaInfo} selectArea={() => { setShowCitysPopup(true) }}></RentingHouse>
+            <RentingHouse change={StepChange} toSubmit={submitForm} AreaInfo={AreaInfo} selectArea={() => { setShowCitysPopup(true) }}>
+              {
+                ShowDemand && TopDom
+              }
+            </RentingHouse>
           }
 
           {/* 置业 */}
           {
             CurrentDemandId === 3 &&
-            <HousePurchasing change={StepChange} toSubmit={submitForm} AreaInfo={AreaInfo} selectArea={() => { setShowCitysPopup(true) }}></HousePurchasing>
+            <HousePurchasing change={StepChange} toSubmit={submitForm} AreaInfo={AreaInfo} selectArea={() => { setShowCitysPopup(true) }}>
+              {
+                ShowDemand && TopDom
+              }
+            </HousePurchasing>
           }
 
         </view>
-      </ScrollView>
+
+      </view>
 
     </view>
   )

src/pages/index/helpToFindHouse/index.scss

@@ -4,75 +4,68 @@
   height: 100%;
   position: relative;
   overflow: hidden;
-  > scroll-view {
-    width: 100%;
-    height: 100%;
+  >.PageContent {
     position: relative;
-    z-index: 1;
-    .PageContent {
+    overflow: hidden;
+    height: 100vh;
+    .DemandContainer {
       position: relative;
       overflow: hidden;
-      min-height: 100vh;
+      &:first-child {
+        margin-top: 30px;
+      }
+      > text {
+        display: block;
+        font-size: 30px;
+        font-weight: bold;
+        color: #333;
+        line-height: 40px;
+        letter-spacing: 4px;
+      }
       > view {
+        // padding: 0 30px;
         position: relative;
         overflow: hidden;
-        &:first-child {
-          margin-top: 30px;
-        }
-        > text {
-          display: block;
-          font-size: 34px;
-          font-weight: bold;
-          color: #333;
-          line-height: 40px;
-          text-indent: 30px;
-          letter-spacing: 4px;
-        }
+      }
+      > .Demand {
+        align-items: center;
         > view {
-          padding: 0 30px;
+          box-sizing: border-box;
+          border: 2px solid #333;
+          border-radius: 8px;
+          margin-left: 30px;
           position: relative;
           overflow: hidden;
-        }
-        > .Demand {
-          align-items: center;
-          > view {
-            box-sizing: border-box;
-            border: 2px solid #333;
-            border-radius: 8px;
-            margin-left: 30px;
-            position: relative;
-            overflow: hidden;
-            padding: 0 20px;
-            &:first-child {
-              margin-left: 0;
-            }
-            &.active {
-              border-color: #193c83;
-              > text {
-                color: #193c83;
-              }
-            }
-            > image {
-              width: 24px;
-              height: 24px;
-              display: block;
-              margin: 10px auto 0;
-            }
+          padding: 0 20px;
+          &:first-child {
+            margin-left: 0;
+          }
+          &.active {
+            border-color: #193c83;
             > text {
-              font-size: 30px;
-              line-height: 30px;
-              display: block;
-              text-align: center;
-              margin-top: 10px;
-              letter-spacing: 4px;
-              &:last-child {
-                font-size: 22px;
-                font-weight: bold;
-                color: #ccc;
-                padding: 6px 0;
-                border-top: 2px solid #eee;
-                letter-spacing: 0;
-              }
+              color: #193c83;
+            }
+          }
+          > image {
+            width: 24px;
+            height: 24px;
+            display: block;
+            margin: 10px auto 0;
+          }
+          > text {
+            font-size: 30px;
+            line-height: 30px;
+            display: block;
+            text-align: center;
+            margin-top: 10px;
+            letter-spacing: 4px;
+            &:last-child {
+              font-size: 22px;
+              font-weight: bold;
+              color: #ccc;
+              padding: 6px 0;
+              border-top: 2px solid #eee;
+              letter-spacing: 0;
             }
           }
         }

src/pages/index/newsList/index.jsx

@@ -8,8 +8,9 @@ import { API_NEWS_LIST } from '@/constants/api'
 import './index.scss'
 import NewsListItem from '../components/NewsListItem/index'
 
-export default withLayout(() => {
+export default withLayout((props) => {
   
+  const { city } = props
   const user = useSelector(state => state.user)
   const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
@@ -35,7 +36,7 @@ export default withLayout(() => {
 
   const GetPageList = () => {
     setHasNextPage(false)
-    fetch({ url: API_NEWS_LIST, method: 'get', payload: { pageNumber, pageSize: 10 } }).then((res) => {
+    fetch({ url: API_NEWS_LIST, method: 'get', payload: { pageNumber, pageSize: 10, cityId: city.id } }).then((res) => {
       setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)

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

@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react'
+import { useSelector } from 'react-redux'
 import Picker from '@/components/Picker'
 import { fetch } from '@/utils/request'
 import { API_GET_AGENT_BUILDINGS, API_ITEMS_LIST } from '@/constants/api'
@@ -7,11 +8,12 @@ import { ROLE_CODE } from '@/constants/user'
 export default (props) => {
 
   const { type = '', change = () => {} } = props
+  const city = useSelector(state => state.city)
   const [dicts, setDicts] = useState([])
 
   useEffect(() => {
     if (type === ROLE_CODE.CUSTOMER) {
-      fetch({ url: API_ITEMS_LIST, payload: { pageNumber: 1, pageSize: 1000 } }).then((res) => {
+      fetch({ url: API_ITEMS_LIST, payload: { pageNumber: 1, pageSize: 1000, cityId: city.curCity.id } }).then((res) => {
         setDicts(res.records || [])
       })
     } else {

src/pages/mine/feedBack/index.jsx

@@ -30,6 +30,10 @@ export default withLayout(() => {
   }
 
   const Submit = () => {
+    if(FormData.message === '') {
+      Taro.showToast({ title: '请填写问题描述', icon: 'none'})
+      return false
+    }
     fetch({ url: API_FEEDBACK_SUBMIT, method: 'post', payload: FormData }).then(() => {
       Taro.showToast({
         title: '反馈成功', icon: 'none', complete: () => {

src/pages/mine/index.jsx

@@ -20,12 +20,14 @@ const copyRight = `技术支持: 云致科技 @ ${(new Date()).getFullYear()}`
 export default withLayout(() => {
 
   const user = useSelector(state => state.user)
+  const city = useSelector(state => state.city)
   const [UserRole, setUserRole] = useState(null) // 1-普通用户 2-经纪人 3-置业顾问 4-驻场管理
   const [MenuList, setMenuList] = useState([])
   const { dispatch } = store
 
   useEffect(() => {
     if (user?.userInfo?.person?.personId) {
+      console.log(city)
       const person = user.userInfo.person
       setUserRole(person.personType === ROLE_CODE.CHANNEL_AGENT ? 2 : person.personType === ROLE_CODE.CONSULTANT ? 3 : person.personType === ROLE_CODE.MARKETING ? 4 : 1)
     }

src/pages/mine/myRecommendCode/index.jsx

@@ -16,7 +16,7 @@ export default withLayout((props) => {
   useEffect(() => {
     const payload = {
       scene: `id=${person?.personId}&from=${page.type}_share&recommender=${person?.personId}`,
-      page: `pages/consultant/myHomepage/index`
+      page: `subpackages/pages/consultant/myHomepage/index`
     }
     fetch({ url: API_QRCODE, payload, method: 'post' }).then((res) => {
       setQrCodeUrl(res)

src/routes.js

@@ -384,7 +384,7 @@ const routes = [
     name: '个人主页',
     page: 'pages/consultant/myHomepage/index',
     pkg: 'subpackages',
-    type: 'mine',
+    type: 'card',
     // auth: ['phone'],
   },
   {

src/subpackages/pages/consultant/myHomepage/index.config.js

@@ -1,3 +1,4 @@
 export default {
-  navigationBarTitleText: '个人主页'
+  navigationBarTitleText: '个人主页',
+  enableShareAppMessage: true
 }

src/subpackages/pages/consultant/myHomepage/index.jsx

@@ -1,11 +1,11 @@
 import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import withLayout from '@/layout'
-import { ScrollView, Image } from '@tarojs/components'
+import { ScrollView, Image, Button } from '@tarojs/components'
 import ProjectListItem from '@/components/ProjectListItem/index'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
-import { API_AGENT_CURRENT, API_ITEMS_DETAIL, API_CARDS_LIST } from '@/constants/api'
+import { API_CARDS_UV, API_ITEMS_DETAIL, API_CARDS_LIST } from '@/constants/api'
 import { getImgURL } from '@/utils/image'
 import useLike from "@/utils/hooks/useLike";
 import '@/assets/css/iconfont.css'
@@ -21,14 +21,28 @@ export default withLayout((props) => {
   const [PullTimer, setPullTimer] = useState(null)
   const [UserInfo, setUserInfo] = useState({})
   const [BuildingInfo, setBuildingInfo] = useState({})
+  const [LikeNum, setLikeNum] = useState(0)
 
   const user = useSelector(state => state.user)
   const [PersonId, setPersonId] = useState(null)
 
-  const [isSave, handleFavor] = useLike(BuildingInfo?.isSave, {
-    id,
+  const [isSave, handleFavor] = useLike(UserInfo?.liked, {
+    id: id || user.userInfo.person.personId,
     ...trackData,
-  });
+    eventType: 'consultant'
+  }, () => {
+    if(!isSave) {
+      AddHotNum()
+    }
+    const likeNum = isSave ? UserInfo.likeNum - 1 : UserInfo.likeNum + 1
+    setLikeNum(likeNum)
+  })
+
+  useEffect(() => {
+    if(UserInfo.id) {
+      setLikeNum(UserInfo.likeNum)
+    }
+  }, [UserInfo])
 
   useEffect(() => {
     if (PersonId !== user.userInfo.person.personId) {
@@ -52,14 +66,14 @@ export default withLayout((props) => {
   }, [PersonId])
 
   useEffect(() => {
-    if (UserInfo.buildingId) {
+    if (UserInfo.buildingId && !BuildingInfo.buildingId) {
       GetBuildingInfo()
     }
   }, [UserInfo])
 
-  const GetUserInfo = () => {
-    fetch({ url: API_AGENT_CURRENT, method: 'get' }).then((res) => {
-      setUserInfo(res)
+  const AddHotNum = () => {
+    fetch({ url: API_CARDS_UV + `/${id || PersonId}`, method: 'post' }).then(() => {
+      setUserInfo({...UserInfo, hotNum: (UserInfo.hotNum || 0) - 0 + 1})
     })
   }
 
@@ -99,7 +113,7 @@ export default withLayout((props) => {
                     <text>{UserInfo.name} {UserInfo.phone}</text>
                   </view>
                   <text onClick={handleFavor} className='iconfont icon-dianzan' style={isSave ? { color: 'red' } : undefined}></text>
-                  <text onClick={handleFavor}>{UserInfo.likeNum || 0}{isSave ? `已点赞` : '赞'}</text>
+                  <text onClick={handleFavor}>{LikeNum}{isSave ? `已点赞` : '赞'}</text>
                 </view>
                 <view className='Tag'>
                   <view>
@@ -134,7 +148,7 @@ export default withLayout((props) => {
                 }
               </view>
               <text className='iconfont icon-renqi'></text>
-              <text>人气值{UserInfo.hotNum || 999}</text>
+              <text>人气值{(UserInfo.hotNum || 0) + 999}</text>
             </view>
           </view>
 
@@ -162,7 +176,7 @@ export default withLayout((props) => {
               </view>
             </view>
             <view className='Btn'>
-              <text>分享主页</text>
+              <Button className='Share' open-type='share'>分享主页</Button>
             </view>
           </view>
 

src/subpackages/pages/consultant/myHomepage/index.scss

@@ -209,7 +209,7 @@
           }
           > .Btn {
             margin-top: 40px;
-            > text {
+            > button {
               display: block;
               text-align: center;
               font-size: 32px;
@@ -218,6 +218,10 @@
               color: #333;
               font-weight: bold;
               background: #f2f2f2;
+              border: none;
+              &::after {
+                border: none;
+              }
             }
           }
         }
@@ -349,6 +353,7 @@
             line-height: 92px;
             background: #193c83;
             border-radius: 92px;
+            border: none;
           }
         }
       }

src/subpackages/pages/marketing/components/ResidentListItem/index.jsx

@@ -102,7 +102,7 @@ export default function ResidentListItem (props) {
       <view className='flex-h'>
         <text>报备时间：</text>
         <view className='flex-item'>
-          <text>{formatDate(data.createDate, 'yyyy/M/d')}</text>
+          <text>{formatDate(data.createDate, 'yyyy/MM/dd')}</text>
         </view>
       </view>
       <view className='Opt'>

src/utils/chatDate.js

@@ -25,7 +25,7 @@ export function getDateByStr(dtStr) {
   return new Date(t[0], t[1]-1, t[2], t[3] || 0, t[4] || 0, t[5] || 0)
 }
 
-//例子 getDateFormat(new Date().valueOf(),true,'yyyy/M/d')
+//例子 getDateFormat(new Date().valueOf(),true,'yyyy/MM/dd')
 export function formatDate(dt, fmt) {
   if (!dt) return dt;
 

src/utils/hooks/useLike.js

@@ -5,9 +5,9 @@ import { resolvePath } from '@/constants/api'
 import track from '@/utils/tracking/track'
 
 const addLike = (type, id) => fetch({ url: resolvePath(`${type}/like/${id}`),  method: 'POST' })
-const cancelLike = (type, id) => fetch({ url: resolvePath(`${type}/like/${id}`),  method: 'POST' })
+const cancelLike = (type, id) => fetch({ url: resolvePath(`${type}/like/${id}`),  method: 'DELETE' })
 
-export default function(liked, options = {}) {
+export default function(liked, options = {}, callback = () => {}) {
   const { id, eventType } = options
   const [isLiked, setIsLiked] = useState(liked)
 
@@ -21,6 +21,7 @@ export default function(liked, options = {}) {
           title: '已取消点赞',
           icon: 'none',
         })
+        callback()
       })
     } else {
       addLike(eventType, id).then(() => {
@@ -29,6 +30,7 @@ export default function(liked, options = {}) {
           title: '点赞成功',
           icon: 'none',
         })
+        callback()
       })
     }
     track({

src/utils/image.js

@@ -1,14 +1,34 @@
 
 import Taro from '@tarojs/taro'
 import { authorize } from './wxAuth'
+
 // eslint-disable-next-line no-undef
 const host = HOST;
+// eslint-disable-next-line no-undef
+const ossPath = OSS_PATH;
+
+let platform = null;
+
+function getPlatform() {
+  if (!platform) {
+    platform = Taro.getSystemInfoSync().platform;
+  }
+  return platform;
+}
 
 export function getImgURL(img) {
   if (!img) return undefined;
 
-  if (img.indexOf('http') === 0) return img;
+  if (img.indexOf(ossPath) > -1) {
+    const plat = getPlatform();
+    if (plat.toLocaleLowerCase().indexOf('ios') > -1) {
+      return `${img}?x-oss-process=style/thumb`
+    } else {
+      return `${img}?x-oss-process=style/webp`
+    }
+  }
 
+  if (img.indexOf('http') === 0) return img;
   return `${host}${img}`;
 }