Merge pull request '修复bug' (#71) from dengjie into dev

Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/71

components/myAvatar/myAvatar.vue

@@ -52,14 +52,6 @@
 				this.showEdit = false
 			}
 			this.getUser()
-			if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-				this.isLoad = false
-				// uni.navigateTo({
-				// 	url: '../../pages/my/login/login'
-				// })
-				return
-			}
-			this.isLoad = true
 		},
 		options: {
 			styleIsolation: 'shared', // 解除样式隔离

pages/my/my.vue

@@ -61,16 +61,6 @@
 			}
 			this.isLoad = true
 		},
-		onLoad() {
-			if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-				this.isLoad = false
-				// uni.navigateTo({
-				// 	url: '../../pages/my/login/login'
-				// })
-				return
-			}
-			this.isLoad = true
-		},
 		methods: {
 			//跳转到绑定公司页面
 			bindCompany() {
@@ -135,7 +125,9 @@
 					return
 				}
 				this.isLoad = true
-				this.$refs.myavatar.getUser()
+				if (this.isLoad) {
+					this.$refs.myavatar.getUser()
+				}
 			},
 			failToLoad() {
 				// uni.navigateBack({