From ebff4140cca715d8942026a9ff666af45c7ba59d Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Sun, 16 Apr 2023 22:25:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                 |  3 +++
 pages.json                    | 13 ++++++-------
 pages/checkList/checkList.vue |  2 +-
 pages/login/login.vue         |  6 +++---
 pages/taskList/taskList.vue   |  4 ++--
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/manifest.json b/manifest.json
index 80982d2..6f40bfc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,6 +9,9 @@
     "app-plus" : {
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
+		"statusbar":{
+			"immersed": false 
+		},
         "compilerVersion" : 3,
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
diff --git a/pages.json b/pages.json
index 904dbdf..7094c63 100644
--- a/pages.json
+++ b/pages.json
@@ -8,9 +8,7 @@
 				"navigationStyle": "custom",
 				"navigationBarBackgroundColor":"#FFFFFF",
 				"app-plus": {
-					"titleNView": {
-						"autoBackButton": false
-					}
+					"titleNView": false
 				}
 			}
 		},
@@ -28,9 +26,7 @@
 				"navigationStyle": "custom",
 				"navigationBarBackgroundColor":"#FFFFFF",
 				"app-plus": {
-					"titleNView": {
-						"autoBackButton": false
-					}
+					"titleNView": false
 				}
 			}
 		},
@@ -61,8 +57,11 @@
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F7F8FA",
 		"backgroundColor": "#F7F8FA",
+		"navigationStyle":"custom",//禁用原生导航
+		
 		"app-plus": {
-			"background": "#efeff4"
+			"background": "#efeff4",
+			"titleNView": false
 		}
 	},
 	"tabBar": {
diff --git a/pages/checkList/checkList.vue b/pages/checkList/checkList.vue
index f2491b3..3e3c0d9 100644
--- a/pages/checkList/checkList.vue
+++ b/pages/checkList/checkList.vue
@@ -232,7 +232,7 @@
 		}
 	}
 .taskList{
-	min-height: calc(100vh - 100upx);
+	min-height: calc(100vh);
 	background-color: #F7F8FA;
 	.taskItem{
 		background: #FFFFFF;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d1654c4..ddcf663 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -59,12 +59,12 @@ export default {
 						title:'登录成功',
 						icon:'none'
 					});
+					
+					uni.setStorageSync('userToken',res.data.userToken) 
+					// this.$store.commit('login',res.data.userToken)
 					uni.reLaunch({
 						url:'/pages/taskList/taskList'
 					})
-					uni.setStorageSync('userToken',res.data.userToken) 
-					this.$store.commit('login',res.data.userToken)
-					
 				}else{
 					uni.showToast({
 						title:res.msg,
diff --git a/pages/taskList/taskList.vue b/pages/taskList/taskList.vue
index 3333ca6..84dba3e 100644
--- a/pages/taskList/taskList.vue
+++ b/pages/taskList/taskList.vue
@@ -79,7 +79,7 @@
 			},
 			getData(){
 				getTaskList().then(res=>{
-					
+					console.log(res,"000")
 					this.taskList = res.data
 				})
 			},
@@ -123,7 +123,7 @@
 		padding:50upx 70upx;
 	}
 .taskList{
-	min-height: calc(100vh - 100upx);
+	min-height: calc(100vh);
 	background-color: #F7F8FA;
 	.taskItem{
 		background: #FFFFFF;