Merge branch 'devlop' of http://git.qniao.cn/dengxiongfei/paper-shopkeeper-app into devlop

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(){

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()
 						}