Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-xqjy

pages/friend/index.vue

@@ -135,7 +135,7 @@
 				</u-image>
 				<view class="friendList-text">
 					<view class="friendList-name">
-						<span>{{item.realName}}</span>
+						<span>{{showName(item.realName)}}</span>
 						<u-icon v-if="item.gender" custom-prefix="custom-icon" name="women-line" color="#FF695B"></u-icon>
 						<u-icon v-else custom-prefix="custom-icon" name="men-line" color="#1677FF"></u-icon>
 					</view>

pages/friend/personal.vue

@@ -35,7 +35,7 @@
  			</view>
 			<view class="personal-main"  v-if="detail.id">
 				<view class="personal-name">
-					<span v-text="detail.realName"></span>
+					<span v-text="showName(detail.realName)"></span>
 					<u-icon custom-prefix="custom-icon" :name="detail.gender?'women-line':'men-line'" :color="detail.gender?'#FF695B':'#1677FF'"></u-icon>
 				</view>
 				<view class="personal-space">

pages/praise/index.vue

@@ -64,23 +64,32 @@
 		onShow() {
 			if(this.carhelp.getPersonInfo().id != null) {
 				this.getHomePage(true);
-			} else {
-				uni.showToast({
-					title: "请用户先登录再浏览本页面",
-					icon: "none"
-				})
 			}
 		},		
 		methods: {
 			toIPraise() {
-				uni.navigateTo({
-					url: '/pages/praise/iPraise'
-				});
+				if(this.carhelp.getPersonInfo().id != null) {
+					uni.navigateTo({
+						url: '/pages/praise/iPraise'
+					});
+				} else {
+					uni.showToast({
+						title: "请用户先登录再浏览本页面",
+						icon: "none"
+					})
+				}
 			},
 			toPraiseMe() {
-				uni.navigateTo({
-					url: '/pages/praise/praiseMe'
-				});
+				if(this.carhelp.getPersonInfo().id != null) {
+					uni.navigateTo({
+						url: '/pages/praise/praiseMe'
+					});
+				} else {
+					uni.showToast({
+						title: "请用户先登录再浏览本页面",
+						icon: "none"
+					})
+				}
 			},
 			getHomePage(bl) {
 				uni.showLoading({