From 6c39e3484e369c60c5c46113c3941ca176e53a1b Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Fri, 14 Jan 2022 14:15:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/record/index.vue | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pages/record/index.vue b/pages/record/index.vue
index bbae083..bc31717 100644
--- a/pages/record/index.vue
+++ b/pages/record/index.vue
@@ -13,7 +13,7 @@
 			<view class="search">
 				<!-- 头像 -->
 				<view class="user">
-					<u-icon name="arrow-left" color="#525252" size="20" class="downIcon" :bold="true" @click='$Router.back()'/>
+					<u-icon name="arrow-left" color="#525252" size="22" class="downIcon" :bold="true" @click='$Router.back()'/>
 					<!-- <u-image class="avatar" width="90rpx" height="90rpx" :src="user.avatar ? user.avatar : require('../../static/imgs/avatar.png')" :lazy-load="true" shape="circle" />
 					<view class="nickname">{{user.nickname}}</view> -->
 					<!-- <u-icon name="arrow-down-fill" color="#525252" size="10" class="downIcon" :bold="true" space="1"/> -->
@@ -36,7 +36,7 @@
 				<!-- 消息中心 -->
 				<view class="news" @click="$Router.push({name:'noticeIndex'})">
 					<u-icon name="bell-fill" color="#525252" size="24" :bold="true" space="1"/>
-					<u-badge class="dian" :isDot="false" bgColor="#e6576b"></u-badge>
+					<u-badge class="dian" :isDot="notifications_count > 0" bgColor="#e6576b"></u-badge>
 				</view>
 			</view>
 			<!-- 体重管理模块 -->
@@ -144,14 +144,14 @@
 			</view>
 		</template>
 		<!-- 未登录 -->
-		<template v-if="!is_login">
+		<template v-else-if="!is_login">
 			<!-- 搜索顶部 -->
 			<view class="search" @click="Login">
 				<!-- 头像 -->
 				<view class="user">
 					<!-- <u-image class="avatar" width="90rpx" height="90rpx" :src="require('../../static/imgs/avatar.png')" :lazy-load="true" shape="circle" />
 					<u-icon name="arrow-down-fill" color="#525252" size="10" class="downIcon" :bold="true" space="1" /> -->
-					<u-icon name="arrow-left" color="#525252" size="20" class="downIcon" :bold="true" @click='$Router.back()'/>
+					<u-icon name="arrow-left" color="#525252" size="22" class="downIcon" :bold="true" @click='$Router.back()'/>
 				</view>
 				<!-- 搜索框 -->
 				<u-search
@@ -168,7 +168,7 @@
 				<!-- 消息中心 -->
 				<view class="news">
 					<u-icon name="bell-fill" color="#525252" size="24" :bold="true" space="1" />
-					<u-badge class="dian" :isDot="true" bgColor="#e6576b"></u-badge>
+					<u-badge class="dian" :isDot="notifications_count > 0"  bgColor="#e6576b"></u-badge>
 				</view>
 			</view>
 			<!-- 体重管理模块 -->
@@ -242,14 +242,14 @@
 			</view>
 		</template>
 		<!-- 登录 (未建立档案) -->
-		<template v-if="is_login && !is_record">
+		<template v-eles-if="is_login && !is_record">
 			<!-- 搜索顶部 -->
 			<view class="search" @click="toCreateInfo">
 				<!-- 头像 -->
 				<view class="user">
 					<!-- <u-image class="avatar" width="90rpx" height="90rpx" :src="require('../../static/imgs/avatar.png')" :lazy-load="true" shape="circle" />
 					<u-icon name="arrow-down-fill" color="#525252" size="10" class="downIcon" :bold="true" space="1" /> -->
-					<u-icon name="arrow-left" color="#525252" size="20" class="downIcon" :bold="true" @click='$Router.back()'/>
+					<u-icon name="arrow-left" color="#525252" size="22" class="downIcon" :bold="true" @click='$Router.back()'/>
 				</view>
 				<!-- 搜索框 -->
 				<u-search
@@ -266,7 +266,7 @@
 				<!-- 消息中心 -->
 				<view class="news">
 					<u-icon name="bell-fill" color="#525252" size="24" :bold="true" space="1" />
-					<u-badge class="dian" :isDot="true" bgColor="#e6576b"></u-badge>
+					<u-badge class="dian" :isDot="notifications_count > 0"  bgColor="#e6576b"></u-badge>
 				</view>
 			</view>
 			<!-- 体重管理模块 -->
@@ -363,7 +363,8 @@ export default {
 			is_record: false, // - boolean - 当前是否完善信息 （创建档案）
 			notices: [], // -- array -- 公告
 			banner: {}, // -- object -- 轮播图
-			user: {}
+			user: {},
+			notifications_count:0,// 消息数量
 		};
 	},
 	onShow() {
@@ -401,6 +402,7 @@ export default {
 				this.notices = res.notices;
 				this.banner = res.banner;
 				this.user = res.user;
+				this.notifications_count = res.notifications_count;
 			});
 		},
 		/**
@@ -449,7 +451,7 @@ export default {
 			flex-direction: row;
 			position: relative;
 			.downIcon {
-				margin: 0 0 0 $margin * 0.4;
+				// margin: 0 0 0 $margin * 0.4;
 			}
 			.nickname{
 				background-color: rgba($color: #fa8168, $alpha:1 );