Merge branch 'master' of http://139.159.177.244:3000/yuanye/high-mini

# Conflicts:
#	static/img/tc.png

App.vue

@@ -5,13 +5,13 @@
 			// brestUrl: 'http://192.168.3.4:9302/brest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			// url: 'https://hsg.dctpay.com/crest',
-			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			// brestUrl : 'https://hsg.dctpay.com/brest',
+			url: 'https://hsg.dctpay.com/crest',
+			imgUrl: 'https://hsg.dctpay.com/filesystem/',
+			brestUrl : 'https://hsg.dctpay.com/brest',
 			//测试
-			url: 'https://hsgcs.dctpay.com/crest',
-			brestUrl : 'https://hsgcs.dctpay.com/brest',
-			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			// url: 'https://hsgcs.dctpay.com/crest',
+			// brestUrl : 'https://hsgcs.dctpay.com/brest',
+			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
 			
 			userInfo: "",
 			brestUserInfo : '',

components/mehaotian-search-revision/mehaotian-search-revision.vue

@@ -114,7 +114,6 @@
 						return;
 					}
 				}
-				console.log(this.inputVal);
 				this.$emit('search', this.inputVal ? this.inputVal : this.placeholder);
 			}
 		},

pages/user/runningWater/runningWater.vue

@@ -152,6 +152,8 @@
 			},
 			bindDateChange: function(e) {
 				this.date = e.target.value;
+				this.pageNum = 1;
+				this.pageSize = 10;
 				this.isNoMoreData = false;
 				this.agentSalesCodeList = [];
 				this.getAgentSalesCodeList();