静态页面

src/pages/index/activityDetail/index.jsx

@@ -201,7 +201,7 @@ export default withLayout((props) => {
             <view className='flex-item'>
               <text>{detail.address}</text>
             </view>
-            <text className='Price'>价格待定</text>
+            <text className='Price'>{detail.groupBuyPrice || '价格待定'}</text>
           </view>
           <text className='Time'>时间：{formatDate(detail.startDate, 'yyyy/M/d')} - {formatDate(detail.endDate, 'yyyy/M/d')}</text>
         </view>

src/pages/index/brandDetail/index.jsx

@@ -31,7 +31,7 @@ export default withLayout((props) => {
 
   const GetPageList = () => {
     setHasNextPage(false)
-    fetch({ url: API_ITEMS_LIST, method: 'get', payload: { pageNumber, pageSize: 10 } }).then((res) => {
+    fetch({ url: API_ITEMS_LIST, method: 'get', payload: { pageNumber, pageSize: 10, brandId: id } }).then((res) => {
       setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)

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

@@ -1,34 +1,75 @@
-import { useState } from 'react'
+import { useState, useEffect } from 'react'
 import { Image } from '@tarojs/components'
 import './index.scss'
 
 export default function FilterForCityArea (props) {
 
-  const { change = () => { }, Cancel = () => { }, defaultValue = '-', List = [] } = props
-  const [CurrentId, setCurrentId] = useState(defaultValue)
+  const { change = () => { }, Cancel = () => { }, defaultValue = [], List = [] } = props
+  const [PageList, setPageList] = useState([])
 
-  const CutArea = (id) => {
+  useEffect(() => {
+    if (List.length) {
+      let Arr = List.map((item) => { return { ...item, Selected: false } })
+      if (defaultValue.length) {
+        defaultValue.map((item) => {
+          Arr.map((subItem) => {
+            if (item === subItem.id) {
+              subItem.Selected = true
+            }
+          })
+        })
+      } else {
+        Arr[0].Selected = true
+      }
+      setPageList(Arr)
+    }
+  }, [List])
+
+  const CutArea = (item, index) => {
     return () => {
-      setCurrentId(id)
+      let Arr = [...PageList]
+      if (item.id === '-') {
+        if (!item.Selected) {
+          Arr.map((aItem) => { if (aItem.id !== '-') aItem.Selected = false })
+          Arr[index].Selected = !item.Selected
+        }
+      } else {
+        if (item.Selected) { // 取消单个勾选
+          let Bool = false
+          Arr.map((aItem) => { if (aItem.Selected && aItem.id !== '-' && item.id !== aItem.id) Bool = true})
+          if (!Bool) Arr[0].Selected = true
+          Arr[index].Selected = !item.Selected
+        } else { // 单个勾选
+          Arr[index].Selected = !item.Selected
+          let Bool = false
+          Arr.map((aItem) => { if (!aItem.Selected && aItem.id !== '-') Bool = true })
+          if (!Bool) {
+            Arr.map((aItem) => { if (aItem.id !== '-') aItem.Selected = false })
+            Arr[0].Selected = true
+          } else {
+            Arr[0].Selected = false
+          }
+        }
+      }
+      setPageList(Arr)
     }
   }
 
   const Sure = () => {
-    change({ name: 'buildingArea', value: CurrentId })
+    let Arr = []
+    PageList.map((item) => { if (item.Selected && item.id !== '-') Arr.push(item.id) })
+    change({ name: 'buildingArea', value: Arr })
   }
 
   return (
     <view className='components FilterForCityArea'>
       {
-        List.map((item, index) => (
-          <view className='ListItem' key={`ListItem${index}`} onClick={CutArea(item.id)}>
+        PageList.map((item, index) => (
+          <view className='ListItem' key={`ListItem${index}`} onClick={CutArea(item, index)}>
             <view>
               <view>
                 <text>{item.name}</text>
-                {
-                  CurrentId === item.id &&
-                  <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
-                }
+                <Image className={item.Selected ? 'active' : ''} mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
               </view>
             </view>
           </view>

src/pages/index/buildingList/components/FilterForCityArea/index.scss

@@ -31,6 +31,10 @@
           right: -2px;
           bottom: 0;
           height: 36px;
+          opacity: 0;
+          &.active {
+            opacity: 1;
+          }
         }
       }
     }

src/pages/index/buildingList/index.jsx

@@ -33,7 +33,7 @@ export default withLayout((props) => {
   ])
   const [CurrentFilter, setCurrentFilter] = useState(null)
   const [FilterData, setFilterData] = useState({
-    buildingArea: '-',
+    buildingArea: [],
     area: '-',
     price: '-',
     priceType: null,
@@ -85,10 +85,14 @@ export default withLayout((props) => {
     setHasNextPage(false)
     let Data = {}
     for (let key in FilterData) {
-      if (FilterData[key] !== '-' && FilterData[key] !== null) {
+      if (FilterData[key] !== '-' && FilterData[key] !== null && key !== 'buildingArea') {
         Data[key] = FilterData[key]
       }
     }
+    if(FilterData.buildingArea.length) {
+      Data.buildingArea = FilterData.buildingArea.join(',')
+    }
+    console.log(Data)
     fetch({ url: API_ITEMS_LIST, method: 'get', payload: { cityId: city.curCity.id, pageNumber, pageSize, isRecentOpening, isCommerce, ...Data } }).then((res) => {
       setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
@@ -117,7 +121,8 @@ export default withLayout((props) => {
   const FilterChange = (e) => {
     let Data = { ...FilterData }
     Data[e.name] = e.value
-    setFilterData(Data)
+    console.log(Data)
+    setFilterData({...Data})
   }
 
   const FiltersChange = (e) => {
@@ -125,7 +130,7 @@ export default withLayout((props) => {
     e.map((item) => {
       Data[item.name] = item.value
     })
-    setFilterData(Data)
+    setFilterData({...Data})
   }
 
   const PriceChange = (e) => {
@@ -133,7 +138,7 @@ export default withLayout((props) => {
     for (let key in e) {
       Data[key] = e[key]
     }
-    setFilterData(Data)
+    setFilterData({...Data})
   }
 
   const SearchConfirm = (e) => {

src/pages/index/findHouseFromMap/index.scss

@@ -55,7 +55,7 @@
     width: 100%;
     transition: all 0.3s ease-out;
     -webkit-transition: all 0.3s ease-out;
-    height: 120px;
+    min-height: 120px;
     &.active {
       height: 784px;
     }