Merge branch 'dev' into chenxuelian

components/myAvatar/myAvatar.vue

@@ -68,7 +68,14 @@
 				this.$apiServe.getUser().then(res => {
 					console.log('个人信息==', res.data);
 					if (res.data.msg == "登录超时，请重新登录") {
-						this.isLoad = false
+						if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
+							this.$toast.warn('登录失败请重试')
+							this.isLoad = false
+							// uni.navigateTo({
+							// 	url: '../../pages/my/login/login'
+							// })
+							return
+						}
 					}
 					var data = res.data.data
 					this.avatar = data.avatar