Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/business/business.vue

@@ -161,7 +161,9 @@
 					
 			// 	})
 			// }, 500);
-			
+			uni.removeTabBarBadge({
+				index: 4
+			})
 			this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
 				if (res.data.data) {
 					let name = 'myTip';

pages/grain_pulse/home.vue

@@ -197,6 +197,31 @@
 			else{
 				this.getList()
 			}
+			uni.removeTabBarBadge({
+				index: 4
+			})
+			this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
+				if (res.data.data) {
+					let name = 'myTip';
+					let value = res.data.data.task;
+					that.$store.commit('$uStore', {
+						name,
+						value
+					});
+					if(value != 0&&value){
+						uni.setTabBarBadge({
+							index:4,
+							text:value+""
+						})
+					}
+					name = 'taskTip';
+					value = res.data.data.task;
+					that.$store.commit('$uStore', {
+						name,
+						value
+					});
+				}
+			})
 		},
 		onLoad(option) {
 			if (option.position){

pages/sale/information.vue

@@ -179,7 +179,9 @@
 			this.loadData()
 			var userInfo = uni.getStorageSync("userInfo")
 			var that = this
-
+			uni.removeTabBarBadge({
+				index: 4
+			})
 			this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
 				console.log("noticeNumber", res)
 				if (res.data.data) {

pages/task/audit/purchase_settlement_details.vue

@@ -74,7 +74,6 @@
 				this.$api.doRequest('get', '/stockPurchaseReceiptReport/getInfo', {
 					id: this.id
 				}).then(res => {
-					debugger
 					this.contractNo = res.data.data.contractNo
 					this.unitPrice = res.data.data.price
 					this.goodsName = res.data.data.goodsName

pages/tran/tran.vue

@@ -129,6 +129,9 @@
 				var userInfo = uni.getStorageSync("userInfo")
 				var that = this
 				console.log("userInfo",userInfo)
+				uni.removeTabBarBadge({
+					index: 4
+				})
 				this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
 					if (res.data.data) {
 						let name = 'myTip';

pages/user/user.vue

@@ -281,6 +281,9 @@
 			this.isShow();
 			uni.hideKeyboard()
 			uni.showTabBar()
+			uni.removeTabBarBadge({
+				index: 4
+			})
 			this.loadData()
 			console.log("hasLogin", this.hasLogin)
 			if (this.userInfo) {