From d30371b4077e3cc2f55b390f48e9e90ed3db4dae Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Wed, 8 Jun 2022 19:38:52 +0800
Subject: [PATCH] tijiao

---
 pages/mine/messageList.vue            |  4 ++--
 pages/mine/reportExcel/dayReport.vue  |  6 +-----
 pages/mine/reportExcel/weekReport.vue | 17 +++++++++--------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/pages/mine/messageList.vue b/pages/mine/messageList.vue
index aa9f108..f6d7cda 100644
--- a/pages/mine/messageList.vue
+++ b/pages/mine/messageList.vue
@@ -185,7 +185,7 @@
 								duration: 2000
 							});
 						} else {
-							this.count = res.data.count
+							this.count = res.data.data.sum
 							if (this.pageNum != 1) {
 								this.updateAnnList = [...this.updateAnnList, ...res.data.data.list.results];
 							} else {
@@ -206,7 +206,7 @@
 			// 跳转日报
 			goReception(data, index) {
 				this.$store.commit('setMessageObj', data)
-				if (data.title == '周报') {
+				if (data.messageType == 2) {
 					uni.navigateTo({
 						url: `/pages/mine/reportExcel/weekReport?id=${data.id}`
 					})
diff --git a/pages/mine/reportExcel/dayReport.vue b/pages/mine/reportExcel/dayReport.vue
index 940fa65..8d2f2c9 100644
--- a/pages/mine/reportExcel/dayReport.vue
+++ b/pages/mine/reportExcel/dayReport.vue
@@ -284,9 +284,6 @@
 
 		<!-- 底部按钮 -->
 		<view class="nav-footer">
-			<view class="footer-item" @click="copy">
-				复制
-			</view>
 
 			<view class="footer-item full" style="margin-left: 22rpx;">
 				<button open-type="share" class="fulls">
@@ -330,7 +327,7 @@
 		methods: {
 			// 获取日报详情
 			getMessage() {
-				this.$u.get('/api/zkMessage/findById', {
+				this.$u.get('/zkMessage/findByProjectId', {
 					id: this.id
 				}).then(res => {
 					console.log(res)
@@ -339,7 +336,6 @@
 						...res.zkMessage,
 						...data
 					}
-					console.log(this.weekObj, 'this.weekObj')
 					this.projectName = res.projectName
 					this.init()
 				}).catch(e => {
diff --git a/pages/mine/reportExcel/weekReport.vue b/pages/mine/reportExcel/weekReport.vue
index 9558cf4..94e03a4 100644
--- a/pages/mine/reportExcel/weekReport.vue
+++ b/pages/mine/reportExcel/weekReport.vue
@@ -91,23 +91,23 @@
 			<view class="statistics-title">
 				接待统计
 			</view>
-			<template v-if="weekObj.customerInfo1.length - weekObj.customerInfo2.length != 0">
+			<template v-if="weekObj.customerInfo1 && weekObj.customerInfo2">
 				<view class="statistics-desc">
 					<text>
 						顾问平均执行率对比上周
 					</text>
 					<text>
-						{{ rankTop('ranktype') }}
+						{{ rankTop('ranktype') || '' }}
 					</text>
-					<text :class="[rankTop('class')]">{{ rankTop('people') }}</text>
+					<text :class="[rankTop('class')]">{{ rankTop('people') || '' }}</text>
 					<text class="">
-						人，其中{{ rankTop('topName') }}上升
+						人，其中{{ rankTop('topName') || '' }}上升
 					</text>
-					<text class="up">{{ rankTop('topPk') }}</text>
+					<text class="up">{{ rankTop('topPk') || '' }}</text>
 					<text class="">
-						%为最高，{{ rankTop('lastName') }}下降
+						%为最高，{{ rankTop('lastName') || '' }}下降
 					</text>
-					<text class="down">{{ rankTop('lastPk') }}</text>
+					<text class="down">{{ rankTop('lastPk') || '' }}</text>
 					<text class="">
 						%降幅最大。
 					</text>
@@ -394,7 +394,8 @@
 		onLoad(option) {
 			if (option.id) this.id = option.id
 			this.getMessage()
-			console.log(this.rankTop(this.weekObj), '12312312312')
+			console.log(this.weekObj, '12312312312')
+			console.log(JSON.stringify(this.weekObj), '12312312312')
 		},