diff --git a/.gitignore b/.gitignore
index 7f7ecab..37c545c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/OM/unpackage/
+/unpackage/
+
diff --git a/OM/.hbuilderx/launch.json b/.hbuilderx/launch.json
similarity index 100%
rename from OM/.hbuilderx/launch.json
rename to .hbuilderx/launch.json
diff --git a/OM/App.vue b/App.vue
similarity index 100%
rename from OM/App.vue
rename to App.vue
diff --git a/OM/pages/login/login.vue b/OM/pages/login/login.vue
deleted file mode 100644
index 50e2eec..0000000
--- a/OM/pages/login/login.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-	<view class="container">
-		<view class="container-top">
-			欢迎登录物业管理系统
-		</view>
-		<view class="container-title">
-			<view class="container-title-view">登录</view>
-		</view>
-		<view class="container-bottom">
-			
-		</view>
-	</view>
-</template>
-
-<script setup>
-
-</script>
-
-<style lang="scss">
-	$globalWidth: 600rpx;
-	$buttonColor: #0e7ff5;
-
-	.container {
-		display: flex;
-		background: -webkit-linear-gradient(270deg,
-				rgba(227, 239, 249, 1) 0%,
-				rgba(245, 245, 247, 1) 100%);
-		flex-direction: column;
-		/* align-items: center; */
-		width: 100%;
-		height: 100vh;
-
-		align-items: center;
-
-		.container-top {
-			margin-top: 200rpx;
-			width: $globalWidth;
-			font-size: 50rpx;
-			font-weight: 400;
-		}
-
-		.container-title {
-			width: $globalWidth;
-			margin-top: 80rpx;
-			font-size: 35rpx solid $buttonColor;
-
-			.container-title-view {
-				border-bottom: 6rpx solid $buttonColor;
-				width: 70rpx;
-				text-align: center;
-				border-radius: 15rpx;
-			}
-		}
-
-		.container-bottom {
-			width: $globalWidth;
-			margin-top: 80rpx;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/OM/index.html b/index.html
similarity index 100%
rename from OM/index.html
rename to index.html
diff --git a/OM/main.js b/main.js
similarity index 89%
rename from OM/main.js
rename to main.js
index c1caf36..25a75ad 100644
--- a/OM/main.js
+++ b/main.js
@@ -1,4 +1,4 @@
-import App from './App'
+import App from './App.vue'
 
 // #ifndef VUE3
 import Vue from 'vue'
diff --git a/OM/manifest.json b/manifest.json
similarity index 100%
rename from OM/manifest.json
rename to manifest.json
diff --git a/OM/pages.json b/pages.json
similarity index 100%
rename from OM/pages.json
rename to pages.json
diff --git a/OM/pages/index/index.vue b/pages/index/index.vue
similarity index 100%
rename from OM/pages/index/index.vue
rename to pages/index/index.vue
diff --git a/pages/login/login.vue b/pages/login/login.vue
new file mode 100644
index 0000000..d5f1351
--- /dev/null
+++ b/pages/login/login.vue
@@ -0,0 +1,146 @@
+<template>
+	<view class="container">
+		<view class="container-top">
+			欢迎{{status?"登录":"注册"}}物业管理系统
+		</view>
+		<view class="container-title">
+			<view class="container-title-view" >{{status?"登录":"注册"}}</view>
+
+		</view>
+		<view class="container-bottom">
+			<label class="container-text">账号</label>
+			<input class="container-input" type="text" v-model="username" placeholder="请输入您的账号" />
+			<label class="container-text">密码</label>
+			<input class="container-input" type="password" v-model="password" placeholder="请输入您的密码"
+				safe-password-time-stamp="fef" />
+		</view>
+
+		<view class="container-button" @click="handleClick">
+			{{status?"登录":"注册"}}
+		</view>
+		<view class="container-change" @click="status = !status">{{status?"前往注册":"前往登录"}}</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref
+	} from 'vue';
+	// 登录注册状态
+	const status = ref(true)
+	// 用户名
+	const username = ref('')
+	// 密码
+	const password = ref('')
+
+	const handleClick = () => {
+		if (status.value) {
+			console.log('登录成功')
+			uni.navigateTo({
+				url:'/pages/index/index'
+			})
+		} else {
+			console.log('注册成功')
+		}
+	}
+</script>
+
+<style lang="scss">
+	$globalWidth: 600rpx;
+	$buttonColor: #0e7ff5;
+
+	.container {
+		display: flex;
+		background: -webkit-linear-gradient(270deg,
+				rgba(227, 239, 249, 1) 0%,
+				rgba(245, 245, 247, 1) 100%);
+		flex-direction: column;
+		/* align-items: center; */
+		width: 100%;
+		height: 100vh;
+
+		align-items: center;
+
+		.container-top {
+			margin-top: 200rpx;
+			width: $globalWidth;
+			font-size: 50rpx;
+			font-weight: 400;
+		}
+
+		.container-title {
+			width: $globalWidth;
+			margin-top: 80rpx;
+			display: flex;
+			font-size: 35rpx solid $buttonColor;
+
+			.container-title-view {
+				border-bottom: 6rpx solid $buttonColor;
+				width: 70rpx;
+				text-align: center;
+				border-radius: 15rpx;
+			}
+		}
+
+		.container-bottom {
+			width: $globalWidth;
+			margin-top: 120rpx;
+
+
+			/*
+			文字样式
+			*/
+			.container-text {
+				font-size: 40rpx;
+				font-weight: bold;
+			}
+
+			/*
+			输入框样式
+			*/
+			.container-input {
+				width: $globalWidth;
+				height: 100rpx;
+				background-color: #fafafa;
+				border-radius: 20rpx;
+				margin-top: 25rpx;
+				margin-bottom: 25rpx;
+				padding-left: 20rpx;
+				margin-right: 20rpx;
+				margin-left: -10rpx;
+
+			}
+		}
+
+		/*
+			登录按钮
+		*/
+		.container-button {
+			margin-top: 30rpx;
+			width: $globalWidth;
+			color: white;
+			margin-top: 120rpx;
+			text-align: center;
+			height: 100rpx;
+			line-height: 100rpx;
+			background-color: $buttonColor;
+			border: none;
+			border-radius: 60rpx;
+			-moz-box-shadow: none;
+			-webkit-box-shadow: none;
+			box-shadow: none;
+		}
+
+
+		.container-change {
+			text-align: right;
+			margin-right: 20rpx;
+			margin-top: 50rpx;
+			width: $globalWidth;
+			color: $buttonColor;
+			font-size: 35rpx;
+		}
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/OM/static/logo.png b/static/logo.png
similarity index 100%
rename from OM/static/logo.png
rename to static/logo.png
diff --git a/OM/uni.promisify.adaptor.js b/uni.promisify.adaptor.js
similarity index 100%
rename from OM/uni.promisify.adaptor.js
rename to uni.promisify.adaptor.js
diff --git a/OM/uni.scss b/uni.scss
similarity index 100%
rename from OM/uni.scss
rename to uni.scss