Merge branch 'dev' into 'test'

登录成功如果为登录页则跳转首页

See merge request quanshu/mp-ui-user!67

src/pages/login/code.vue

@@ -153,8 +153,9 @@
 					if(res.code == 0) {
 						//判断有没有头像
 						if(res.data.avatar) {
+							let Pages = getCurrentPages()
 							setTimeout(() => {
-								if(this.pagesNum > 2) {
+								if(this.pagesNum > 2 && (Pages[this.pagesNum-3].route != "pages/login/index")) {
 									uni.navigateBack({
 										delta: 2
 									})