From de483cde09bc47ee660691ab59e6eeccca3341a8 Mon Sep 17 00:00:00 2001
From: linju-json <linju@dcloud.io>
Date: Sun, 25 Apr 2021 17:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=90=E5=8A=9F=E7=99=BB?=
 =?UTF-8?q?=E9=99=86=E5=90=8E=E8=BF=94=E5=9B=9E=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复因目录结构变化导致的，登陆成功后返回的路由错误
---
 package.json                                  | 12 +++++-----
 .../login-page/common/loginPage.mixin.js      | 24 -------------------
 .../ucenter/login-page/common/loginSuccess.js |  5 +++-
 store/modules/user.js                         | 15 +++++++-----
 4 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/package.json b/package.json
index 523e77ef..3ac4d570 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
-	"id": "uni-search-template",
+	"id": "uniCloud-base-app",
 	"displayName": "baseApp",
-	"version": "0.1.4",
-	"description": "uniCloud云端一体项目模板，无需再开发服务器代码",
+	"version": "1.0.0",
+	"description": "云端一体项目基础功能示例",
 	"keywords": [
 		"baseApp",
 		"login",
@@ -13,14 +13,14 @@
         "usearch",
         "unisearch"
     ],
-	"repository": "https://gitee.com/dcloud/uniCloud-search",
+	"repository": "https://gitee.com/dcloud/base-app",
 	"engines": {
 		"HBuilderX": "^3.1.0"
 	},
 	"dcloudext": {
 		"category": [
 			"uniCloud",
-			"云端一体项目模板"
+			"云端一体项目基础功能示例"
 		],
 		"sale": {
 			"regular": {
@@ -80,4 +80,4 @@
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/pages/ucenter/login-page/common/loginPage.mixin.js b/pages/ucenter/login-page/common/loginPage.mixin.js
index fc342a81..c448423b 100644
--- a/pages/ucenter/login-page/common/loginPage.mixin.js
+++ b/pages/ucenter/login-page/common/loginPage.mixin.js
@@ -2,12 +2,6 @@ const helpPage = '/pages/ucenter/help/help';	// 帮助页面
 import {mapMutations} from 'vuex';
 import loginSuccess from './loginSuccess.js';
 let mixin = {
-	// // 监听帮助按钮
-	// onNavigationBarButtonTap(event) {
-	// 	uni.navigateTo({
-	// 		url:helpPage
-	// 	})
-	// },
 	data(){
 		return {
 			// 用户协议页面跳转
@@ -106,24 +100,6 @@ let mixin = {
 			loginSuccess(result)
 			delete result.userInfo.token
 			this.setUserInfo(result.userInfo)
-			// uni.showToast({
-			// 	title: '登陆成功',
-			// 	icon: 'none'
-			// });
-			// uni.setStorageSync('uni_id_uid', result.uid)
-			// uni.setStorageSync('uni_id_token', result.token)
-			// uni.setStorageSync('uni_id_token_expired', result.tokenExpired)
-			// delete result.userInfo.token
-			// this.setUserInfo(result.userInfo)
-			
-			// var delta = 0//判断需要返回几层
-			// let pages = getCurrentPages();
-			// pages.forEach((page,index)=>{
-			// 	if(pages[pages.length-index-1].route.split('/')[1] == 'uni-login-page'){
-			// 		delta ++
-			// 	}
-			// })
-			// uni.navigateBack({delta})
 		}
 	}
 }
diff --git a/pages/ucenter/login-page/common/loginSuccess.js b/pages/ucenter/login-page/common/loginSuccess.js
index 0c19774b..f94c54a9 100644
--- a/pages/ucenter/login-page/common/loginSuccess.js
+++ b/pages/ucenter/login-page/common/loginSuccess.js
@@ -14,9 +14,12 @@ export default function(result){
 	let pages = getCurrentPages();
 	console.log(pages);
 	pages.forEach((page,index)=>{
-		if(pages[pages.length-index-1].route.split('/')[1] == 'uni-login-page'){
+		console.log(pages[pages.length-index-1].route.split('/')[2]);
+		pages[pages.length-index-1].route.split('/')
+		if(pages[pages.length-index-1].route.split('/')[2] == 'login-page'){
 			delta ++
 		}
 	})
+	console.log('判断需要返回几层',delta);
 	uni.navigateBack({delta})
 }
\ No newline at end of file
diff --git a/store/modules/user.js b/store/modules/user.js
index 3f15a9ba..7bfa7569 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -1,11 +1,11 @@
 // 上次启动时的用户信息
-let userHistory = uni.getStorageSync('userInfo') || {};
+let userInfoHistory = uni.getStorageSync('userInfo') || {};
 
 let state = {
-		/* 是否需要强制登录 */
-		forcedLogin: false,
-		hasLogin: Boolean(userHistory),
-		info: userHistory
+		//是否已经登陆
+		hasLogin: Boolean(Object.keys(userInfoHistory).length),
+		//用户信息
+		info: userInfoHistory
 	},
 	getters = {
 		info(state) {
@@ -16,10 +16,13 @@ let state = {
 		}
 	},
 	mutations = {
-		login(state, info) {
+		login(state, info) { //登陆成功后的操作
+			//原有的结合传来的参数
 			let _info = state.info;
 			state.info = Object.assign({}, _info, info);
+			//设置为已经登陆
 			state.hasLogin = true;
+			//存储最新的用户数据到本地持久化存储
 			uni.setStorageSync('userInfo', state.info);
 		},
 		logout(state) {
-- 
GitLab