diff --git a/src/componments/Model/index.jsx b/src/componments/Model/index.jsx
new file mode 100644
index 0000000..f5d2f3e
--- /dev/null
+++ b/src/componments/Model/index.jsx
@@ -0,0 +1,28 @@
+import { View, Text, Image, Button, Icon } from "@tarojs/components";
+import { useLoad } from "@tarojs/taro";
+import Taro from "@tarojs/taro";
+import {
+ AtAvatar,
+ AtTag,
+ AtIcon,
+ AtTabBar,
+ AtButton,
+ AtAccordion,
+ AtList,
+ AtListItem,
+} from "taro-ui";
+import "./index.scss";
+import beijing from "@/images/city/beijing.jpg";
+import guangzhou from "@/images/city/guangzhou.jpg";
+import shanghai from "@/images/city/shanghai.jpg";
+import shenzhen from "@/images/city/shenzhen.jpg";
+import touxiang from "@/images/index/touxiang.jpg";
+import TabbarCom from "@/componments/TabbarCom";
+import { useEffect, useState } from "react";
+const Model = () => {
+ const [open, setopen] = useState(false);
+
+ return ;
+};
+
+export default Model;
diff --git a/src/componments/Model/index.scss b/src/componments/Model/index.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/componments/QrCode/index.jsx b/src/componments/QrCode/index.jsx
new file mode 100644
index 0000000..e80e069
--- /dev/null
+++ b/src/componments/QrCode/index.jsx
@@ -0,0 +1,83 @@
+import { View, Text, Image, Button, Icon, Dialog } from "@tarojs/components";
+import { useLoad } from "@tarojs/taro";
+import Taro from "@tarojs/taro";
+import {
+ AtAvatar,
+ AtTag,
+ AtIcon,
+ AtTabBar,
+ AtButton,
+ AtAccordion,
+ AtList,
+ AtListItem,
+ AtModal,
+ AtModalHeader,
+ AtModalContent,
+ AtModalAction,
+ AtCurtain,
+} from "taro-ui";
+import "./index.scss";
+import beijing from "@/images/city/beijing.jpg";
+import guangzhou from "@/images/city/guangzhou.jpg";
+import shanghai from "@/images/city/shanghai.jpg";
+import shenzhen from "@/images/city/shenzhen.jpg";
+import touxiang from "@/images/index/touxiang.jpg";
+import QRcodePng from "@/images/index/QRcode.png";
+
+import TabbarCom from "@/componments/TabbarCom";
+import { useEffect, useState } from "react";
+const QrCode = (props) => {
+ console.log("props", props);
+ const [isOpened, setisOpened] = useState(false);
+ useEffect(() => {
+ setisOpened(props.isOpened);
+ }, [props.isOpened]);
+
+ const Qrcode = () => {
+ return (
+
+ 长按识别二维码
+
+
+ );
+ };
+ return (
+
+ {/* {
+ setisOpened(false);
+ }}
+ onCancel={() => {
+ setisOpened(false);
+ }}
+ onConfirm={() => {
+ setisOpened(false);
+ }}
+ content={Qrcode}
+ /> */}
+
+ {
+ setisOpened(false);
+ // 设置父组件状态
+ props.setisOpened(false);
+ }}
+ >
+
+
+
+ );
+};
+
+export default QrCode;
diff --git a/src/componments/QrCode/index.scss b/src/componments/QrCode/index.scss
new file mode 100644
index 0000000..93e3e7e
--- /dev/null
+++ b/src/componments/QrCode/index.scss
@@ -0,0 +1,13 @@
+.QrCode{
+
+ .wechatCode{
+ width: 600px;
+ height: 600px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ // background-color: #fff;
+ }
+
+}
\ No newline at end of file
diff --git a/src/images/index/QRcode.png b/src/images/index/QRcode.png
new file mode 100644
index 0000000..b91c505
Binary files /dev/null and b/src/images/index/QRcode.png differ
diff --git a/src/pages/index/index.jsx b/src/pages/index/index.jsx
index 3947d40..2eb2091 100644
--- a/src/pages/index/index.jsx
+++ b/src/pages/index/index.jsx
@@ -9,6 +9,7 @@ import shanghai from "@/images/city/shanghai.jpg";
import shenzhen from "@/images/city/shenzhen.jpg";
import touxiang from "@/images/index/touxiang.jpg";
import TabbarCom from "@/componments/TabbarCom";
+import QrCode from "@/componments/QrCode";
import { useEffect, useState } from "react";
// import beijing from "../../images/city/beijing.jpg";
@@ -16,6 +17,7 @@ import { useEffect, useState } from "react";
export default function Index() {
// 用户基本信息
const [userInfo, setuserInfo] = useState({});
+ const [isOpened, setisOpened] = useState(false);
useLoad(() => {
console.log("Page loaded.");
@@ -46,9 +48,14 @@ export default function Index() {
}, []);
// 自定义组件
- const CustomTest = () => {
+ const JoinWechat = () => {
return (
-
+ {
+ setisOpened(true);
+ }}
+ >
🥂加入微信群-meetup
{/*
*/}
- {[1, 2, 3, 4,5,6,7].map((item, index) => {
+ {[1, 2, 3, 4, 5, 6, 7].map((item, index) => {
return (
,
+ customCom: ,
},
{
cityName: "上海",
@@ -97,10 +104,10 @@ export default function Index() {
customCom: "test",
},
// {
- // cityName: "上海",
+ // cityName: "同城活动",
// imagePath: shanghai,
// isCustom: true,
- // customCom: ,
+ // customCom: ,
// },
{
cityName: "广州",
@@ -112,7 +119,7 @@ export default function Index() {
// cityName: "上海",
// imagePath: shanghai,
// isCustom: true,
- // customCom: ,
+ // customCom: ,
// },
{
cityName: "深圳",
@@ -120,6 +127,12 @@ export default function Index() {
isCustom: false,
customCom: "test",
},
+ // {
+ // cityName: "腾讯云推广",
+ // imagePath: shanghai,
+ // isCustom: true,
+ // customCom: ,
+ // },
].map((item, index) => {
return (
// 设置自动换行
@@ -187,6 +200,7 @@ export default function Index() {
{/* 底部tabbar */}
+
);
}
diff --git a/src/pages/my/index.jsx b/src/pages/my/index.jsx
index e26ced9..0c263be 100644
--- a/src/pages/my/index.jsx
+++ b/src/pages/my/index.jsx
@@ -32,20 +32,20 @@ const my = () => {
{/* 头像 */}
- 昵称
- 女
+ 星球新居民
+ {/* 女 */}
{/* 列表 */}