-
+
- {/*
- 配合路由使用
-
*/}
- {/* */}
- }>
- }/>
+ }>
+ }/>
}>
}/>
}>
@@ -36,22 +29,7 @@ function App() {
}>
}>
-
- {/*
-
-
- */}
- {/* }>
- }>
- {/*
*/}
- {/*
-
*/}
-
{
- navigate("/detail/searchTask", {state: {"search": search}});
- }}>
+
{
+ navigate("/detail/searchTask", {state: {"search": search}});
+ }}>
{this.cityListComponent.current.scrollToRow(index)}}>
- {item === 'hot' ? '热' : item.toUpperCase()}
-
- ))
- }
- // 用户获取list组件渲染行数据
- onRowsRendered=({startIndex})=>{
- if(this.state.activeIndex!=startIndex){
- this.setState({
- activeIndex:startIndex
- })
- }
- }
- changeCity({label,value}){
- if(HOUSE_CITY.indexOf(label)>-1){
- localStorage.setItem('local_city',JSON.stringify({label,value}))
- // 返回上一个页面
- this.props.to(-1)
- }else{
- Toast.show('该城市暂无房源数据')
- }
- }
-
- render() {
- return 城市选择
-
- {({ width, height }) => (
-
-
- }
-}
-
-// 使用高阶组件包裹当前类组件
-const CityList = WidthUseNavigate(CityListInner);
-export default CityList
\ No newline at end of file
diff --git a/src/pages/CityList/index.module.css b/src/pages/CityList/index.module.css
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pages/DetailSearchContext/index.js b/src/pages/DetailSearchContext/index.js
index 2f77ddd..5f22e9f 100644
--- a/src/pages/DetailSearchContext/index.js
+++ b/src/pages/DetailSearchContext/index.js
@@ -1,11 +1,10 @@
import {Button, Checkbox, DatePicker, Form, Input, Space, Switch, Tag} from "antd-mobile";
import ParentTask from "../../components/ParentTask";
import React, {useEffect} from "react";
-import dayjs, {isDayjs} from "dayjs";
+import dayjs from "dayjs";
import {CloseCircleFill} from "antd-mobile-icons";
import {useLocation, useNavigate, useOutletContext} from "react-router-dom";
import {getDictionary} from "../../utils/dictUtil";
-import {getTaskById} from "../../utils";
const DetailSearchContext = () => {
const navigate = useNavigate();
@@ -33,7 +32,8 @@ const DetailSearchContext = () => {
if (!search) {
return
}
- let searchMap = new Map(search.data.andList.map(searchObj => [searchObj.name, searchObj]));
+ let searchMap = new Map(
+ search.data?.orSearchModel?.andList.map(searchObj => [searchObj.name, searchObj]));
if (searchMap.has("pid")) {
// form.setFieldValue(task.name);
@@ -45,14 +45,16 @@ const DetailSearchContext = () => {
form.setFieldValue("priority", searchMap.get("priority").value.split(','))
}
// 结束时间大于todo日，开始时间小于结束日
- if (searchMap.has("expectedEndTime")) {
- let value = searchMap.get("expectedEndTime").value;
- form.setFieldValue("todoDay", dayjs(value).toDate())
- }
+ search.data.orSearchModel?.andSearchModel?.andList?.forEach((searchObj) => {
+ if (searchObj.name === "expectedEndTime") {
+ form.setFieldValue("todoDay", dayjs(searchObj.value).toDate())
+ }
+ })
+
if (searchMap.has("name")) {
form.setFieldValue("name", searchMap.get("name").value)
}
- let orMap = new Map(search.data.orList.map(searchObj => [searchObj.name, searchObj]));
+ let orMap = new Map(search.data.andList.map(searchObj => [searchObj.name, searchObj]));
if (orMap.has("state") && orMap.get("state").value === "10") {
form.setFieldValue("allOverdueTasks", 'checked')
}
@@ -64,8 +66,11 @@ const DetailSearchContext = () => {
layout='horizontal'
onFinish={(values) => {
console.log("Form", values)
- let searchCondition = [];
- let orList = []
+ let andList = []
+ let searchCondition =[]
+ let andSearchModel = {}
+ let orSearchModel = {"andList":searchCondition,andSearchModel}
+
const {pidArray, name, priority, state, todoDay, allOverdueTasks} = values;
if (pidArray && pidArray.length !== 0) {
searchCondition.push({"name": "name", "value": pidArray[pidArray.length - 1], "operateType": "="})
@@ -80,28 +85,58 @@ const DetailSearchContext = () => {
searchCondition.push({"name": "state", "value": state.join(","), "operateType": "IN"})
}
if (todoDay) {
- searchCondition.push({
+ andSearchModel.andList = [{
"name": "expectedStartTime",
"value": dayjs(todoDay).add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
"operateType": "<"
- })
- searchCondition.push({
+ }, {
"name": "expectedEndTime",
"value": dayjs(todoDay).set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
"operateType": ">"
- })
+ }]
+ andSearchModel.orSearchModel = {
+ "andList": [
+ {
+ "name": "expectedStartTime",
+ "value": dayjs(todoDay).add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": "<"
+ }, {
+ "name": "expectedStartTime",
+ "value": dayjs(todoDay).set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": ">"
+ }, {
+ "name": "expectedEndTime",
+ "operateType": "NULL"
+ }
+ ], orSearchModel: {
+ "andList": [
+ {
+ "name": "expectedEndTime",
+ "value": dayjs(todoDay).add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": "<"
+ }, {
+ "name": "expectedEndTime",
+ "value": dayjs(todoDay).set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": ">"
+ }, {
+ "name": "expectedStartTime",
+ "operateType": "NULL"
+ }
+ ]
+ }
+ }
}
if (allOverdueTasks) {
- orList.push({"name": "state", "value": "10", "operateType": "="})
+ andList.push({"name": "state", "value": "10", "operateType": "="})
}
- navigate("/home/listTask", {
+ navigate("/mobile/listTask", {
state: {
search: {
"pageSize": 12,
"pageNumber": 1,
"data": {
- "andList": searchCondition,
- orList
+ andList,
+ orSearchModel
}
}
}
@@ -151,9 +186,10 @@ const DetailSearchContext = () => {
{
- console.log("prevValues,curValues",prevValues,curValues)
- return prevValues.todoDay !== curValues.todoDay}
+ shouldUpdate={(prevValues, curValues) => {
+ console.log("prevValues,curValues", prevValues, curValues)
+ return prevValues.todoDay !== curValues.todoDay
+ }
}
>
{({getFieldValue, setFieldsValue}) => (
diff --git a/src/pages/Home/index.js b/src/pages/Home/index.js
index 9591746..afcf227 100644
--- a/src/pages/Home/index.js
+++ b/src/pages/Home/index.js
@@ -16,21 +16,64 @@ const Home = () => {
"pageSize": 20,
"pageNumber": 1,
"data": {
- "andList": [
- {"name": "state", "value": "8,9", "operateType": "IN"}
- ,
- {
- "name": "expectedStartTime",
- "value": dayjs().add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
- "operateType": "<"
+ "orSearchModel": {
+ "andList": [
+ {"name": "state", "value": "8,9", "operateType": "IN"},
+ ],
+ "andSearchModel": {
+ "andList": [
+ {
+ "name": "expectedStartTime",
+ "value": dayjs().add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": "<"
+ },
+ {
+ "name": "expectedEndTime",
+ "value": dayjs().set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": ">"
+ }
+ ],
+ "orSearchModel": {
+ "andList": [
+ {
+ "name": "expectedStartTime",
+ "value": dayjs().add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": "<"
+ },
+ {
+ "name": "expectedStartTime",
+ "value": dayjs().set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": ">"
+ },
+ {
+ "name": "expectedEndTime",
+ "value": dayjs().set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": "NULL"
+ }
+ ],
+ "orSearchModel": {
+ "andList": [
+ {
+ "name": "expectedEndTime",
+ "value": dayjs().add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": "<"
+ },
+ {
+ "name": "expectedEndTime",
+ "value": dayjs().set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": ">"
+ },
+ {
+ "name": "expectedStartTime",
+ "value": dayjs().set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": "NULL"
+ }
+ ],
+ }
+ }
},
- {
- "name": "expectedEndTime",
- "value": dayjs().set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
- "operateType": ">"
- }
- ],
- "orList": [
+ },
+ "andList": [
{"name": "state", "value": "10", "operateType": "="}
]
}
diff --git a/src/pages/Index/index.css b/src/pages/Index/index.css
deleted file mode 100644
index 383763a..0000000
--- a/src/pages/Index/index.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.home {
- padding-bottom: 50px;
- }
-
- .home .iconfont {
- font-size: 20px;
- }
-
- .home .am-tab-bar-bar {
- position: fixed;
- bottom: 0;
- }
-
\ No newline at end of file
diff --git a/src/pages/Index/index.js b/src/pages/Index/index.js
deleted file mode 100644
index 606a759..0000000
--- a/src/pages/Index/index.js
+++ /dev/null
@@ -1,136 +0,0 @@
-import React from 'react'
-import { BrowserRouter as Router, Route, Navigate , Routes } from 'react-router-dom';
-import axios from 'axios';
-import { Swiper,Grid } from 'antd-mobile';
-import WidthUseNavigate from './../WidthUseNavigate/index'
-import ImgZZ from './../../assets/images/nav-1.png'
-import ImgHZ from './../../assets/images/nav-2.png'
-import ImgDTZF from './../../assets/images/nav-3.png'
-import ImgQCZ from './../../assets/images/nav-4.png'
-import './index.css'
-const localCatalog = [
- { "imgSrc": ImgZZ, "title": "整租", "path": "/todo" },
- { "imgSrc": ImgHZ, "title": "合租", "path": "/todo" },
- { "imgSrc": ImgDTZF, "title": "地图找房", "path": "/map" },
- { "imgSrc": ImgQCZ, "title": "去出租", "path": "/me" }
-]
-class IndexInner extends React.Component {
- state = {
- swipers: [],
- isSwiperLoaded: false,
- groups: [],
- curCityName:''
- }
- // 获取轮播图
- async getSwitpers() {
- const res = await axios.get('http://localhost:8080/home/swiper')
- this.setState(
- {
- swipers: res.data.body,
- isSwiperLoaded: true
- },
-
- // ()=>{
- // return{swipers:res.data.body}
- // }
- )
- }
- // 获取租房小组
- async getGroups() {
- const res = await axios.get('http://localhost:8080/home/groups', {
- params: {
- area: 'AREA%7C88cff55c-aaa4-e2e0'
- }
- })
- this.setState(
- () => {
- return { groups: res.data.body }
- }
- )
- }
- componentDidMount() {
- this.getSwitpers()
- this.getGroups()
- const curCity = new window.BMapGL.LocalCity()
- curCity.get(async res=>{
- this.setState(()=>{
- return {curCityName:res.name}
- })
- const result = await axios.get('http://localhost:8080/area/info?name=${res.name}')
- console.log(result)
- })
- }
-
- renderSwipers() {
- return this.state.swipers.map(item => (
- 
- ))
- }
-
- render() {
- return
pc端可访问:http://www.hauruyu.com
-}
-
// 使用高阶组件包裹当前类组件
const Bottom = WidthUseNavigate(BottomInner);
export default Bottom
\ No newline at end of file
diff --git a/src/pages/CityList/index.css b/src/pages/CityList/index.css
deleted file mode 100644
index ea7662f..0000000
--- a/src/pages/CityList/index.css
+++ /dev/null
@@ -1,34 +0,0 @@
-.citylist{
- height: 100%;
- /* padding-top: 45px; */
-}
-ul{
- list-style: none;
- margin: 0;
-}
-
-.city-index {
- position: absolute;
- display: flex;
- flex-direction: column;
- right: 5px;
- z-index: 1;
- height: 90%;
- box-sizing: border-box;
- padding-top: 20px;
- text-align: center;
-}
-.city-index .city-index-item {
- flex: 1;
- }
-
-.city-index .index-active {
- color: #fff;
- background-color: #21b97a;
- border-radius: 100%;
- display: inline-block;
- font-size: 12px;
- width: 15px;
- height: 15px;
- line-height: 15px;
- }
diff --git a/src/pages/CityList/index.js b/src/pages/CityList/index.js
deleted file mode 100644
index 84dc9be..0000000
--- a/src/pages/CityList/index.js
+++ /dev/null
@@ -1,192 +0,0 @@
-import React from "react";
-import { NavBar, Space, Toast } from 'antd-mobile'
-import { SearchOutline, MoreOutline, CloseOutline } from 'antd-mobile-icons'
-import './index.css'
-import axios from "axios";
-import { getCurrentCity } from "../../utils";
-import { List, AutoSizer } from "react-virtualized";
-import WidthUseNavigate from "../WidthUseNavigate";
-import NavHeader from "../../components/NavHeader";
-import styles from './index.module.css'
-console.log(styles)
-// list:[{},{}]
-const formatCityIndex = (letter) => {
- switch (letter) {
- case '#':
- return '当前城市'
- case 'hot':
- return '热门城市'
- default:
- return letter.toUpperCase()
- }
-}
-const formatCityData = (list) => {
- // {{'a':{},'b':{}}}
- const cityList = {}
- // 遍历
- list.forEach(element => {
- //获取短名称的第一个字母
- const first = element.short.substr(0, 1)
- //判断cityList中是否包含
- if (cityList[first]) {
- cityList[first].push(element)
- } else {
- cityList[first] = [element]
- }
- });
- const cityIndex = Object.keys(cityList).sort()
- return {
- cityList,
- cityIndex
- }
-}
-
-const HOUSE_CITY= ['北京','上海','广州','深圳']
-// const right = (
-//
-//
-//
-//
-// )
-
-const back = () => { }
-// Toast.show({
-// content: '点击了返回区域',
-// duration: 1000,
-// })
-// const list =
-// // [
-// // 'Brian Vaughn',
-// // // And so on...
-// // ];
-// Array(100).fill('Brian Vaughn')
-// function rowRenderer({
-// key, // Unique key within array of rows
-// index, // Index of row within collection
-// isScrolling, // The List is currently being scrolled
-// isVisible, // This row is visible within the List (eg it is not an overscanned row)
-// style, // Style object to be applied to row (to position it)
-// }) {
-// return (
-//
-// {list[index]}
-//
-// );
-// }
-class CityListInner extends React.Component {
-
- constructor(props){
- super(props)
- this.state = {
- cityList: {},
- cityIndex: [],
- activeIndex: 0
- }
- this.cityListComponent = React.createRef()
- }
- async componentDidMount() {
- await this.getCityList()
- //提前计算list高度
- this.cityListComponent.current.measureAllRows()
- }
- async getCityList() {
- const res = await axios.get('http://localhost:8080/area/city?level=1')
- const { cityList, cityIndex } = formatCityData(res.data.body)
-
- // 热门城市数据
- const hotRes = await axios.get('http://localhost:8080/area/hot')
- cityList['hot'] = hotRes.data.body
- // 放在第一位
- cityIndex.unshift('hot')
-
- const curCity = await getCurrentCity();
- cityList['#'] = [curCity]
- cityIndex.unshift('#')
-
- this.setState({
- cityList,
- cityIndex
- })
- // this.setState(()=>{
- // return {
- // cityList:cityList,
- // cityIndex:cityIndex
- // }
- // })
- }
-
- rowRenderer = ({
- key, // Unique key within array of rows
- index, // Index of row within collection
- isScrolling, // The List is currently being scrolled
- isVisible, // This row is visible within the List (eg it is not an overscanned row)
- style, // Style object to be applied to row (to position it)
- }) => {
- const cityIndex = this.state.cityIndex
- const letter = cityIndex[index]
- return (
-
-
- );
- }
- getRowHeight = ({ index }) => {
- return 36 + this.state.cityList[this.state.cityIndex[index]].length * 20
- }
-
- renderCityIndex() {
- const { cityIndex, activeIndex } = this.state
- return cityIndex.map((item, index) => (
- {formatCityIndex(letter)}
- {
- this.state.cityList[letter].map(item => (
- this.changeCity(item)}>{item.label}
- ))
- }
- - {this.renderCityIndex()}
-
- {/* 轮播图 */}
-
- {
- localCatalog.map((item, index) => (
- {
- console.log("点击跳转")
- this.props.to(item.path)
- }}>
- 
-
- ))
- }
-
- {/* 租房小组 */}
-
- };
-}
-// 使用高阶组件包裹当前类组件
-const Index = WidthUseNavigate(IndexInner);
-export default Index
\ No newline at end of file
diff --git a/src/pages/Map/index.css b/src/pages/Map/index.css
deleted file mode 100644
index 6a5a203..0000000
--- a/src/pages/Map/index.css
+++ /dev/null
@@ -1,4 +0,0 @@
-#container{
- height: 100%;
- width: 100%;
-}
\ No newline at end of file
diff --git a/src/pages/Map/index.js b/src/pages/Map/index.js
deleted file mode 100644
index 94f34d8..0000000
--- a/src/pages/Map/index.js
+++ /dev/null
@@ -1,162 +0,0 @@
-import React from "react";
-// import './index.css'
-import 'react-virtualized/styles.css'
-import NavHeader from "../../components/NavHeader";
-import styles from './index.module.css'
-import axios from "axios";
-import Item from "antd-mobile/es/components/dropdown/item";
-import { type } from "@testing-library/user-event/dist/type";
-
-export default class Map extends React.Component {
- async renderOverlays(id){
- const res = await axios.get('http://localhost:8080/area/map?id='+id)
- const {nextZoom,type} = this.getTypeAndZoom
- res.data.body.forEach(element => {
- this.createOverlays(element,nextZoom,type)
- })
- }
- createCircle(element){
- const {coord:{longitude,latitude},label:areaName,count,value}=element;
- console.info(longitude,latitude)
- var label = new window.BMapGL.Label(`
-
-
-
- {/* 本地导航 */}
-
- {
- this.state.isSwiperLoaded ? {this.renderSwipers()} : ""
- }
-
-
- {/* 左侧白色区域 */}
-
-
- {/* 位置 */}
-
- {/* 右侧地图图标 */}
- this.props.history.push('/map')}
- />
- this.props.to('/citylist')}
- >
- {this.state.curCityName}
-
-
-
- {/* 搜索表单 */}
- this.props.to('/search')}
- >
-
- 请输入小区或地址
-
- {item.title}
-
- - 租房小组更多 -
-
-
${areaName}
-${count}
- `, { // 创建文本标注 - position: new window.BMapGL.Point(longitude,latitude), // 设置标注的地理位置 - offset: new window.BMapGL.Size(10, 20) // 设置标注的偏移量 - }) - this.map.addOverlay(label); - label.id=value - label.addEventListener('click',()=>{ - console.log(value) - // // 放大地图 - // this.map.centerAndZoom(new window.BMapGL.Point(longitude,latitude),nextZoom) - // // 清除当前覆盖物信息 - // this.map.clearOverlays() - }) - } - createRect(element){ - const {coord:{longitude,latitude},label:areaName,count,value}=element; - console.info(longitude,latitude) - var label = new window.BMapGL.Label(` -
-
+
+}
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 6fc9799..3ed80a0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,8 +6,8 @@ import DetailSearchContext from "../pages/DetailSearchContext";
const router = [
{
- key:"home",
- path: "/home",
+ key:"mobile",
+ path: "/mobile",
element:
${areaName}
-${count}
- `, { // 创建文本标注 - position: new window.BMapGL.Point(longitude,latitude), // 设置标注的地理位置 - offset: new window.BMapGL.Size(10, 20) // 设置标注的偏移量 - }) - this.map.addOverlay(label); - label.id=value - label.addEventListener('click',()=>{ - console.log(value) - this.getHousesList(value) - }) - } - async getHousesList(id){ - const res = await axios.get(`http://localhost:8080/houses?cityId=${id}`) - - } - createOverlays(element,nextZoom,type){ - if(type === 'circle'){ - this.createCircle(element) - }else{ - this.createRect(element) - } - } - getTypeAndZoom(){ - const zoom = this.map.getZoom() - let nextZoom,type - if(zoom>=10&&zoom<12){ - nextZoom=13 - type='circle' - }else if(zoom>=12&&zoom<14){ - nextZoom=15 - type='circle' - }else if(zoom>=14&&zoom<16){ - type='rect' - } - return {nextZoom,type} - } - - componentDidMount() { - // 获取当前城市 - const {label,value}=JSON.parse(localStorage.getItem('local_city')) - console.log(label,value) - // 解析当前坐标 - - var myGeo = new window.BMapGL.Geocoder(); - // 将地址解析结果显示在地图上，并调整地图视野 - // myGeo.getPoint('北京市海淀区上地10街', function(point){ - // if(point){ - // map.centerAndZoom(point, 16); - // map.addOverlay(new window.BMapGL.Marker(point, {title: '北京市海淀区上地10街'})) - // }else{ - // alert('您选择的地址没有解析到结果！'); - // } - // }, '北京市') - var map = new window.BMapGL.Map("container") - // 在其他方法中可以使用map - this.map = map - myGeo.getPoint(label,async point=>{ - if(point){ - map.centerAndZoom(point,11) - // map.addOverlay(new window.BMapGL.Marker(point)) - var scaleCtrl = new window.BMapGL.ScaleControl(); // 添加比例尺控件 - map.addControl(scaleCtrl); - var zoomCtrl = new window.BMapGL.ZoomControl(); // 添加缩放控件 - map.addControl(zoomCtrl); - var cityCtrl = new window.BMapGL.CityListControl(); // 添加城市列表控件 - map.addControl(cityCtrl); - this.renderOverlays(value) - // 文本覆盖物 - // const res = await axios.get('http://localhost:8080/area/map?id='+value) - // res.data.body.forEach(element => { - // // - // const {coord:{longitude,latitude},label:areaName,count,value}=element; - // console.info(longitude,latitude) - // var label = new window.BMapGL.Label(` - //
- // */}
- {/* {item.name}*/}
- {/* {item.expectedEndTime && */}
- {/* 结束时间:{item.expectedEndTime}}*/}
-
- {/*
}*/}
- {/*>*/}
- {/* {item.description}*/}
- {/**/}
))}
diff --git a/src/pages/ToDoTree/index.js b/src/pages/ToDoTree/index.js
index 4929ca6..a0a4c97 100644
--- a/src/pages/ToDoTree/index.js
+++ b/src/pages/ToDoTree/index.js
@@ -1 +1,8 @@
-上面用文本下面用联动视图
\ No newline at end of file
+import {Fragment} from "react";
+
+export default ()=>{
+ return ${areaName}
- //${count}
- // `, { // 创建文本标注 - // position: new window.BMapGL.Point(longitude,latitude), // 设置标注的地理位置 - // offset: new window.BMapGL.Size(10, 20) // 设置标注的偏移量 - // }) - // map.addOverlay(label); - // label.id=value - // label.addEventListener('click',()=>{ - // console.log(value) - // // 放大地图 - // map.centerAndZoom(new window.BMapGL.Point(longitude,latitude),13) - // // 清除当前覆盖物信息 - // map.clearOverlays() - // }) - - // }); - // var point = new BMapGL.Point(116.404, 39.915); - // var content = "文本覆盖物"; - // var label = new window.BMapGL.Label(content, { // 创建文本标注 - // position: point, // 设置标注的地理位置 - // offset: new window.BMapGL.Size(10, 20) // 设置标注的偏移量 - // }) - // label.setStyle({color:'red'}) - // map.addOverlay(label); - } - },label) - // 设置中心点 - // var point = new window.BMapGL.Point(116.404, 39.915); - // map.centerAndZoom(point, 15); - map.enableScrollWheelZoom(true); - } - render() { - return ( -
- 地图找房
-
- )
- }
-}
\ No newline at end of file
diff --git a/src/pages/Map/index.module.css b/src/pages/Map/index.module.css
deleted file mode 100644
index cfc5011..0000000
--- a/src/pages/Map/index.module.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.map{
- padding-top: 45px;
- height: 100%;
-}
-.container{
- height: 100%;
-}
-.map :global(.adm-nav-bar){
- margin-top: -45px;
-}
\ No newline at end of file
diff --git a/src/pages/News/index.js b/src/pages/News/index.js
deleted file mode 100644
index 21b2246..0000000
--- a/src/pages/News/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from "react";
-export default function News (){
- // render(){
- return (
-
- news子路由
)
- // }
-}
\ No newline at end of file
diff --git a/src/pages/PersonalCenter/index.js b/src/pages/PersonalCenter/index.js
new file mode 100644
index 0000000..dde350e
--- /dev/null
+++ b/src/pages/PersonalCenter/index.js
@@ -0,0 +1,5 @@
+import React from "react";
+
+export function PersonalCenter() {
+ return pc端可访问:http://www.hauruyu.com
+}
\ No newline at end of file
diff --git a/src/pages/TaskCount/index.js b/src/pages/TaskCount/index.js
index 0a0ba4a..fe0ca7c 100644
--- a/src/pages/TaskCount/index.js
+++ b/src/pages/TaskCount/index.js
@@ -4,10 +4,13 @@ import dayjs from "dayjs";
import {DATE_FORMAT} from "../../utils/timeFormatUtil";
import {getDictionary} from "../../utils/dictUtil";
import {Tag} from "antd-mobile";
+import detailSearchBar from "../../components/DetailSearchBar";
+import {useNavigate} from "react-router-dom";
const TaskCount = (props) => {
let currentDay = props.currentDay;
+ const navigate = useNavigate();
const [taskCount, setTaskCount] = React.useState([]);
const [stateMap, setStateMap] = React.useState(new Map);
const [priorityMap, setPriorityMap] = React.useState(new Map);
@@ -32,9 +35,70 @@ const TaskCount = (props) => {
}, [currentDay])
+ const todoDayDetail = ()=>{
+ let andSearchModel = {}
+ let orSearchModel = {andSearchModel}
+ if (currentDay) {
+ andSearchModel.andList = [{
+ "name": "expectedStartTime",
+ "value": dayjs(currentDay).add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": "<"
+ }, {
+ "name": "expectedEndTime",
+ "value": dayjs(currentDay).set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": ">"
+ }]
+ andSearchModel.orSearchModel = {
+ "andList": [
+ {
+ "name": "expectedStartTime",
+ "value": dayjs(currentDay).add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": "<"
+ }, {
+ "name": "expectedStartTime",
+ "value": dayjs(currentDay).set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": ">"
+ }, {
+ "name": "expectedEndTime",
+ "operateType": "NULL"
+ }
+ ], orSearchModel: {
+ "andList": [
+ {
+ "name": "expectedEndTime",
+ "value": dayjs(currentDay).add(1, "d").set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": "<"
+ }, {
+ "name": "expectedEndTime",
+ "value": dayjs(currentDay).set('h', 0).set('m', 0).set('s', 0).set('ms', 0).format(),
+ "operateType": ">"
+ }, {
+ "name": "expectedStartTime",
+ "operateType": "NULL"
+ }
+ ]
+ }
+ }
+ }
+ console.log({orSearchModel})
+ navigate("/mobile/listTask", {
+ state: {
+ search: {
+ "pageSize": 12,
+ "pageNumber": 1,
+ "data": {
+ orSearchModel
+ }
+ }
+ }
+ }
+ )
+ }
+
return (
-
{/* 下拉刷新 */}
@@ -89,65 +83,69 @@ const ToDoList = () => {
}
description={item.description}
>
- {/*TODO日{currentDay&&dayjs(currentDay).format(DATE_FORMAT)}代办：
+TODO日{currentDay && dayjs(currentDay).format(DATE_FORMAT)}代办： + {currentDay&&详情}
任务状态
{ // taskCount.map(task => { diff --git a/src/pages/ToDoList/index.js b/src/pages/ToDoList/index.js index b4634ee..344434c 100644 --- a/src/pages/ToDoList/index.js +++ b/src/pages/ToDoList/index.js @@ -1,11 +1,5 @@ -import {Card, Dialog, Image, InfiniteScroll, List, PullToRefresh, SwipeAction} from 'antd-mobile' +import {Dialog, InfiniteScroll, List, PullToRefresh, SwipeAction} from 'antd-mobile' import React, {Fragment, useEffect, useRef, useState} from 'react' -import { - DragDropContext, - Draggable, - Droppable, - // DropResult, -} from 'react-beautiful-dnd' import {deleteTaskById, getTaskList, updateTaskStateById} from "../../utils"; import "./index.css" import {useLocation, useNavigate, useOutletContext} from "react-router-dom"; @@ -32,25 +26,31 @@ const ToDoList = () => { const [priorityMap, setPriorityMap] = useState([]); const [stateMap, setStateMap] = useState([]) const navigate = useNavigate(); - let loading = true; + let loading = false; const location = useLocation(); const {search: outletSearch} = useOutletContext() const search = location.state ? location.state.search : outletSearch; console.log("ToDoList.search", location, outletSearch) - async function loadMore() { + const loadMore = async () => { if (loading) { return } loading = true; console.log("loadMore", loading) - getTaskList({...search, "pageNumber": pageNumber + 1}).then(result => { + await getTaskList({...search, "pageNumber": pageNumber + 1}).then(result => { setTaskList(val => [...val, ...result.content]) setHasMore(result.page.number < result.page.totalPages) }) setPageNumber(pageNumber + 1) loading = false; } + /** + * 根据查询条件筛选本地列表，不触发接口 + */ + const localRefresh = () =>{ + + } useEffect(() => { getDictionary("2").then(res => { @@ -62,17 +62,11 @@ const ToDoList = () => { getTaskList({...search, "pageNumber": pageNumber}).then(result => { setTaskList(result.content) setHasMore(result.page.number < result.page.totalPages) - loading=false; + loading = false; }) }, []) - const onDragEnd = (result) => { - if (!result.destination) return - const newList = reorder(taskList, result.source.index, result.destination.index) - setTaskList([...newList]) - } const ref = useRef(null) - const refSwip = useRef(null) return (-
{taskList.map((item, index) => (
文本
+联动数
+