From c1a11d00e6cfffee251a05d55b8693bc42ff4f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=98=81=E8=BE=89?=
 <yanggehui@chalco-steering.com>
Date: Thu, 27 Jan 2022 15:52:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E5=85=A8=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/message/index.vue          | 5 ++++-
 pages/message/system-message.vue | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pages/message/index.vue b/pages/message/index.vue
index 241ff8c..20b1c8e 100644
--- a/pages/message/index.vue
+++ b/pages/message/index.vue
@@ -53,7 +53,10 @@ export default {
 			this.subIndex = item
 		},
 		systemCount(item){
-			this.systemBadge = item
+			if(item === 0){
+				this.systemBadge = 0
+			}
+			this.systemBadge =this.systemBadge + item
 			console.log('this.systemBadge',this.systemBadge)
 		},
 		cupRead(){
diff --git a/pages/message/system-message.vue b/pages/message/system-message.vue
index ae813be..ce79c13 100644
--- a/pages/message/system-message.vue
+++ b/pages/message/system-message.vue
@@ -123,7 +123,10 @@ export default {
 				var meesage = this.list.map(item => {
 					return item.id
 				})
-				systemRead(meesage)
+				var params = {
+					messageIds:meesage
+				}
+				systemRead(params)
 					.then(res => {
 						if (res) {
 							uni.showToast({
@@ -132,6 +135,7 @@ export default {
 							})
 							this.pagination.pageNum = 0
 							this.queryData()
+							this.$emit('systemCount', 0)
 						} else {
 							reject()
 						}

From 433553e3909a07954022b58ec46d1c20ca0f26f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=98=81=E8=BE=89?=
 <yanggehui@chalco-steering.com>
Date: Thu, 27 Jan 2022 16:30:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=85=AC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/submit-quotation/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/submit-quotation/index.vue b/pages/submit-quotation/index.vue
index 4bae0ac..ba4d561 100644
--- a/pages/submit-quotation/index.vue
+++ b/pages/submit-quotation/index.vue
@@ -475,10 +475,11 @@ export default {
       this.upDataObj.otherFee = 0
       for (let i = 0; i < this.upDataObj.itemList.length; i++) {
         var totalAllPrice = parseFloat(this.upDataObj.totalAllPrice) + parseFloat(this.upDataObj.itemList[i].totalPrice)
-        this.upDataObj.totalAllPrice = round(totalAllPrice, 2)
         var otherFee = parseFloat(this.upDataObj.otherFee) + parseFloat(this.upDataObj.itemList[i].otherFee)
-        this.upDataObj.otherFee = round(otherFee, 2)
       }
+	   this.upDataObj.otherFee = round(otherFee, 2)
+	   var zj = totalAllPrice + otherFee
+	   this.upDataObj.totalAllPrice = round(zj, 2)
     },
     //提交报价
     updateQuery() {