Merge branch 'master' of http://git.zhiqiyun.com/xionghaojie/renshou

pages/user/user.vue

@@ -194,7 +194,7 @@
 		<view class="lt ddflex" @click="jumpConversation()">
 			<view class="ddflex" style="position: relative;width: 100%;height: 100%;">
 				<image src="../../static/pages/images/lt.png"></image>
-				<view class="lt-num">1</view>
+				<view class="lt-num" v-if="getMsgNumber()>0">{{getMsgNumber()}}</view>
 			</view>
 		</view>
 		
@@ -320,6 +320,12 @@
 			}
 		},
 		methods: {
+			
+			getMsgNumber(){
+				
+				return getApp().globalData.unReadMessageNum;
+			},
+			
 			styleHintPhoneText(phone) {
 				var phones = util.styleHintPhoneText(phone);
 				return phones;