From 561c8e663921e7a415fd6123d302af311525d747 Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Wed, 5 Jan 2022 09:55:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=A5=E5=8E=86=E9=A1=B5=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                     |   3 +-
 components/Calendar/Calendar.vue |   8 ++
 components/Projects/Projects.vue |   8 ++
 components/Upload/Upload.vue     |   8 ++
 pages.json                       |  13 +++-
 pages/index/index.vue            | 126 +++++++++++++++----------------
 pages/project/project.vue        |  64 ++++++++++++++++
 7 files changed, 161 insertions(+), 69 deletions(-)
 create mode 100644 components/Calendar/Calendar.vue
 create mode 100644 components/Projects/Projects.vue
 create mode 100644 components/Upload/Upload.vue
 create mode 100644 pages/project/project.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4460cec..2a7a65f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,10 @@
-# 1.0.0 (2022-01-04)
+# 1.0.0 (2022-01-05)
 
 ### 🌟 新功能
 范围|描述|commitId
 --|--|--
  - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8)
+ - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a)
  - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de)
  - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad)
 
diff --git a/components/Calendar/Calendar.vue b/components/Calendar/Calendar.vue
new file mode 100644
index 0000000..48d48ea
--- /dev/null
+++ b/components/Calendar/Calendar.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
diff --git a/components/Projects/Projects.vue b/components/Projects/Projects.vue
new file mode 100644
index 0000000..48d48ea
--- /dev/null
+++ b/components/Projects/Projects.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
diff --git a/components/Upload/Upload.vue b/components/Upload/Upload.vue
new file mode 100644
index 0000000..48d48ea
--- /dev/null
+++ b/components/Upload/Upload.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
diff --git a/pages.json b/pages.json
index 1aea851..1c2b2b7 100644
--- a/pages.json
+++ b/pages.json
@@ -3,13 +3,20 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarText": "TALL"
 			}
-		}
+		}
+		// {
+		// 	"path": "pages/project/project",
+		// 	"style": {
+		// 		"navigationStyle": "custom",
+		// 		"navigationBarTextStyle": "white"
+		// 	}
+		// }
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
+		"navigationBarTitleText": "TALL",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c452e57..7a5fadf 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,66 +1,62 @@
-<template>
-	<view :style="{ height: height }" class="flex flex-col overflow-hidden u-font-14">
-		<!-- 标题栏 -->
-		<Title />
-		
-		<view class="container flex flex-col flex-1 mx-auto overflow-hidden bg-gray-100">
-			<!-- 角色栏 -->
-			<Roles />
-
-			<!-- 日常任务面板 -->
-			<Globals />
-
-			<!-- 定期任务面板 -->
-			<TimeLine @getTasks="getTasks" class="flex-1 overflow-hidden" ref="timeLine" />
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import {
-		ref, onMounted
-	} from 'vue';
-	import Navbar from '@/components/Title/Title.vue';
-	import Roles from '@/components/Roles/Roles.vue';
-	import Globals from '@/components/Globals/Globals.vue';
-	import TimeLine from '@/components/TimeLine/TimeLine.vue';
-
-	let height = ref(null);
-
-	onMounted(() => {
-		const system = uni.getSystemInfoSync();
-		height.value = system.windowHeight + 'px';
-	});
-
-	function getTasks() {
-
-	}
-</script>
-
-<style>
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.logo {
-		height: 200rpx;
-		width: 200rpx;
-		margin-top: 200rpx;
-		margin-left: auto;
-		margin-right: auto;
-		margin-bottom: 50rpx;
-	}
-
-	.text-area {
-		display: flex;
-		justify-content: center;
-	}
-
-	.title {
-		font-size: 36rpx;
-		color: #8f8f94;
-	}
+<template>
+	<view class="flex flex-col h-full bg-gray-50" @click="openAuth">
+		<view class="relative" @touchmove="onMove">
+			<!-- 日历 -->
+			<Calendar @selected-change="onDateChange" :show-back="true" ref="calendar" @handleFindPoint="handleFindPoint" />
+			<!-- 上传 导入wbs -->
+			<Upload @success="onUploadSuccess" @error="onUploadError" />
+		</view>
+
+		<!-- 项目列表 -->
+		<Projects @getProjects="getProjects" class="flex-1 overflow-y-auto" />
+
+		<!-- 全局提示框 -->
+		<u-top-tips ref="uTips"></u-top-tips>
+	</view>
+</template>
+
+<script setup>
+	import { ref, onMounted } from 'vue';
+	import Calendar from '@/components/Calendar/Calendar.vue';
+	import Upload from '@/components/Upload/Upload.vue';
+	import Projects from '@/components/Projects/Projects.vue';
+
+	let height = ref(null);
+
+	onMounted(() => {
+		const system = uni.getSystemInfoSync();
+		height.value = system.windowHeight + 'px';
+	});
+
+	function getTasks() {
+
+	}
+</script>
+
+<style>
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.logo {
+		height: 200rpx;
+		width: 200rpx;
+		margin-top: 200rpx;
+		margin-left: auto;
+		margin-right: auto;
+		margin-bottom: 50rpx;
+	}
+
+	.text-area {
+		display: flex;
+		justify-content: center;
+	}
+
+	.title {
+		font-size: 36rpx;
+		color: #8f8f94;
+	}
 </style>
diff --git a/pages/project/project.vue b/pages/project/project.vue
new file mode 100644
index 0000000..8c394f6
--- /dev/null
+++ b/pages/project/project.vue
@@ -0,0 +1,64 @@
+<template>
+	<view :style="{ height: height }" class="flex flex-col overflow-hidden u-font-14">
+		<!-- 标题栏 -->
+		<Title />
+		
+		<view class="container flex flex-col flex-1 mx-auto overflow-hidden bg-gray-100">
+			<!-- 角色栏 -->
+			<Roles />
+
+			<!-- 日常任务面板 -->
+			<Globals />
+
+			<!-- 定期任务面板 -->
+			<TimeLine @getTasks="getTasks" class="flex-1 overflow-hidden" ref="timeLine" />
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, onMounted } from 'vue';
+	import Navbar from '@/components/Title/Title.vue';
+	import Roles from '@/components/Roles/Roles.vue';
+	import Globals from '@/components/Globals/Globals.vue';
+	import TimeLine from '@/components/TimeLine/TimeLine.vue';
+
+	let height = ref(null);
+
+	onMounted(() => {
+		const system = uni.getSystemInfoSync();
+		height.value = system.windowHeight + 'px';
+	});
+
+	function getTasks() {
+
+	}
+</script>
+
+<style>
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.logo {
+		height: 200rpx;
+		width: 200rpx;
+		margin-top: 200rpx;
+		margin-left: auto;
+		margin-right: auto;
+		margin-bottom: 50rpx;
+	}
+
+	.text-area {
+		display: flex;
+		justify-content: center;
+	}
+
+	.title {
+		font-size: 36rpx;
+		color: #8f8f94;
+	}
+</style>