| 
					
				 | 
			
			
				@@ -7,7 +7,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		<!-- ===================================== 头像 ===================================== --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		<view class="u-flex user-box u-p-l-30 u-p-r-20 u-p-b-30 u-p-t-30"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			<view class="u-m-r-24" @click="clickHead"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				<u-avatar :src="userInfo.headImgUrl || pic" size="140"></u-avatar> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				<u-avatar :src="userInfo.headImgUrl || userInfo.avatar || pic" size="140"></u-avatar> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			</view> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			<view class="u-flex-1"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				<view class="u-font-18 u-p-b-20">{{ userInfo.nickname || userInfo.mobile }}</view> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -119,10 +119,10 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		onShow() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			this.getMsgNum() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			this.getDict() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			if (this.$store.state.vuex_hasLogin) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				this.userInfo = this.$store.state.vuex_user; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				if (this.$store.state.vuex_wxinfo) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					this.userInfo = Object.assign(this.userInfo, this.$store.state.vuex_wxinfo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			if (this.vuex_hasLogin) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				this.userInfo = this.vuex_user; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				if (this.vuex_wxinfo) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					this.userInfo = Object.assign(this.userInfo, this.vuex_wxinfo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			} else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				this.userInfo = []; 
			 |