Merge branch 'huipay-h5' into huipay-app-dev

pages/index/collectNotes/collectNotes.vue

@@ -199,6 +199,7 @@
 				let datas = {
 					pageNum: 1,
 					pageSize: 9999,
+					merStatus:1,
 					salesmanId: item
 				}
 				getMerList(datas).then(res => {
@@ -312,9 +313,9 @@
 					payTimeE: endTime,
 					outTradeNo: this.orderNo,
 					pageNum: pagenum,
-					// salesmanId:this.salesmanid,
-					// merId: this.merno,
-					// storeId: this.storeno,
+					salesmanId:this.salesmanid,
+					merId: this.merno,
+					storeId: this.storeno,
 					pageSize: this.pageSize
 				}
 				getTradeOrderList(datas).then(res => {