优化样式

pages/my/my.vue

@@ -4,7 +4,7 @@
 		<u-navbar :autoBack="false" title="我的"></u-navbar>
 		<u--image src="/static/my/wo_icon_bj1.png" width="750rpx" height="349rpx">
 		</u--image>
-		<myAvatar></myAvatar>
+		<myAvatar ref="myavatar"></myAvatar>
 		<view class="table">
 			<u-cell-group>
 				<u-cell size="large" title="绑定公司" icon="/static/my/wo_icon_bd.png" :isLink="true" value="未绑定公司"
@@ -30,18 +30,47 @@
 				</view>
 			</u-modal>
 		</view>
-
+		<view style="margin:0 20rpx;">
+			<u-overlay :show="!isLoad">
+				<login @success="reOnLoad()" @fail="failToLoad()"></login>
+			</u-overlay>
+		</view>
 	</view>
 </template>
 <script>
-	import loginVue from './login/login.vue'
+	import login from 'pages/my/login/login'
 	export default {
+		components: {
+			login
+		},
 		data() {
 			return {
 				showM: false,
 				phone: '138 1222 222',
+				isLoad: true,
 			}
 		},
+		onTabItemTap() {
+			this.$refs.myavatar.getUser()
+			if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
+				this.isLoad = false
+				// uni.navigateTo({
+				// 	url: '../../pages/my/login/login'
+				// })
+				return
+			}
+			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() {
@@ -95,6 +124,24 @@
 			},
 			close() {
 				this.showM = false
+			},
+			reOnLoad() {
+				if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
+					this.$toast.warn('登录失败请重试')
+					this.isLoad = false
+					// uni.navigateTo({
+					// 	url: '../../pages/my/login/login'
+					// })
+					return
+				}
+				this.isLoad = true
+				this.$refs.myavatar.getUser()
+			},
+			failToLoad() {
+				// uni.navigateBack({
+				// 	url: '/pages/my/my'
+				// })
+				this.$toast.warn('登录失败请重试')
 			}
 		}
 	}