From dceaa2c2aee82144fcf2f12cf788e09d643115b0 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Thu, 14 Jul 2022 11:57:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=A5=E6=8A=A5=E5=91=A8?=
 =?UTF-8?q?=E6=8A=A5=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                        |  23 ++
 config.js                      |   2 +
 pages/index/consumer/index.vue |  33 ++-
 pages/index/customer.vue       |  82 ++++---
 pages/index/index.vue          | 383 ++++++++++++++++++++-------------
 pages/index/learning.vue       |  24 +++
 pages/index/personal.vue       |  98 +++++++--
 7 files changed, 436 insertions(+), 209 deletions(-)

diff --git a/App.vue b/App.vue
index 0a54a75..bb97bb3 100644
--- a/App.vue
+++ b/App.vue
@@ -172,6 +172,29 @@
 					}
 				}
 			})
+			
+		
+				this.$u.get(config.service.notReadNum, {
+					id: uni.getStorageSync('weapp_session_userInfo_data').accountId,
+					projectId: uni.getStorageSync('buildingID').id
+				}).then(res => {
+					console.log(res)
+					if (res > 0) {
+						uni.setTabBarBadge({ //显示数字
+							index: 4, //tabbar下标
+							text: res || 0 //数字
+						})
+					} else {
+						uni.removeTabBarBadge({
+							index: 4
+						})
+					}
+				}).catch(e => {
+					uni.removeTabBarBadge({
+						index: 4
+					})
+				})
+			
 			// this.$u.get("/user/getUser")
 			// .then(data => {
 			// 	if (data.user.total==0) {
diff --git a/config.js b/config.js
index 80ee131..c6d5858 100644
--- a/config.js
+++ b/config.js
@@ -77,6 +77,8 @@ var config = {
 	// 升级公告更新阅读
 	updateRead: `${host}/zkMessage/updateFlag`,
 	
+	//消息未读数
+	notReadNum: `${host}/zkMessage/findFlagCount`,
 	// 隐私协议
 	privacyAgr: `${host}/zkPrivate/findById`,
   }
diff --git a/pages/index/consumer/index.vue b/pages/index/consumer/index.vue
index 1b8b42d..883bb19 100644
--- a/pages/index/consumer/index.vue
+++ b/pages/index/consumer/index.vue
@@ -255,11 +255,6 @@
 		</u-popup>
 		<!-- <u-select v-model="soltishow" :list="orderBylist" @confirm="selectCallback2"></u-select> -->
 
-		<!-- 底部导航栏 -->
-		<!-- 		<u-tabbar :mid-button="true" activeColor="#1296db" inactiveColor="#999999" v-model="current" :list="tabbarList">
-		</u-tabbar> -->
-
-
 		<!-- 加载组件 -->
 		<u-loadings v-model="LOADING"></u-loadings>
 	</view>
@@ -267,14 +262,13 @@
 </template>
 
 <script>
-	import tabbarList from '@/utils/tabbar.js'
+	var config = require("@/config");
 	let _this
 	export default {
 		data() {
 			return {
 				// tabbar配置项
 				current: 1,
-				tabbarList: tabbarList,
 				//--- end --- tabbar配置项
 				orderBylist: [{
 						label: '创建时间倒序',
@@ -433,6 +427,7 @@
 				this.getMyCustom()
 				this.isnorefresh = 'refresh';
 			}
+			this.updateInit()
 		},
 		onReachBottom() {
 			if (this.totalRecord == this.nextPage) {
@@ -449,6 +444,30 @@
 			}
 		},
 		methods: {
+
+			updateInit() {
+				this.$u.get(config.service.notReadNum, {
+					id: uni.getStorageSync('weapp_session_userInfo_data').accountId,
+					projectId: uni.getStorageSync('buildingID').id
+				}).then(res => {
+					console.log(res)
+					if (res > 0) {
+						uni.setTabBarBadge({ //显示数字
+							index: 4, //tabbar下标
+							text: `${res}`//数字
+						})
+					} else {
+						uni.removeTabBarBadge({
+							index: 4
+						})
+					}
+				}).catch(e => {
+					uni.removeTabBarBadge({
+						index: 4
+					})
+				})
+			},
+
 			filterFun() {
 
 			},
diff --git a/pages/index/customer.vue b/pages/index/customer.vue
index 4b48042..10e0696 100644
--- a/pages/index/customer.vue
+++ b/pages/index/customer.vue
@@ -152,14 +152,13 @@
 </template>
 
 <script>
-	import tabbarList from '@/utils/tabbar.js'
+		var config = require("../../config");
 	export default {
 		data() {
 			return {
-				noClick:true,
+				noClick: true,
 				// tabbar配置项
 				current: 0,
-				tabbarList: tabbarList,
 				//--- end --- tabbar配置项
 				buildingID: '',
 				waitCustomList: [],
@@ -206,15 +205,41 @@
 			this.dataCode = dataCode;
 			this.init()
 			this.queryHaveDept()
+			this.updateInit()
 		},
-		
-		onPullDownRefresh(){
+
+		onPullDownRefresh() {
 			this.init()
-			setTimeout(function () {
-			    uni.stopPullDownRefresh();
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
 			}, 1000);
 		},
 		methods: {
+
+
+			updateInit() {
+				this.$u.get(config.service.notReadNum, {
+					id: uni.getStorageSync('weapp_session_userInfo_data').accountId,
+					projectId: uni.getStorageSync('buildingID').id
+				}).then(res => {
+					console.log(res)
+					if (res > 0) {
+						uni.setTabBarBadge({ //显示数字
+							index: 4, //tabbar下标
+							text: `${res}`//数字
+						})
+					} else {
+						uni.removeTabBarBadge({
+							index: 4
+						})
+					}
+				}).catch(e => {
+					uni.removeTabBarBadge({
+						index: 4
+					})
+				})
+			},
+
 			reshCustom() {
 				this.init()
 			},
@@ -312,24 +337,24 @@
 					cancelColor: "#999999",
 					success: res => {
 						if (this.noClick) {
-						    this.noClick= false;
-						    if (res.confirm) {
-						    	this.$u.post("/customer/endReception", {
-						    		id: id,
-						    		houseId: this.buildingID
-						    	}).then(res => {
-						    		uni.showToast({
-						    			icon: "none",
-						    			title: "操作成功"
-						    		})
-						    		this.init();
-						    	});
-						    }
-						    setTimeout(()=> {
-						        this.noClick= true;
-						    }, 2000)
+							this.noClick = false;
+							if (res.confirm) {
+								this.$u.post("/customer/endReception", {
+									id: id,
+									houseId: this.buildingID
+								}).then(res => {
+									uni.showToast({
+										icon: "none",
+										title: "操作成功"
+						 		})
+									this.init();
+								});
+							}
+							setTimeout(() => {
+								this.noClick = true;
+							}, 2000)
 						} else {
-						    //  这里是重复点击的判断
+							//  这里是重复点击的判断
 						}
 					}
 				})
@@ -614,9 +639,12 @@
 				font-size: 30rpx;
 				font-weight: 400;
 				color: #666666;
-				overflow: hidden;/*超出部分隐藏*/
-				text-overflow:ellipsis;/* 超出部分显示省略号 */
-				white-space: nowrap;/*规定段落中的文本不进行换行 */
+				overflow: hidden;
+				/*超出部分隐藏*/
+				text-overflow: ellipsis;
+				/* 超出部分显示省略号 */
+				white-space: nowrap;
+				/*规定段落中的文本不进行换行 */
 			}
 
 			.arriveNum {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index bcd484f..23bb680 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -7,7 +7,8 @@
 			<view class="Switching2 u-line-1">项目：{{buildingname}}</view>
 			<view class="Switching4" v-if="buildingishow" @click="piskbuilding()">切换项目</view>
 		</view>
-		<view class="title" style="margin-top: 30rpx; display: flex; justify-content: space-between;" v-if="permissions.myisshebei">
+		<view class="title" style="margin-top: 30rpx; display: flex; justify-content: space-between;"
+			v-if="permissions.myisshebei">
 			<view class="gongpai">
 				我的工牌:{{imeiCode||'未绑定'}}
 			</view>
@@ -65,7 +66,7 @@
 			</view>
 		</view>
 
-<!-- 
+		<!-- 
 		<view class="title" v-if="permissions.shebeinum">待处理</view>
 		<view class="shebenbox" v-if="permissions.shebeinum" >
 			<view class="shebenche" @click="indexStatus(0)">
@@ -82,11 +83,13 @@
 			</view>
 		</view> -->
 
-<!-- 设备总览 -->
+		<!-- 设备总览 -->
 		<view class="contbox" v-if="permissions.shebeinum">
-			<view class="title"> 
-				<image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png" mode="" />
-				设备总览</view>
+			<view class="title">
+				<image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png"
+					mode="" />
+				设备总览
+			</view>
 			<view class="shebenbox">
 				<view class="shebenche" @click="tapjumpequipment(0)">
 					<view class="shebenchenum">{{equipmentobj.totalNum || 0}}</view>
@@ -109,11 +112,15 @@
 		</view>
 		<!-- 今日工作 -->
 		<view class="contbox" v-if="permissions.shishinum">
-			<view class="title" ><image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png" mode="" />今日工作</view>
+			<view class="title">
+				<image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png"
+					mode="" />今日工作
+			</view>
 			<view class="real-timebox">
 				<view class="timebox">
 					<view class="real" @click="tapjumpreception('1')">
-						<view class="realnum u-flex"  style="justify-content: center">{{realtimeobj.fraction || 0}}<text style="font-weight: 400;font-family: SimHei;font-size: 30rpx;">%</text>
+						<view class="realnum u-flex" style="justify-content: center">{{realtimeobj.fraction || 0}}<text
+								style="font-weight: 400;font-family: SimHei;font-size: 30rpx;">%</text>
 							<!-- <image class="qushi-icon" src="/static/images/excute.png"  mode="" /> -->
 						</view>
 						<view class="realtext">平均执行率</view>
@@ -133,7 +140,8 @@
 				</view>
 				<view class="timebox" style="margin-bottom:0;">
 					<view class="real" @click="tapjumpreception('1')">
-						<view class="realnum">{{realtimeobj.avgDuration|| 0}}<text style="font-size: 30rpx;font-weight: 400;font-family: SimHei">min</text></view>
+						<view class="realnum">{{realtimeobj.avgDuration|| 0}}<text
+								style="font-size: 30rpx;font-weight: 400;font-family: SimHei">min</text></view>
 						<view class="realtext">平均接待时长</view>
 					</view>
 					<view class="real" @click="tapjumpreception('4')">
@@ -142,7 +150,8 @@
 					</view>
 					<view class="real">
 						<view @click="prohibitedtap(1)" v-if="methodsisshow==true" class="realnum" style="color: red;">
-							{{realtimeobj.prohibitedCustomer || 0}}</view>
+							{{realtimeobj.prohibitedCustomer || 0}}
+						</view>
 						<view @click="prohibitedtap(1)" v-if="methodsisshow==true" class="realtext">违禁预警</view>
 					</view>
 					<view class="real">
@@ -154,19 +163,21 @@
 			</view>
 		</view>
 		<!-- 近30天 -->
-		<view class="contbox"  v-if="permissions.jileinum">
+		<view class="contbox" v-if="permissions.jileinum">
 			<view class="title">
-				<image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png" mode="" />
-				<view style="width: 70%;"  @click="taptimeisshow">
+				<image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png"
+					mode="" />
+				<view style="width: 70%;" @click="taptimeisshow">
 					<!-- 概览 -->
 					{{choiceIndex}}累计<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 				</view>
 			</view>
 			<!-- <view class="timeshow">统计时间：2022.05.20-2022.05.27</view> -->
-			<view class="real-timebox" >
+			<view class="real-timebox">
 				<view class="timebox">
 					<view class="real" @click="tapjumpreception('3')">
-						<view class="realnum u-flex" style="justify-content: center">{{Thisweekobj.fraction || 0}}<text style="font-weight: 400;font-family: SimHei;font-size: 30rpx;">%</text>
+						<view class="realnum u-flex" style="justify-content: center">{{Thisweekobj.fraction || 0}}<text
+								style="font-weight: 400;font-family: SimHei;font-size: 30rpx;">%</text>
 							<!-- <image class="qushi-icon" src="/static/images/qushi-up.png" mode="" /> -->
 						</view>
 						<view class="realtext">平均执行率</view>
@@ -182,7 +193,8 @@
 				</view>
 				<view class="timebox" style="margin-bottom:0;">
 					<view class="real" @click="tapjumpreception('3')">
-						<view class="realnum">{{Thisweekobj.avgDuration || 0}}<text style="font-size: 30rpx;font-weight: 400;font-family: SimHei">min</text></view>
+						<view class="realnum">{{Thisweekobj.avgDuration || 0}}<text
+								style="font-size: 30rpx;font-weight: 400;font-family: SimHei">min</text></view>
 						<view class="realtext">平均接待时长</view>
 					</view>
 					<view class="real" @click="prohibitedtap(2)" v-if="methodsisshow">
@@ -201,86 +213,105 @@
 			</view>
 		</view>
 		<!-- 常用功能 -->
-	<view class="contbox" >
-		<view class="title" v-if="permissions.commonly2||permissions.commonly3||permissions.commonly10">
-			<image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png" mode="" />接待管理</view>
-		<view class="commonly-box">
-			<view class="commonly" @click="Piabodata('接待记录')" v-if="permissions.commonly2">
-				<view class="commonly-img">
-					<image class="commonly-img1" src="https://static.quhouse.com/4649b5bd19124afca0f1a809f93bfd73.png" mode=""></image>
-				</view>
-				<view class="commonly-text">接待记录</view>
+		<view class="contbox">
+			<view class="title" v-if="permissions.commonly2||permissions.commonly3||permissions.commonly10">
+				<image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png"
+					mode="" />接待管理
 			</view>
-			<view class="commonly" @click="Piabodata('违禁记录')" v-if="permissions.commonly3">
-				<view class="commonly-img">
-					<image class="commonly-img1" src="https://static.quhouse.com/b1dd1da2a969465bbbf41818320b8487.png" mode=""></image>
+			<view class="commonly-box">
+				<view class="commonly" @click="Piabodata('接待记录')" v-if="permissions.commonly2">
+					<view class="commonly-img">
+						<image class="commonly-img1"
+							src="https://static.quhouse.com/4649b5bd19124afca0f1a809f93bfd73.png" mode=""></image>
+					</view>
+					<view class="commonly-text">接待记录</view>
 				</view>
-				<view class="commonly-text">违禁记录</view>
-			</view>
-			<view class="commonly" @click="toUserinsightinto()" v-if="permissions.commonly10">
-				<view class="commonly-img">
-					<image class="commonly-img1" src="https://static.quhouse.com/c2c2e1af3d5f41d180ec55a04a5d4f26.png" mode=""></image>
+				<view class="commonly" @click="Piabodata('违禁记录')" v-if="permissions.commonly3">
+					<view class="commonly-img">
+						<image class="commonly-img1"
+							src="https://static.quhouse.com/b1dd1da2a969465bbbf41818320b8487.png" mode=""></image>
+					</view>
+					<view class="commonly-text">违禁记录</view>
 				</view>
-				<view class="commonly-text">客户画像</view>
-			</view>
-		</view>
-		<view class="title" v-if="permissions.commonly4||permissions.commonly8||permissions.commonly7||permissions.commonly9">
-			<image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png" mode="" />数据分析</view>
-		<view class="commonly-box">
-			<view class="commonly" @click="Piabodata('销讲分析')" v-if="permissions.commonly4">
-				<view class="commonly-img">
-					<image class="commonly-img1" src="https://static.quhouse.com/1f01dfa38203493b88d9668a506fdff3.png" mode=""></image>
+				<view class="commonly" @click="toUserinsightinto()" v-if="permissions.commonly10">
+					<view class="commonly-img">
+						<image class="commonly-img1"
+							src="https://static.quhouse.com/c2c2e1af3d5f41d180ec55a04a5d4f26.png" mode=""></image>
+					</view>
+					<view class="commonly-text">客户画像</view>
 				</view>
-				<view class="commonly-text">销讲分析</view>
 			</view>
-			<view class="commonly" @click="toTrendAnalysis()" v-if="permissions.commonly8">
-				<view class="commonly-img">
-					<image class="commonly-img1" src="https://static.quhouse.com/df070b1a2d5e48359c7de5654e4f7a17.png" mode=""></image>
-				</view>
-				<view class="commonly-text">销讲趋势</view>
+			<view class="title"
+				v-if="permissions.commonly4||permissions.commonly8||permissions.commonly7||permissions.commonly9">
+				<image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png"
+					mode="" />数据分析
 			</view>
-				<view class="commonly" @click="Piabodata('顾问排名')" v-if="permissions.commonly7">
-				<view class="commonly-img">
-					<image class="commonly-img1" src="https://static.quhouse.com/f5a6b2d6032348a1b256cfd7083be436.png" mode=""></image>
+			<view class="commonly-box">
+				<view class="commonly" @click="Piabodata('销讲分析')" v-if="permissions.commonly4">
+					<view class="commonly-img">
+						<image class="commonly-img1"
+							src="https://static.quhouse.com/1f01dfa38203493b88d9668a506fdff3.png" mode=""></image>
+					</view>
+					<view class="commonly-text">销讲分析</view>
 				</view>
-				<view class="commonly-text">顾问排名</view>
+				<view class="commonly" @click="toTrendAnalysis()" v-if="permissions.commonly8">
+					<view class="commonly-img">
+						<image class="commonly-img1"
+							src="https://static.quhouse.com/df070b1a2d5e48359c7de5654e4f7a17.png" mode=""></image>
+					</view>
+					<view class="commonly-text">销讲趋势</view>
 				</view>
-				<view class="commonly" @click="toStaffAnalysis()" v-if="permissions.commonly9">
-				<view class="commonly-img">
-					<image class="commonly-img1" src="https://static.quhouse.com/c2d3801540cf4880a68cce0e04eb59b0.png" mode=""></image>
+				<view class="commonly" @click="Piabodata('顾问排名')" v-if="permissions.commonly7">
+					<view class="commonly-img">
+						<image class="commonly-img1"
+							src="https://static.quhouse.com/f5a6b2d6032348a1b256cfd7083be436.png" mode=""></image>
+					</view>
+					<view class="commonly-text">顾问排名</view>
 				</view>
-				<view class="commonly-text">员工分析</view>
+				<view class="commonly" @click="toStaffAnalysis()" v-if="permissions.commonly9">
+					<view class="commonly-img">
+						<image class="commonly-img1"
+							src="https://static.quhouse.com/c2d3801540cf4880a68cce0e04eb59b0.png" mode=""></image>
+					</view>
+					<view class="commonly-text">员工分析</view>
 				</view>
-		</view>
-		<view class="title" v-if="permissions.commonly11||permissions.commonly12||permissions.commonly5||permissions.commonly6">
-			<image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png" mode="" />团队管理</view>
+			</view>
+			<view class="title"
+				v-if="permissions.commonly11||permissions.commonly12||permissions.commonly5||permissions.commonly6">
+				<image class="title-icon" src="https://static.quhouse.com/bc2ec951ad9a47e5bf58f2829926e143.png"
+					mode="" />团队管理
+			</view>
 			<view class="commonly-box">
 				<view class="commonly" @click="Theteamcompared()" v-if="permissions.commonly11">
-						<view class="commonly-img">
-							<image class="commonly-img1" src="https://static.quhouse.com/4f5a3a61c06a4508a806eb290ef678e6.png" mode=""></image>
-						</view>
-						<view class="commonly-text">团队对比</view>
+					<view class="commonly-img">
+						<image class="commonly-img1"
+							src="https://static.quhouse.com/4f5a3a61c06a4508a806eb290ef678e6.png" mode=""></image>
 					</view>
-					<view class="commonly" @click="Groupcontrast()" v-if="permissions.commonly12">
-						<view class="commonly-img">
-							<image class="commonly-img1" src="https://static.quhouse.com/759c2e3240e54213827196559ce38fa4.png" mode=""></image>
-						</view>
-						<view class="commonly-text">集团对比</view>
+					<view class="commonly-text">团队对比</view>
+				</view>
+				<view class="commonly" @click="Groupcontrast()" v-if="permissions.commonly12">
+					<view class="commonly-img">
+						<image class="commonly-img1"
+							src="https://static.quhouse.com/759c2e3240e54213827196559ce38fa4.png" mode=""></image>
 					</view>
-					<view class="commonly" @click="Piabodata('设备管理')" v-if="permissions.commonly5">
-				<view class="commonly-img">
-					<image class="commonly-img1" src="https://static.quhouse.com/e617133ecbbd46498e30719444fc02e8.png" mode=""></image>
+					<view class="commonly-text">集团对比</view>
 				</view>
-				<view class="commonly-text">设备管理</view>
-			</view>
-			<view class="commonly" @click="Piabodata('值班顾问')" v-if="permissions.commonly6">
-				<view class="commonly-img">
-					<image class="commonly-img1" src="https://static.quhouse.com/196fcbc7f6aa456cb9dff22cd3753445.png" mode=""></image>
+				<view class="commonly" @click="Piabodata('设备管理')" v-if="permissions.commonly5">
+					<view class="commonly-img">
+						<image class="commonly-img1"
+							src="https://static.quhouse.com/e617133ecbbd46498e30719444fc02e8.png" mode=""></image>
+					</view>
+					<view class="commonly-text">设备管理</view>
+				</view>
+				<view class="commonly" @click="Piabodata('值班顾问')" v-if="permissions.commonly6">
+					<view class="commonly-img">
+						<image class="commonly-img1"
+							src="https://static.quhouse.com/196fcbc7f6aa456cb9dff22cd3753445.png" mode=""></image>
+					</view>
+					<view class="commonly-text">值班顾问</view>
 				</view>
-				<view class="commonly-text">值班顾问</view>
-			</view>
 			</view>
-	</view>
+		</view>
 		<!-- 项目切换 -->
 		<view v-if="Showhiddenunits">
 			<u-select :mask-close-able="false" v-model="Showhiddenunits" mode="single-column" :list="lpanlist"
@@ -288,13 +319,16 @@
 		</view>
 		<u-calendar v-model="totalTimeShow" mode="range" @change="totalTimeChange"></u-calendar>
 		<u-popup v-model="timeshow" mode="bottom">
-			<view class="timeview" :style="{ color: zhixingcenterindex == 2 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(2,'近7天')">近7天</view>
-			<view class="timeview" :style="{ color: zhixingcenterindex == 6 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(6,'近30天')">近30天</view>
-			<view class="timeview" :style="{ color: zhixingcenterindex == 7 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(7,'自定义')">自定义</view>
+			<view class="timeview" :style="{ color: zhixingcenterindex == 2 ? '#2B6EFF' : '#333333' }"
+				@click="tabtimetap(2,'近7天')">近7天</view>
+			<view class="timeview" :style="{ color: zhixingcenterindex == 6 ? '#2B6EFF' : '#333333' }"
+				@click="tabtimetap(6,'近30天')">近30天</view>
+			<view class="timeview" :style="{ color: zhixingcenterindex == 7 ? '#2B6EFF' : '#333333' }"
+				@click="tabtimetap(7,'自定义')">自定义</view>
 		</u-popup>
 		<!-- 底部导航栏 -->
 		<!-- <u-tabbar :mid-button="false" activeColor="#1296db" inactiveColor="#999999" v-model="current" :list="tabbarList"></u-tabbar> -->
-		
+
 		<!-- 加载组件 -->
 		<u-loadings v-model="LOADING"></u-loadings>
 	</view>
@@ -321,23 +355,23 @@
 				Whetheroffline: false, //是否离线
 				signalDevice: 0, //信号
 				signalDevicetext: "",
-				imeiCode:'',//设备号
-				openFlag:'',//接待是否
-				choiceIndex:'近7天',
+				imeiCode: '', //设备号
+				openFlag: '', //接待是否
+				choiceIndex: '近7天',
 				audioStatus: false,
 				equipmentisshow: false,
-				timeshow:false,
+				timeshow: false,
 				equipmentobj: {
 					totalNum: '',
 					onlineNum: '',
 					activeNum: '',
 					lowPowerNum: '',
 				},
-				operation:{
-					receptionCount:'',
-					accountCount:'',
-					forbiddenCount:'',
-					lowPowerNum:''
+				operation: {
+					receptionCount: '',
+					accountCount: '',
+					forbiddenCount: '',
+					lowPowerNum: ''
 				},
 				Menulist: [],
 				realtimeobj: {
@@ -390,7 +424,7 @@
 			this.LOADING = true
 			this.sendLog()
 		},
-		
+
 		onPullDownRefresh() {
 			this.getMenu()
 
@@ -430,7 +464,7 @@
 				uni.stopPullDownRefresh()
 			}, 3000)
 		},
-		
+
 		onShow() {
 			this.getMenu()
 
@@ -440,7 +474,7 @@
 			} else {
 				this.methodsisshow = true;
 			}
-			if (this.userInfo.zkProperties&&this.userInfo.zkProperties.length == 1) {
+			if (this.userInfo.zkProperties && this.userInfo.zkProperties.length == 1) {
 				this.buildingID = uni.getStorageSync('buildingID').id;
 				this.buildingname = uni.getStorageSync('buildingID').name;
 				this.buildingishow = false;
@@ -449,7 +483,7 @@
 				this.buildingishow = true;
 				this.buildingname = uni.getStorageSync('buildingID').name;
 				this.buildingID = uni.getStorageSync('buildingID').id;
-				if(this.userInfo.zkProperties&&this.userInfo.zkProperties.length){
+				if (this.userInfo.zkProperties && this.userInfo.zkProperties.length) {
 					this.userInfo.zkProperties.forEach(item => {
 						item.label = item.propertyName;
 						item.value = item.id
@@ -469,26 +503,51 @@
 			}
 			this.initworkThisWeek()
 			this.initrealTimeStatistics()
+			this.updateInit()
 		},
 		methods: {
-			indexStatus(i){
+
+			updateInit() {
+				this.$u.get(config.service.notReadNum, {
+					id: uni.getStorageSync('weapp_session_userInfo_data').accountId,
+					projectId: uni.getStorageSync('buildingID').id
+				}).then(res => {
+					console.log(res)
+					if (res > 0) {
+						uni.setTabBarBadge({ //显示数字
+							index: 4, //tabbar下标
+							text: `${res}`//数字
+						})
+					} else {
+						uni.removeTabBarBadge({
+							index: 4
+						})
+					}
+				}).catch(e => {
+					uni.removeTabBarBadge({
+						index: 4
+					})
+				})
+			},
+
+			indexStatus(i) {
 				if (this.permissions.commonly5 == true) {
-					if(i==0){
+					if (i == 0) {
 						uni.switchTab({
-							url:"/pages/index/customer"
+							url: "/pages/index/customer"
 						})
-					}else if(i==1){
+					} else if (i == 1) {
 						uni.navigateTo({
 							url: '/pages/center/records/index?refresh=refresh&markAdvisor=0'
 						});
-					}else if(i==3){
+					} else if (i == 3) {
 						uni.navigateTo({
 							url: '/pages/center/prohibited/index?refresh=refresh'
 						});
 					}
 				}
 			},
-			sendLog(){
+			sendLog() {
 				uni.request({
 					url: config.service.addLog,
 					method: "POST",
@@ -498,7 +557,7 @@
 					},
 					data: {
 						houseId: this.buildingID,
-						serviceId:"test"
+						serviceId: "test"
 					},
 					success: (data) => {
 						console.log(data)
@@ -506,19 +565,19 @@
 				})
 			},
 			//时间选择
-			tabtimetap(index,str){
-				this.timeshow=false;
+			tabtimetap(index, str) {
+				this.timeshow = false;
 				if (index == 7) {
 					this.totalTimeShow = true;
 				} else {
 					console.log(str)
-					this.choiceIndex=str
+					this.choiceIndex = str
 					this.zhixingcenterindex = index;
 					this.initworkThisWeek()
 				}
 			},
-			taptimeisshow(){
-				this.timeshow=true;
+			taptimeisshow() {
+				this.timeshow = true;
 			},
 			//获取权限
 			getMenu() {
@@ -542,12 +601,12 @@
 							this.permissions.commonly5 = newmenulist.sbgl;
 							this.permissions.commonly6 = newmenulist.zbgw;
 							this.permissions.commonly7 = newmenulist.gwpm;
-							
-							this.permissions.commonly8=newmenulist.lpdb;
-							this.permissions.commonly9=newmenulist.xjqs;
-							this.permissions.commonly10=newmenulist.tddb;
-							this.permissions.commonly11=newmenulist.gwnl;
-							this.permissions.commonly12=newmenulist.yhhx;
+
+							this.permissions.commonly8 = newmenulist.lpdb;
+							this.permissions.commonly9 = newmenulist.xjqs;
+							this.permissions.commonly10 = newmenulist.tddb;
+							this.permissions.commonly11 = newmenulist.gwnl;
+							this.permissions.commonly12 = newmenulist.yhhx;
 
 							this.permissions.myisshebei = newmenulist.wdsb;
 							this.permissions.shebeinum = newmenulist.sbtj;
@@ -561,7 +620,7 @@
 			totalTimeChange(e) {
 				this.statDateStart = e.startDate;
 				this.statDateEnd = e.endDate;
-				this.choiceIndex= `${e.startDate.replace(/\-/g, '.')}-${e.endDate.replace(/\-/g, '.')}`
+				this.choiceIndex = `${e.startDate.replace(/\-/g, '.')}-${e.endDate.replace(/\-/g, '.')}`
 				this.zhixingcenterindex = 7;
 				this.initworkThisWeek()
 			},
@@ -667,17 +726,17 @@
 				})
 			},
 			// 待处理
-			waitForOperation (){
-				this.$u.post('/cusLvStatistics/waitForOperation ',{
-					houseId:this.buildingID
-				})
-				.then(res=>{
-					// console.log(res,'带接待')
-					this.operation.receptionCount=res.receptionCount
-					this.operation.accountCount=res.accountCount
-					this.operation.forbiddenCount=res.forbiddenCount
-					this.operation.lowPowerNum=res.lowPowerNum
-				})
+			waitForOperation() {
+				this.$u.post('/cusLvStatistics/waitForOperation ', {
+						houseId: this.buildingID
+					})
+					.then(res => {
+						// console.log(res,'带接待')
+						this.operation.receptionCount = res.receptionCount
+						this.operation.accountCount = res.accountCount
+						this.operation.forbiddenCount = res.forbiddenCount
+						this.operation.lowPowerNum = res.lowPowerNum
+					})
 			},
 			//我的工牌
 			iniodianloang() {
@@ -696,8 +755,8 @@
 						if (data.data.data == null) {
 							return
 						} else {
-							this.imeiCode=data.data.data.imei
-							this.openFlag=data.data.data.recCmd
+							this.imeiCode = data.data.data.imei
+							this.openFlag = data.data.data.recCmd
 							if (data.data.data > 100) {
 								this.percentage = 100;
 							} else {
@@ -729,7 +788,7 @@
 			piskbuilding() {
 				// this.Showhiddenunits = true;
 				uni.navigateTo({
-					url:"../mine/selectBuilding"
+					url: "../mine/selectBuilding"
 				})
 			},
 			// 项目选择确认
@@ -768,15 +827,18 @@
 				} else {
 					if (this.zhixingcenterindex == 2) {
 						uni.navigateTo({
-							url: '/pages/center/prohibited/index?refresh=refresh&activeTotal=2' + '&violatedStatus=1'
+							url: '/pages/center/prohibited/index?refresh=refresh&activeTotal=2' +
+								'&violatedStatus=1'
 						});
-					} else if (this.zhixingcenterindex == 6) {//近30天
+					} else if (this.zhixingcenterindex == 6) { //近30天
 						uni.navigateTo({
-							url: '/pages/center/prohibited/index?refresh=refresh&activeTotal=3' + '&violatedStatus=1'
+							url: '/pages/center/prohibited/index?refresh=refresh&activeTotal=3' +
+								'&violatedStatus=1'
 						});
-					} else {// 自定义时间段
+					} else { // 自定义时间段
 						uni.navigateTo({
-							url: '/pages/center/prohibited/index?refresh=refresh&activeTotal=4&staTime=' + this.statDateStart + '&endtime=' + this.statDateEnd + '&violatedStatus=1'
+							url: '/pages/center/prohibited/index?refresh=refresh&activeTotal=4&staTime=' + this
+								.statDateStart + '&endtime=' + this.statDateEnd + '&violatedStatus=1'
 						});
 					}
 				}
@@ -796,31 +858,33 @@
 							url: '/pages/index/customer'
 						});
 					} else if (i == 3) {
-						if (this.zhixingcenterindex == 2) {// 近7天
+						if (this.zhixingcenterindex == 2) { // 近7天
 							uni.navigateTo({
 								url: '/pages/center/records/index?refresh=refresh&activeTotal=2&validInvalid=0'
 							});
-						} else if (this.zhixingcenterindex == 6) {//近30天
+						} else if (this.zhixingcenterindex == 6) { //近30天
 							uni.navigateTo({
 								url: '/pages/center/records/index?refresh=refresh&activeTotal=3&validInvalid=0'
 							});
-						} else {// 自定义时间段
+						} else { // 自定义时间段
 							uni.navigateTo({
-								url: '/pages/center/records/index?refresh=refresh&activeTotal=4&validInvalid=0&staTime=' + this.statDateStart + '&endtime=' + this.statDateEnd
+								url: '/pages/center/records/index?refresh=refresh&activeTotal=4&validInvalid=0&staTime=' +
+									this.statDateStart + '&endtime=' + this.statDateEnd
 							});
 						}
 					} else if (i == 33) {
-						if (this.zhixingcenterindex == 2) {// 近7天
+						if (this.zhixingcenterindex == 2) { // 近7天
 							uni.navigateTo({
 								url: '/pages/center/records/index?refresh=refresh&activeTotal=2'
 							});
-						} else if (this.zhixingcenterindex == 6) {//近30天
+						} else if (this.zhixingcenterindex == 6) { //近30天
 							uni.navigateTo({
 								url: '/pages/center/records/index?refresh=refresh&activeTotal=3'
 							});
-						} else {// 自定义时间段
+						} else { // 自定义时间段
 							uni.navigateTo({
-								url: '/pages/center/records/index?refresh=refresh&activeTotal=4&staTime=' + this.statDateStart + '&endtime=' + this.statDateEnd
+								url: '/pages/center/records/index?refresh=refresh&activeTotal=4&staTime=' + this
+									.statDateStart + '&endtime=' + this.statDateEnd
 							});
 						}
 					} else if (i == 6) {
@@ -838,7 +902,8 @@
 							});
 						} else {
 							uni.navigateTo({
-								url: '/pages/center/records/index?refresh=refresh&activeTotal=4&validInvalid=0&staTime=' + this.statDateStart + '&endtime=' + this.statDateEnd
+								url: '/pages/center/records/index?refresh=refresh&activeTotal=4&validInvalid=0&staTime=' +
+									this.statDateStart + '&endtime=' + this.statDateEnd
 							});
 						}
 					} else {
@@ -917,7 +982,7 @@
 					uni.navigateTo({
 						url: '/pages/center/prohibited/index?refresh=refresh'
 					});
-				}else if (item == '日报') {
+				} else if (item == '日报') {
 					uni.navigateTo({
 						url: '/pages/mine/daily/dailyList?refresh=refresh'
 					});
@@ -968,6 +1033,7 @@
 		.Switching1 {
 			width: 44rpx;
 			height: 44rpx;
+
 			.Switching1-img {
 				width: 44rpx;
 				height: 44rpx;
@@ -976,7 +1042,7 @@
 
 		.Switching2 {
 			margin: 0 12rpx;
-			flex:1;
+			flex: 1;
 			height: 44rpx;
 			font-size: 32rpx;
 			font-family: PingFangSC-Medium, PingFang SC;
@@ -996,9 +1062,10 @@
 		}
 	}
 
-	.gongpai{
+	.gongpai {
 		margin-bottom: 20rpx;
 	}
+
 	.Workcard {
 		width: 100%;
 		background: #FFFFFF;
@@ -1024,6 +1091,7 @@
 					background-size: 100% 100%;
 					padding: 8rpx;
 					transform: rotate(-90deg);
+
 					.bar {
 						background-color: #43CD80;
 						height: 100%;
@@ -1064,12 +1132,13 @@
 		}
 	}
 
-	.contbox{
+	.contbox {
 		width: 690rpx;
 		background: #FFFFFF;
 		border-radius: 12rpx;
 		padding: 24rpx 0 30rpx;
 		margin-bottom: 20rpx;
+
 		.title {
 			height: 42rpx;
 			font-size: 30rpx;
@@ -1080,29 +1149,33 @@
 			margin-bottom: 24rpx;
 			display: flex;
 			align-items: center;
-			.title-icon{
+
+			.title-icon {
 				width: 12rpx;
 				height: 20rpx;
 				margin-right: 18rpx;
 			}
 		}
-		.timeshow{
+
+		.timeshow {
 			height: 40rpx;
 			font-size: 28rpx;
 			font-family: PingFangSC-Regular, PingFang SC;
 			font-weight: 400;
 			color: #666666;
 			line-height: 40rpx;
-			margin: -18rpx 0 24rpx 35rpx ;
+			margin: -18rpx 0 24rpx 35rpx;
 		}
 	}
 
 	.shebenbox {
 		width: 100%;
 		display: flex;
+
 		.shebenche {
 			width: 25%;
 			height: 100%;
+
 			.shebenchenum {
 				width: 100%;
 				text-align: center;
@@ -1127,13 +1200,16 @@
 			}
 		}
 	}
+
 	//今日工作
 	.real-timebox {
 		width: 100%;
+
 		.timebox {
 			width: 100%;
 			display: flex;
 			margin-bottom: 20rpx;
+
 			.real {
 				flex: 1;
 				height: 100%;
@@ -1147,7 +1223,8 @@
 					font-weight: bold;
 					color: #333333;
 					line-height: 50rpx;
-					.qushi-icon{
+
+					.qushi-icon {
 						width: 28rpx;
 						height: 14rpx;
 						margin-left: 2rpx;
@@ -1183,6 +1260,7 @@
 				width: 100%;
 				height: 80rpx;
 				text-align: center;
+
 				.commonly-img1 {
 					width: 80rpx;
 					height: 80rpx;
@@ -1202,7 +1280,8 @@
 			}
 		}
 	}
-	.timeview{
+
+	.timeview {
 		height: 90rpx;
 		line-height: 90rpx;
 		width: 100%;
diff --git a/pages/index/learning.vue b/pages/index/learning.vue
index facdac0..a470d68 100644
--- a/pages/index/learning.vue
+++ b/pages/index/learning.vue
@@ -188,11 +188,35 @@
 				this.leftIndex = 0
 				this.infoinit()
 			}
+			this.updateInit()
 		},
 		// onLoad() {
 		// 	this.infoinit()
 		// },
 		methods: {
+
+			updateInit() {
+				this.$u.get(config.service.notReadNum, {
+					id: uni.getStorageSync('weapp_session_userInfo_data').accountId,
+					projectId: uni.getStorageSync('buildingID').id
+				}).then(res => {
+					console.log(res)
+					if (res > 0) {
+						uni.setTabBarBadge({ //显示数字
+							index: 4, //tabbar下标
+							text: `${res}`//数字
+						})
+					} else {
+						uni.removeTabBarBadge({
+							index: 4
+						})
+					}
+				}).catch(e => {
+					uni.removeTabBarBadge({
+						index: 4
+					})
+				})
+			},
 			// 跳转部分学习
 			quclicks(item) {
 				uni.showLoading({
diff --git a/pages/index/personal.vue b/pages/index/personal.vue
index 0fb5b28..8d7eaea 100644
--- a/pages/index/personal.vue
+++ b/pages/index/personal.vue
@@ -1,11 +1,10 @@
 <template>
 	<view class="main">
-		<u-navbar title="我的" size="16" :is-back="false" :background="{background: 'none'}" :border-bottom="false" title-color="#333">	</u-navbar>
+		<u-navbar title="我的" size="16" :is-back="false" :background="{background: 'none'}" :border-bottom="false"
+			title-color="#333"> </u-navbar>
 		<view class="header">
 			<view class="header-zuo">
-				<u-avatar
-					:src="photo?photo:'/static/images/avatar.png'"
-					size="128"></u-avatar>
+				<u-avatar :src="photo?photo:'/static/images/avatar.png'" size="128"></u-avatar>
 			</view>
 			<view class="header-you">
 				<view class="userName u-line-2">
@@ -17,39 +16,44 @@
 		<view class="settingGroup">
 			<navigator class="line" url="/pages/mine/messageList">
 				<view class="title" style="width: 19%;">
-					<image src="/static/images/studyhot.png"  mode=""></image>
+					<image src="/static/images/studyhot.png" mode=""></image>
 					消息
+					<template v-if="count > 0">
+						<view class="count">
+							{{ count }}
+						</view>
+					</template>
 				</view>
 				<view class="right">
-					<image src="/static/images/right-arrow.png"  mode=""></image>
+					<image src="/static/images/right-arrow.png" mode=""></image>
 				</view>
 			</navigator>
 			<navigator class="line" url="/pages/mine/Myprofile">
 				<view class="title">
-					<image src="/static/images/setting.png"  mode=""></image>
+					<image src="/static/images/setting.png" mode=""></image>
 					个人资料
 				</view>
 				<view class="right">
-					<image src="/static/images/right-arrow.png"  mode=""></image>
+					<image src="/static/images/right-arrow.png" mode=""></image>
 				</view>
 			</navigator>
 
 			<view class="line" @click="Changehepassword">
 				<view class="title">
-					<image src="/static/images/password.png"  mode=""></image>
+					<image src="/static/images/password.png" mode=""></image>
 					修改密码
 				</view>
 				<view class="right">
-					<image src="/static/images/right-arrow.png"  mode=""></image>
+					<image src="/static/images/right-arrow.png" mode=""></image>
 				</view>
 			</view>
 			<view class="line" @click="phone">
 				<view class="title">
-					<image src="/static/images/concat.png"  mode=""></image>
+					<image src="/static/images/concat.png" mode=""></image>
 					联系客服
 				</view>
 				<view class="right">
-					<image src="/static/images/right-arrow.png"  mode=""></image>
+					<image src="/static/images/right-arrow.png" mode=""></image>
 				</view>
 			</view>
 			<!-- <view class="line" @click="help">
@@ -61,7 +65,7 @@
 					<image src="/static/images/right-arrow.png"  mode=""></image>
 				</view>
 			</view> -->
-<!-- 			<view class="line" @click="scan">
+			<!-- 			<view class="line" @click="scan">
 				<view class="title">
 					<image src="/static/images/visitCode.png"  mode=""></image>
 					访客登记码
@@ -97,29 +101,55 @@
 				name: "",
 				photo: "",
 				mobile: "",
+				count: 0, // 
 			};
 		},
-		onShow: function() {
+		onShow() {
 			var userInfos = uni.getStorageSync('weapp_session_userInfo_data');
 			this.name = userInfos.name,
 				this.photo = userInfos.avatar,
 				this.mobile = userInfos.username
+			this.updateInit()
 		},
 		methods: {
+			updateInit() {
+				this.$u.get(config.service.notReadNum, {
+					id: uni.getStorageSync('weapp_session_userInfo_data').accountId,
+					projectId: uni.getStorageSync('buildingID').id
+				}).then(res => {
+					this.count = res
+					console.log(res)
+					if (res > 0) {
+						uni.setTabBarBadge({ //显示数字
+							index: 4, //tabbar下标
+							text: `${res}` //数字
+						})
+					} else {
+						uni.removeTabBarBadge({
+							index: 4
+						})
+					}
+				}).catch(e => {
+					uni.removeTabBarBadge({
+						index: 4
+					})
+				})
+			},
+
 			//拨打电话
 			phone() {
 				wx.makePhoneCall({
 					phoneNumber: '4008191707,8888' //仅为示例，并非真实的电话号码
 				})
 			},
-			scan(){
+			scan() {
 				uni.navigateTo({
-					url:"../mine/registerCode"
+					url: "../mine/registerCode"
 				})
 			},
-			help(){
+			help() {
 				uni.navigateTo({
-					url:"../mine/help/index"
+					url: "../mine/help/index"
 				})
 			},
 			//修改密码
@@ -181,6 +211,7 @@
 		background: url('https://static.quhouse.com/efadbd8a89f94e98b37eb59dc8074f83.png') no-repeat;
 		background-size: 750rpx 600rpx;
 	}
+
 	.header {
 		width: 670rpx;
 		height: 248rpx;
@@ -191,6 +222,7 @@
 		margin: 0 40rpx 60rpx;
 		border-radius: 18rpx;
 		box-shadow: 0 3rpx 10rpx #999;
+
 		.header-zuo {
 			width: 128rpx;
 			height: 128rpx;
@@ -199,6 +231,7 @@
 
 		.header-you {
 			margin-left: 30rpx;
+
 			.userName {
 				margin-bottom: 20rpx;
 				font-size: 36rpx;
@@ -223,36 +256,55 @@
 		color: #333333;
 		font-size: 30rpx;
 		border-radius: 12rpx;
+
 		.line {
+			position: relative;
 			height: 44rpx;
 			margin: 0 50rpx 60rpx;
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
+
 			.title {
 				display: flex;
 				align-items: center;
 				width: 300rpx;
-				height:44rpx;
+				height: 44rpx;
 				line-height: 44rpx;
 				font-size: 32rpx;
 				font-family: PingFangSC-Regular, PingFang SC;
 				font-weight: 400;
 				color: #333333;
-				image{
+
+				image {
 					width: 36rpx;
 					height: 36rpx;
 					margin-right: 20rpx;
 				}
+				
+				.count {
+					position: absolute;
+					right: 24rpx;
+					width: 50rpx;
+					height: 50rpx;
+					border-radius: 50%;
+					background: red;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					color: #fff;
+					font-size: 20rpx;
+				}
 			}
-			.right{
-				image{
+
+			.right {
+				image {
 					width: 12rpx;
 					height: 28rpx;
 				}
 			}
 		}
-		
+
 		.loginout {
 			position: absolute;
 			left: 40rpx;