diff --git a/package-lock.json b/package-lock.json index 8218c34..91e0c28 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", "antd-mobile": "^5.27.0", + "axios": "^1.2.2", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.6.2", @@ -4882,6 +4883,29 @@ "node": ">=4" } }, + "node_modules/axios": { + "version": "1.2.2", + "resolved": "https://registry.npmmirror.com/axios/-/axios-1.2.2.tgz", + "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/axios/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/axobject-query": { "version": "3.1.1", "resolved": "https://registry.npmmirror.com/axobject-query/-/axobject-query-3.1.1.tgz", @@ -13215,6 +13239,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/psl": { "version": "1.9.0", "resolved": "https://registry.npmmirror.com/psl/-/psl-1.9.0.tgz", diff --git a/package.json b/package.json index a6d8f9f..0a1b0eb 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", "antd-mobile": "^5.27.0", + "axios": "^1.2.2", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.6.2", diff --git a/public/logo192.png b/public/logo192.png deleted file mode 100644 index fc44b0a..0000000 Binary files a/public/logo192.png and /dev/null differ diff --git a/public/logo512.png b/public/logo512.png deleted file mode 100644 index a4e47a6..0000000 Binary files a/public/logo512.png and /dev/null differ diff --git a/src/assets/images/nav-1.png b/src/assets/images/nav-1.png new file mode 100644 index 0000000..74b7ecf Binary files /dev/null and b/src/assets/images/nav-1.png differ diff --git a/src/assets/images/nav-2.png b/src/assets/images/nav-2.png new file mode 100644 index 0000000..8a55ce7 Binary files /dev/null and b/src/assets/images/nav-2.png differ diff --git a/src/assets/images/nav-3.png b/src/assets/images/nav-3.png new file mode 100644 index 0000000..5926c6d Binary files /dev/null and b/src/assets/images/nav-3.png differ diff --git a/src/assets/images/nav-4.png b/src/assets/images/nav-4.png new file mode 100644 index 0000000..b778759 Binary files /dev/null and b/src/assets/images/nav-4.png differ diff --git a/src/pages/Buttom/index.css b/src/pages/Bottom/index.css similarity index 86% rename from src/pages/Buttom/index.css rename to src/pages/Bottom/index.css index b4aa589..e785be5 100644 --- a/src/pages/Buttom/index.css +++ b/src/pages/Bottom/index.css @@ -1,3 +1,6 @@ +/* *{ + touch-action:pan-y +} */ .app { height: 100vh; display: flex; @@ -13,7 +16,7 @@ flex: 1; display: flex; justify-content: center; - align-items: center; + align-items: top; } .adm-tab-bar { diff --git a/src/pages/Buttom/index.js b/src/pages/Bottom/index.js similarity index 92% rename from src/pages/Buttom/index.js rename to src/pages/Bottom/index.js index 665b2c5..f25b164 100644 --- a/src/pages/Buttom/index.js +++ b/src/pages/Bottom/index.js @@ -26,35 +26,37 @@ export function Bottom (){ key: '/home', title: '首页', icon: , + badge: '1', }, { key: '/todo', title: '待办', icon: , + badge: '2', }, { key: '/message', title: '消息', icon: , + badge: '3', }, { key: '/me', title: '我的', icon: , + badge: '4', }, ] return ( setRouteActive(value)}> {tabs.map(item => ( - + ))} ) } - export function Home() { - return
首页
- } + export function Todo() { return
待办
diff --git a/src/pages/Home/index.css b/src/pages/Home/index.css new file mode 100644 index 0000000..f8f780b --- /dev/null +++ b/src/pages/Home/index.css @@ -0,0 +1,15 @@ +/* .div .context { + width: 100%; + color: #ffffff; + justify-content: center; + font-size: 48px; + user-select: none; + align-items: top; +} */ +.adm-grid-item { + text-align: center; +} +.context h2 { + margin: 0; +} + diff --git a/src/pages/Home/index.js b/src/pages/Home/index.js new file mode 100644 index 0000000..f498d7d --- /dev/null +++ b/src/pages/Home/index.js @@ -0,0 +1,59 @@ +import React from 'react' +import { Swiper, CapsuleTabs, Grid } from 'antd-mobile' +import axios from 'axios'; +import './index.css' +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 { redirect, useNavigate } from 'react-router-dom'; +const localCatalog = [ + { "imgSrc": ImgZZ, "title": "整租" ,"path":"/todo"}, + { "imgSrc": ImgHZ, "title": "合租" ,"path":"/todo"}, + { "imgSrc": ImgDTZF, "title": "地图找房" ,"path":"/message"}, + { "imgSrc": ImgQCZ, "title": "去出租" ,"path":"/me"} +] +export class Home extends React.Component { + state = { + swipers: [] + } + async getSwitpers() { + const res = await axios.get('http://localhost:8080/home/swiper') + console.log('轮播图信息' + res.data.body) + this.setState( + { swipers: res.data.body } + // ()=>{ + // return{swipers:res.data.body} + // } + ) + } + componentDidMount() { + this.getSwitpers() + } + + renderSwipers() { + return this.state.swipers.map(item => ( + + )) + } + + render() { + return
+ {this.renderSwipers()} + + { + localCatalog.map((item,index) => ( + { + console.log("点击跳转") + this.props.navigate=item.path}}> +

{item.title}

+
+ )) + } +
+
+ }; +} \ No newline at end of file