feats

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"http://127.0.0.1:8081"',
+    // HOST: '"https://xlk.njyz.tech"',
+    HOST: '"http://127.0.0.1:8081"',
     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/"',

src/components/AreaPickerView/index.jsx

@@ -0,0 +1,105 @@
+import { useState, useEffect } from 'react'
+import { PickerView, PickerViewColumn } from '@tarojs/components'
+import { fetch } from '@/utils/request'
+import { API_AREA_LIST } from '@/constants/api'
+import './style.scss'
+
+export default (props) => {
+
+  const { show = false, Change = () => {}, Cancel = () => {} } = props
+  const [Value, setValue] = useState([0, 0, 0])
+  const [StateList, setStateList] = useState([])
+  const [CurrentState, setCurrentState] = useState({})
+  const [CityList, setCityList] = useState([])
+  const [CurrentCity, setCurrentCity] = useState({})
+  const [IntentAreaList, setIntentAreaList] = useState([])
+  const [CurrentIntentArea, setCurrentIntentArea] = useState({})
+
+  useEffect(() => {
+    GetAreaList()
+  }, [])
+
+  useEffect(() => {
+    if (StateList.length) {
+      if (StateList[Value[0]].id !== CurrentState.id) { // 省份更新
+        setCurrentState(StateList[Value[0]])
+      } else if (CityList[Value[1]].id !== CurrentCity.id) { // 城市更新
+        setCurrentCity(CityList[Value[1]])
+      } else if (IntentAreaList[Value[2]].id !== CurrentIntentArea.id) { // 区县更新
+        setCurrentIntentArea(IntentAreaList[Value[2]])
+      }
+    }
+  }, [Value])
+
+  useEffect(() => {
+    if (CurrentState.id) {
+      GetAreaList(CurrentState.id, 2)
+    }
+  }, [CurrentState])
+
+  useEffect(() => {
+    if (CurrentCity.id) {
+      GetAreaList(CurrentCity.id, 3)
+    }
+  }, [CurrentCity])
+
+  const Sure = () => {
+    Change([CurrentState, CurrentCity, CurrentIntentArea])
+  }
+
+  const PickerChange = (e) => {
+    setValue(e.detail.value)
+  }
+
+  const GetAreaList = (parentCity = 100000, levelType = 1) => {
+    fetch({ url: API_AREA_LIST, method: 'get', payload: { parentCity, levelType } }).then((res) => {
+      if (levelType === 1) { // 省份
+        setStateList(res || [])
+        setValue([0, 0, 0])
+      } else if (levelType === 2) { // 城市
+        setCityList(res || [])
+        setValue([Value[0], 0, 0])
+      } else { // 区县
+        setIntentAreaList(res || [])
+        setValue([Value[0], Value[1], 0])
+      }
+    })
+  }
+
+  return (
+    <view className='components AreaPickerView' style={{ display: show ? 'block' : 'none' }}>
+      <view className='flex-v'>
+        <view className='flex-h'>
+          <text onClick={Cancel}>取消</text>
+          <view className='flex-item'></view>
+          <text onClick={Sure}>确认</text>
+        </view>
+        <view className='flex-item'>
+          <PickerView value={Value} indicator-style='height: 50px;' style='width: 100%; height: 300px;' onChange={PickerChange}>
+            <PickerViewColumn>
+              {
+                StateList.map((item, index) => (
+                  <view key={index} style='line-height: 50px; text-align: center;'>{item.name}</view>
+                ))
+              }
+            </PickerViewColumn>
+            <PickerViewColumn>
+              {
+                CityList.map((item, index) => (
+                  <view key={index} style='line-height: 50px; text-align: center;'>{item.name}</view>
+                ))
+              }
+            </PickerViewColumn>
+            <PickerViewColumn>
+              {
+                IntentAreaList.map((item, index) => (
+                  <view key={index} style='line-height: 50px; text-align: center;'>{item.name}</view>
+                ))
+              }
+            </PickerViewColumn>
+          </PickerView>
+        </view>
+      </view>
+    </view>
+  )
+}

src/components/AreaPickerView/style.scss

@@ -0,0 +1,30 @@
+.components.AreaPickerView {
+  width: 100%;
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  z-index: 100;
+  background: rgba(0, 0, 0, 0.6);
+  > view {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    height: 600px;
+    background: #fff;
+    >.flex-h {
+      align-items: center;
+      padding: 0 30px;
+      border-bottom: 2px solid rgba(0, 0, 0, 0.08);
+      >text {
+        font-size: 28px;
+        line-height: 80px;
+        color: #193C83;
+        &:first-child {
+          color: #ccc;
+        }
+      }
+    }
+  }
+}

src/constants/api.js

@@ -33,6 +33,7 @@ export const API_PRELOAD = resolvePath('preload')
 export const API_QRCODE = resolvePath('qrcode')
 export const API_BANNER_LIST = resolvePath('extendContent')
 export const API_QUERY_CODE_SCENE = resolvePath('qrcode/scene')
+export const API_AREA_LIST = resolvePath('city/cascade')
 
 // user
 export const API_USER_LOGIN = resolvePath('login')

src/pages/index/activityDetail/index.jsx

@@ -1,9 +1,17 @@
 import { useState, useEffect } from "react";
 import Taro from "@tarojs/taro";
 import withLayout from "@/layout";
-import { ScrollView, Image, RichText, Button } from "@tarojs/components";
+import {
+  ScrollView,
+  Image,
+  RichText,
+  View,
+  Text,
+  Input,
+  Picker,
+} from "@tarojs/components";
 import Disclaimer from "@/components/Disclaimer";
-
+import { useSelector } from "react-redux";
 import {
   // addActivityShareNum,
   signupActivity,
@@ -16,12 +24,21 @@ import useShare from "@/utils/hooks/useShare";
 import useFavor from "@/utils/hooks/useFavor";
 import useStatus from './useStatus'
 
+import { getDownloadURL, times, transferImage } from "@/utils/tools";
 import "./index.scss";
 
 export default withLayout((props) => {
   const { router, shareContent, trackData, person, page } = props;
   const { id } = router.params;
+
+  const user = useSelector((state) => state.user);
+
   const [detail, setDetail] = useState();
+  const [canChoose, setCanChoose] = useState("none");
+  const [inputName, setInputName] = useState("");
+  const [selectorChecked, setSelectorChecked] = useState("1");
+  const [selector, setSelector] = useState("");
+
   const buildingId = detail?.buildingId;
 
   const [btnText, btnDisabled] = useStatus(detail)
@@ -30,9 +47,14 @@ export default withLayout((props) => {
     Taro.showLoading();
 
     queryActivityDetail(params).then((res) => {
-      console.log(res, "queryActivityDetail");
-      setDetail(res);
+      // const maxperson =
+      //   res.maxEnlistByPerson < 100 ? res.maxEnlistByPerson : 100;
+
+      const maxperson = 10
 
+      setSelector(times(maxperson).map((_, i) => `${i + 1}`));
+
+      setDetail(res);
       Taro.hideLoading();
     });
   };
@@ -69,38 +91,58 @@ export default withLayout((props) => {
   }, [id]);
 
   const handleSignup = () => {
-    const {
-      detail: { buildingId, dynamicId, isSign },
-    } = this.state;
-    const {
-      userInfo: {
-        person: { phone, name, nickname },
-      },
-    } = this.props;
+    setCanChoose("block");
+  };
 
-    if (isSign) {
+  const comfire = (e) => {
+    const { dynamicId } =detail;
+    // console.log(user, "user");
+    const { userInfo: { person: { phone,  tel } } } = user
+    if (inputName == "") {
       Taro.showToast({
+        title: "请输入姓名",
         icon: "none",
-        title: "你已报名成功",
       });
       return;
     }
 
-    this.setState({
-      canChoose: "block",
+    const payload = {
+      buildingId,
+      dynamicId,
+      name: inputName,
+      phone: phone ? phone : tel,
+      attendNum: selectorChecked,
+    };
+
+    signupActivity(payload).then((res) => {
+      Taro.showToast({
+        title: "报名成功",
+      });
+      setCanChoose('none')
+      setTimeout(() => {
+        getDetail(id);
+      }, 500);
     });
   };
 
+  function hideModal() {
+    setCanChoose("none");
+  }
+
+  const onInputText = (e) => {
+    setInputName(e.detail.value);
+  };
+
   const dymic = () => (
-    <view className="Info">
+    <view className='Info'>
       <view>
-        <view className="Title flex-h">
-          <view className="flex-item">
+        <view className='Title flex-h'>
+          <view className='flex-item'>
             <text>{detail.halfTitle}</text>
           </view>
-          <text className="Tips">{detail.enlisted || 0}人已报名</text>
+          <text className='Tips'>{detail.enlisted || 0}人已报名</text>
         </view>
-        <text className="Time">
+        <text className='Time'>
           报名截止时间：
           {getDateFormat(
             new Date(detail.enlistEnd).valueOf(),
@@ -108,16 +150,16 @@ export default withLayout((props) => {
             "yyyy/M/d"
           )}
         </text>
-        <text className="Name">{detail.title}</text>
-        <view className="flex-h Address">
+        <text className='Name'>{detail.title}</text>
+        <view className='flex-h Address'>
           <text>地址：</text>
-          <view className="flex-item">
+          <view className='flex-item'>
             <text>{detail.address}</text>
           </view>
         </view>
-        <view className="flex-h Date">
+        <view className='flex-h Date'>
           <text>时间：</text>
-          <view className="flex-item">
+          <view className='flex-item'>
             <text>
               {getDateFormat(
                 new Date(detail.startDate).valueOf(),
@@ -133,8 +175,8 @@ export default withLayout((props) => {
             </text>
           </view>
         </view>
-        <view className="Btn">
-          <button open-type="share">
+        <view className='Btn'>
+          <button open-type='share'>
             <text>分享好友</text>
           </button>
         </view>
@@ -143,23 +185,23 @@ export default withLayout((props) => {
   );
 
   const house = () => (
-    <view className="houseInfo">
+    <view className='houseInfo'>
       {/* <view> */}
-      <view className="flex-h">
-        <view className="left">
-          <view className="Title">
-            <view className="flex-item">
+      <view className='flex-h'>
+        <view className='left'>
+          <view className='Title'>
+            <view className='flex-item'>
               <text>{detail.title}</text>
             </view>
           </view>
-          <view className="flex-h Address">
-            <text className="iconfont icon-dingwei"></text>
-            <view className="flex-item">
+          <view className='flex-h Address'>
+            <text className='iconfont icon-dingwei'></text>
+            <view className='flex-item'>
               <text>{detail.address}</text>
             </view>
-            <text className="price">价格待定</text>
+            <text className='price'>价格待定</text>
           </view>
-          <text className="flex-h Time">
+          <text className='flex-h Time'>
             时间：
             {getDateFormat(
               new Date(detail.startDate).valueOf(),
@@ -174,50 +216,50 @@ export default withLayout((props) => {
             )}
           </text>
         </view>
-        <view className="right">
+        <view className='right'>
           <view>
-            <button  open-type="share">
-              <text className="iconfont icon-fenxiang"></text>
+            <button open-type='share'>
+              <text className='iconfont icon-fenxiang'></text>
               <text>分享</text>
             </button>
             {/* <text className="iconfont icon-dingwei"></text>
             <text>分享</text> */}
           </view>
           <view>
-            <text className="iconfont icon-dingwei"></text>
+            <text className='iconfont icon-dingwei'></text>
             <text>海报</text>
           </view>
         </view>
       </view>
 
-      <view className="lastdate">
-        <text className="text">距离结束还有</text>
-        <text className="text day">7</text>
-        <text className="text">天</text>
-        <text className="text time">2</text>
-        <text className="text">时</text>
-        <text className="text time">4</text>
-        <text className="text">分</text>
-        <text className="text time">5</text>
-        <text className="text">秒</text>
+      <view className='lastdate'>
+        <text className='text'>距离结束还有</text>
+        <text className='text day'>7</text>
+        <text className='text'>天</text>
+        <text className='text time'>2</text>
+        <text className='text'>时</text>
+        <text className='text time'>4</text>
+        <text className='text'>分</text>
+        <text className='text time'>5</text>
+        <text className='text'>秒</text>
         {/* <view>距离结束还有</view> */}
       </view>
 
-      <view className="flex-h join">
-        <view className="Collect" onClick={handleFavor}>
+      <view className='flex-h join'>
+        <view className='Collect' onClick={handleFavor}>
           <text
-            className="iconfont icon-shoucang"
+            className='iconfont icon-shoucang'
             style={isSaved ? { color: "red" } : undefined}
           ></text>
           <text>{isSaved ? "已收藏" : "收藏"}</text>
         </view>
-        <view className="enlisted">
+        <view className='enlisted'>
           <view>
-            <text className="iconfont icon-shoucang"></text>
+            <text className='iconfont icon-shoucang'></text>
             <text>{detail.enlisted || 0}人已报名</text>
           </view>
         </view>
-        <button className="btn" disabled={btnDisabled} onClick={handleSignup}>
+        <button className='btn' disabled={btnDisabled} onClick={handleSignup}>
           <text>{btnText}</text>
         </button>
       </view>
@@ -228,23 +270,23 @@ export default withLayout((props) => {
   return (
     <>
       {detail && (
-        <view className="Page activityDetail flex-v">
-          <view className="flex-item">
+        <view className='Page activityDetail flex-v'>
+          <view className='flex-item'>
             <view>
               <ScrollView scroll-y>
-                <view className="PageContent">
-                  <view className="Top">
+                <view className='PageContent'>
+                  <view className='Top'>
                     <Image
-                      mode="aspectFill"
+                      mode='aspectFill'
                       src={getImgURL(detail.bannerListImg)}
-                      className="centerLabel"
+                      className='centerLabel'
                     ></Image>
                   </view>
 
                   {detail.type == "dymic" && dymic()}
                   {detail.type == "house" && house()}
-                  <view className="ActivityIntro">
-                    <view className="Title">
+                  <view className='ActivityIntro'>
+                    <view className='Title'>
                       <text>活动介绍</text>
                     </view>
                     <RichText nodes={detail.desc} />
@@ -256,27 +298,56 @@ export default withLayout((props) => {
             </view>
           </view>
           {detail.type == "dymic" && (
-            <view className="PageBottom flex-h">
-              <button className="Share" open-type="share">
-                <text className="iconfont icon-fenxiang"></text>
+            <view className='PageBottom flex-h'>
+              <button className='Share' open-type='share'>
+                <text className='iconfont icon-fenxiang'></text>
                 <text>分享</text>
               </button>
-              <view className="Collect" onClick={handleFavor}>
+              <view className='Collect' onClick={handleFavor}>
                 <text
-                  className="iconfont icon-shoucang"
+                  className='iconfont icon-shoucang'
                   style={isSaved ? { color: "red" } : undefined}
                 ></text>
                 <text>{isSaved ? "已收藏" : "收藏"}</text>
               </view>
-              <view className="flex-item"></view>
+              <view className='flex-item'></view>
 
-              <button disabled={btnDisabled} className="Post" onClick={handleSignup}>
+              <button disabled={btnDisabled} className='Post' onClick={handleSignup}>
                 {btnText}
               </button>
             </view>
           )}
         </view>
       )}
+
+      <View className='page-body' style={{ display: canChoose }}>
+        <View className='mask' onClick={() => hideModal()}></View>
+        <View className='page-section'>
+          <Text className='page-section__title'>报名信息</Text>
+          <View className='page-content'>
+            <Input
+              className='inputName'
+              onInput={onInputText}
+              type='text'
+              placeholder='请输入姓名'
+            />
+            <Picker
+              mode='selector'
+              range={selector}
+              onChange={(e) => setSelectorChecked(selector[e.detail.value])}
+            >
+              <View className='picker'>
+                <Text>参加人数</Text>
+                <Text className='content'>{selectorChecked}</Text>
+                <Text>人</Text>
+              </View>
+            </Picker>
+            <View onClick={comfire} className='comfire'>
+              确认
+            </View>
+          </View>
+        </View>
+      </View>
     </>
   );
 });

src/pages/index/activityDetail/index.scss

@@ -223,3 +223,88 @@
     }
   }
 }
+
+.page-body {
+  z-index: 99;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+
+  .mask {
+    background: rgba(0, 0, 0, 0.7);
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+  }
+
+  .page-section {
+    position: absolute;
+    width: 600px;
+    top: 24%;
+    left: 75px;
+    border-radius: 10px;
+    background: white;
+    height: 500px;
+
+    &__title {
+      font-size: 36px;
+      text-align: center;
+      width: 100%;
+      line-height: 120px;
+      display: block;
+      color: black;
+    }
+
+    .page-content {
+      width: 490px;
+      margin: 0 auto;
+
+      .inputName {
+        width: 100%;
+        height: 80px;
+        line-height: 80px;
+        border: 1px solid #CCCCCC;
+        border-radius: 10px;
+        text-align: center;
+      }
+
+      .picker {
+        width: 100%;
+        margin-top: 30px;
+        display: flex;
+        justify-content: center;
+        border: 1px solid #CCCCCC;
+
+        Text {
+          display: block;
+          color: black;
+          height: 80px;
+          line-height: 80px;
+          width: auto;
+        }
+
+        .content {
+          text-align: center;
+          margin-right: 20px;
+          margin-left: 20px;
+        }
+      }
+
+      .comfire {
+        width: 490px;
+        height: 96px;
+        background: #BB9C79;;
+        border-radius: 7px;
+        line-height: 96px;
+        color: white;
+        text-align: center;
+        margin-top: 60px;
+        font-size: 36px;
+      }
+    }
+  }
+
+}

src/pages/index/activityDetail/useStatus.js

@@ -5,7 +5,7 @@ const ACT_ENLIST_FULL = 2
 const ACT_SIGNED = 1
 
 export default function useStatus(info) {
-  const { dynamicId, isSign, activityStatus, isEnlist } = info || {}
+  const { dynamicId, isSign, activityStatus, isEnlist, enlistStart, enlistEnd } = info || {}
 
   const [disabled, setDisabled] = useState(false)
   const [btnText, setBtnText] = useState('立即报名')
@@ -15,7 +15,7 @@ export default function useStatus(info) {
 
     // 活动结束
     if (activityStatus === ACT_GAMEOVER) {
-      setBtnText('已结束')
+      setBtnText('活动已结束')
       setDisabled(true)
       return;
     }
@@ -34,6 +34,22 @@ export default function useStatus(info) {
       return;
     }
 
+    // 报名时间
+    const now = new Date()
+    const start = new Date(enlistStart)
+    const end = new Date(enlistEnd)
+    if (now < start) {
+      setBtnText('报名未开始')
+      setDisabled(true)
+      return;
+    }
+
+    if (now > end) {
+      setBtnText('报名已结束')
+      setDisabled(true)
+      return;
+    }
+
     setBtnText('立即报名')
     setDisabled(false)
   },[dynamicId])

src/pages/index/addedValueService/index.jsx

@@ -44,7 +44,11 @@ export default function AddedValueService () {
       }
     })
     params.push({question: '创建人小程序人员', result: user?.userInfo?.person?.personId, key: 'personId' })
-    fetch({ url: API_HELP_FIND_HOUSE_SUBMIT, method: 'post', payload: params }).then((res) => {
+    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: 4 } }).then((res) => {
       setResultList(res.taBuildingList || [])
       setShowPopup(true)
     })

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

@@ -1,20 +1,17 @@
 import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
-import { Image, Slider, Textarea, Picker } from '@tarojs/components'
+import { Image, Slider, Textarea } from '@tarojs/components'
 import './index.scss'
 import questions from './formData'
 
 export default function BuyHouse (props) {
-  const { change = () => { }, toSubmit = () => { }, CityList = [] } = props
+  const { change = () => { }, toSubmit = () => { }, AreaInfo = {}, selectArea = () => {} } = props
 
   const [FormData, setFormData] = useState(questions)
 
   const [StepId, setStepId] = useState(1)
   const [StepRange, setStepRange] = useState([0, 4])
 
-  const [CityName, setCityName] = useState(null)
-  const [CityId, setCityId] = useState(null)
-
   useEffect(() => {
     if (StepId === 1) {
       setStepRange([0, 4])
@@ -59,7 +56,7 @@ export default function BuyHouse (props) {
     if (StepId < 4) {
       setStepId(StepId + 1)
     } else {
-      toSubmit(FormData.concat([{result: CityId, key: 'intentArea', question: '意向区域'}]))
+      toSubmit(FormData)
     }
   }
 
@@ -69,11 +66,6 @@ export default function BuyHouse (props) {
     }
   }
 
-  const PickerChange = (e) => {
-    setCityName(CityList[e.detail.value - 0].name)
-    setCityId(CityList[e.detail.value - 0].id)
-  }
-
   return (
     <view className='components BuyHouse'>
       {
@@ -114,17 +106,13 @@ export default function BuyHouse (props) {
                 {
                   item.type === 'select' &&
                   <view className='Area'>
-                    <view className='flex-h'>
+                    <view className='flex-h' onClick={selectArea}>
                       {
                         item.key === 'intentArea' &&
                         <text className='iconfont icon-dingwei'></text>
                       }
-                      {/* <text>不限</text> */}
-                      <view className='flex-item'>
-                        <Picker range-key='name' onChange={PickerChange} value={0} range={CityList}>
-                          <text>{CityName || '请选择'}</text>
-                        </Picker>
-                      </view>
+                      <text>{AreaInfo.name || '不限'}</text>
+                      <view className='flex-item'></view>
                       <text className='iconfont icon-jiantoudown'></text>
                     </view>
                   </view>

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

@@ -1,20 +1,17 @@
 import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
-import { Image, Slider, Textarea, Picker } from '@tarojs/components'
+import { Image, Slider, Textarea } from '@tarojs/components'
 import './index.scss'
 import questions from './formData'
 
 export default function HousePurchasing (props) {
-  const { change = () => { }, toSubmit = () => {}, CityList = [] } = props
+  const { change = () => { }, toSubmit = () => {}, AreaInfo = {}, selectArea = () => {} } = props
 
   const [FormData, setFormData] = useState(questions)
 
   const [StepId, setStepId] = useState(1)
   const [StepRange, setStepRange] = useState([0, 5])
 
-  const [CityName, setCityName] = useState(null)
-  const [CityId, setCityId] = useState(null)
-
   useEffect(() => {
     if(StepId === 1) {
       setStepRange([0, 5])
@@ -53,7 +50,7 @@ export default function HousePurchasing (props) {
     if (StepId < 1) {
       setStepId(StepId + 1)
     } else {
-      toSubmit(FormData.concat([{result: CityId, key: 'intentArea', question: '意向区域'}]))
+      toSubmit(FormData)
     }
   }
 
@@ -63,11 +60,6 @@ export default function HousePurchasing (props) {
     }
   }
 
-  const PickerChange = (e) => {
-    setCityName(CityList[e.detail.value - 0].name)
-    setCityId(CityList[e.detail.value - 0].id)
-  }
-
   return (
     <view className='components BuyHouse'>
       {
@@ -108,17 +100,13 @@ export default function HousePurchasing (props) {
                 {
                   item.type === 'select' &&
                   <view className='Area'>
-                    <view className='flex-h'>
+                    <view className='flex-h' onClick={selectArea}>
                       {
                         item.key === 'district' &&
                         <text className='iconfont icon-dingwei'></text>
                       }
-                      {/* <text>不限</text> */}
-                      <view className='flex-item'>
-                        <Picker range-key='name' onChange={PickerChange} value={0} range={CityList}>
-                          <text>{CityName || '请选择'}</text>
-                        </Picker>
-                      </view>
+                      <text>{AreaInfo.name || '不限'}</text>
+                      <view className='flex-item'></view>
                       <text className='iconfont icon-jiantoudown'></text>
                     </view>
                   </view>

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

@@ -1,20 +1,17 @@
 import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
-import { Image, Slider, Textarea, Picker } from '@tarojs/components'
+import { Image, Slider, Textarea } from '@tarojs/components'
 import './index.scss'
 import questions from './formData'
 
 export default function RentingHouse (props) {
-  const { change = () => { }, toSubmit = () => {}, CityList = [] } = props
+  const { change = () => { }, toSubmit = () => {}, AreaInfo = {}, selectArea = () => {} } = props
 
   const [FormData, setFormData] = useState(questions)
 
   const [StepId, setStepId] = useState(1)
   const [StepRange, setStepRange] = useState([0, 4])
 
-  const [CityName, setCityName] = useState(null)
-  const [CityId, setCityId] = useState(null)
-
   useEffect(() => {
     if(StepId === 1) {
       setStepRange([0, 4])
@@ -55,7 +52,7 @@ export default function RentingHouse (props) {
     if (StepId < 2) {
       setStepId(StepId + 1)
     } else {
-      toSubmit(FormData.concat([{result: CityId, key: 'intentArea', question: '意向区域'}]))
+      toSubmit(FormData)
     }
   }
 
@@ -65,11 +62,6 @@ export default function RentingHouse (props) {
     }
   }
 
-  const PickerChange = (e) => {
-    setCityName(CityList[e.detail.value - 0].name)
-    setCityId(CityList[e.detail.value - 0].id)
-  }
-
   return (
     <view className='components BuyHouse'>
       {
@@ -110,17 +102,13 @@ export default function RentingHouse (props) {
                 {
                   item.type === 'select' &&
                   <view className='Area'>
-                    <view className='flex-h'>
+                    <view className='flex-h' onClick={selectArea}>
                       {
                         item.key === 'district' &&
                         <text className='iconfont icon-dingwei'></text>
                       }
-                      {/* <text>不限</text> */}
-                      <view className='flex-item'>
-                        <Picker range-key='name' onChange={PickerChange} value={0} range={CityList}>
-                          <text>{CityName || '请选择'}</text>
-                        </Picker>
-                      </view>
+                      <text>{AreaInfo.name || '不限'}</text>
+                      <view className='flex-item'></view>
                       <text className='iconfont icon-jiantoudown'></text>
                     </view>
                   </view>

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

@@ -1,6 +1,7 @@
 
 import '@/assets/css/iconfont.css'
 import { Image, Block } from '@tarojs/components'
+import { getImgURL } from '@/utils/image'
 import Taro from '@tarojs/taro'
 import './index.scss'
 
@@ -44,7 +45,7 @@ export default function SubmitBuyHouseResult (props) {
                       <view className='RecommendBuildingItem' onClick={() => {Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${item.buildingId}` })}}>
                         <view>
                           <view className='Img'>
-                            <Image mode='aspectFill' src={item.poster} className='centerLabel'></Image>
+                            <Image mode='aspectFill' src={getImgURL(item.poster || item.preSalePermit)} className='centerLabel'></Image>
                           </view>
                           <view className='Title flex-h'>
                             <view className='flex-item'>

src/pages/index/helpToFindHouse/index.jsx

@@ -1,10 +1,11 @@
-import { useState, useEffect } from 'react'
+import { useState } from 'react'
 import withLayout from '@/layout'
 import { ScrollView, Image } from '@tarojs/components'
 import { fetch } from '@/utils/request'
-import { API_HELP_FIND_HOUSE_SUBMIT, API_CITY_AREA } from '@/constants/api'
+import { API_HELP_FIND_HOUSE_SUBMIT } from '@/constants/api'
 import '@/assets/css/iconfont.css'
 import { useSelector } from 'react-redux'
+import AreaPickerView from '@/components/AreaPickerView/index'
 import './index.scss'
 import BuyHouse from './components/BuyHouse/index'
 import RentingHouse from './components/RentingHouse/index'
@@ -14,7 +15,6 @@ import SubmitBuyHouseResult from './components/SubmitBuyHouseResult/index'
 export default withLayout(() => {
 
   const user = useSelector(state => state.user)
-  const city = useSelector(state => state.city)
   const [DemandList] = useState([
     { name: '我要买房', id: 1, icon: '', spell: 'MAI FANG' },
     { name: '我要租房', id: 2, icon: '', spell: 'ZU FANG' },
@@ -22,19 +22,10 @@ export default withLayout(() => {
   ])
   const [CurrentDemandId, setCurrentDemandId] = useState(1)
   const [ShowDemand, setShowDemand] = useState(true)
-  const [CityAreaList, setCityAreaList] = useState([])
   const [ResultList, setResultList] = useState([])
   const [ShowPopup, setShowPopup] = useState(false)
-
-  useEffect(() => {
-    CityArea()
-  }, [])
-
-  const CityArea = () => {
-    fetch({ url: API_CITY_AREA, method: 'get', payload: { cityId: city.curCity.id, leveltype: 3 } }).then((res) => {
-      setCityAreaList(res || [])
-    })
-  }
+  const [ShowCitysPopup, setShowCitysPopup] = useState(false)
+  const [AreaInfo, setAreaInfo] = useState({})
 
   const CutDemandId = (id) => {
     return () => {
@@ -46,21 +37,31 @@ export default withLayout(() => {
     setShowDemand(id === 1)
   }
 
+  const AreaChange = (e) => {
+    setAreaInfo(e[2])
+    setShowCitysPopup(false)
+  }
+
   const submitForm = (data) => {
     data = data || []
     let params = []
     data.map((item) => {
-      if(item.key === 'budget') {
-        params.push({...item, key: 'minPrice', result: CurrentDemandId === 2 ? item.options[0] : item.options[0] * 10000})
-        params.push({...item, key: 'maxPrice', result: CurrentDemandId === 2 ? item.result : item.result * 10000})
+      if (item.key === 'budget') {
+        params.push({ ...item, key: 'minPrice', result: CurrentDemandId === 2 ? item.options[0] : item.options[0] * 10000 })
+        params.push({ ...item, key: 'maxPrice', result: CurrentDemandId === 2 ? item.result : item.result * 10000 })
       } else {
-        if(item.result !== '' || item.resultId !== null) {
+        if (item.result !== '' || item.resultId !== null) {
           params.push(item)
         }
       }
     })
-    params.push({question: '创建人小程序人员', result: user?.userInfo?.person?.personId, key: 'personId' })
-    fetch({ url: API_HELP_FIND_HOUSE_SUBMIT, method: 'post', payload: params }).then((res) => {
+    params.push({ question: '创建人小程序人员', result: user?.userInfo?.person?.personId, key: 'personId' })
+    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) => {
       setResultList(res.taBuildingList || [])
       setShowPopup(true)
     })
@@ -68,6 +69,9 @@ export default withLayout(() => {
 
   return (
     <view className='Page helpToFindHouse'>
+
+      <AreaPickerView show={ShowCitysPopup} Change={AreaChange} Cancel={() => { setShowCitysPopup(false) }}></AreaPickerView>
+
       {
         ShowPopup &&
         <SubmitBuyHouseResult List={ResultList}></SubmitBuyHouseResult>
@@ -97,19 +101,19 @@ export default withLayout(() => {
           {/* 买房 */}
           {
             CurrentDemandId === 1 &&
-            <BuyHouse change={StepChange} toSubmit={submitForm} CityList={CityAreaList}></BuyHouse>
+            <BuyHouse change={StepChange} toSubmit={submitForm} AreaInfo={AreaInfo} selectArea={() => { setShowCitysPopup(true) }}></BuyHouse>
           }
 
           {/* 租房 */}
           {
             CurrentDemandId === 2 &&
-            <RentingHouse change={StepChange} toSubmit={submitForm} CityList={CityAreaList}></RentingHouse>
+            <RentingHouse change={StepChange} toSubmit={submitForm} AreaInfo={AreaInfo} selectArea={() => { setShowCitysPopup(true) }}></RentingHouse>
           }
 
           {/* 置业 */}
           {
             CurrentDemandId === 3 &&
-            <HousePurchasing change={StepChange} toSubmit={submitForm} CityList={CityAreaList}></HousePurchasing>
+            <HousePurchasing change={StepChange} toSubmit={submitForm} AreaInfo={AreaInfo} selectArea={() => { setShowCitysPopup(true) }}></HousePurchasing>
           }
 
         </view>

src/pages/index/helpToFindHouse/index.scss

@@ -1,8 +1,14 @@
 .Page.helpToFindHouse {
   background: #fff;
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
   > scroll-view {
     width: 100%;
     height: 100%;
+    position: relative;
+    z-index: 1;
     .PageContent {
       position: relative;
       overflow: hidden;